diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 97f0a8e14..639c779c3 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 74dd639e4..b2c751a35 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 99ed2312c..831a16d28 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -45,7 +45,8 @@ android {
             .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
             .forEach { output ->
                 if (variant.buildType.name == "release") {
-                    val outputFileName = "afinity-v${variant.versionName}-${output.getFilter("ABI")}.apk"
+                    val outputFileName =
+                        "afinity-v${variant.versionName}-${output.getFilter("ABI")}.apk"
                     output.outputFileName = outputFileName
                 }
             }
@@ -64,7 +65,7 @@ android {
             buildConfigField("boolean", "DEBUG", "false")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
         }
     }
@@ -91,7 +92,7 @@ android {
                 "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
                 "-opt-in=androidx.compose.material3.pulltorefresh.ExperimentalMaterial3PullToRefreshApi",
                 "-Xjvm-default=all",
-                "-Xcontext-receivers"
+                "-Xcontext-receivers",
             )
         }
     }
@@ -116,7 +117,6 @@ android {
 }
 
 dependencies {
-
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.core.splashscreen)
     implementation(libs.androidx.lifecycle.runtime.ktx)
@@ -124,6 +124,7 @@ dependencies {
     implementation(libs.androidx.hilt.work)
     implementation(libs.androidx.ui)
     ksp(libs.androidx.hilt.compiler)
+    implementation(libs.androidx.palette.ktx)
     implementation(libs.androidx.activity.compose)
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.ui)
@@ -178,4 +179,4 @@ dependencies {
     implementation(libs.androidx.paging.runtime)
     implementation(libs.androidx.paging.compose)
     coreLibraryDesugaring(libs.android.desugar.jdk)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2aa45fcd8..721fe6903 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,12 +5,14 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
 
     <application
         android:name=".AfinityApplication"
@@ -29,7 +31,8 @@
             android:exported="true"
             android:label="@string/app_name"
             android:supportsPictureInPicture="true"
-            android:theme="@style/Theme.AFinity.Splash">
+            android:theme="@style/Theme.AFinity.Splash"
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -70,6 +73,15 @@
             android:name="androidx.work.impl.foreground.SystemForegroundService"
             android:foregroundServiceType="dataSync"
             tools:node="merge" />
+
+        <service
+            android:name=".player.audiobookshelf.AudiobookshelfPlayerService"
+            android:exported="true"
+            android:foregroundServiceType="mediaPlayback">
+            <intent-filter>
+                <action android:name="androidx.media3.session.MediaSessionService" />
+            </intent-filter>
+        </service>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/makd/afinity/AfinityApplication.kt b/app/src/main/java/com/makd/afinity/AfinityApplication.kt
index 6cee0fc0d..d7485e8f5 100644
--- a/app/src/main/java/com/makd/afinity/AfinityApplication.kt
+++ b/app/src/main/java/com/makd/afinity/AfinityApplication.kt
@@ -17,6 +17,7 @@ import com.makd.afinity.data.repository.PreferencesRepository
 import com.makd.afinity.data.updater.UpdateScheduler
 import com.makd.afinity.data.updater.models.UpdateCheckFrequency
 import dagger.hilt.android.HiltAndroidApp
+import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -24,22 +25,17 @@ import kotlinx.coroutines.launch
 import okhttp3.OkHttpClient
 import okio.Path.Companion.toOkioPath
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltAndroidApp
 class AfinityApplication : Application(), Configuration.Provider, SingletonImageLoader.Factory {
 
-    @Inject
-    lateinit var workerFactory: HiltWorkerFactory
+    @Inject lateinit var workerFactory: HiltWorkerFactory
 
-    @Inject
-    lateinit var updateScheduler: UpdateScheduler
+    @Inject lateinit var updateScheduler: UpdateScheduler
 
-    @Inject
-    lateinit var preferencesRepository: PreferencesRepository
+    @Inject lateinit var preferencesRepository: PreferencesRepository
 
-    @Inject
-    lateinit var okHttpClient: OkHttpClient
+    @Inject lateinit var okHttpClient: OkHttpClient
 
     private val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
 
@@ -60,9 +56,7 @@ class AfinityApplication : Application(), Configuration.Provider, SingletonImage
     }
 
     override val workManagerConfiguration: Configuration
-        get() = Configuration.Builder()
-            .setWorkerFactory(workerFactory)
-            .build()
+        get() = Configuration.Builder().setWorkerFactory(workerFactory).build()
 
     override fun newImageLoader(context: PlatformContext): ImageLoader {
         return ImageLoader.Builder(context)
@@ -90,4 +84,4 @@ class AfinityApplication : Application(), Configuration.Provider, SingletonImage
             .crossfade(true)
             .build()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/MainActivity.kt b/app/src/main/java/com/makd/afinity/MainActivity.kt
index 15217fcb8..96d28be4a 100644
--- a/app/src/main/java/com/makd/afinity/MainActivity.kt
+++ b/app/src/main/java/com/makd/afinity/MainActivity.kt
@@ -32,22 +32,18 @@ import com.makd.afinity.ui.login.LoginScreen
 import com.makd.afinity.ui.theme.AFinityTheme
 import com.makd.afinity.ui.theme.ThemeMode
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
 import javax.inject.Inject
+import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
-    @Inject
-    lateinit var preferencesRepository: PreferencesRepository
+    @Inject lateinit var preferencesRepository: PreferencesRepository
 
-    @Inject
-    lateinit var updateManager: UpdateManager
+    @Inject lateinit var updateManager: UpdateManager
 
-    @Inject
-    lateinit var offlineModeManager: OfflineModeManager
+    @Inject lateinit var offlineModeManager: OfflineModeManager
 
-    @Inject
-    lateinit var updateScheduler: UpdateScheduler
+    @Inject lateinit var updateScheduler: UpdateScheduler
 
     override fun onCreate(savedInstanceState: Bundle?) {
         val splashScreen = installSplashScreen()
@@ -59,25 +55,24 @@ class MainActivity : ComponentActivity() {
         setContent {
             @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
             val windowSize = calculateWindowSizeClass(this)
-            val themeMode by preferencesRepository.getThemeModeFlow()
-                .collectAsState(initial = "SYSTEM")
-            val dynamicColors by preferencesRepository.getDynamicColorsFlow()
-                .collectAsState(initial = true)
-
-            AFinityTheme(
-                themeMode = themeMode,
-                dynamicColor = dynamicColors
-            ) {
+            val themeMode by
+                preferencesRepository.getThemeModeFlow().collectAsState(initial = "SYSTEM")
+            val dynamicColors by
+                preferencesRepository.getDynamicColorsFlow().collectAsState(initial = true)
+
+            AFinityTheme(themeMode = themeMode, dynamicColor = dynamicColors) {
                 val windowInsetsController =
                     WindowCompat.getInsetsController(window, window.decorView)
                 val mode = ThemeMode.fromString(themeMode)
                 val systemInDarkTheme = isSystemInDarkTheme()
 
-                val isLightTheme = when (mode) {
-                    ThemeMode.SYSTEM -> !systemInDarkTheme
-                    ThemeMode.LIGHT -> true
-                    ThemeMode.DARK, ThemeMode.AMOLED -> false
-                }
+                val isLightTheme =
+                    when (mode) {
+                        ThemeMode.SYSTEM -> !systemInDarkTheme
+                        ThemeMode.LIGHT -> true
+                        ThemeMode.DARK,
+                        ThemeMode.AMOLED -> false
+                    }
 
                 windowInsetsController.isAppearanceLightStatusBars = isLightTheme
                 windowInsetsController.isAppearanceLightNavigationBars = isLightTheme
@@ -86,7 +81,7 @@ class MainActivity : ComponentActivity() {
                     modifier = Modifier.fillMaxSize(),
                     updateManager = updateManager,
                     offlineModeManager = offlineModeManager,
-                    widthSizeClass = windowSize.widthSizeClass
+                    widthSizeClass = windowSize.widthSizeClass,
                 )
             }
         }
@@ -105,7 +100,7 @@ private fun MainContent(
     viewModel: MainViewModel = hiltViewModel(),
     updateManager: UpdateManager,
     offlineModeManager: OfflineModeManager,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val authState by viewModel.authenticationState.collectAsStateWithLifecycle()
 
@@ -113,7 +108,7 @@ private fun MainContent(
         AuthenticationState.Loading -> {
             AfinitySplashScreen(
                 statusText = stringResource(R.string.splash_status_authenticating),
-                modifier = modifier
+                modifier = modifier,
             )
         }
 
@@ -122,19 +117,16 @@ private fun MainContent(
                 modifier = modifier,
                 updateManager = updateManager,
                 offlineModeManager = offlineModeManager,
-                widthSizeClass = widthSizeClass
+                widthSizeClass = widthSizeClass,
             )
         }
 
         AuthenticationState.NotAuthenticated -> {
-            Scaffold(
-                modifier = modifier
-            ) { innerPadding ->
+            Scaffold(modifier = modifier) { innerPadding ->
                 LoginScreen(
-                    onLoginSuccess = {
-                    },
+                    onLoginSuccess = {},
                     modifier = Modifier.padding(innerPadding),
-                    widthSizeClass = widthSizeClass
+                    widthSizeClass = widthSizeClass,
                 )
             }
         }
@@ -143,6 +135,8 @@ private fun MainContent(
 
 sealed class AuthenticationState {
     object Loading : AuthenticationState()
+
     object Authenticated : AuthenticationState()
+
     object NotAuthenticated : AuthenticationState()
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/MainViewModel.kt b/app/src/main/java/com/makd/afinity/MainViewModel.kt
index 91bc175d1..702ee893b 100644
--- a/app/src/main/java/com/makd/afinity/MainViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/MainViewModel.kt
@@ -8,20 +8,22 @@ import com.makd.afinity.data.repository.AppDataRepository
 import com.makd.afinity.data.repository.auth.AuthRepository
 import com.makd.afinity.data.websocket.JellyfinWebSocketManager
 import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltViewModel
-class MainViewModel @Inject constructor(
+class MainViewModel
+@Inject
+constructor(
     private val authRepository: AuthRepository,
     private val playbackStateManager: PlaybackStateManager,
     private val webSocketManager: JellyfinWebSocketManager,
     private val appDataRepository: AppDataRepository,
-    private val offlineModeManager: OfflineModeManager
+    private val offlineModeManager: OfflineModeManager,
 ) : ViewModel() {
 
     private val _authenticationState =
@@ -67,11 +69,17 @@ class MainViewModel @Inject constructor(
     private fun observeAuthenticationChanges() {
         viewModelScope.launch {
             authRepository.isAuthenticated.collect { isAuthenticated ->
-                if (isAuthenticated && _authenticationState.value != AuthenticationState.Authenticated) {
+                if (
+                    isAuthenticated &&
+                        _authenticationState.value != AuthenticationState.Authenticated
+                ) {
                     Timber.d("User authenticated via auth repository")
                     _authenticationState.value = AuthenticationState.Authenticated
                     webSocketManager.connect()
-                } else if (!isAuthenticated && _authenticationState.value == AuthenticationState.Authenticated) {
+                } else if (
+                    !isAuthenticated &&
+                        _authenticationState.value == AuthenticationState.Authenticated
+                ) {
                     Timber.d("User logged out via auth repository")
                     _authenticationState.value = AuthenticationState.NotAuthenticated
                     webSocketManager.disconnect()
@@ -99,4 +107,4 @@ class MainViewModel @Inject constructor(
     fun refreshAuthState() {
         checkAuthenticationState()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/core/AppConstants.kt b/app/src/main/java/com/makd/afinity/core/AppConstants.kt
index 43deb0b07..f8502a7f0 100644
--- a/app/src/main/java/com/makd/afinity/core/AppConstants.kt
+++ b/app/src/main/java/com/makd/afinity/core/AppConstants.kt
@@ -14,4 +14,4 @@ object AppConstants {
 
     const val CLIENT_ICON_URL =
         "https://raw.githubusercontent.com/MakD/AFinity/refs/heads/master/screenshots/Logo/afinity_client_logo.png"
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/AfinityDatabase.kt b/app/src/main/java/com/makd/afinity/data/database/AfinityDatabase.kt
index e7b6d01d9..d43f54115 100644
--- a/app/src/main/java/com/makd/afinity/data/database/AfinityDatabase.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/AfinityDatabase.kt
@@ -5,6 +5,7 @@ import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
+import com.makd.afinity.data.database.dao.AudiobookshelfDao
 import com.makd.afinity.data.database.dao.BoxSetCacheDao
 import com.makd.afinity.data.database.dao.EpisodeDao
 import com.makd.afinity.data.database.dao.GenreCacheDao
@@ -32,6 +33,10 @@ import com.makd.afinity.data.database.entities.AfinitySegmentDto
 import com.makd.afinity.data.database.entities.AfinityShowDto
 import com.makd.afinity.data.database.entities.AfinitySourceDto
 import com.makd.afinity.data.database.entities.AfinityTrickplayInfoDto
+import com.makd.afinity.data.database.entities.AudiobookshelfConfigEntity
+import com.makd.afinity.data.database.entities.AudiobookshelfItemEntity
+import com.makd.afinity.data.database.entities.AudiobookshelfLibraryEntity
+import com.makd.afinity.data.database.entities.AudiobookshelfProgressEntity
 import com.makd.afinity.data.database.entities.BoxSetCacheEntity
 import com.makd.afinity.data.database.entities.BoxSetCacheMetadata
 import com.makd.afinity.data.database.entities.DownloadDto
@@ -52,116 +57,130 @@ import com.makd.afinity.data.models.user.AfinityUserDataDto
 import com.makd.afinity.data.models.user.User
 
 @Database(
-    entities = [
-
-        Server::class,
-        ServerAddress::class,
-        User::class,
-
-        LibraryCacheEntity::class,
-        BoxSetCacheEntity::class,
-        BoxSetCacheMetadata::class,
-
-        GenreCacheEntity::class,
-        GenreMovieCacheEntity::class,
-
-        ShowGenreCacheEntity::class,
-        GenreShowCacheEntity::class,
-
-        StudioCacheEntity::class,
-
-        TopPeopleCacheEntity::class,
-        PersonSectionCacheEntity::class,
-        MovieSectionCacheEntity::class,
-
-        AfinityMovieDto::class,
-        AfinityShowDto::class,
-        AfinitySeasonDto::class,
-        AfinityEpisodeDto::class,
-
-        AfinitySourceDto::class,
-        AfinityMediaStreamDto::class,
-        AfinityTrickplayInfoDto::class,
-        AfinitySegmentDto::class,
-
-        AfinityUserDataDto::class,
-
-        DownloadDto::class,
-
-        JellyseerrRequestEntity::class,
-        JellyseerrConfigEntity::class,
-    ],
-    version = 25,
-    exportSchema = false
+    entities =
+        [
+            Server::class,
+            ServerAddress::class,
+            User::class,
+            LibraryCacheEntity::class,
+            BoxSetCacheEntity::class,
+            BoxSetCacheMetadata::class,
+            GenreCacheEntity::class,
+            GenreMovieCacheEntity::class,
+            ShowGenreCacheEntity::class,
+            GenreShowCacheEntity::class,
+            StudioCacheEntity::class,
+            TopPeopleCacheEntity::class,
+            PersonSectionCacheEntity::class,
+            MovieSectionCacheEntity::class,
+            AfinityMovieDto::class,
+            AfinityShowDto::class,
+            AfinitySeasonDto::class,
+            AfinityEpisodeDto::class,
+            AfinitySourceDto::class,
+            AfinityMediaStreamDto::class,
+            AfinityTrickplayInfoDto::class,
+            AfinitySegmentDto::class,
+            AfinityUserDataDto::class,
+            DownloadDto::class,
+            JellyseerrRequestEntity::class,
+            JellyseerrConfigEntity::class,
+            AudiobookshelfConfigEntity::class,
+            AudiobookshelfLibraryEntity::class,
+            AudiobookshelfItemEntity::class,
+            AudiobookshelfProgressEntity::class,
+        ],
+    version = 26,
+    exportSchema = false,
 )
 @TypeConverters(AfinityTypeConverters::class)
 abstract class AfinityDatabase : RoomDatabase() {
 
     abstract fun serverDao(): ServerDao
+
     abstract fun serverAddressDao(): ServerAddressDao
+
     abstract fun userDao(): UserDao
 
     abstract fun movieDao(): MovieDao
+
     abstract fun showDao(): ShowDao
+
     abstract fun seasonDao(): SeasonDao
+
     abstract fun episodeDao(): EpisodeDao
 
     abstract fun sourceDao(): SourceDao
+
     abstract fun mediaStreamDao(): MediaStreamDao
+
     abstract fun userDataDao(): UserDataDao
 
     abstract fun serverDatabaseDao(): ServerDatabaseDao
 
     abstract fun libraryCacheDao(): LibraryCacheDao
+
     abstract fun boxSetCacheDao(): BoxSetCacheDao
+
     abstract fun genreCacheDao(): GenreCacheDao
+
     abstract fun studioCacheDao(): StudioCacheDao
+
     abstract fun topPeopleDao(): TopPeopleDao
+
     abstract fun personSectionDao(): PersonSectionDao
+
     abstract fun movieSectionDao(): MovieSectionDao
+
     abstract fun jellyseerrDao(): JellyseerrDao
 
+    abstract fun audiobookshelfDao(): AudiobookshelfDao
+
     companion object {
-        @Volatile
-        private var INSTANCE: AfinityDatabase? = null
+        @Volatile private var INSTANCE: AfinityDatabase? = null
 
         fun getDatabase(context: Context): AfinityDatabase {
-            return INSTANCE ?: synchronized(this) {
-                val instance = Room.databaseBuilder(
-                    context.applicationContext,
-                    AfinityDatabase::class.java,
-                    "afinity_database"
-                )
-                    .addMigrations(*DatabaseMigrations.ALL_MIGRATIONS)
-                    .build()
-                INSTANCE = instance
-                instance
-            }
+            return INSTANCE
+                ?: synchronized(this) {
+                    val instance =
+                        Room.databaseBuilder(
+                                context.applicationContext,
+                                AfinityDatabase::class.java,
+                                "afinity_database",
+                            )
+                            .addMigrations(*DatabaseMigrations.ALL_MIGRATIONS)
+                            .build()
+                    INSTANCE = instance
+                    instance
+                }
         }
 
         fun getProductionDatabase(context: Context): AfinityDatabase {
-            return INSTANCE ?: synchronized(this) {
-                val instance = Room.databaseBuilder(
-                    context.applicationContext,
-                    AfinityDatabase::class.java,
-                    "afinity_database"
-                )
-                    .addMigrations(*DatabaseMigrations.ALL_MIGRATIONS)
-                    .build()
-                INSTANCE = instance
-                instance
-            }
+            return INSTANCE
+                ?: synchronized(this) {
+                    val instance =
+                        Room.databaseBuilder(
+                                context.applicationContext,
+                                AfinityDatabase::class.java,
+                                "afinity_database",
+                            )
+                            .addMigrations(*DatabaseMigrations.ALL_MIGRATIONS)
+                            .build()
+                    INSTANCE = instance
+                    instance
+                }
         }
 
         fun createInMemoryDatabase(context: Context): AfinityDatabase {
             return Room.inMemoryDatabaseBuilder(
-                context.applicationContext,
-                AfinityDatabase::class.java
-            ).build()
+                    context.applicationContext,
+                    AfinityDatabase::class.java,
+                )
+                .build()
         }
 
         fun clearInstance() {
             INSTANCE = null
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/AfinityTypeConverters.kt b/app/src/main/java/com/makd/afinity/data/database/AfinityTypeConverters.kt
index 4ea9f3ec2..74811899a 100644
--- a/app/src/main/java/com/makd/afinity/data/database/AfinityTypeConverters.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/AfinityTypeConverters.kt
@@ -11,23 +11,21 @@ import com.makd.afinity.data.models.media.AfinitySegmentType
 import com.makd.afinity.data.models.media.AfinityShow
 import com.makd.afinity.data.models.media.AfinitySourceType
 import com.makd.afinity.data.models.media.AfinityStudio
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+import java.util.UUID
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import org.jellyfin.sdk.model.api.MediaStreamType
 import org.jellyfin.sdk.model.api.PersonKind
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
-import java.util.UUID
 
 class AfinityTypeConverters {
 
     private val json = Json { ignoreUnknownKeys = true }
 
-    @TypeConverter
-    fun fromUUID(uuid: UUID?): String? = uuid?.toString()
+    @TypeConverter fun fromUUID(uuid: UUID?): String? = uuid?.toString()
 
-    @TypeConverter
-    fun toUUID(uuidString: String?): UUID? = uuidString?.let { UUID.fromString(it) }
+    @TypeConverter fun toUUID(uuidString: String?): UUID? = uuidString?.let { UUID.fromString(it) }
 
     @TypeConverter
     fun fromLocalDateTime(dateTime: LocalDateTime?): String? =
@@ -52,8 +50,7 @@ class AfinityTypeConverters {
         }
 
     @TypeConverter
-    fun fromStringList(strings: List<String>?): String? =
-        strings?.let { json.encodeToString(it) }
+    fun fromStringList(strings: List<String>?): String? = strings?.let { json.encodeToString(it) }
 
     @TypeConverter
     fun toStringList(stringsString: String?): List<String>? =
@@ -65,8 +62,7 @@ class AfinityTypeConverters {
             }
         }
 
-    @TypeConverter
-    fun fromSourceType(sourceType: AfinitySourceType?): String? = sourceType?.name
+    @TypeConverter fun fromSourceType(sourceType: AfinitySourceType?): String? = sourceType?.name
 
     @TypeConverter
     fun toSourceType(sourceTypeName: String?): AfinitySourceType? =
@@ -104,31 +100,30 @@ class AfinityTypeConverters {
             }
         }
 
-    @TypeConverter
-    fun fromUri(uri: Uri?): String? = uri?.toString()
+    @TypeConverter fun fromUri(uri: Uri?): String? = uri?.toString()
 
-    @TypeConverter
-    fun toUri(uriString: String?): Uri? = uriString?.let { Uri.parse(it) }
+    @TypeConverter fun toUri(uriString: String?): Uri? = uriString?.let { Uri.parse(it) }
 
     @TypeConverter
     fun fromAfinityImages(images: AfinityImages?): String? {
         if (images == null) return null
-        val serializable = SerializableAfinityImages(
-            primary = images.primary?.toString(),
-            backdrop = images.backdrop?.toString(),
-            thumb = images.thumb?.toString(),
-            logo = images.logo?.toString(),
-            showPrimary = images.showPrimary?.toString(),
-            showBackdrop = images.showBackdrop?.toString(),
-            showLogo = images.showLogo?.toString(),
-            primaryImageBlurHash = images.primaryImageBlurHash,
-            backdropImageBlurHash = images.backdropImageBlurHash,
-            thumbImageBlurHash = images.thumbImageBlurHash,
-            logoImageBlurHash = images.logoImageBlurHash,
-            showPrimaryImageBlurHash = images.showPrimaryImageBlurHash,
-            showBackdropImageBlurHash = images.showBackdropImageBlurHash,
-            showLogoImageBlurHash = images.showLogoImageBlurHash
-        )
+        val serializable =
+            SerializableAfinityImages(
+                primary = images.primary?.toString(),
+                backdrop = images.backdrop?.toString(),
+                thumb = images.thumb?.toString(),
+                logo = images.logo?.toString(),
+                showPrimary = images.showPrimary?.toString(),
+                showBackdrop = images.showBackdrop?.toString(),
+                showLogo = images.showLogo?.toString(),
+                primaryImageBlurHash = images.primaryImageBlurHash,
+                backdropImageBlurHash = images.backdropImageBlurHash,
+                thumbImageBlurHash = images.thumbImageBlurHash,
+                logoImageBlurHash = images.logoImageBlurHash,
+                showPrimaryImageBlurHash = images.showPrimaryImageBlurHash,
+                showBackdropImageBlurHash = images.showBackdropImageBlurHash,
+                showLogoImageBlurHash = images.showLogoImageBlurHash,
+            )
         return json.encodeToString(serializable)
     }
 
@@ -151,7 +146,7 @@ class AfinityTypeConverters {
                 logoImageBlurHash = serializable.logoImageBlurHash,
                 showPrimaryImageBlurHash = serializable.showPrimaryImageBlurHash,
                 showBackdropImageBlurHash = serializable.showBackdropImageBlurHash,
-                showLogoImageBlurHash = serializable.showLogoImageBlurHash
+                showLogoImageBlurHash = serializable.showLogoImageBlurHash,
             )
         } catch (e: Exception) {
             null
@@ -161,16 +156,17 @@ class AfinityTypeConverters {
     @TypeConverter
     fun fromAfinityPersonList(people: List<AfinityPerson>?): String? {
         if (people == null) return null
-        val serializable = people.map { person ->
-            SerializableAfinityPerson(
-                id = person.id.toString(),
-                name = person.name,
-                type = person.type.name,
-                role = person.role,
-                imageUri = person.image.uri?.toString(),
-                imageBlurHash = person.image.blurHash
-            )
-        }
+        val serializable =
+            people.map { person ->
+                SerializableAfinityPerson(
+                    id = person.id.toString(),
+                    name = person.name,
+                    type = person.type.name,
+                    role = person.role,
+                    imageUri = person.image.uri?.toString(),
+                    imageBlurHash = person.image.blurHash,
+                )
+            }
         return json.encodeToString(serializable)
     }
 
@@ -185,10 +181,11 @@ class AfinityTypeConverters {
                     name = person.name,
                     type = PersonKind.valueOf(person.type),
                     role = person.role,
-                    image = AfinityPersonImage(
-                        uri = person.imageUri?.let { Uri.parse(it) },
-                        blurHash = person.imageBlurHash
-                    )
+                    image =
+                        AfinityPersonImage(
+                            uri = person.imageUri?.let { Uri.parse(it) },
+                            blurHash = person.imageBlurHash,
+                        ),
                 )
             }
         } catch (e: Exception) {
@@ -199,34 +196,35 @@ class AfinityTypeConverters {
     @TypeConverter
     fun fromAfinityMovie(movie: AfinityMovie?): String? {
         if (movie == null) return null
-        val serializable = SerializableAfinityMovie(
-            id = movie.id.toString(),
-            name = movie.name,
-            originalTitle = movie.originalTitle,
-            overview = movie.overview,
-            played = movie.played,
-            favorite = movie.favorite,
-            liked = movie.liked,
-            canPlay = movie.canPlay,
-            canDownload = movie.canDownload,
-            runtimeTicks = movie.runtimeTicks,
-            playbackPositionTicks = movie.playbackPositionTicks,
-            premiereDate = movie.premiereDate?.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
-            dateCreated = movie.dateCreated?.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
-            genres = movie.genres,
-            communityRating = movie.communityRating,
-            officialRating = movie.officialRating,
-            criticRating = movie.criticRating,
-            taglines = movie.taglines,
-            status = movie.status,
-            productionYear = movie.productionYear,
-            endDate = movie.endDate?.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
-            trailer = movie.trailer,
-            tagline = movie.tagline,
-            unplayedItemCount = movie.unplayedItemCount,
-            imagesJson = fromAfinityImages(movie.images),
-            peopleJson = fromAfinityPersonList(movie.people)
-        )
+        val serializable =
+            SerializableAfinityMovie(
+                id = movie.id.toString(),
+                name = movie.name,
+                originalTitle = movie.originalTitle,
+                overview = movie.overview,
+                played = movie.played,
+                favorite = movie.favorite,
+                liked = movie.liked,
+                canPlay = movie.canPlay,
+                canDownload = movie.canDownload,
+                runtimeTicks = movie.runtimeTicks,
+                playbackPositionTicks = movie.playbackPositionTicks,
+                premiereDate = movie.premiereDate?.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
+                dateCreated = movie.dateCreated?.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
+                genres = movie.genres,
+                communityRating = movie.communityRating,
+                officialRating = movie.officialRating,
+                criticRating = movie.criticRating,
+                taglines = movie.taglines,
+                status = movie.status,
+                productionYear = movie.productionYear,
+                endDate = movie.endDate?.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
+                trailer = movie.trailer,
+                tagline = movie.tagline,
+                unplayedItemCount = movie.unplayedItemCount,
+                imagesJson = fromAfinityImages(movie.images),
+                peopleJson = fromAfinityPersonList(movie.people),
+            )
         return json.encodeToString(serializable)
     }
 
@@ -248,18 +246,14 @@ class AfinityTypeConverters {
                 canDownload = serializable.canDownload,
                 runtimeTicks = serializable.runtimeTicks,
                 playbackPositionTicks = serializable.playbackPositionTicks,
-                premiereDate = serializable.premiereDate?.let {
-                    LocalDateTime.parse(
-                        it,
-                        DateTimeFormatter.ISO_LOCAL_DATE_TIME
-                    )
-                },
-                dateCreated = serializable.dateCreated?.let {
-                    LocalDateTime.parse(
-                        it,
-                        DateTimeFormatter.ISO_LOCAL_DATE_TIME
-                    )
-                },
+                premiereDate =
+                    serializable.premiereDate?.let {
+                        LocalDateTime.parse(it, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+                    },
+                dateCreated =
+                    serializable.dateCreated?.let {
+                        LocalDateTime.parse(it, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+                    },
                 people = toAfinityPersonList(serializable.peopleJson) ?: emptyList(),
                 genres = serializable.genres,
                 communityRating = serializable.communityRating,
@@ -268,12 +262,10 @@ class AfinityTypeConverters {
                 taglines = serializable.taglines,
                 status = serializable.status,
                 productionYear = serializable.productionYear,
-                endDate = serializable.endDate?.let {
-                    LocalDateTime.parse(
-                        it,
-                        DateTimeFormatter.ISO_LOCAL_DATE_TIME
-                    )
-                },
+                endDate =
+                    serializable.endDate?.let {
+                        LocalDateTime.parse(it, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+                    },
                 trailer = serializable.trailer,
                 tagline = serializable.tagline,
                 unplayedItemCount = serializable.unplayedItemCount,
@@ -281,7 +273,7 @@ class AfinityTypeConverters {
                 chapters = emptyList(),
                 trickplayInfo = null,
                 providerIds = null,
-                externalUrls = null
+                externalUrls = null,
             )
         } catch (e: Exception) {
             null
@@ -291,36 +283,38 @@ class AfinityTypeConverters {
     @TypeConverter
     fun fromAfinityShow(show: AfinityShow?): String? {
         if (show == null) return null
-        val serializable = SerializableAfinityShow(
-            id = show.id.toString(),
-            name = show.name,
-            originalTitle = show.originalTitle,
-            overview = show.overview,
-            played = show.played,
-            favorite = show.favorite,
-            liked = show.liked,
-            canPlay = show.canPlay,
-            canDownload = show.canDownload,
-            runtimeTicks = show.runtimeTicks,
-            playbackPositionTicks = show.playbackPositionTicks,
-            premiereDate = show.premiereDate?.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
-            dateCreated = show.dateCreated?.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
-            dateLastContentAdded = show.dateLastContentAdded?.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
-            genres = show.genres,
-            communityRating = show.communityRating,
-            officialRating = show.officialRating,
-            taglines = show.taglines,
-            status = show.status,
-            productionYear = show.productionYear,
-            endDate = show.endDate?.toString(),
-            trailer = show.trailer,
-            tagline = show.tagline,
-            unplayedItemCount = show.unplayedItemCount,
-            seasonCount = show.seasonCount,
-            episodeCount = show.episodeCount,
-            imagesJson = fromAfinityImages(show.images),
-            peopleJson = fromAfinityPersonList(show.people)
-        )
+        val serializable =
+            SerializableAfinityShow(
+                id = show.id.toString(),
+                name = show.name,
+                originalTitle = show.originalTitle,
+                overview = show.overview,
+                played = show.played,
+                favorite = show.favorite,
+                liked = show.liked,
+                canPlay = show.canPlay,
+                canDownload = show.canDownload,
+                runtimeTicks = show.runtimeTicks,
+                playbackPositionTicks = show.playbackPositionTicks,
+                premiereDate = show.premiereDate?.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
+                dateCreated = show.dateCreated?.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
+                dateLastContentAdded =
+                    show.dateLastContentAdded?.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
+                genres = show.genres,
+                communityRating = show.communityRating,
+                officialRating = show.officialRating,
+                taglines = show.taglines,
+                status = show.status,
+                productionYear = show.productionYear,
+                endDate = show.endDate?.toString(),
+                trailer = show.trailer,
+                tagline = show.tagline,
+                unplayedItemCount = show.unplayedItemCount,
+                seasonCount = show.seasonCount,
+                episodeCount = show.episodeCount,
+                imagesJson = fromAfinityImages(show.images),
+                peopleJson = fromAfinityPersonList(show.people),
+            )
         return json.encodeToString(serializable)
     }
 
@@ -343,24 +337,18 @@ class AfinityTypeConverters {
                 canDownload = serializable.canDownload,
                 playbackPositionTicks = serializable.playbackPositionTicks,
                 runtimeTicks = serializable.runtimeTicks,
-                premiereDate = serializable.premiereDate?.let {
-                    LocalDateTime.parse(
-                        it,
-                        DateTimeFormatter.ISO_LOCAL_DATE_TIME
-                    )
-                },
-                dateCreated = serializable.dateCreated?.let {
-                    LocalDateTime.parse(
-                        it,
-                        DateTimeFormatter.ISO_LOCAL_DATE_TIME
-                    )
-                },
-                dateLastContentAdded = serializable.dateLastContentAdded?.let {
-                    LocalDateTime.parse(
-                        it,
-                        DateTimeFormatter.ISO_LOCAL_DATE_TIME
-                    )
-                },
+                premiereDate =
+                    serializable.premiereDate?.let {
+                        LocalDateTime.parse(it, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+                    },
+                dateCreated =
+                    serializable.dateCreated?.let {
+                        LocalDateTime.parse(it, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+                    },
+                dateLastContentAdded =
+                    serializable.dateLastContentAdded?.let {
+                        LocalDateTime.parse(it, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+                    },
                 people = toAfinityPersonList(serializable.peopleJson) ?: emptyList(),
                 genres = serializable.genres,
                 communityRating = serializable.communityRating,
@@ -377,7 +365,7 @@ class AfinityTypeConverters {
                 images = toAfinityImages(serializable.imagesJson) ?: AfinityImages(),
                 chapters = emptyList(),
                 providerIds = null,
-                externalUrls = null
+                externalUrls = null,
             )
         } catch (e: Exception) {
             null
@@ -387,12 +375,13 @@ class AfinityTypeConverters {
     @TypeConverter
     fun fromAfinityStudio(studio: AfinityStudio?): String? {
         if (studio == null) return null
-        val serializable = SerializableAfinityStudio(
-            id = studio.id.toString(),
-            name = studio.name,
-            primaryImageUrl = studio.primaryImageUrl,
-            itemCount = studio.itemCount
-        )
+        val serializable =
+            SerializableAfinityStudio(
+                id = studio.id.toString(),
+                name = studio.name,
+                primaryImageUrl = studio.primaryImageUrl,
+                itemCount = studio.itemCount,
+            )
         return json.encodeToString(serializable)
     }
 
@@ -405,7 +394,7 @@ class AfinityTypeConverters {
                 id = UUID.fromString(serializable.id),
                 name = serializable.name,
                 primaryImageUrl = serializable.primaryImageUrl,
-                itemCount = serializable.itemCount
+                itemCount = serializable.itemCount,
             )
         } catch (e: Exception) {
             null
@@ -418,7 +407,7 @@ private data class SerializableAfinityStudio(
     val id: String,
     val name: String,
     val primaryImageUrl: String?,
-    val itemCount: Int
+    val itemCount: Int,
 )
 
 @Serializable
@@ -428,7 +417,7 @@ private data class SerializableAfinityPerson(
     val type: String,
     val role: String,
     val imageUri: String? = null,
-    val imageBlurHash: String? = null
+    val imageBlurHash: String? = null,
 )
 
 @Serializable
@@ -446,7 +435,7 @@ private data class SerializableAfinityImages(
     val logoImageBlurHash: String? = null,
     val showPrimaryImageBlurHash: String? = null,
     val showBackdropImageBlurHash: String? = null,
-    val showLogoImageBlurHash: String? = null
+    val showLogoImageBlurHash: String? = null,
 )
 
 @Serializable
@@ -476,7 +465,7 @@ private data class SerializableAfinityMovie(
     val tagline: String?,
     val unplayedItemCount: Int?,
     val imagesJson: String?,
-    val peopleJson: String?
+    val peopleJson: String?,
 )
 
 @Serializable
@@ -508,5 +497,5 @@ private data class SerializableAfinityShow(
     val seasonCount: Int?,
     val episodeCount: Int?,
     val imagesJson: String?,
-    val peopleJson: String?
-)
\ No newline at end of file
+    val peopleJson: String?,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/database/DatabaseMigrations.kt b/app/src/main/java/com/makd/afinity/data/database/DatabaseMigrations.kt
index 24fad652c..5a1c8417e 100644
--- a/app/src/main/java/com/makd/afinity/data/database/DatabaseMigrations.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/DatabaseMigrations.kt
@@ -5,454 +5,618 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 object DatabaseMigrations {
 
-    val MIGRATION_1_2 = object : Migration(1, 2) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            db.execSQL("ALTER TABLE users ADD COLUMN primaryImageTag TEXT")
+    val MIGRATION_1_2 =
+        object : Migration(1, 2) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE users ADD COLUMN primaryImageTag TEXT")
+            }
         }
-    }
 
-    val MIGRATION_2_3 = object : Migration(2, 3) {
-        override fun migrate(db: SupportSQLiteDatabase) {
+    val MIGRATION_2_3 =
+        object : Migration(2, 3) {
+            override fun migrate(db: SupportSQLiteDatabase) {}
         }
-    }
-
-    val MIGRATION_5_6 = object : Migration(5, 6) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            db.execSQL(
-                """
-            CREATE TABLE IF NOT EXISTS watchlist (
-                itemId TEXT PRIMARY KEY NOT NULL,
-                itemType TEXT NOT NULL,
-                addedAt INTEGER NOT NULL
-            )
-        """.trimIndent()
-            )
+
+    val MIGRATION_5_6 =
+        object : Migration(5, 6) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL(
+                    """
+                    CREATE TABLE IF NOT EXISTS watchlist (
+                        itemId TEXT PRIMARY KEY NOT NULL,
+                        itemType TEXT NOT NULL,
+                        addedAt INTEGER NOT NULL
+                    )
+                    """
+                        .trimIndent()
+                )
+            }
         }
-    }
 
-    val MIGRATION_6_7 = object : Migration(6, 7) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            db.execSQL("ALTER TABLE movies ADD COLUMN dateCreated TEXT")
+    val MIGRATION_6_7 =
+        object : Migration(6, 7) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE movies ADD COLUMN dateCreated TEXT")
 
-            db.execSQL("ALTER TABLE shows ADD COLUMN dateCreated TEXT")
-            db.execSQL("ALTER TABLE shows ADD COLUMN dateLastContentAdded TEXT")
+                db.execSQL("ALTER TABLE shows ADD COLUMN dateCreated TEXT")
+                db.execSQL("ALTER TABLE shows ADD COLUMN dateLastContentAdded TEXT")
+            }
         }
-    }
 
-    val MIGRATION_7_8 = object : Migration(7, 8) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            db.execSQL("ALTER TABLE servers ADD COLUMN version TEXT")
+    val MIGRATION_7_8 =
+        object : Migration(7, 8) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE servers ADD COLUMN version TEXT")
+            }
         }
-    }
-
-    val MIGRATION_8_9 = object : Migration(8, 9) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            db.execSQL(
-                """
-                CREATE TABLE IF NOT EXISTS downloads (
-                    id TEXT PRIMARY KEY NOT NULL,
-                    itemId TEXT NOT NULL,
-                    itemName TEXT NOT NULL,
-                    itemType TEXT NOT NULL,
-                    sourceId TEXT NOT NULL,
-                    sourceName TEXT NOT NULL,
-                    status TEXT NOT NULL,
-                    progress REAL NOT NULL,
-                    bytesDownloaded INTEGER NOT NULL,
-                    totalBytes INTEGER NOT NULL,
-                    filePath TEXT,
-                    error TEXT,
-                    createdAt INTEGER NOT NULL,
-                    updatedAt INTEGER NOT NULL
+
+    val MIGRATION_8_9 =
+        object : Migration(8, 9) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL(
+                    """
+                    CREATE TABLE IF NOT EXISTS downloads (
+                        id TEXT PRIMARY KEY NOT NULL,
+                        itemId TEXT NOT NULL,
+                        itemName TEXT NOT NULL,
+                        itemType TEXT NOT NULL,
+                        sourceId TEXT NOT NULL,
+                        sourceName TEXT NOT NULL,
+                        status TEXT NOT NULL,
+                        progress REAL NOT NULL,
+                        bytesDownloaded INTEGER NOT NULL,
+                        totalBytes INTEGER NOT NULL,
+                        filePath TEXT,
+                        error TEXT,
+                        createdAt INTEGER NOT NULL,
+                        updatedAt INTEGER NOT NULL
+                    )
+                    """
+                        .trimIndent()
                 )
-            """.trimIndent()
-            )
+            }
         }
-    }
 
-    val MIGRATION_9_10 = object : Migration(9, 10) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            db.execSQL("ALTER TABLE movies ADD COLUMN images TEXT")
+    val MIGRATION_9_10 =
+        object : Migration(9, 10) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE movies ADD COLUMN images TEXT")
 
-            db.execSQL("ALTER TABLE episodes ADD COLUMN images TEXT")
+                db.execSQL("ALTER TABLE episodes ADD COLUMN images TEXT")
+            }
         }
-    }
 
-    val MIGRATION_10_11 = object : Migration(10, 11) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            db.execSQL("ALTER TABLE shows ADD COLUMN images TEXT")
+    val MIGRATION_10_11 =
+        object : Migration(10, 11) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE shows ADD COLUMN images TEXT")
+            }
         }
-    }
 
-    val MIGRATION_11_12 = object : Migration(11, 12) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            db.execSQL("ALTER TABLE movies ADD COLUMN genres TEXT")
-            db.execSQL("ALTER TABLE movies ADD COLUMN tagline TEXT")
-            db.execSQL("ALTER TABLE movies ADD COLUMN people TEXT")
+    val MIGRATION_11_12 =
+        object : Migration(11, 12) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE movies ADD COLUMN genres TEXT")
+                db.execSQL("ALTER TABLE movies ADD COLUMN tagline TEXT")
+                db.execSQL("ALTER TABLE movies ADD COLUMN people TEXT")
+            }
         }
-    }
 
-    val MIGRATION_12_13 = object : Migration(12, 13) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            db.execSQL("ALTER TABLE shows ADD COLUMN genres TEXT")
-            db.execSQL("ALTER TABLE shows ADD COLUMN people TEXT")
+    val MIGRATION_12_13 =
+        object : Migration(12, 13) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE shows ADD COLUMN genres TEXT")
+                db.execSQL("ALTER TABLE shows ADD COLUMN people TEXT")
+            }
         }
-    }
 
-    val MIGRATION_13_14 = object : Migration(13, 14) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            db.execSQL("ALTER TABLE seasons ADD COLUMN images TEXT")
+    val MIGRATION_13_14 =
+        object : Migration(13, 14) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE seasons ADD COLUMN images TEXT")
+            }
         }
-    }
 
-    val MIGRATION_14_15 = object : Migration(14, 15) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            db.execSQL("DROP TABLE IF EXISTS watchlist")
+    val MIGRATION_14_15 =
+        object : Migration(14, 15) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("DROP TABLE IF EXISTS watchlist")
+            }
         }
-    }
 
-    val MIGRATION_15_16 = object : Migration(15, 16) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            // This migration is left empty as there were no schema changes
+    val MIGRATION_15_16 =
+        object : Migration(15, 16) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                // This migration is left empty as there were no schema changes
+            }
         }
-    }
-
-    val MIGRATION_16_17 = object : Migration(16, 17) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            db.execSQL(
-                """
-                CREATE TABLE IF NOT EXISTS genre_cache (
-                    genreName TEXT PRIMARY KEY NOT NULL,
-                    lastFetchedTimestamp INTEGER NOT NULL,
-                    movieCount INTEGER NOT NULL DEFAULT 0
+
+    val MIGRATION_16_17 =
+        object : Migration(16, 17) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL(
+                    """
+                    CREATE TABLE IF NOT EXISTS genre_cache (
+                        genreName TEXT PRIMARY KEY NOT NULL,
+                        lastFetchedTimestamp INTEGER NOT NULL,
+                        movieCount INTEGER NOT NULL DEFAULT 0
+                    )
+                    """
+                        .trimIndent()
                 )
-            """.trimIndent()
-            )
-
-            db.execSQL(
-                """
-                CREATE TABLE IF NOT EXISTS genre_movie_cache (
-                    genreName TEXT NOT NULL,
-                    movieId TEXT NOT NULL,
-                    movieData TEXT NOT NULL,
-                    position INTEGER NOT NULL,
-                    cachedTimestamp INTEGER NOT NULL,
-                    PRIMARY KEY (genreName, movieId)
+
+                db.execSQL(
+                    """
+                    CREATE TABLE IF NOT EXISTS genre_movie_cache (
+                        genreName TEXT NOT NULL,
+                        movieId TEXT NOT NULL,
+                        movieData TEXT NOT NULL,
+                        position INTEGER NOT NULL,
+                        cachedTimestamp INTEGER NOT NULL,
+                        PRIMARY KEY (genreName, movieId)
+                    )
+                    """
+                        .trimIndent()
                 )
-            """.trimIndent()
-            )
+            }
         }
-    }
-
-    val MIGRATION_17_18 = object : Migration(17, 18) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            db.execSQL(
-                """
-                CREATE TABLE IF NOT EXISTS show_genre_cache (
-                    genreName TEXT PRIMARY KEY NOT NULL,
-                    lastFetchedTimestamp INTEGER NOT NULL,
-                    showCount INTEGER NOT NULL DEFAULT 0
+
+    val MIGRATION_17_18 =
+        object : Migration(17, 18) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL(
+                    """
+                    CREATE TABLE IF NOT EXISTS show_genre_cache (
+                        genreName TEXT PRIMARY KEY NOT NULL,
+                        lastFetchedTimestamp INTEGER NOT NULL,
+                        showCount INTEGER NOT NULL DEFAULT 0
+                    )
+                    """
+                        .trimIndent()
                 )
-            """.trimIndent()
-            )
-
-            db.execSQL(
-                """
-                CREATE TABLE IF NOT EXISTS genre_show_cache (
-                    genreName TEXT NOT NULL,
-                    showId TEXT NOT NULL,
-                    showData TEXT NOT NULL,
-                    position INTEGER NOT NULL,
-                    cachedTimestamp INTEGER NOT NULL,
-                    PRIMARY KEY (genreName, showId)
+
+                db.execSQL(
+                    """
+                    CREATE TABLE IF NOT EXISTS genre_show_cache (
+                        genreName TEXT NOT NULL,
+                        showId TEXT NOT NULL,
+                        showData TEXT NOT NULL,
+                        position INTEGER NOT NULL,
+                        cachedTimestamp INTEGER NOT NULL,
+                        PRIMARY KEY (genreName, showId)
+                    )
+                    """
+                        .trimIndent()
                 )
-            """.trimIndent()
-            )
+            }
         }
-    }
-
-    val MIGRATION_18_19 = object : Migration(18, 19) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            db.execSQL(
-                """
-                CREATE TABLE IF NOT EXISTS studio_cache (
-                    studioId TEXT PRIMARY KEY NOT NULL,
-                    studioData TEXT NOT NULL,
-                    position INTEGER NOT NULL,
-                    cachedTimestamp INTEGER NOT NULL
+
+    val MIGRATION_18_19 =
+        object : Migration(18, 19) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL(
+                    """
+                    CREATE TABLE IF NOT EXISTS studio_cache (
+                        studioId TEXT PRIMARY KEY NOT NULL,
+                        studioData TEXT NOT NULL,
+                        position INTEGER NOT NULL,
+                        cachedTimestamp INTEGER NOT NULL
+                    )
+                    """
+                        .trimIndent()
                 )
-            """.trimIndent()
-            )
+            }
         }
-    }
-
-    val MIGRATION_21_22 = object : Migration(21, 22) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            db.execSQL("ALTER TABLE jellyseerr_requests ADD COLUMN mediaTitle TEXT")
-            db.execSQL("ALTER TABLE jellyseerr_requests ADD COLUMN mediaName TEXT")
-            db.execSQL("ALTER TABLE jellyseerr_requests ADD COLUMN mediaBackdropPath TEXT")
-            db.execSQL("ALTER TABLE jellyseerr_requests ADD COLUMN mediaReleaseDate TEXT")
-            db.execSQL("ALTER TABLE jellyseerr_requests ADD COLUMN mediaFirstAirDate TEXT")
-            db.execSQL("ALTER TABLE jellyseerr_requests ADD COLUMN mediaStatus INTEGER")
+
+    val MIGRATION_21_22 =
+        object : Migration(21, 22) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE jellyseerr_requests ADD COLUMN mediaTitle TEXT")
+                db.execSQL("ALTER TABLE jellyseerr_requests ADD COLUMN mediaName TEXT")
+                db.execSQL("ALTER TABLE jellyseerr_requests ADD COLUMN mediaBackdropPath TEXT")
+                db.execSQL("ALTER TABLE jellyseerr_requests ADD COLUMN mediaReleaseDate TEXT")
+                db.execSQL("ALTER TABLE jellyseerr_requests ADD COLUMN mediaFirstAirDate TEXT")
+                db.execSQL("ALTER TABLE jellyseerr_requests ADD COLUMN mediaStatus INTEGER")
+            }
         }
-    }
-
-    val MIGRATION_22_23 = object : Migration(22, 23) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            val defaultServerId = "default-server-migration"
-
-            db.execSQL("DROP TABLE IF EXISTS servers_new")
-            db.execSQL("""
-                CREATE TABLE servers_new (
-                    id TEXT PRIMARY KEY NOT NULL,
-                    name TEXT NOT NULL,
-                    version TEXT,
-                    address TEXT NOT NULL
+
+    val MIGRATION_22_23 =
+        object : Migration(22, 23) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                val defaultServerId = "default-server-migration"
+
+                db.execSQL("DROP TABLE IF EXISTS servers_new")
+                db.execSQL(
+                    """
+                    CREATE TABLE servers_new (
+                        id TEXT PRIMARY KEY NOT NULL,
+                        name TEXT NOT NULL,
+                        version TEXT,
+                        address TEXT NOT NULL
+                    )
+                    """
+                        .trimIndent()
                 )
-            """.trimIndent())
 
-            db.execSQL("""
+                db.execSQL(
+                    """
                 INSERT INTO servers_new (id, name, version, address)
                 SELECT id, name, version, '$defaultServerId'
                 FROM servers
-            """.trimIndent())
-
-            db.execSQL("DROP TABLE servers")
-            db.execSQL("ALTER TABLE servers_new RENAME TO servers")
-
-            db.execSQL("DROP TABLE IF EXISTS movies_new")
-            db.execSQL("""
-                CREATE TABLE movies_new (
-                    id TEXT PRIMARY KEY NOT NULL,
-                    serverId TEXT NOT NULL,
-                    name TEXT NOT NULL,
-                    originalTitle TEXT,
-                    overview TEXT NOT NULL,
-                    runtimeTicks INTEGER NOT NULL,
-                    premiereDate TEXT,
-                    dateCreated TEXT,
-                    communityRating REAL,
-                    officialRating TEXT,
-                    criticRating REAL,
-                    status TEXT NOT NULL,
-                    productionYear INTEGER,
-                    endDate TEXT,
-                    chapters TEXT,
-                    images TEXT,
-                    genres TEXT,
-                    tagline TEXT,
-                    people TEXT
+            """
+                        .trimIndent()
+                )
+
+                db.execSQL("DROP TABLE servers")
+                db.execSQL("ALTER TABLE servers_new RENAME TO servers")
+
+                db.execSQL("DROP TABLE IF EXISTS movies_new")
+                db.execSQL(
+                    """
+                    CREATE TABLE movies_new (
+                        id TEXT PRIMARY KEY NOT NULL,
+                        serverId TEXT NOT NULL,
+                        name TEXT NOT NULL,
+                        originalTitle TEXT,
+                        overview TEXT NOT NULL,
+                        runtimeTicks INTEGER NOT NULL,
+                        premiereDate TEXT,
+                        dateCreated TEXT,
+                        communityRating REAL,
+                        officialRating TEXT,
+                        criticRating REAL,
+                        status TEXT NOT NULL,
+                        productionYear INTEGER,
+                        endDate TEXT,
+                        chapters TEXT,
+                        images TEXT,
+                        genres TEXT,
+                        tagline TEXT,
+                        people TEXT
+                    )
+                    """
+                        .trimIndent()
                 )
-            """.trimIndent())
 
-            db.execSQL("""
+                db.execSQL(
+                    """
                 INSERT INTO movies_new
                 SELECT id, COALESCE(serverId, '$defaultServerId'), name, originalTitle, overview,
                        runtimeTicks, premiereDate, dateCreated, communityRating, officialRating,
                        criticRating, status, productionYear, endDate, chapters, images, genres, tagline, people
                 FROM movies
-            """.trimIndent())
-
-            db.execSQL("DROP TABLE movies")
-            db.execSQL("ALTER TABLE movies_new RENAME TO movies")
-
-            db.execSQL("DROP TABLE IF EXISTS shows_new")
-            db.execSQL("""
-                CREATE TABLE shows_new (
-                    id TEXT PRIMARY KEY NOT NULL,
-                    serverId TEXT NOT NULL,
-                    name TEXT NOT NULL,
-                    originalTitle TEXT,
-                    overview TEXT NOT NULL,
-                    runtimeTicks INTEGER NOT NULL,
-                    communityRating REAL,
-                    officialRating TEXT,
-                    status TEXT NOT NULL,
-                    productionYear INTEGER,
-                    premiereDate TEXT,
-                    dateCreated TEXT,
-                    dateLastContentAdded TEXT,
-                    endDate TEXT,
-                    images TEXT,
-                    genres TEXT,
-                    people TEXT
+            """
+                        .trimIndent()
+                )
+
+                db.execSQL("DROP TABLE movies")
+                db.execSQL("ALTER TABLE movies_new RENAME TO movies")
+
+                db.execSQL("DROP TABLE IF EXISTS shows_new")
+                db.execSQL(
+                    """
+                    CREATE TABLE shows_new (
+                        id TEXT PRIMARY KEY NOT NULL,
+                        serverId TEXT NOT NULL,
+                        name TEXT NOT NULL,
+                        originalTitle TEXT,
+                        overview TEXT NOT NULL,
+                        runtimeTicks INTEGER NOT NULL,
+                        communityRating REAL,
+                        officialRating TEXT,
+                        status TEXT NOT NULL,
+                        productionYear INTEGER,
+                        premiereDate TEXT,
+                        dateCreated TEXT,
+                        dateLastContentAdded TEXT,
+                        endDate TEXT,
+                        images TEXT,
+                        genres TEXT,
+                        people TEXT
+                    )
+                    """
+                        .trimIndent()
                 )
-            """.trimIndent())
 
-            db.execSQL("""
+                db.execSQL(
+                    """
                 INSERT INTO shows_new
                 SELECT id, COALESCE(serverId, '$defaultServerId'), name, originalTitle, overview,
                        runtimeTicks, communityRating, officialRating, status, productionYear,
                        premiereDate, dateCreated, dateLastContentAdded, endDate, images, genres, people
                 FROM shows
-            """.trimIndent())
-
-            db.execSQL("DROP TABLE shows")
-            db.execSQL("ALTER TABLE shows_new RENAME TO shows")
-
-            db.execSQL("DROP INDEX IF EXISTS index_seasons_seriesId")
-            db.execSQL("DROP TABLE IF EXISTS seasons_new")
-            db.execSQL("""
-                CREATE TABLE seasons_new (
-                    id TEXT PRIMARY KEY NOT NULL,
-                    serverId TEXT NOT NULL,
-                    seriesId TEXT NOT NULL,
-                    name TEXT NOT NULL,
-                    seriesName TEXT NOT NULL,
-                    overview TEXT NOT NULL,
-                    indexNumber INTEGER NOT NULL,
-                    images TEXT,
-                    FOREIGN KEY (seriesId) REFERENCES shows(id) ON DELETE CASCADE
+            """
+                        .trimIndent()
+                )
+
+                db.execSQL("DROP TABLE shows")
+                db.execSQL("ALTER TABLE shows_new RENAME TO shows")
+
+                db.execSQL("DROP INDEX IF EXISTS index_seasons_seriesId")
+                db.execSQL("DROP TABLE IF EXISTS seasons_new")
+                db.execSQL(
+                    """
+                    CREATE TABLE seasons_new (
+                        id TEXT PRIMARY KEY NOT NULL,
+                        serverId TEXT NOT NULL,
+                        seriesId TEXT NOT NULL,
+                        name TEXT NOT NULL,
+                        seriesName TEXT NOT NULL,
+                        overview TEXT NOT NULL,
+                        indexNumber INTEGER NOT NULL,
+                        images TEXT,
+                        FOREIGN KEY (seriesId) REFERENCES shows(id) ON DELETE CASCADE
+                    )
+                    """
+                        .trimIndent()
                 )
-            """.trimIndent())
 
-            db.execSQL("CREATE INDEX index_seasons_seriesId ON seasons_new(seriesId)")
+                db.execSQL("CREATE INDEX index_seasons_seriesId ON seasons_new(seriesId)")
 
-            db.execSQL("""
+                db.execSQL(
+                    """
                 INSERT INTO seasons_new
                 SELECT id, '$defaultServerId', seriesId, name, seriesName, overview, indexNumber, images
                 FROM seasons
-            """.trimIndent())
-
-            db.execSQL("DROP TABLE seasons")
-            db.execSQL("ALTER TABLE seasons_new RENAME TO seasons")
-
-            db.execSQL("DROP INDEX IF EXISTS index_episodes_seasonId")
-            db.execSQL("DROP INDEX IF EXISTS index_episodes_seriesId")
-            db.execSQL("DROP TABLE IF EXISTS episodes_new")
-            db.execSQL("""
-                CREATE TABLE episodes_new (
-                    id TEXT PRIMARY KEY NOT NULL,
-                    serverId TEXT NOT NULL,
-                    seasonId TEXT NOT NULL,
-                    seriesId TEXT NOT NULL,
-                    name TEXT NOT NULL,
-                    seriesName TEXT NOT NULL,
-                    overview TEXT NOT NULL,
-                    indexNumber INTEGER NOT NULL,
-                    indexNumberEnd INTEGER,
-                    parentIndexNumber INTEGER NOT NULL,
-                    runtimeTicks INTEGER NOT NULL,
-                    premiereDate TEXT,
-                    communityRating REAL,
-                    chapters TEXT,
-                    images TEXT,
-                    FOREIGN KEY (seasonId) REFERENCES seasons(id) ON DELETE CASCADE,
-                    FOREIGN KEY (seriesId) REFERENCES shows(id) ON DELETE CASCADE
+            """
+                        .trimIndent()
+                )
+
+                db.execSQL("DROP TABLE seasons")
+                db.execSQL("ALTER TABLE seasons_new RENAME TO seasons")
+
+                db.execSQL("DROP INDEX IF EXISTS index_episodes_seasonId")
+                db.execSQL("DROP INDEX IF EXISTS index_episodes_seriesId")
+                db.execSQL("DROP TABLE IF EXISTS episodes_new")
+                db.execSQL(
+                    """
+                    CREATE TABLE episodes_new (
+                        id TEXT PRIMARY KEY NOT NULL,
+                        serverId TEXT NOT NULL,
+                        seasonId TEXT NOT NULL,
+                        seriesId TEXT NOT NULL,
+                        name TEXT NOT NULL,
+                        seriesName TEXT NOT NULL,
+                        overview TEXT NOT NULL,
+                        indexNumber INTEGER NOT NULL,
+                        indexNumberEnd INTEGER,
+                        parentIndexNumber INTEGER NOT NULL,
+                        runtimeTicks INTEGER NOT NULL,
+                        premiereDate TEXT,
+                        communityRating REAL,
+                        chapters TEXT,
+                        images TEXT,
+                        FOREIGN KEY (seasonId) REFERENCES seasons(id) ON DELETE CASCADE,
+                        FOREIGN KEY (seriesId) REFERENCES shows(id) ON DELETE CASCADE
+                    )
+                    """
+                        .trimIndent()
                 )
-            """.trimIndent())
 
-            db.execSQL("CREATE INDEX index_episodes_seasonId ON episodes_new(seasonId)")
-            db.execSQL("CREATE INDEX index_episodes_seriesId ON episodes_new(seriesId)")
+                db.execSQL("CREATE INDEX index_episodes_seasonId ON episodes_new(seasonId)")
+                db.execSQL("CREATE INDEX index_episodes_seriesId ON episodes_new(seriesId)")
 
-            db.execSQL("""
+                db.execSQL(
+                    """
                 INSERT INTO episodes_new
                 SELECT id, COALESCE(serverId, '$defaultServerId'), seasonId, seriesId, name, seriesName,
                        overview, indexNumber, indexNumberEnd, parentIndexNumber, runtimeTicks,
                        premiereDate, communityRating, chapters, images
                 FROM episodes
-            """.trimIndent())
-
-            db.execSQL("DROP TABLE episodes")
-            db.execSQL("ALTER TABLE episodes_new RENAME TO episodes")
-
-            db.execSQL("DROP TABLE IF EXISTS userdata_new")
-            db.execSQL("""
-                CREATE TABLE userdata_new (
-                    userId TEXT NOT NULL,
-                    itemId TEXT NOT NULL,
-                    serverId TEXT NOT NULL,
-                    played INTEGER NOT NULL,
-                    favorite INTEGER NOT NULL,
-                    playbackPositionTicks INTEGER NOT NULL,
-                    toBeSynced INTEGER NOT NULL,
-                    PRIMARY KEY (userId, itemId, serverId)
+            """
+                        .trimIndent()
+                )
+
+                db.execSQL("DROP TABLE episodes")
+                db.execSQL("ALTER TABLE episodes_new RENAME TO episodes")
+
+                db.execSQL("DROP TABLE IF EXISTS userdata_new")
+                db.execSQL(
+                    """
+                    CREATE TABLE userdata_new (
+                        userId TEXT NOT NULL,
+                        itemId TEXT NOT NULL,
+                        serverId TEXT NOT NULL,
+                        played INTEGER NOT NULL,
+                        favorite INTEGER NOT NULL,
+                        playbackPositionTicks INTEGER NOT NULL,
+                        toBeSynced INTEGER NOT NULL,
+                        PRIMARY KEY (userId, itemId, serverId)
+                    )
+                    """
+                        .trimIndent()
                 )
-            """.trimIndent())
 
-            db.execSQL("""
+                db.execSQL(
+                    """
                 INSERT INTO userdata_new
                 SELECT userId, itemId, '$defaultServerId', played, favorite, playbackPositionTicks, toBeSynced
                 FROM userdata
-            """.trimIndent())
+            """
+                        .trimIndent()
+                )
 
-            db.execSQL("DROP TABLE userdata")
-            db.execSQL("ALTER TABLE userdata_new RENAME TO userdata")
+                db.execSQL("DROP TABLE userdata")
+                db.execSQL("ALTER TABLE userdata_new RENAME TO userdata")
+            }
         }
-    }
-
-    val MIGRATION_23_24 = object : Migration(23, 24) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            db.execSQL("DROP TABLE IF EXISTS jellyseerr_config")
-            db.execSQL("""
-                CREATE TABLE IF NOT EXISTS jellyseerr_config (
-                    jellyfinServerId TEXT NOT NULL,
-                    jellyfinUserId TEXT NOT NULL,
-                    serverUrl TEXT NOT NULL,
-                    isLoggedIn INTEGER NOT NULL,
-                    username TEXT,
-                    userId INTEGER,
-                    permissions INTEGER,
-                    PRIMARY KEY(jellyfinServerId, jellyfinUserId)
+
+    val MIGRATION_23_24 =
+        object : Migration(23, 24) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("DROP TABLE IF EXISTS jellyseerr_config")
+                db.execSQL(
+                    """
+                    CREATE TABLE IF NOT EXISTS jellyseerr_config (
+                        jellyfinServerId TEXT NOT NULL,
+                        jellyfinUserId TEXT NOT NULL,
+                        serverUrl TEXT NOT NULL,
+                        isLoggedIn INTEGER NOT NULL,
+                        username TEXT,
+                        userId INTEGER,
+                        permissions INTEGER,
+                        PRIMARY KEY(jellyfinServerId, jellyfinUserId)
+                    )
+                    """
+                        .trimIndent()
                 )
-            """.trimIndent())
-
-            db.execSQL("DROP TABLE IF EXISTS jellyseerr_requests")
-            db.execSQL("""
-                CREATE TABLE IF NOT EXISTS jellyseerr_requests (
-                    id INTEGER NOT NULL,
-                    jellyfinServerId TEXT NOT NULL,
-                    jellyfinUserId TEXT NOT NULL,
-                    status INTEGER NOT NULL,
-                    mediaType TEXT NOT NULL,
-                    tmdbId INTEGER,
-                    tvdbId INTEGER,
-                    title TEXT NOT NULL,
-                    posterPath TEXT,
-                    requestedAt INTEGER NOT NULL,
-                    updatedAt INTEGER NOT NULL,
-                    requestedByName TEXT,
-                    requestedByAvatar TEXT,
-                    cachedAt INTEGER NOT NULL,
-                    mediaTitle TEXT,
-                    mediaName TEXT,
-                    mediaBackdropPath TEXT,
-                    mediaReleaseDate TEXT,
-                    mediaFirstAirDate TEXT,
-                    mediaStatus INTEGER,
-                    PRIMARY KEY(id, jellyfinServerId, jellyfinUserId)
+
+                db.execSQL("DROP TABLE IF EXISTS jellyseerr_requests")
+                db.execSQL(
+                    """
+                    CREATE TABLE IF NOT EXISTS jellyseerr_requests (
+                        id INTEGER NOT NULL,
+                        jellyfinServerId TEXT NOT NULL,
+                        jellyfinUserId TEXT NOT NULL,
+                        status INTEGER NOT NULL,
+                        mediaType TEXT NOT NULL,
+                        tmdbId INTEGER,
+                        tvdbId INTEGER,
+                        title TEXT NOT NULL,
+                        posterPath TEXT,
+                        requestedAt INTEGER NOT NULL,
+                        updatedAt INTEGER NOT NULL,
+                        requestedByName TEXT,
+                        requestedByAvatar TEXT,
+                        cachedAt INTEGER NOT NULL,
+                        mediaTitle TEXT,
+                        mediaName TEXT,
+                        mediaBackdropPath TEXT,
+                        mediaReleaseDate TEXT,
+                        mediaFirstAirDate TEXT,
+                        mediaStatus INTEGER,
+                        PRIMARY KEY(id, jellyfinServerId, jellyfinUserId)
+                    )
+                    """
+                        .trimIndent()
                 )
-            """.trimIndent())
+            }
         }
-    }
 
-    val MIGRATION_24_25 = object : Migration(24, 25) {
-        override fun migrate(db: SupportSQLiteDatabase) {
-            db.execSQL("ALTER TABLE downloads ADD COLUMN serverId TEXT NOT NULL DEFAULT ''")
-            db.execSQL("ALTER TABLE downloads ADD COLUMN userId TEXT NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'")
+    val MIGRATION_24_25 =
+        object : Migration(24, 25) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE downloads ADD COLUMN serverId TEXT NOT NULL DEFAULT ''")
+                db.execSQL(
+                    "ALTER TABLE downloads ADD COLUMN userId TEXT NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'"
+                )
+            }
         }
-    }
-
-    val ALL_MIGRATIONS = arrayOf(
-        MIGRATION_1_2,
-        MIGRATION_2_3,
-        MIGRATION_5_6,
-        MIGRATION_6_7,
-        MIGRATION_7_8,
-        MIGRATION_8_9,
-        MIGRATION_9_10,
-        MIGRATION_10_11,
-        MIGRATION_11_12,
-        MIGRATION_12_13,
-        MIGRATION_13_14,
-        MIGRATION_14_15,
-        MIGRATION_15_16,
-        MIGRATION_16_17,
-        MIGRATION_17_18,
-        MIGRATION_18_19,
-        MIGRATION_21_22,
-        MIGRATION_22_23,
-        MIGRATION_23_24,
-        MIGRATION_24_25
-    )
-}
\ No newline at end of file
+
+    val MIGRATION_25_26 =
+        object : Migration(25, 26) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL(
+                    """
+                    CREATE TABLE IF NOT EXISTS audiobookshelf_config (
+                        jellyfinServerId TEXT NOT NULL,
+                        jellyfinUserId TEXT NOT NULL,
+                        serverUrl TEXT NOT NULL,
+                        absUserId TEXT NOT NULL,
+                        username TEXT NOT NULL,
+                        isLoggedIn INTEGER NOT NULL,
+                        lastSync INTEGER NOT NULL,
+                        PRIMARY KEY(jellyfinServerId, jellyfinUserId)
+                    )
+                    """
+                        .trimIndent()
+                )
+
+                db.execSQL(
+                    """
+                    CREATE TABLE IF NOT EXISTS audiobookshelf_libraries (
+                        id TEXT NOT NULL,
+                        jellyfinServerId TEXT NOT NULL,
+                        jellyfinUserId TEXT NOT NULL,
+                        name TEXT NOT NULL,
+                        mediaType TEXT NOT NULL,
+                        icon TEXT,
+                        displayOrder INTEGER NOT NULL,
+                        totalItems INTEGER NOT NULL,
+                        totalDuration REAL,
+                        lastUpdated INTEGER NOT NULL,
+                        cachedAt INTEGER NOT NULL,
+                        PRIMARY KEY(id, jellyfinServerId, jellyfinUserId)
+                    )
+                    """
+                        .trimIndent()
+                )
+
+                db.execSQL(
+                    """
+                    CREATE TABLE IF NOT EXISTS audiobookshelf_items (
+                        id TEXT NOT NULL,
+                        jellyfinServerId TEXT NOT NULL,
+                        jellyfinUserId TEXT NOT NULL,
+                        libraryId TEXT NOT NULL,
+                        title TEXT NOT NULL,
+                        authorName TEXT,
+                        narratorName TEXT,
+                        seriesName TEXT,
+                        seriesSequence TEXT,
+                        mediaType TEXT NOT NULL,
+                        duration REAL,
+                        coverUrl TEXT,
+                        description TEXT,
+                        publishedYear TEXT,
+                        genres TEXT,
+                        numTracks INTEGER,
+                        numChapters INTEGER,
+                        addedAt INTEGER,
+                        updatedAt INTEGER,
+                        cachedAt INTEGER NOT NULL,
+                        PRIMARY KEY(id, jellyfinServerId, jellyfinUserId)
+                    )
+                    """
+                        .trimIndent()
+                )
+
+                db.execSQL(
+                    """
+                    CREATE TABLE IF NOT EXISTS audiobookshelf_progress (
+                        id TEXT NOT NULL,
+                        jellyfinServerId TEXT NOT NULL,
+                        jellyfinUserId TEXT NOT NULL,
+                        libraryItemId TEXT NOT NULL,
+                        episodeId TEXT,
+                        currentTime REAL NOT NULL,
+                        duration REAL NOT NULL,
+                        progress REAL NOT NULL,
+                        isFinished INTEGER NOT NULL,
+                        lastUpdate INTEGER NOT NULL,
+                        startedAt INTEGER NOT NULL,
+                        finishedAt INTEGER,
+                        pendingSync INTEGER NOT NULL,
+                        PRIMARY KEY(id, jellyfinServerId, jellyfinUserId)
+                    )
+                    """
+                        .trimIndent()
+                )
+            }
+        }
+
+    val ALL_MIGRATIONS =
+        arrayOf(
+            MIGRATION_1_2,
+            MIGRATION_2_3,
+            MIGRATION_5_6,
+            MIGRATION_6_7,
+            MIGRATION_7_8,
+            MIGRATION_8_9,
+            MIGRATION_9_10,
+            MIGRATION_10_11,
+            MIGRATION_11_12,
+            MIGRATION_12_13,
+            MIGRATION_13_14,
+            MIGRATION_14_15,
+            MIGRATION_15_16,
+            MIGRATION_16_17,
+            MIGRATION_17_18,
+            MIGRATION_18_19,
+            MIGRATION_21_22,
+            MIGRATION_22_23,
+            MIGRATION_23_24,
+            MIGRATION_24_25,
+            MIGRATION_25_26,
+        )
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/DatabaseUtils.kt b/app/src/main/java/com/makd/afinity/data/database/DatabaseUtils.kt
index 41f396736..c6def40e3 100644
--- a/app/src/main/java/com/makd/afinity/data/database/DatabaseUtils.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/DatabaseUtils.kt
@@ -11,7 +11,7 @@ object DatabaseUtils {
 
     fun getDatabaseSizeFormatted(
         context: Context,
-        databaseName: String = "afinity_database"
+        databaseName: String = "afinity_database",
     ): String {
         val sizeInBytes = getDatabaseSize(context, databaseName)
         return formatBytes(sizeInBytes)
@@ -59,7 +59,7 @@ object DatabaseUtils {
         val movieCount: Int,
         val showCount: Int,
         val episodeCount: Int,
-        val downloadedItemCount: Int
+        val downloadedItemCount: Int,
     )
 
     suspend fun getDatabaseStats(context: Context, database: AfinityDatabase): DatabaseStats {
@@ -70,7 +70,7 @@ object DatabaseUtils {
             movieCount = serverDao.getMovieCount(),
             showCount = serverDao.getShowCount(),
             episodeCount = serverDao.getEpisodeCount(),
-            downloadedItemCount = serverDao.getDownloadedItemCount()
+            downloadedItemCount = serverDao.getDownloadedItemCount(),
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/AudiobookshelfDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/AudiobookshelfDao.kt
new file mode 100644
index 000000000..40478cdd3
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/AudiobookshelfDao.kt
@@ -0,0 +1,203 @@
+package com.makd.afinity.data.database.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import com.makd.afinity.data.database.entities.AudiobookshelfConfigEntity
+import com.makd.afinity.data.database.entities.AudiobookshelfItemEntity
+import com.makd.afinity.data.database.entities.AudiobookshelfLibraryEntity
+import com.makd.afinity.data.database.entities.AudiobookshelfProgressEntity
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface AudiobookshelfDao {
+
+    @Query(
+        "SELECT * FROM audiobookshelf_config WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
+    suspend fun getConfig(serverId: String, userId: String): AudiobookshelfConfigEntity?
+
+    @Query(
+        "SELECT * FROM audiobookshelf_config WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
+    fun getConfigFlow(serverId: String, userId: String): Flow<AudiobookshelfConfigEntity?>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertConfig(config: AudiobookshelfConfigEntity)
+
+    @Query(
+        "DELETE FROM audiobookshelf_config WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
+    suspend fun deleteConfig(serverId: String, userId: String)
+
+    @Query(
+        "SELECT * FROM audiobookshelf_libraries WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId ORDER BY displayOrder ASC"
+    )
+    fun getLibrariesFlow(serverId: String, userId: String): Flow<List<AudiobookshelfLibraryEntity>>
+
+    @Query(
+        "SELECT * FROM audiobookshelf_libraries WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId ORDER BY displayOrder ASC"
+    )
+    suspend fun getLibraries(serverId: String, userId: String): List<AudiobookshelfLibraryEntity>
+
+    @Query(
+        "SELECT * FROM audiobookshelf_libraries WHERE id = :libraryId AND jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
+    suspend fun getLibrary(
+        libraryId: String,
+        serverId: String,
+        userId: String,
+    ): AudiobookshelfLibraryEntity?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertLibraries(libraries: List<AudiobookshelfLibraryEntity>)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertLibrary(library: AudiobookshelfLibraryEntity)
+
+    @Query(
+        "DELETE FROM audiobookshelf_libraries WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
+    suspend fun deleteAllLibraries(serverId: String, userId: String)
+
+    @Query(
+        "SELECT * FROM audiobookshelf_items WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId AND libraryId = :libraryId ORDER BY title ASC"
+    )
+    fun getItemsFlow(
+        serverId: String,
+        userId: String,
+        libraryId: String,
+    ): Flow<List<AudiobookshelfItemEntity>>
+
+    @Query(
+        "SELECT * FROM audiobookshelf_items WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId AND libraryId = :libraryId ORDER BY title ASC"
+    )
+    suspend fun getItems(
+        serverId: String,
+        userId: String,
+        libraryId: String,
+    ): List<AudiobookshelfItemEntity>
+
+    @Query(
+        "SELECT * FROM audiobookshelf_items WHERE id = :itemId AND jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
+    suspend fun getItem(itemId: String, serverId: String, userId: String): AudiobookshelfItemEntity?
+
+    @Query(
+        "SELECT * FROM audiobookshelf_items WHERE id = :itemId AND jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
+    fun getItemFlow(
+        itemId: String,
+        serverId: String,
+        userId: String,
+    ): Flow<AudiobookshelfItemEntity?>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertItems(items: List<AudiobookshelfItemEntity>)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertItem(item: AudiobookshelfItemEntity)
+
+    @Query(
+        "DELETE FROM audiobookshelf_items WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId AND libraryId = :libraryId"
+    )
+    suspend fun deleteItemsByLibrary(serverId: String, userId: String, libraryId: String)
+
+    @Query(
+        "DELETE FROM audiobookshelf_items WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
+    suspend fun deleteAllItems(serverId: String, userId: String)
+
+    @Query(
+        "SELECT * FROM audiobookshelf_items WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId AND (title LIKE '%' || :query || '%' OR authorName LIKE '%' || :query || '%') ORDER BY title ASC"
+    )
+    suspend fun searchItems(
+        serverId: String,
+        userId: String,
+        query: String,
+    ): List<AudiobookshelfItemEntity>
+
+    @Query(
+        "SELECT * FROM audiobookshelf_progress WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId ORDER BY lastUpdate DESC"
+    )
+    fun getAllProgressFlow(
+        serverId: String,
+        userId: String,
+    ): Flow<List<AudiobookshelfProgressEntity>>
+
+    @Query(
+        "SELECT * FROM audiobookshelf_progress WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId AND isFinished = 0 ORDER BY lastUpdate DESC"
+    )
+    fun getInProgressFlow(
+        serverId: String,
+        userId: String,
+    ): Flow<List<AudiobookshelfProgressEntity>>
+
+    @Query(
+        "SELECT * FROM audiobookshelf_progress WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId AND isFinished = 0 ORDER BY lastUpdate DESC"
+    )
+    suspend fun getInProgress(serverId: String, userId: String): List<AudiobookshelfProgressEntity>
+
+    @Query(
+        "SELECT * FROM audiobookshelf_progress WHERE libraryItemId = :itemId AND jellyfinServerId = :serverId AND jellyfinUserId = :userId AND (episodeId IS NULL OR episodeId = '')"
+    )
+    suspend fun getProgressForItem(
+        itemId: String,
+        serverId: String,
+        userId: String,
+    ): AudiobookshelfProgressEntity?
+
+    @Query(
+        "SELECT * FROM audiobookshelf_progress WHERE libraryItemId = :itemId AND episodeId = :episodeId AND jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
+    suspend fun getProgressForEpisode(
+        itemId: String,
+        episodeId: String,
+        serverId: String,
+        userId: String,
+    ): AudiobookshelfProgressEntity?
+
+    @Query(
+        "SELECT * FROM audiobookshelf_progress WHERE libraryItemId = :itemId AND jellyfinServerId = :serverId AND jellyfinUserId = :userId AND (episodeId IS NULL OR episodeId = '')"
+    )
+    fun getProgressForItemFlow(
+        itemId: String,
+        serverId: String,
+        userId: String,
+    ): Flow<AudiobookshelfProgressEntity?>
+
+    @Query(
+        "SELECT * FROM audiobookshelf_progress WHERE pendingSync = 1 AND jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
+    suspend fun getPendingSyncProgress(
+        serverId: String,
+        userId: String,
+    ): List<AudiobookshelfProgressEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertProgress(progress: AudiobookshelfProgressEntity)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertProgressList(progressList: List<AudiobookshelfProgressEntity>)
+
+    @Query(
+        "UPDATE audiobookshelf_progress SET pendingSync = 0 WHERE id = :progressId AND jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
+    suspend fun markSynced(progressId: String, serverId: String, userId: String)
+
+    @Query(
+        "DELETE FROM audiobookshelf_progress WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
+    suspend fun deleteAllProgress(serverId: String, userId: String)
+
+    @Query(
+        "DELETE FROM audiobookshelf_items WHERE cachedAt < :expiryTime AND jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
+    suspend fun deleteExpiredItems(expiryTime: Long, serverId: String, userId: String)
+
+    @Query(
+        "DELETE FROM audiobookshelf_libraries WHERE cachedAt < :expiryTime AND jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
+    suspend fun deleteExpiredLibraries(expiryTime: Long, serverId: String, userId: String)
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/BoxSetCacheDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/BoxSetCacheDao.kt
index a2f3aeca8..dc2638faf 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/BoxSetCacheDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/BoxSetCacheDao.kt
@@ -13,8 +13,7 @@ interface BoxSetCacheDao {
     @Query("SELECT * FROM boxset_cache WHERE itemId = :itemId")
     suspend fun getCacheEntry(itemId: String): BoxSetCacheEntity?
 
-    @Query("SELECT * FROM boxset_cache")
-    suspend fun getAllCacheEntries(): List<BoxSetCacheEntity>
+    @Query("SELECT * FROM boxset_cache") suspend fun getAllCacheEntries(): List<BoxSetCacheEntity>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertCacheEntries(entries: List<BoxSetCacheEntity>)
@@ -22,14 +21,12 @@ interface BoxSetCacheDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertCacheEntry(entry: BoxSetCacheEntity)
 
-    @Query("DELETE FROM boxset_cache")
-    suspend fun clearAllCacheEntries()
+    @Query("DELETE FROM boxset_cache") suspend fun clearAllCacheEntries()
 
     @Query("DELETE FROM boxset_cache WHERE itemId = :itemId")
     suspend fun deleteCacheEntry(itemId: String)
 
-    @Query("SELECT COUNT(*) FROM boxset_cache")
-    suspend fun getCacheSize(): Int
+    @Query("SELECT COUNT(*) FROM boxset_cache") suspend fun getCacheSize(): Int
 
     @Query("SELECT * FROM boxset_cache_metadata WHERE id = 1")
     suspend fun getMetadata(): BoxSetCacheMetadata?
@@ -37,15 +34,13 @@ interface BoxSetCacheDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertMetadata(metadata: BoxSetCacheMetadata)
 
-    @Query("DELETE FROM boxset_cache_metadata")
-    suspend fun clearMetadata()
+    @Query("DELETE FROM boxset_cache_metadata") suspend fun clearMetadata()
 
-    @Query("DELETE FROM boxset_cache")
-    suspend fun clearCache()
+    @Query("DELETE FROM boxset_cache") suspend fun clearCache()
 
     @androidx.room.Transaction
     suspend fun clearAllCache() {
         clearAllCacheEntries()
         clearMetadata()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/EpisodeDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/EpisodeDao.kt
index cd02c192e..017be85ff 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/EpisodeDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/EpisodeDao.kt
@@ -7,8 +7,8 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
 import com.makd.afinity.data.database.entities.AfinityEpisodeDto
-import kotlinx.coroutines.flow.Flow
 import java.util.UUID
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface EpisodeDao {
@@ -19,11 +19,9 @@ interface EpisodeDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertEpisodes(episodes: List<AfinityEpisodeDto>)
 
-    @Update
-    suspend fun updateEpisode(episode: AfinityEpisodeDto)
+    @Update suspend fun updateEpisode(episode: AfinityEpisodeDto)
 
-    @Delete
-    suspend fun deleteEpisode(episode: AfinityEpisodeDto)
+    @Delete suspend fun deleteEpisode(episode: AfinityEpisodeDto)
 
     @Query("DELETE FROM episodes WHERE id = :episodeId")
     suspend fun deleteEpisodeById(episodeId: UUID)
@@ -40,39 +38,54 @@ interface EpisodeDao {
     @Query("SELECT * FROM episodes WHERE id = :episodeId AND serverId = :serverId")
     suspend fun getEpisode(episodeId: UUID, serverId: String): AfinityEpisodeDto?
 
-    @Query("SELECT * FROM episodes WHERE seasonId = :seasonId AND serverId = :serverId ORDER BY indexNumber ASC")
+    @Query(
+        "SELECT * FROM episodes WHERE seasonId = :seasonId AND serverId = :serverId ORDER BY indexNumber ASC"
+    )
     suspend fun getEpisodesForSeason(seasonId: UUID, serverId: String): List<AfinityEpisodeDto>
 
-    @Query("SELECT * FROM episodes WHERE seasonId = :seasonId AND serverId = :serverId ORDER BY indexNumber ASC")
+    @Query(
+        "SELECT * FROM episodes WHERE seasonId = :seasonId AND serverId = :serverId ORDER BY indexNumber ASC"
+    )
     fun getEpisodesForSeasonFlow(seasonId: UUID, serverId: String): Flow<List<AfinityEpisodeDto>>
 
-    @Query("SELECT * FROM episodes WHERE seriesId = :seriesId AND serverId = :serverId ORDER BY parentIndexNumber ASC, indexNumber ASC")
+    @Query(
+        "SELECT * FROM episodes WHERE seriesId = :seriesId AND serverId = :serverId ORDER BY parentIndexNumber ASC, indexNumber ASC"
+    )
     suspend fun getEpisodesForSeries(seriesId: UUID, serverId: String): List<AfinityEpisodeDto>
 
-    @Query("""
+    @Query(
+        """
         SELECT * FROM episodes
         WHERE serverId = :serverId
         AND (name LIKE '%' || :query || '%' OR overview LIKE '%' || :query || '%')
         ORDER BY seriesName ASC, parentIndexNumber ASC, indexNumber ASC
-    """)
+    """
+    )
     suspend fun searchEpisodes(query: String, serverId: String): List<AfinityEpisodeDto>
 
-    @Query("""
+    @Query(
+        """
         SELECT e.* FROM episodes e
         INNER JOIN userdata u ON e.id = u.itemId
         WHERE e.serverId = :serverId AND u.serverId = :serverId
         AND u.userId = :userId AND u.playbackPositionTicks > 0 AND u.played = 0
         ORDER BY u.playbackPositionTicks DESC
         LIMIT :limit
-    """)
-    suspend fun getContinueWatchingEpisodes(userId: UUID, serverId: String, limit: Int): List<AfinityEpisodeDto>
-
-    @Query("SELECT * FROM episodes WHERE serverId = :serverId ORDER BY seriesName ASC, parentIndexNumber ASC, indexNumber ASC")
+    """
+    )
+    suspend fun getContinueWatchingEpisodes(
+        userId: UUID,
+        serverId: String,
+        limit: Int,
+    ): List<AfinityEpisodeDto>
+
+    @Query(
+        "SELECT * FROM episodes WHERE serverId = :serverId ORDER BY seriesName ASC, parentIndexNumber ASC, indexNumber ASC"
+    )
     suspend fun getAllEpisodes(serverId: String): List<AfinityEpisodeDto>
 
     @Query("SELECT COUNT(*) FROM episodes WHERE serverId = :serverId")
     suspend fun getEpisodeCount(serverId: String): Int
 
-    @Query("DELETE FROM episodes")
-    suspend fun deleteAllEpisodes()
-}
\ No newline at end of file
+    @Query("DELETE FROM episodes") suspend fun deleteAllEpisodes()
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/GenreCacheDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/GenreCacheDao.kt
index 36103558b..5c289059b 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/GenreCacheDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/GenreCacheDao.kt
@@ -31,8 +31,7 @@ interface GenreCacheDao {
     @Query("DELETE FROM genre_cache WHERE genreName = :genreName")
     suspend fun deleteGenreCache(genreName: String)
 
-    @Query("DELETE FROM genre_cache")
-    suspend fun clearAllGenreCaches()
+    @Query("DELETE FROM genre_cache") suspend fun clearAllGenreCaches()
 
     @Query("SELECT * FROM genre_movie_cache WHERE genreName = :genreName ORDER BY position ASC")
     suspend fun getCachedMoviesForGenre(genreName: String): List<GenreMovieCacheEntity>
@@ -43,22 +42,25 @@ interface GenreCacheDao {
     @Query("DELETE FROM genre_movie_cache WHERE genreName = :genreName")
     suspend fun deleteMoviesForGenre(genreName: String)
 
-    @Query("DELETE FROM genre_movie_cache")
-    suspend fun clearAllGenreMovies()
+    @Query("DELETE FROM genre_movie_cache") suspend fun clearAllGenreMovies()
 
-    @Query("""
+    @Query(
+        """
         SELECT COUNT(*) > 0
         FROM genre_cache
         WHERE genreName = :genreName
         AND (lastFetchedTimestamp + :ttlMillis) > :currentTime
-    """)
+    """
+    )
     suspend fun isGenreCacheFresh(genreName: String, ttlMillis: Long, currentTime: Long): Boolean
 
-    @Query("""
+    @Query(
+        """
         SELECT COUNT(*) > 0
         FROM genre_cache
         WHERE (lastFetchedTimestamp + :ttlMillis) > :currentTime
-    """)
+    """
+    )
     suspend fun hasAnyFreshGenre(ttlMillis: Long, currentTime: Long): Boolean
 
     @Query("SELECT MIN(lastFetchedTimestamp) FROM genre_cache")
@@ -68,13 +70,13 @@ interface GenreCacheDao {
     suspend fun cacheGenreWithMovies(
         genreName: String,
         movies: List<GenreMovieCacheEntity>,
-        timestamp: Long
+        timestamp: Long,
     ) {
         insertGenreCache(
             GenreCacheEntity(
                 genreName = genreName,
                 lastFetchedTimestamp = timestamp,
-                movieCount = movies.size
+                movieCount = movies.size,
             )
         )
 
@@ -111,8 +113,7 @@ interface GenreCacheDao {
     @Query("DELETE FROM show_genre_cache WHERE genreName = :genreName")
     suspend fun deleteShowGenreCache(genreName: String)
 
-    @Query("DELETE FROM show_genre_cache")
-    suspend fun clearAllShowGenreCaches()
+    @Query("DELETE FROM show_genre_cache") suspend fun clearAllShowGenreCaches()
 
     @Query("SELECT * FROM genre_show_cache WHERE genreName = :genreName ORDER BY position ASC")
     suspend fun getCachedShowsForGenre(genreName: String): List<GenreShowCacheEntity>
@@ -123,22 +124,29 @@ interface GenreCacheDao {
     @Query("DELETE FROM genre_show_cache WHERE genreName = :genreName")
     suspend fun deleteShowsForGenre(genreName: String)
 
-    @Query("DELETE FROM genre_show_cache")
-    suspend fun clearAllGenreShows()
+    @Query("DELETE FROM genre_show_cache") suspend fun clearAllGenreShows()
 
-    @Query("""
+    @Query(
+        """
         SELECT COUNT(*) > 0
         FROM show_genre_cache
         WHERE genreName = :genreName
         AND (lastFetchedTimestamp + :ttlMillis) > :currentTime
-    """)
-    suspend fun isShowGenreCacheFresh(genreName: String, ttlMillis: Long, currentTime: Long): Boolean
+    """
+    )
+    suspend fun isShowGenreCacheFresh(
+        genreName: String,
+        ttlMillis: Long,
+        currentTime: Long,
+    ): Boolean
 
-    @Query("""
+    @Query(
+        """
         SELECT COUNT(*) > 0
         FROM show_genre_cache
         WHERE (lastFetchedTimestamp + :ttlMillis) > :currentTime
-    """)
+    """
+    )
     suspend fun hasAnyFreshShowGenre(ttlMillis: Long, currentTime: Long): Boolean
 
     @Query("SELECT MIN(lastFetchedTimestamp) FROM show_genre_cache")
@@ -148,13 +156,13 @@ interface GenreCacheDao {
     suspend fun cacheGenreWithShows(
         genreName: String,
         shows: List<GenreShowCacheEntity>,
-        timestamp: Long
+        timestamp: Long,
     ) {
         insertShowGenreCache(
             ShowGenreCacheEntity(
                 genreName = genreName,
                 lastFetchedTimestamp = timestamp,
-                showCount = shows.size
+                showCount = shows.size,
             )
         )
 
@@ -164,4 +172,4 @@ interface GenreCacheDao {
             insertGenreShows(shows)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/JellyseerrDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/JellyseerrDao.kt
index 1bb405f63..031a799fd 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/JellyseerrDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/JellyseerrDao.kt
@@ -11,14 +11,28 @@ import kotlinx.coroutines.flow.Flow
 @Dao
 interface JellyseerrDao {
 
-    @Query("SELECT * FROM jellyseerr_requests WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId ORDER BY requestedAt DESC")
+    @Query(
+        "SELECT * FROM jellyseerr_requests WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId ORDER BY requestedAt DESC"
+    )
     fun getAllRequests(serverId: String, userId: String): Flow<List<JellyseerrRequestEntity>>
 
-    @Query("SELECT * FROM jellyseerr_requests WHERE id = :requestId AND jellyfinServerId = :serverId AND jellyfinUserId = :userId")
-    suspend fun getRequestById(requestId: Int, serverId: String, userId: String): JellyseerrRequestEntity?
+    @Query(
+        "SELECT * FROM jellyseerr_requests WHERE id = :requestId AND jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
+    suspend fun getRequestById(
+        requestId: Int,
+        serverId: String,
+        userId: String,
+    ): JellyseerrRequestEntity?
 
-    @Query("SELECT * FROM jellyseerr_requests WHERE status = :status AND jellyfinServerId = :serverId AND jellyfinUserId = :userId ORDER BY requestedAt DESC")
-    fun getRequestsByStatus(status: Int, serverId: String, userId: String): Flow<List<JellyseerrRequestEntity>>
+    @Query(
+        "SELECT * FROM jellyseerr_requests WHERE status = :status AND jellyfinServerId = :serverId AND jellyfinUserId = :userId ORDER BY requestedAt DESC"
+    )
+    fun getRequestsByStatus(
+        status: Int,
+        serverId: String,
+        userId: String,
+    ): Flow<List<JellyseerrRequestEntity>>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertRequest(request: JellyseerrRequestEntity)
@@ -26,24 +40,36 @@ interface JellyseerrDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertRequests(requests: List<JellyseerrRequestEntity>)
 
-    @Query("DELETE FROM jellyseerr_requests WHERE id = :requestId AND jellyfinServerId = :serverId AND jellyfinUserId = :userId")
+    @Query(
+        "DELETE FROM jellyseerr_requests WHERE id = :requestId AND jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
     suspend fun deleteRequest(requestId: Int, serverId: String, userId: String)
 
-    @Query("DELETE FROM jellyseerr_requests WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId")
+    @Query(
+        "DELETE FROM jellyseerr_requests WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
     suspend fun clearAllRequests(serverId: String, userId: String)
 
-    @Query("DELETE FROM jellyseerr_requests WHERE cachedAt < :expiryTime AND jellyfinServerId = :serverId AND jellyfinUserId = :userId")
+    @Query(
+        "DELETE FROM jellyseerr_requests WHERE cachedAt < :expiryTime AND jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
     suspend fun deleteExpiredRequests(expiryTime: Long, serverId: String, userId: String)
 
-    @Query("SELECT * FROM jellyseerr_config WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId")
+    @Query(
+        "SELECT * FROM jellyseerr_config WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
     suspend fun getConfig(serverId: String, userId: String): JellyseerrConfigEntity?
 
-    @Query("SELECT * FROM jellyseerr_config WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId")
+    @Query(
+        "SELECT * FROM jellyseerr_config WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
     fun getConfigFlow(serverId: String, userId: String): Flow<JellyseerrConfigEntity?>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun saveConfig(config: JellyseerrConfigEntity)
 
-    @Query("DELETE FROM jellyseerr_config WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId")
+    @Query(
+        "DELETE FROM jellyseerr_config WHERE jellyfinServerId = :serverId AND jellyfinUserId = :userId"
+    )
     suspend fun clearConfig(serverId: String, userId: String)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/LibraryCacheDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/LibraryCacheDao.kt
index 99b89ac7f..d439ad460 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/LibraryCacheDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/LibraryCacheDao.kt
@@ -8,19 +8,21 @@ import com.makd.afinity.data.database.entities.LibraryCacheEntity
 
 @Dao
 interface LibraryCacheDao {
-    @Query("""
+    @Query(
+        """
         SELECT * FROM library_cache 
         WHERE libraryId = :libraryId 
         AND sortBy = :sortBy 
         AND sortDescending = :sortDescending 
         AND filterType = :filterType 
         ORDER BY itemName ASC
-    """)
+    """
+    )
     suspend fun getCachedItems(
         libraryId: String,
         sortBy: String,
         sortDescending: Boolean,
-        filterType: String
+        filterType: String,
     ): List<LibraryCacheEntity>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
@@ -31,4 +33,4 @@ interface LibraryCacheDao {
 
     @Query("DELETE FROM library_cache WHERE cacheTimestamp < :expiredTimestamp")
     suspend fun clearExpiredCache(expiredTimestamp: Long)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/MediaStreamDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/MediaStreamDao.kt
index 0dd3d07cc..29183faad 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/MediaStreamDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/MediaStreamDao.kt
@@ -18,11 +18,9 @@ interface MediaStreamDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertMediaStreams(streams: List<AfinityMediaStreamDto>)
 
-    @Update
-    suspend fun updateMediaStream(stream: AfinityMediaStreamDto)
+    @Update suspend fun updateMediaStream(stream: AfinityMediaStreamDto)
 
-    @Delete
-    suspend fun deleteMediaStream(stream: AfinityMediaStreamDto)
+    @Delete suspend fun deleteMediaStream(stream: AfinityMediaStreamDto)
 
     @Query("DELETE FROM mediastreams WHERE id = :streamId")
     suspend fun deleteMediaStreamById(streamId: UUID)
@@ -39,9 +37,7 @@ interface MediaStreamDao {
     @Query("SELECT * FROM mediastreams WHERE sourceId = :sourceId AND type = :type")
     suspend fun getMediaStreamsByType(sourceId: String, type: String): List<AfinityMediaStreamDto>
 
-    @Query("SELECT COUNT(*) FROM mediastreams")
-    suspend fun getMediaStreamCount(): Int
+    @Query("SELECT COUNT(*) FROM mediastreams") suspend fun getMediaStreamCount(): Int
 
-    @Query("DELETE FROM mediastreams")
-    suspend fun deleteAllMediaStreams()
-}
\ No newline at end of file
+    @Query("DELETE FROM mediastreams") suspend fun deleteAllMediaStreams()
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/MovieDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/MovieDao.kt
index cdc866489..585ae6ca0 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/MovieDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/MovieDao.kt
@@ -7,26 +7,22 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
 import com.makd.afinity.data.database.entities.AfinityMovieDto
-import kotlinx.coroutines.flow.Flow
 import java.util.UUID
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface MovieDao {
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertMovie(movie: AfinityMovieDto)
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertMovie(movie: AfinityMovieDto)
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertMovies(movies: List<AfinityMovieDto>)
 
-    @Update
-    suspend fun updateMovie(movie: AfinityMovieDto)
+    @Update suspend fun updateMovie(movie: AfinityMovieDto)
 
-    @Delete
-    suspend fun deleteMovie(movie: AfinityMovieDto)
+    @Delete suspend fun deleteMovie(movie: AfinityMovieDto)
 
-    @Query("DELETE FROM movies WHERE id = :movieId")
-    suspend fun deleteMovieById(movieId: UUID)
+    @Query("DELETE FROM movies WHERE id = :movieId") suspend fun deleteMovieById(movieId: UUID)
 
     @Query("DELETE FROM movies WHERE serverId = :serverId")
     suspend fun deleteMoviesByServerId(serverId: String)
@@ -40,15 +36,19 @@ interface MovieDao {
     @Query("SELECT * FROM movies WHERE serverId = :serverId ORDER BY name ASC")
     fun getMoviesFlow(serverId: String): Flow<List<AfinityMovieDto>>
 
-    @Query("""
+    @Query(
+        """
         SELECT * FROM movies
         WHERE serverId = :serverId
         AND (name LIKE '%' || :query || '%' OR originalTitle LIKE '%' || :query || '%')
         ORDER BY name ASC
-    """)
+    """
+    )
     suspend fun searchMovies(query: String, serverId: String): List<AfinityMovieDto>
 
-    @Query("SELECT * FROM movies WHERE serverId = :serverId AND premiereDate >= :fromDate ORDER BY premiereDate DESC LIMIT :limit")
+    @Query(
+        "SELECT * FROM movies WHERE serverId = :serverId AND premiereDate >= :fromDate ORDER BY premiereDate DESC LIMIT :limit"
+    )
     suspend fun getRecentMovies(fromDate: Long, limit: Int, serverId: String): List<AfinityMovieDto>
 
     @Query("SELECT * FROM movies WHERE serverId = :serverId ORDER BY name ASC")
@@ -57,6 +57,5 @@ interface MovieDao {
     @Query("SELECT COUNT(*) FROM movies WHERE serverId = :serverId")
     suspend fun getMovieCount(serverId: String): Int
 
-    @Query("DELETE FROM movies")
-    suspend fun deleteAllMovies()
-}
\ No newline at end of file
+    @Query("DELETE FROM movies") suspend fun deleteAllMovies()
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/MovieSectionDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/MovieSectionDao.kt
index 947ec19b8..1bc32110f 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/MovieSectionDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/MovieSectionDao.kt
@@ -12,12 +12,14 @@ interface MovieSectionDao {
     @Query("SELECT * FROM movie_section_cache WHERE sectionId = :id")
     suspend fun getCachedSection(id: String): MovieSectionCacheEntity?
 
-    @Query("""
+    @Query(
+        """
         SELECT COUNT(*) > 0
         FROM movie_section_cache
         WHERE sectionId = :id
         AND (cachedTimestamp + :ttlMillis) > :currentTime
-    """)
+    """
+    )
     suspend fun isSectionCacheFresh(id: String, ttlMillis: Long, currentTime: Long): Boolean
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
@@ -29,6 +31,5 @@ interface MovieSectionDao {
     @Query("DELETE FROM movie_section_cache WHERE sectionType = :type")
     suspend fun deleteSectionsByType(type: String)
 
-    @Query("DELETE FROM movie_section_cache")
-    suspend fun clearAllCache()
-}
\ No newline at end of file
+    @Query("DELETE FROM movie_section_cache") suspend fun clearAllCache()
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/PersonSectionDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/PersonSectionDao.kt
index d5f390bbb..f53b3d38f 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/PersonSectionDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/PersonSectionDao.kt
@@ -12,12 +12,14 @@ interface PersonSectionDao {
     @Query("SELECT * FROM person_section_cache WHERE cacheKey = :key")
     suspend fun getCachedSection(key: String): PersonSectionCacheEntity?
 
-    @Query("""
+    @Query(
+        """
         SELECT COUNT(*) > 0
         FROM person_section_cache
         WHERE cacheKey = :key
         AND (cachedTimestamp + :ttlMillis) > :currentTime
-    """)
+    """
+    )
     suspend fun isSectionCacheFresh(key: String, ttlMillis: Long, currentTime: Long): Boolean
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
@@ -29,6 +31,5 @@ interface PersonSectionDao {
     @Query("DELETE FROM person_section_cache WHERE sectionType = :type")
     suspend fun deleteSectionsByType(type: String)
 
-    @Query("DELETE FROM person_section_cache")
-    suspend fun clearAllCache()
-}
\ No newline at end of file
+    @Query("DELETE FROM person_section_cache") suspend fun clearAllCache()
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/SeasonDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/SeasonDao.kt
index 612f0ad16..cc29c7f6f 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/SeasonDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/SeasonDao.kt
@@ -7,8 +7,8 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
 import com.makd.afinity.data.database.entities.AfinitySeasonDto
-import kotlinx.coroutines.flow.Flow
 import java.util.UUID
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface SeasonDao {
@@ -19,14 +19,11 @@ interface SeasonDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertSeasons(seasons: List<AfinitySeasonDto>)
 
-    @Update
-    suspend fun updateSeason(season: AfinitySeasonDto)
+    @Update suspend fun updateSeason(season: AfinitySeasonDto)
 
-    @Delete
-    suspend fun deleteSeason(season: AfinitySeasonDto)
+    @Delete suspend fun deleteSeason(season: AfinitySeasonDto)
 
-    @Query("DELETE FROM seasons WHERE id = :seasonId")
-    suspend fun deleteSeasonById(seasonId: UUID)
+    @Query("DELETE FROM seasons WHERE id = :seasonId") suspend fun deleteSeasonById(seasonId: UUID)
 
     @Query("DELETE FROM seasons WHERE seriesId = :seriesId")
     suspend fun deleteSeasonsBySeriesId(seriesId: UUID)
@@ -37,21 +34,28 @@ interface SeasonDao {
     @Query("SELECT * FROM seasons WHERE id = :seasonId AND serverId = :serverId")
     suspend fun getSeason(seasonId: UUID, serverId: String): AfinitySeasonDto?
 
-    @Query("SELECT * FROM seasons WHERE seriesId = :seriesId AND serverId = :serverId ORDER BY indexNumber ASC")
+    @Query(
+        "SELECT * FROM seasons WHERE seriesId = :seriesId AND serverId = :serverId ORDER BY indexNumber ASC"
+    )
     suspend fun getSeasonsForSeries(seriesId: UUID, serverId: String): List<AfinitySeasonDto>
 
-    @Query("SELECT * FROM seasons WHERE seriesId = :seriesId AND serverId = :serverId ORDER BY indexNumber ASC")
+    @Query(
+        "SELECT * FROM seasons WHERE seriesId = :seriesId AND serverId = :serverId ORDER BY indexNumber ASC"
+    )
     fun getSeasonsForSeriesFlow(seriesId: UUID, serverId: String): Flow<List<AfinitySeasonDto>>
 
-    @Query("SELECT * FROM seasons WHERE serverId = :serverId AND name LIKE '%' || :query || '%' ORDER BY name ASC")
+    @Query(
+        "SELECT * FROM seasons WHERE serverId = :serverId AND name LIKE '%' || :query || '%' ORDER BY name ASC"
+    )
     suspend fun searchSeasons(query: String, serverId: String): List<AfinitySeasonDto>
 
-    @Query("SELECT * FROM seasons WHERE serverId = :serverId ORDER BY seriesName ASC, indexNumber ASC")
+    @Query(
+        "SELECT * FROM seasons WHERE serverId = :serverId ORDER BY seriesName ASC, indexNumber ASC"
+    )
     suspend fun getAllSeasons(serverId: String): List<AfinitySeasonDto>
 
     @Query("SELECT COUNT(*) FROM seasons WHERE serverId = :serverId")
     suspend fun getSeasonCount(serverId: String): Int
 
-    @Query("DELETE FROM seasons")
-    suspend fun deleteAllSeasons()
-}
\ No newline at end of file
+    @Query("DELETE FROM seasons") suspend fun deleteAllSeasons()
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/ServerAddressDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/ServerAddressDao.kt
index 1610a1e1e..81e2a4110 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/ServerAddressDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/ServerAddressDao.kt
@@ -18,11 +18,9 @@ interface ServerAddressDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertServerAddresses(serverAddresses: List<ServerAddress>)
 
-    @Update
-    suspend fun updateServerAddress(serverAddress: ServerAddress)
+    @Update suspend fun updateServerAddress(serverAddress: ServerAddress)
 
-    @Delete
-    suspend fun deleteServerAddress(serverAddress: ServerAddress)
+    @Delete suspend fun deleteServerAddress(serverAddress: ServerAddress)
 
     @Query("DELETE FROM serverAddresses WHERE id = :addressId")
     suspend fun deleteServerAddressById(addressId: UUID)
@@ -38,4 +36,4 @@ interface ServerAddressDao {
 
     @Query("SELECT * FROM serverAddresses WHERE serverId = :serverId AND address = :address")
     suspend fun getServerAddressByUrl(serverId: String, address: String): ServerAddress?
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/ServerDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/ServerDao.kt
index d359eb606..d43208ad7 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/ServerDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/ServerDao.kt
@@ -16,11 +16,9 @@ import kotlinx.coroutines.flow.Flow
 @Dao
 interface ServerDao {
 
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
-    suspend fun insertServer(server: Server): Long
+    @Insert(onConflict = OnConflictStrategy.IGNORE) suspend fun insertServer(server: Server): Long
 
-    @Update
-    suspend fun updateServer(server: Server)
+    @Update suspend fun updateServer(server: Server)
 
     @Transaction
     suspend fun upsertServer(server: Server) {
@@ -30,8 +28,7 @@ interface ServerDao {
         }
     }
 
-    @Delete
-    suspend fun deleteServer(server: Server)
+    @Delete suspend fun deleteServer(server: Server)
 
     @Query("DELETE FROM servers WHERE id = :serverId")
     suspend fun deleteServerById(serverId: String)
@@ -39,11 +36,9 @@ interface ServerDao {
     @Query("SELECT * FROM servers WHERE id = :serverId")
     suspend fun getServer(serverId: String): Server?
 
-    @Query("SELECT * FROM servers")
-    suspend fun getAllServers(): List<Server>
+    @Query("SELECT * FROM servers") suspend fun getAllServers(): List<Server>
 
-    @Query("SELECT * FROM servers")
-    fun getAllServersFlow(): Flow<List<Server>>
+    @Query("SELECT * FROM servers") fun getAllServersFlow(): Flow<List<Server>>
 
     @Transaction
     @Query("SELECT * FROM servers WHERE id = :serverId")
@@ -60,4 +55,4 @@ interface ServerDao {
     @Transaction
     @Query("SELECT * FROM servers WHERE id = :serverId")
     suspend fun getServerWithUsers(serverId: String): ServerWithUsers?
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/ServerDatabaseDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/ServerDatabaseDao.kt
index 4c2d9d2ca..64fbad65c 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/ServerDatabaseDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/ServerDatabaseDao.kt
@@ -16,8 +16,8 @@ import com.makd.afinity.data.database.entities.AfinityTrickplayInfoDto
 import com.makd.afinity.data.database.entities.DownloadDto
 import com.makd.afinity.data.models.download.DownloadStatus
 import com.makd.afinity.data.models.user.AfinityUserDataDto
-import kotlinx.coroutines.flow.Flow
 import java.util.UUID
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 abstract class ServerDatabaseDao {
@@ -77,15 +77,21 @@ abstract class ServerDatabaseDao {
     abstract suspend fun getUserData(userId: UUID, itemId: UUID): AfinityUserDataDto?
 
     @Transaction
-    open suspend fun getUserDataOrCreateNew(itemId: UUID, userId: UUID, serverId: String): AfinityUserDataDto {
-        return getUserData(userId, itemId) ?: AfinityUserDataDto(
-            userId = userId,
-            itemId = itemId,
-            serverId = serverId,
-            played = false,
-            favorite = false,
-            playbackPositionTicks = 0L
-        ).also { insertUserData(it) }
+    open suspend fun getUserDataOrCreateNew(
+        itemId: UUID,
+        userId: UUID,
+        serverId: String,
+    ): AfinityUserDataDto {
+        return getUserData(userId, itemId)
+            ?: AfinityUserDataDto(
+                    userId = userId,
+                    itemId = itemId,
+                    serverId = serverId,
+                    played = false,
+                    favorite = false,
+                    playbackPositionTicks = 0L,
+                )
+                .also { insertUserData(it) }
     }
 
     @Query("SELECT * FROM seasons WHERE seriesId = :seriesId ORDER BY indexNumber ASC")
@@ -94,7 +100,9 @@ abstract class ServerDatabaseDao {
     @Query("SELECT * FROM episodes WHERE seasonId = :seasonId ORDER BY indexNumber ASC")
     abstract suspend fun getEpisodesForSeason(seasonId: UUID): List<AfinityEpisodeDto>
 
-    @Query("SELECT * FROM episodes WHERE seriesId = :seriesId ORDER BY parentIndexNumber ASC, indexNumber ASC")
+    @Query(
+        "SELECT * FROM episodes WHERE seriesId = :seriesId ORDER BY parentIndexNumber ASC, indexNumber ASC"
+    )
     abstract suspend fun getEpisodesForSeries(seriesId: UUID): List<AfinityEpisodeDto>
 
     @Query("SELECT * FROM segments WHERE itemId = :itemId")
@@ -124,16 +132,32 @@ abstract class ServerDatabaseDao {
     @Query("DELETE FROM downloads WHERE status = :status")
     abstract suspend fun deleteDownloadsByStatus(status: DownloadStatus)
 
-    @Query("SELECT * FROM downloads WHERE itemId = :itemId AND serverId = :serverId AND userId = :userId")
-    abstract suspend fun getDownloadByItemIdScoped(itemId: UUID, serverId: String, userId: UUID): DownloadDto?
-
-    @Query("SELECT * FROM downloads WHERE serverId = :serverId AND userId = :userId ORDER BY createdAt DESC")
+    @Query(
+        "SELECT * FROM downloads WHERE itemId = :itemId AND serverId = :serverId AND userId = :userId"
+    )
+    abstract suspend fun getDownloadByItemIdScoped(
+        itemId: UUID,
+        serverId: String,
+        userId: UUID,
+    ): DownloadDto?
+
+    @Query(
+        "SELECT * FROM downloads WHERE serverId = :serverId AND userId = :userId ORDER BY createdAt DESC"
+    )
     abstract fun getAllDownloadsFlowScoped(serverId: String, userId: UUID): Flow<List<DownloadDto>>
 
-    @Query("SELECT * FROM downloads WHERE status IN (:statuses) AND serverId = :serverId AND userId = :userId ORDER BY createdAt DESC")
-    abstract fun getDownloadsByStatusFlowScoped(statuses: List<DownloadStatus>, serverId: String, userId: UUID): Flow<List<DownloadDto>>
-
-    @Query("SELECT COALESCE(SUM(totalBytes), 0) FROM downloads WHERE serverId = :serverId AND status = 'COMPLETED'")
+    @Query(
+        "SELECT * FROM downloads WHERE status IN (:statuses) AND serverId = :serverId AND userId = :userId ORDER BY createdAt DESC"
+    )
+    abstract fun getDownloadsByStatusFlowScoped(
+        statuses: List<DownloadStatus>,
+        serverId: String,
+        userId: UUID,
+    ): Flow<List<DownloadDto>>
+
+    @Query(
+        "SELECT COALESCE(SUM(totalBytes), 0) FROM downloads WHERE serverId = :serverId AND status = 'COMPLETED'"
+    )
     abstract suspend fun getTotalBytesForServer(serverId: String): Long
 
     @Query("SELECT COALESCE(SUM(totalBytes), 0) FROM downloads WHERE status = 'COMPLETED'")
@@ -142,11 +166,9 @@ abstract class ServerDatabaseDao {
     @Query("UPDATE downloads SET serverId = :serverId, userId = :userId WHERE serverId = ''")
     abstract suspend fun backfillEmptyServerIds(serverId: String, userId: UUID)
 
-    @Query("DELETE FROM movies WHERE id = :movieId")
-    abstract suspend fun deleteMovie(movieId: UUID)
+    @Query("DELETE FROM movies WHERE id = :movieId") abstract suspend fun deleteMovie(movieId: UUID)
 
-    @Query("DELETE FROM shows WHERE id = :showId")
-    abstract suspend fun deleteShow(showId: UUID)
+    @Query("DELETE FROM shows WHERE id = :showId") abstract suspend fun deleteShow(showId: UUID)
 
     @Query("DELETE FROM seasons WHERE id = :seasonId")
     abstract suspend fun deleteSeason(seasonId: UUID)
@@ -169,80 +191,96 @@ abstract class ServerDatabaseDao {
     @Query("DELETE FROM episodes WHERE serverId = :serverId")
     abstract suspend fun deleteEpisodesByServerId(serverId: String)
 
-    @Query("""
+    @Query(
+        """
         SELECT * FROM movies 
         WHERE name LIKE '%' || :query || '%' OR originalTitle LIKE '%' || :query || '%'
         ORDER BY name ASC
         LIMIT :limit
-    """)
+    """
+    )
     abstract suspend fun searchMovies(query: String, limit: Int = 50): List<AfinityMovieDto>
 
-    @Query("""
+    @Query(
+        """
         SELECT * FROM shows 
         WHERE name LIKE '%' || :query || '%' OR originalTitle LIKE '%' || :query || '%'
         ORDER BY name ASC
         LIMIT :limit
-    """)
+    """
+    )
     abstract suspend fun searchShows(query: String, limit: Int = 50): List<AfinityShowDto>
 
-    @Query("""
+    @Query(
+        """
         SELECT * FROM episodes 
         WHERE name LIKE '%' || :query || '%' OR overview LIKE '%' || :query || '%'
         ORDER BY seriesName ASC, parentIndexNumber ASC, indexNumber ASC
         LIMIT :limit
-    """)
+    """
+    )
     abstract suspend fun searchEpisodes(query: String, limit: Int = 50): List<AfinityEpisodeDto>
 
-    @Query("""
+    @Query(
+        """
         SELECT m.* FROM movies m
         INNER JOIN userdata u ON m.id = u.itemId
         WHERE u.userId = :userId AND u.favorite = 1
         ORDER BY m.name ASC
-    """)
+    """
+    )
     abstract suspend fun getFavoriteMovies(userId: UUID): List<AfinityMovieDto>
 
-    @Query("""
+    @Query(
+        """
         SELECT s.* FROM shows s
         INNER JOIN userdata u ON s.id = u.itemId
         WHERE u.userId = :userId AND u.favorite = 1
         ORDER BY s.name ASC
-    """)
+    """
+    )
     abstract suspend fun getFavoriteShows(userId: UUID): List<AfinityShowDto>
 
-    @Query("""
+    @Query(
+        """
         SELECT e.* FROM episodes e
         INNER JOIN userdata u ON e.id = u.itemId
         WHERE u.userId = :userId AND u.favorite = 1
         ORDER BY e.seriesName ASC, e.parentIndexNumber ASC, e.indexNumber ASC
-    """)
+    """
+    )
     abstract suspend fun getFavoriteEpisodes(userId: UUID): List<AfinityEpisodeDto>
 
-    @Query("""
+    @Query(
+        """
         SELECT m.* FROM movies m
         INNER JOIN userdata u ON m.id = u.itemId
         WHERE u.userId = :userId AND u.playbackPositionTicks > 0 AND u.played = 0
         ORDER BY u.playbackPositionTicks DESC
         LIMIT :limit
-    """)
+    """
+    )
     abstract suspend fun getContinueWatchingMovies(userId: UUID, limit: Int): List<AfinityMovieDto>
 
-    @Query("""
+    @Query(
+        """
         SELECT e.* FROM episodes e
         INNER JOIN userdata u ON e.id = u.itemId
         WHERE u.userId = :userId AND u.playbackPositionTicks > 0 AND u.played = 0
         ORDER BY u.playbackPositionTicks DESC
         LIMIT :limit
-    """)
-    abstract suspend fun getContinueWatchingEpisodes(userId: UUID, limit: Int): List<AfinityEpisodeDto>
+    """
+    )
+    abstract suspend fun getContinueWatchingEpisodes(
+        userId: UUID,
+        limit: Int,
+    ): List<AfinityEpisodeDto>
 
-    @Query("SELECT COUNT(*) FROM movies")
-    abstract suspend fun getMovieCount(): Int
+    @Query("SELECT COUNT(*) FROM movies") abstract suspend fun getMovieCount(): Int
 
-    @Query("SELECT COUNT(*) FROM shows")
-    abstract suspend fun getShowCount(): Int
+    @Query("SELECT COUNT(*) FROM shows") abstract suspend fun getShowCount(): Int
 
-    @Query("SELECT COUNT(*) FROM episodes")
-    abstract suspend fun getEpisodeCount(): Int
+    @Query("SELECT COUNT(*) FROM episodes") abstract suspend fun getEpisodeCount(): Int
 
     @Query("SELECT COUNT(*) FROM sources WHERE type = 'LOCAL'")
     abstract suspend fun getDownloadedItemCount(): Int
@@ -261,33 +299,23 @@ abstract class ServerDatabaseDao {
         deleteAllDownloads()
     }
 
-    @Query("DELETE FROM movies")
-    abstract suspend fun deleteAllMovies()
+    @Query("DELETE FROM movies") abstract suspend fun deleteAllMovies()
 
-    @Query("DELETE FROM shows")
-    abstract suspend fun deleteAllShows()
+    @Query("DELETE FROM shows") abstract suspend fun deleteAllShows()
 
-    @Query("DELETE FROM seasons")
-    abstract suspend fun deleteAllSeasons()
+    @Query("DELETE FROM seasons") abstract suspend fun deleteAllSeasons()
 
-    @Query("DELETE FROM episodes")
-    abstract suspend fun deleteAllEpisodes()
+    @Query("DELETE FROM episodes") abstract suspend fun deleteAllEpisodes()
 
-    @Query("DELETE FROM sources")
-    abstract suspend fun deleteAllSources()
+    @Query("DELETE FROM sources") abstract suspend fun deleteAllSources()
 
-    @Query("DELETE FROM mediastreams")
-    abstract suspend fun deleteAllMediaStreams()
+    @Query("DELETE FROM mediastreams") abstract suspend fun deleteAllMediaStreams()
 
-    @Query("DELETE FROM trickplayInfos")
-    abstract suspend fun deleteAllTrickplayInfos()
+    @Query("DELETE FROM trickplayInfos") abstract suspend fun deleteAllTrickplayInfos()
 
-    @Query("DELETE FROM segments")
-    abstract suspend fun deleteAllSegments()
+    @Query("DELETE FROM segments") abstract suspend fun deleteAllSegments()
 
-    @Query("DELETE FROM userdata")
-    abstract suspend fun deleteAllUserData()
+    @Query("DELETE FROM userdata") abstract suspend fun deleteAllUserData()
 
-    @Query("DELETE FROM downloads")
-    abstract suspend fun deleteAllDownloads()
-}
\ No newline at end of file
+    @Query("DELETE FROM downloads") abstract suspend fun deleteAllDownloads()
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/ShowDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/ShowDao.kt
index d254bfafc..4ea859253 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/ShowDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/ShowDao.kt
@@ -7,26 +7,22 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
 import com.makd.afinity.data.database.entities.AfinityShowDto
-import kotlinx.coroutines.flow.Flow
 import java.util.UUID
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface ShowDao {
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertShow(show: AfinityShowDto)
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertShow(show: AfinityShowDto)
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertShows(shows: List<AfinityShowDto>)
 
-    @Update
-    suspend fun updateShow(show: AfinityShowDto)
+    @Update suspend fun updateShow(show: AfinityShowDto)
 
-    @Delete
-    suspend fun deleteShow(show: AfinityShowDto)
+    @Delete suspend fun deleteShow(show: AfinityShowDto)
 
-    @Query("DELETE FROM shows WHERE id = :showId")
-    suspend fun deleteShowById(showId: UUID)
+    @Query("DELETE FROM shows WHERE id = :showId") suspend fun deleteShowById(showId: UUID)
 
     @Query("DELETE FROM shows WHERE serverId = :serverId")
     suspend fun deleteShowsByServerId(serverId: String)
@@ -40,12 +36,14 @@ interface ShowDao {
     @Query("SELECT * FROM shows WHERE serverId = :serverId ORDER BY name ASC")
     fun getShowsFlow(serverId: String): Flow<List<AfinityShowDto>>
 
-    @Query("""
+    @Query(
+        """
         SELECT * FROM shows
         WHERE serverId = :serverId
         AND (name LIKE '%' || :query || '%' OR originalTitle LIKE '%' || :query || '%')
         ORDER BY name ASC
-    """)
+    """
+    )
     suspend fun searchShows(query: String, serverId: String): List<AfinityShowDto>
 
     @Query("SELECT * FROM shows WHERE serverId = :serverId ORDER BY name ASC")
@@ -54,6 +52,5 @@ interface ShowDao {
     @Query("SELECT COUNT(*) FROM shows WHERE serverId = :serverId")
     suspend fun getShowCount(serverId: String): Int
 
-    @Query("DELETE FROM shows")
-    suspend fun deleteAllShows()
-}
\ No newline at end of file
+    @Query("DELETE FROM shows") suspend fun deleteAllShows()
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/SourceDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/SourceDao.kt
index 0d6a2679f..f583a1348 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/SourceDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/SourceDao.kt
@@ -18,11 +18,9 @@ interface SourceDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertSources(sources: List<AfinitySourceDto>)
 
-    @Update
-    suspend fun updateSource(source: AfinitySourceDto)
+    @Update suspend fun updateSource(source: AfinitySourceDto)
 
-    @Delete
-    suspend fun deleteSource(source: AfinitySourceDto)
+    @Delete suspend fun deleteSource(source: AfinitySourceDto)
 
     @Query("DELETE FROM sources WHERE id = :sourceId")
     suspend fun deleteSourceById(sourceId: String)
@@ -48,6 +46,5 @@ interface SourceDao {
     @Query("SELECT SUM(length(path)) FROM sources WHERE type = 'LOCAL'")
     suspend fun getTotalLocalStorageSize(): Long?
 
-    @Query("DELETE FROM sources")
-    suspend fun deleteAllSources()
-}
\ No newline at end of file
+    @Query("DELETE FROM sources") suspend fun deleteAllSources()
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/StudioCacheDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/StudioCacheDao.kt
index 616d6a9b0..a2fc45b33 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/StudioCacheDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/StudioCacheDao.kt
@@ -16,7 +16,9 @@ interface StudioCacheDao {
     @Query("SELECT * FROM studio_cache WHERE studioId = :studioId")
     suspend fun getStudioById(studioId: String): StudioCacheEntity?
 
-    @Query("SELECT COUNT(*) > 0 FROM studio_cache WHERE (cachedTimestamp + :ttlMillis) > :currentTime")
+    @Query(
+        "SELECT COUNT(*) > 0 FROM studio_cache WHERE (cachedTimestamp + :ttlMillis) > :currentTime"
+    )
     suspend fun isStudioCacheFresh(ttlMillis: Long, currentTime: Long): Boolean
 
     @Query("SELECT MIN(cachedTimestamp) FROM studio_cache")
@@ -25,12 +27,11 @@ interface StudioCacheDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertStudios(studios: List<StudioCacheEntity>)
 
-    @Query("DELETE FROM studio_cache")
-    suspend fun deleteAllStudios()
+    @Query("DELETE FROM studio_cache") suspend fun deleteAllStudios()
 
     @Transaction
     suspend fun replaceStudios(studios: List<StudioCacheEntity>) {
         deleteAllStudios()
         insertStudios(studios)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/TopPeopleDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/TopPeopleDao.kt
index 1f65a9cf2..3d340397d 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/TopPeopleDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/TopPeopleDao.kt
@@ -12,12 +12,14 @@ interface TopPeopleDao {
     @Query("SELECT * FROM top_people_cache WHERE personType = :type")
     suspend fun getCachedTopPeople(type: String): TopPeopleCacheEntity?
 
-    @Query("""
+    @Query(
+        """
         SELECT COUNT(*) > 0
         FROM top_people_cache
         WHERE personType = :type
         AND (cachedTimestamp + :ttlMillis) > :currentTime
-    """)
+    """
+    )
     suspend fun isTopPeopleCacheFresh(type: String, ttlMillis: Long, currentTime: Long): Boolean
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
@@ -26,6 +28,5 @@ interface TopPeopleDao {
     @Query("DELETE FROM top_people_cache WHERE personType = :type")
     suspend fun deleteTopPeople(type: String)
 
-    @Query("DELETE FROM top_people_cache")
-    suspend fun clearAllCache()
-}
\ No newline at end of file
+    @Query("DELETE FROM top_people_cache") suspend fun clearAllCache()
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/UserDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/UserDao.kt
index a5acee457..d96cc2650 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/UserDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/UserDao.kt
@@ -12,26 +12,20 @@ import java.util.UUID
 @Dao
 interface UserDao {
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertUser(user: User)
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertUser(user: User)
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertUsers(users: List<User>)
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertUsers(users: List<User>)
 
-    @Update
-    suspend fun updateUser(user: User)
+    @Update suspend fun updateUser(user: User)
 
-    @Delete
-    suspend fun deleteUser(user: User)
+    @Delete suspend fun deleteUser(user: User)
 
-    @Query("DELETE FROM users WHERE id = :userId")
-    suspend fun deleteUserById(userId: UUID)
+    @Query("DELETE FROM users WHERE id = :userId") suspend fun deleteUserById(userId: UUID)
 
     @Query("DELETE FROM users WHERE serverId = :serverId")
     suspend fun deleteUsersByServerId(serverId: String)
 
-    @Query("SELECT * FROM users WHERE id = :userId")
-    suspend fun getUser(userId: UUID): User?
+    @Query("SELECT * FROM users WHERE id = :userId") suspend fun getUser(userId: UUID): User?
 
     @Query("SELECT * FROM users WHERE serverId = :serverId")
     suspend fun getUsersForServer(serverId: String): List<User>
@@ -42,6 +36,5 @@ interface UserDao {
     @Query("SELECT * FROM users WHERE accessToken IS NOT NULL LIMIT 1")
     suspend fun getCurrentUser(): User?
 
-    @Query("SELECT * FROM users")
-    suspend fun getAllUsers(): List<User>
-}
\ No newline at end of file
+    @Query("SELECT * FROM users") suspend fun getAllUsers(): List<User>
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/dao/UserDataDao.kt b/app/src/main/java/com/makd/afinity/data/database/dao/UserDataDao.kt
index 324789745..351770cce 100644
--- a/app/src/main/java/com/makd/afinity/data/database/dao/UserDataDao.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/dao/UserDataDao.kt
@@ -7,8 +7,8 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
 import com.makd.afinity.data.models.user.AfinityUserDataDto
-import kotlinx.coroutines.flow.Flow
 import java.util.UUID
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface UserDataDao {
@@ -19,19 +19,21 @@ interface UserDataDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertUserDataList(userDataList: List<AfinityUserDataDto>)
 
-    @Update
-    suspend fun updateUserData(userData: AfinityUserDataDto)
+    @Update suspend fun updateUserData(userData: AfinityUserDataDto)
 
-    @Delete
-    suspend fun deleteUserData(userData: AfinityUserDataDto)
+    @Delete suspend fun deleteUserData(userData: AfinityUserDataDto)
 
-    @Query("DELETE FROM userdata WHERE userId = :userId AND itemId = :itemId AND serverId = :serverId")
+    @Query(
+        "DELETE FROM userdata WHERE userId = :userId AND itemId = :itemId AND serverId = :serverId"
+    )
     suspend fun deleteUserDataByIds(userId: UUID, itemId: UUID, serverId: String)
 
     @Query("DELETE FROM userdata WHERE userId = :userId AND serverId = :serverId")
     suspend fun deleteUserDataByUserId(userId: UUID, serverId: String)
 
-    @Query("SELECT * FROM userdata WHERE userId = :userId AND itemId = :itemId AND serverId = :serverId")
+    @Query(
+        "SELECT * FROM userdata WHERE userId = :userId AND itemId = :itemId AND serverId = :serverId"
+    )
     suspend fun getUserData(userId: UUID, itemId: UUID, serverId: String): AfinityUserDataDto?
 
     @Query("SELECT * FROM userdata WHERE userId = :userId AND serverId = :serverId")
@@ -40,30 +42,43 @@ interface UserDataDao {
     @Query("SELECT * FROM userdata WHERE userId = :userId AND serverId = :serverId")
     fun getAllUserDataFlow(userId: UUID, serverId: String): Flow<List<AfinityUserDataDto>>
 
-    @Query("SELECT * FROM userdata WHERE userId = :userId AND serverId = :serverId AND favorite = 1")
+    @Query(
+        "SELECT * FROM userdata WHERE userId = :userId AND serverId = :serverId AND favorite = 1"
+    )
     suspend fun getFavoriteItems(userId: UUID, serverId: String): List<AfinityUserDataDto>
 
-    @Query("SELECT * FROM userdata WHERE userId = :userId AND serverId = :serverId AND favorite = 1")
+    @Query(
+        "SELECT * FROM userdata WHERE userId = :userId AND serverId = :serverId AND favorite = 1"
+    )
     fun getFavoriteItemsFlow(userId: UUID, serverId: String): Flow<List<AfinityUserDataDto>>
 
-    @Query("SELECT * FROM userdata WHERE userId = :userId AND serverId = :serverId AND playbackPositionTicks > 0 AND played = 0")
+    @Query(
+        "SELECT * FROM userdata WHERE userId = :userId AND serverId = :serverId AND playbackPositionTicks > 0 AND played = 0"
+    )
     suspend fun getContinueWatchingItems(userId: UUID, serverId: String): List<AfinityUserDataDto>
 
-    @Query("SELECT * FROM userdata WHERE userId = :userId AND serverId = :serverId AND playbackPositionTicks > 0 AND played = 0")
+    @Query(
+        "SELECT * FROM userdata WHERE userId = :userId AND serverId = :serverId AND playbackPositionTicks > 0 AND played = 0"
+    )
     fun getContinueWatchingItemsFlow(userId: UUID, serverId: String): Flow<List<AfinityUserDataDto>>
 
-    @Query("SELECT * FROM userdata WHERE userId = :userId AND serverId = :serverId AND toBeSynced = 1")
+    @Query(
+        "SELECT * FROM userdata WHERE userId = :userId AND serverId = :serverId AND toBeSynced = 1"
+    )
     suspend fun getUnsyncedUserData(userId: UUID, serverId: String): List<AfinityUserDataDto>
 
-    @Query("UPDATE userdata SET toBeSynced = 0 WHERE userId = :userId AND itemId = :itemId AND serverId = :serverId")
+    @Query(
+        "UPDATE userdata SET toBeSynced = 0 WHERE userId = :userId AND itemId = :itemId AND serverId = :serverId"
+    )
     suspend fun markUserDataSynced(userId: UUID, itemId: UUID, serverId: String)
 
-    @Query("UPDATE userdata SET toBeSynced = 1 WHERE userId = :userId AND itemId = :itemId AND serverId = :serverId")
+    @Query(
+        "UPDATE userdata SET toBeSynced = 1 WHERE userId = :userId AND itemId = :itemId AND serverId = :serverId"
+    )
     suspend fun markUserDataUnsynced(userId: UUID, itemId: UUID, serverId: String)
 
     @Query("SELECT COUNT(*) FROM userdata WHERE userId = :userId AND serverId = :serverId")
     suspend fun getUserDataCount(userId: UUID, serverId: String): Int
 
-    @Query("DELETE FROM userdata")
-    suspend fun deleteAllUserData()
-}
\ No newline at end of file
+    @Query("DELETE FROM userdata") suspend fun deleteAllUserData()
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/AfinityEpisodeDto.kt b/app/src/main/java/com/makd/afinity/data/database/entities/AfinityEpisodeDto.kt
index f15ed03db..e34365cf3 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/AfinityEpisodeDto.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/AfinityEpisodeDto.kt
@@ -12,28 +12,25 @@ import java.util.UUID
 
 @Entity(
     tableName = "episodes",
-    foreignKeys = [
-        ForeignKey(
-            entity = AfinitySeasonDto::class,
-            parentColumns = arrayOf("id"),
-            childColumns = arrayOf("seasonId"),
-            onDelete = ForeignKey.CASCADE,
-        ),
-        ForeignKey(
-            entity = AfinityShowDto::class,
-            parentColumns = arrayOf("id"),
-            childColumns = arrayOf("seriesId"),
-            onDelete = ForeignKey.CASCADE,
-        ),
-    ],
-    indices = [
-        Index("seasonId"),
-        Index("seriesId"),
-    ],
+    foreignKeys =
+        [
+            ForeignKey(
+                entity = AfinitySeasonDto::class,
+                parentColumns = arrayOf("id"),
+                childColumns = arrayOf("seasonId"),
+                onDelete = ForeignKey.CASCADE,
+            ),
+            ForeignKey(
+                entity = AfinityShowDto::class,
+                parentColumns = arrayOf("id"),
+                childColumns = arrayOf("seriesId"),
+                onDelete = ForeignKey.CASCADE,
+            ),
+        ],
+    indices = [Index("seasonId"), Index("seriesId")],
 )
 data class AfinityEpisodeDto(
-    @PrimaryKey
-    val id: UUID,
+    @PrimaryKey val id: UUID,
     val serverId: String,
     val seasonId: UUID,
     val seriesId: UUID,
@@ -68,4 +65,4 @@ fun AfinityEpisode.toAfinityEpisodeDto(serverId: String): AfinityEpisodeDto {
         chapters = chapters,
         images = images,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/AfinityMediaStreamDto.kt b/app/src/main/java/com/makd/afinity/data/database/entities/AfinityMediaStreamDto.kt
index a76f301b5..da38a47d8 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/AfinityMediaStreamDto.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/AfinityMediaStreamDto.kt
@@ -3,15 +3,12 @@ package com.makd.afinity.data.database.entities
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.makd.afinity.data.models.media.AfinityMediaStream
-import org.jellyfin.sdk.model.api.MediaStreamType
 import java.util.UUID
+import org.jellyfin.sdk.model.api.MediaStreamType
 
-@Entity(
-    tableName = "mediastreams",
-)
+@Entity(tableName = "mediastreams")
 data class AfinityMediaStreamDto(
-    @PrimaryKey
-    val id: UUID,
+    @PrimaryKey val id: UUID,
     val sourceId: String,
     val title: String,
     val displayTitle: String?,
@@ -31,7 +28,11 @@ data class AfinityMediaStreamDto(
     val downloadId: Long? = null,
 )
 
-fun AfinityMediaStream.toAfinityMediaStreamDto(id: UUID, sourceId: String, path: String): AfinityMediaStreamDto {
+fun AfinityMediaStream.toAfinityMediaStreamDto(
+    id: UUID,
+    sourceId: String,
+    path: String,
+): AfinityMediaStreamDto {
     return AfinityMediaStreamDto(
         id = id,
         sourceId = sourceId,
@@ -51,4 +52,4 @@ fun AfinityMediaStream.toAfinityMediaStreamDto(id: UUID, sourceId: String, path:
         channels = channels,
         isDefault = isDefault,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/AfinityMovieDto.kt b/app/src/main/java/com/makd/afinity/data/database/entities/AfinityMovieDto.kt
index a7d120264..de45be506 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/AfinityMovieDto.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/AfinityMovieDto.kt
@@ -11,8 +11,7 @@ import java.util.UUID
 
 @Entity(tableName = "movies")
 data class AfinityMovieDto(
-    @PrimaryKey
-    val id: UUID,
+    @PrimaryKey val id: UUID,
     val serverId: String,
     val name: String,
     val originalTitle: String?,
@@ -55,4 +54,4 @@ fun AfinityMovie.toAfinityMovieDto(serverId: String): AfinityMovieDto {
         tagline = tagline,
         people = people,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/AfinitySeasonDto.kt b/app/src/main/java/com/makd/afinity/data/database/entities/AfinitySeasonDto.kt
index 925da7524..2a1967456 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/AfinitySeasonDto.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/AfinitySeasonDto.kt
@@ -10,21 +10,19 @@ import java.util.UUID
 
 @Entity(
     tableName = "seasons",
-    foreignKeys = [
-        ForeignKey(
-            entity = AfinityShowDto::class,
-            parentColumns = arrayOf("id"),
-            childColumns = arrayOf("seriesId"),
-            onDelete = ForeignKey.CASCADE,
-        ),
-    ],
-    indices = [
-        Index("seriesId"),
-    ],
+    foreignKeys =
+        [
+            ForeignKey(
+                entity = AfinityShowDto::class,
+                parentColumns = arrayOf("id"),
+                childColumns = arrayOf("seriesId"),
+                onDelete = ForeignKey.CASCADE,
+            )
+        ],
+    indices = [Index("seriesId")],
 )
 data class AfinitySeasonDto(
-    @PrimaryKey
-    val id: UUID,
+    @PrimaryKey val id: UUID,
     val serverId: String,
     val seriesId: UUID,
     val name: String,
@@ -45,4 +43,4 @@ fun AfinitySeason.toAfinitySeasonDto(serverId: String): AfinitySeasonDto {
         indexNumber = indexNumber,
         images = images,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/AfinitySegmentDto.kt b/app/src/main/java/com/makd/afinity/data/database/entities/AfinitySegmentDto.kt
index 657c882de..106d640f5 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/AfinitySegmentDto.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/AfinitySegmentDto.kt
@@ -9,14 +9,15 @@ import java.util.UUID
 @Entity(
     tableName = "segments",
     primaryKeys = ["itemId", "type"],
-    foreignKeys = [
-        ForeignKey(
-            entity = AfinityEpisodeDto::class,
-            parentColumns = arrayOf("id"),
-            childColumns = arrayOf("itemId"),
-            onDelete = ForeignKey.CASCADE,
-        ),
-    ],
+    foreignKeys =
+        [
+            ForeignKey(
+                entity = AfinityEpisodeDto::class,
+                parentColumns = arrayOf("id"),
+                childColumns = arrayOf("itemId"),
+                onDelete = ForeignKey.CASCADE,
+            )
+        ],
 )
 data class AfinitySegmentDto(
     val itemId: UUID,
@@ -32,4 +33,4 @@ fun AfinitySegment.toAfinitySegmentsDto(itemId: UUID): AfinitySegmentDto {
         startTicks = startTicks,
         endTicks = endTicks,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/AfinityShowDto.kt b/app/src/main/java/com/makd/afinity/data/database/entities/AfinityShowDto.kt
index 97d192f7f..d65b6929b 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/AfinityShowDto.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/AfinityShowDto.kt
@@ -10,8 +10,7 @@ import java.util.UUID
 
 @Entity(tableName = "shows")
 data class AfinityShowDto(
-    @PrimaryKey
-    val id: UUID,
+    @PrimaryKey val id: UUID,
     val serverId: String,
     val name: String,
     val originalTitle: String?,
@@ -50,4 +49,4 @@ fun AfinityShow.toAfinityShowDto(serverId: String): AfinityShowDto {
         genres = genres,
         people = people,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/AfinitySourceDto.kt b/app/src/main/java/com/makd/afinity/data/database/entities/AfinitySourceDto.kt
index b6180162c..7eb80418c 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/AfinitySourceDto.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/AfinitySourceDto.kt
@@ -6,12 +6,9 @@ import com.makd.afinity.data.models.media.AfinitySource
 import com.makd.afinity.data.models.media.AfinitySourceType
 import java.util.UUID
 
-@Entity(
-    tableName = "sources",
-)
+@Entity(tableName = "sources")
 data class AfinitySourceDto(
-    @PrimaryKey
-    val id: String,
+    @PrimaryKey val id: String,
     val itemId: UUID,
     val name: String,
     val type: AfinitySourceType,
@@ -27,4 +24,4 @@ fun AfinitySource.toAfinitySourceDto(itemId: UUID, path: String): AfinitySourceD
         type = AfinitySourceType.LOCAL,
         path = path,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/AfinityTrickplayInfoDto.kt b/app/src/main/java/com/makd/afinity/data/database/entities/AfinityTrickplayInfoDto.kt
index 98b6f12f1..708918006 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/AfinityTrickplayInfoDto.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/AfinityTrickplayInfoDto.kt
@@ -7,18 +7,18 @@ import com.makd.afinity.data.models.media.AfinityTrickplayInfo
 
 @Entity(
     tableName = "trickplayInfos",
-    foreignKeys = [
-        ForeignKey(
-            entity = AfinitySourceDto::class,
-            parentColumns = arrayOf("id"),
-            childColumns = arrayOf("sourceId"),
-            onDelete = ForeignKey.CASCADE,
-        ),
-    ],
+    foreignKeys =
+        [
+            ForeignKey(
+                entity = AfinitySourceDto::class,
+                parentColumns = arrayOf("id"),
+                childColumns = arrayOf("sourceId"),
+                onDelete = ForeignKey.CASCADE,
+            )
+        ],
 )
 data class AfinityTrickplayInfoDto(
-    @PrimaryKey
-    val sourceId: String,
+    @PrimaryKey val sourceId: String,
     val width: Int,
     val height: Int,
     val tileWidth: Int,
@@ -39,4 +39,4 @@ fun AfinityTrickplayInfo.toAfinityTrickplayInfoDto(sourceId: String): AfinityTri
         interval = interval,
         bandwidth = bandwidth,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/AudiobookshelfConfigEntity.kt b/app/src/main/java/com/makd/afinity/data/database/entities/AudiobookshelfConfigEntity.kt
new file mode 100644
index 000000000..0497435cb
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/AudiobookshelfConfigEntity.kt
@@ -0,0 +1,14 @@
+package com.makd.afinity.data.database.entities
+
+import androidx.room.Entity
+
+@Entity(tableName = "audiobookshelf_config", primaryKeys = ["jellyfinServerId", "jellyfinUserId"])
+data class AudiobookshelfConfigEntity(
+    val jellyfinServerId: String,
+    val jellyfinUserId: String,
+    val serverUrl: String,
+    val absUserId: String,
+    val username: String,
+    val isLoggedIn: Boolean,
+    val lastSync: Long,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/AudiobookshelfItemEntity.kt b/app/src/main/java/com/makd/afinity/data/database/entities/AudiobookshelfItemEntity.kt
new file mode 100644
index 000000000..d6d4931fe
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/AudiobookshelfItemEntity.kt
@@ -0,0 +1,30 @@
+package com.makd.afinity.data.database.entities
+
+import androidx.room.Entity
+
+@Entity(
+    tableName = "audiobookshelf_items",
+    primaryKeys = ["id", "jellyfinServerId", "jellyfinUserId"],
+)
+data class AudiobookshelfItemEntity(
+    val id: String,
+    val jellyfinServerId: String,
+    val jellyfinUserId: String,
+    val libraryId: String,
+    val title: String,
+    val authorName: String?,
+    val narratorName: String?,
+    val seriesName: String?,
+    val seriesSequence: String?,
+    val mediaType: String,
+    val duration: Double?,
+    val coverUrl: String?,
+    val description: String?,
+    val publishedYear: String?,
+    val genres: String?,
+    val numTracks: Int?,
+    val numChapters: Int?,
+    val addedAt: Long?,
+    val updatedAt: Long?,
+    val cachedAt: Long,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/AudiobookshelfLibraryEntity.kt b/app/src/main/java/com/makd/afinity/data/database/entities/AudiobookshelfLibraryEntity.kt
new file mode 100644
index 000000000..3b89a1735
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/AudiobookshelfLibraryEntity.kt
@@ -0,0 +1,21 @@
+package com.makd.afinity.data.database.entities
+
+import androidx.room.Entity
+
+@Entity(
+    tableName = "audiobookshelf_libraries",
+    primaryKeys = ["id", "jellyfinServerId", "jellyfinUserId"],
+)
+data class AudiobookshelfLibraryEntity(
+    val id: String,
+    val jellyfinServerId: String,
+    val jellyfinUserId: String,
+    val name: String,
+    val mediaType: String,
+    val icon: String?,
+    val displayOrder: Int,
+    val totalItems: Int,
+    val totalDuration: Double?,
+    val lastUpdated: Long,
+    val cachedAt: Long,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/AudiobookshelfProgressEntity.kt b/app/src/main/java/com/makd/afinity/data/database/entities/AudiobookshelfProgressEntity.kt
new file mode 100644
index 000000000..4913200f0
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/AudiobookshelfProgressEntity.kt
@@ -0,0 +1,23 @@
+package com.makd.afinity.data.database.entities
+
+import androidx.room.Entity
+
+@Entity(
+    tableName = "audiobookshelf_progress",
+    primaryKeys = ["id", "jellyfinServerId", "jellyfinUserId"],
+)
+data class AudiobookshelfProgressEntity(
+    val id: String,
+    val jellyfinServerId: String,
+    val jellyfinUserId: String,
+    val libraryItemId: String,
+    val episodeId: String?,
+    val currentTime: Double,
+    val duration: Double,
+    val progress: Double,
+    val isFinished: Boolean,
+    val lastUpdate: Long,
+    val startedAt: Long,
+    val finishedAt: Long?,
+    val pendingSync: Boolean,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/BoxSetCacheEntity.kt b/app/src/main/java/com/makd/afinity/data/database/entities/BoxSetCacheEntity.kt
index 5a3d3e9ef..e12c3dd9b 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/BoxSetCacheEntity.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/BoxSetCacheEntity.kt
@@ -5,8 +5,7 @@ import androidx.room.PrimaryKey
 
 @Entity(tableName = "boxset_cache")
 data class BoxSetCacheEntity(
-    @PrimaryKey
-    val itemId: String,
+    @PrimaryKey val itemId: String,
     val boxSetIds: String,
-    val lastUpdated: Long
-)
\ No newline at end of file
+    val lastUpdated: Long,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/BoxSetCacheMetadata.kt b/app/src/main/java/com/makd/afinity/data/database/entities/BoxSetCacheMetadata.kt
index d71e437ac..b43bacd1e 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/BoxSetCacheMetadata.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/BoxSetCacheMetadata.kt
@@ -5,8 +5,7 @@ import androidx.room.PrimaryKey
 
 @Entity(tableName = "boxset_cache_metadata")
 data class BoxSetCacheMetadata(
-    @PrimaryKey
-    val id: Int = 1,
+    @PrimaryKey val id: Int = 1,
     val lastFullBuild: Long,
-    val cacheVersion: Int
-)
\ No newline at end of file
+    val cacheVersion: Int,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/DownloadDto.kt b/app/src/main/java/com/makd/afinity/data/database/entities/DownloadDto.kt
index 270e59929..c2ff9c97c 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/DownloadDto.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/DownloadDto.kt
@@ -8,8 +8,7 @@ import java.util.UUID
 
 @Entity(tableName = "downloads")
 data class DownloadDto(
-    @PrimaryKey
-    val id: UUID,
+    @PrimaryKey val id: UUID,
     val itemId: UUID,
     val itemName: String,
     val itemType: String,
@@ -24,7 +23,7 @@ data class DownloadDto(
     val createdAt: Long,
     val updatedAt: Long,
     val serverId: String,
-    val userId: UUID
+    val userId: UUID,
 )
 
 fun DownloadDto.toDownloadInfo(): DownloadInfo {
@@ -46,4 +45,4 @@ fun DownloadDto.toDownloadInfo(): DownloadInfo {
         serverId = serverId,
         userId = userId,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/GenreCacheEntity.kt b/app/src/main/java/com/makd/afinity/data/database/entities/GenreCacheEntity.kt
index 67fe397e9..08992ce2d 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/GenreCacheEntity.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/GenreCacheEntity.kt
@@ -5,8 +5,7 @@ import androidx.room.PrimaryKey
 
 @Entity(tableName = "genre_cache")
 data class GenreCacheEntity(
-    @PrimaryKey
-    val genreName: String,
+    @PrimaryKey val genreName: String,
     val lastFetchedTimestamp: Long,
-    val movieCount: Int = 0
-)
\ No newline at end of file
+    val movieCount: Int = 0,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/GenreMovieCacheEntity.kt b/app/src/main/java/com/makd/afinity/data/database/entities/GenreMovieCacheEntity.kt
index 119e94c87..8e02baca7 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/GenreMovieCacheEntity.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/GenreMovieCacheEntity.kt
@@ -2,14 +2,11 @@ package com.makd.afinity.data.database.entities
 
 import androidx.room.Entity
 
-@Entity(
-    tableName = "genre_movie_cache",
-    primaryKeys = ["genreName", "movieId"]
-)
+@Entity(tableName = "genre_movie_cache", primaryKeys = ["genreName", "movieId"])
 data class GenreMovieCacheEntity(
     val genreName: String,
     val movieId: String,
     val movieData: String,
     val position: Int,
-    val cachedTimestamp: Long
-)
\ No newline at end of file
+    val cachedTimestamp: Long,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/GenreShowCacheEntity.kt b/app/src/main/java/com/makd/afinity/data/database/entities/GenreShowCacheEntity.kt
index 1ab41209d..a0866b9a8 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/GenreShowCacheEntity.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/GenreShowCacheEntity.kt
@@ -2,14 +2,11 @@ package com.makd.afinity.data.database.entities
 
 import androidx.room.Entity
 
-@Entity(
-    tableName = "genre_show_cache",
-    primaryKeys = ["genreName", "showId"]
-)
+@Entity(tableName = "genre_show_cache", primaryKeys = ["genreName", "showId"])
 data class GenreShowCacheEntity(
     val genreName: String,
     val showId: String,
     val showData: String,
     val position: Int,
-    val cachedTimestamp: Long
-)
\ No newline at end of file
+    val cachedTimestamp: Long,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/JellyseerrConfigEntity.kt b/app/src/main/java/com/makd/afinity/data/database/entities/JellyseerrConfigEntity.kt
index 6e319b0be..1c37894bb 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/JellyseerrConfigEntity.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/JellyseerrConfigEntity.kt
@@ -2,10 +2,7 @@ package com.makd.afinity.data.database.entities
 
 import androidx.room.Entity
 
-@Entity(
-    tableName = "jellyseerr_config",
-    primaryKeys = ["jellyfinServerId", "jellyfinUserId"]
-)
+@Entity(tableName = "jellyseerr_config", primaryKeys = ["jellyfinServerId", "jellyfinUserId"])
 data class JellyseerrConfigEntity(
     val jellyfinServerId: String,
     val jellyfinUserId: String,
@@ -13,5 +10,5 @@ data class JellyseerrConfigEntity(
     val isLoggedIn: Boolean,
     val username: String?,
     val userId: Int?,
-    val permissions: Int?
+    val permissions: Int?,
 )
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/JellyseerrRequestEntity.kt b/app/src/main/java/com/makd/afinity/data/database/entities/JellyseerrRequestEntity.kt
index 1e194aaa9..ce82ae572 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/JellyseerrRequestEntity.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/JellyseerrRequestEntity.kt
@@ -4,7 +4,7 @@ import androidx.room.Entity
 
 @Entity(
     tableName = "jellyseerr_requests",
-    primaryKeys = ["id", "jellyfinServerId", "jellyfinUserId"]
+    primaryKeys = ["id", "jellyfinServerId", "jellyfinUserId"],
 )
 data class JellyseerrRequestEntity(
     val id: Int,
@@ -26,5 +26,5 @@ data class JellyseerrRequestEntity(
     val mediaBackdropPath: String? = null,
     val mediaReleaseDate: String? = null,
     val mediaFirstAirDate: String? = null,
-    val mediaStatus: Int? = null
-)
\ No newline at end of file
+    val mediaStatus: Int? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/LibraryCacheEntity.kt b/app/src/main/java/com/makd/afinity/data/database/entities/LibraryCacheEntity.kt
index 08a3b8cc7..d75b4a3c1 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/LibraryCacheEntity.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/LibraryCacheEntity.kt
@@ -2,10 +2,7 @@ package com.makd.afinity.data.database.entities
 
 import androidx.room.Entity
 
-@Entity(
-    tableName = "library_cache",
-    primaryKeys = ["libraryId", "itemId"]
-)
+@Entity(tableName = "library_cache", primaryKeys = ["libraryId", "itemId"])
 data class LibraryCacheEntity(
     val libraryId: String,
     val itemId: String,
@@ -40,5 +37,5 @@ data class LibraryCacheEntity(
     val cacheTimestamp: Long,
     val sortBy: String,
     val sortDescending: Boolean,
-    val filterType: String
-)
\ No newline at end of file
+    val filterType: String,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/MovieSectionCacheEntity.kt b/app/src/main/java/com/makd/afinity/data/database/entities/MovieSectionCacheEntity.kt
index 27da0dd22..d4fab5bd8 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/MovieSectionCacheEntity.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/MovieSectionCacheEntity.kt
@@ -5,10 +5,9 @@ import androidx.room.PrimaryKey
 
 @Entity(tableName = "movie_section_cache")
 data class MovieSectionCacheEntity(
-    @PrimaryKey
-    val sectionId: String,
+    @PrimaryKey val sectionId: String,
     val referenceMovieData: String,
     val recommendedItemsData: String,
     val sectionType: String,
-    val cachedTimestamp: Long
-)
\ No newline at end of file
+    val cachedTimestamp: Long,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/PersonSectionCacheEntity.kt b/app/src/main/java/com/makd/afinity/data/database/entities/PersonSectionCacheEntity.kt
index cae63bd46..fa0452aef 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/PersonSectionCacheEntity.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/PersonSectionCacheEntity.kt
@@ -5,10 +5,9 @@ import androidx.room.PrimaryKey
 
 @Entity(tableName = "person_section_cache")
 data class PersonSectionCacheEntity(
-    @PrimaryKey
-    val cacheKey: String,
+    @PrimaryKey val cacheKey: String,
     val personData: String,
     val itemsData: String,
     val sectionType: String,
-    val cachedTimestamp: Long
-)
\ No newline at end of file
+    val cachedTimestamp: Long,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/ShowGenreCacheEntity.kt b/app/src/main/java/com/makd/afinity/data/database/entities/ShowGenreCacheEntity.kt
index 55eb7224f..07b503c0f 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/ShowGenreCacheEntity.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/ShowGenreCacheEntity.kt
@@ -5,8 +5,7 @@ import androidx.room.PrimaryKey
 
 @Entity(tableName = "show_genre_cache")
 data class ShowGenreCacheEntity(
-    @PrimaryKey
-    val genreName: String,
+    @PrimaryKey val genreName: String,
     val lastFetchedTimestamp: Long,
-    val showCount: Int = 0
-)
\ No newline at end of file
+    val showCount: Int = 0,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/StudioCacheEntity.kt b/app/src/main/java/com/makd/afinity/data/database/entities/StudioCacheEntity.kt
index c7bd6f249..b8d99e694 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/StudioCacheEntity.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/StudioCacheEntity.kt
@@ -5,9 +5,8 @@ import androidx.room.PrimaryKey
 
 @Entity(tableName = "studio_cache")
 data class StudioCacheEntity(
-    @PrimaryKey
-    val studioId: String,
+    @PrimaryKey val studioId: String,
     val studioData: String,
     val position: Int,
-    val cachedTimestamp: Long
-)
\ No newline at end of file
+    val cachedTimestamp: Long,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/database/entities/TopPeopleCacheEntity.kt b/app/src/main/java/com/makd/afinity/data/database/entities/TopPeopleCacheEntity.kt
index a06621629..15451474b 100644
--- a/app/src/main/java/com/makd/afinity/data/database/entities/TopPeopleCacheEntity.kt
+++ b/app/src/main/java/com/makd/afinity/data/database/entities/TopPeopleCacheEntity.kt
@@ -5,8 +5,7 @@ import androidx.room.PrimaryKey
 
 @Entity(tableName = "top_people_cache")
 data class TopPeopleCacheEntity(
-    @PrimaryKey
-    val personType: String,
+    @PrimaryKey val personType: String,
     val peopleData: String,
-    val cachedTimestamp: Long
-)
\ No newline at end of file
+    val cachedTimestamp: Long,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/manager/OfflineModeManager.kt b/app/src/main/java/com/makd/afinity/data/manager/OfflineModeManager.kt
index e76be70a1..e62b7b4b8 100644
--- a/app/src/main/java/com/makd/afinity/data/manager/OfflineModeManager.kt
+++ b/app/src/main/java/com/makd/afinity/data/manager/OfflineModeManager.kt
@@ -2,25 +2,30 @@ package com.makd.afinity.data.manager
 
 import com.makd.afinity.data.repository.PreferencesRepository
 import com.makd.afinity.util.NetworkConnectivityMonitor
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @Singleton
-class OfflineModeManager @Inject constructor(
+class OfflineModeManager
+@Inject
+constructor(
     private val preferencesRepository: PreferencesRepository,
-    private val networkConnectivityMonitor: NetworkConnectivityMonitor
+    private val networkConnectivityMonitor: NetworkConnectivityMonitor,
 ) {
-    val isOffline: Flow<Boolean> = combine(
-        preferencesRepository.getOfflineModeFlow(),
-        networkConnectivityMonitor.isNetworkAvailable
-    ) { manualOfflineMode, isNetworkAvailable ->
-        val isOffline = manualOfflineMode || !isNetworkAvailable
-        Timber.d("Offline mode status: manual=$manualOfflineMode, network=$isNetworkAvailable, result=$isOffline")
-        isOffline
-    }
+    val isOffline: Flow<Boolean> =
+        combine(
+            preferencesRepository.getOfflineModeFlow(),
+            networkConnectivityMonitor.isNetworkAvailable,
+        ) { manualOfflineMode, isNetworkAvailable ->
+            val isOffline = manualOfflineMode || !isNetworkAvailable
+            Timber.d(
+                "Offline mode status: manual=$manualOfflineMode, network=$isNetworkAvailable, result=$isOffline"
+            )
+            isOffline
+        }
 
     suspend fun isCurrentlyOffline(): Boolean {
         val manualOfflineMode = preferencesRepository.getOfflineMode()
diff --git a/app/src/main/java/com/makd/afinity/data/manager/PlaybackStateManager.kt b/app/src/main/java/com/makd/afinity/data/manager/PlaybackStateManager.kt
index 1af68a495..3c06038e7 100644
--- a/app/src/main/java/com/makd/afinity/data/manager/PlaybackStateManager.kt
+++ b/app/src/main/java/com/makd/afinity/data/manager/PlaybackStateManager.kt
@@ -5,6 +5,9 @@ import com.makd.afinity.data.repository.FieldSets
 import com.makd.afinity.data.repository.media.MediaRepository
 import com.makd.afinity.data.repository.playback.PlaybackRepository
 import com.makd.afinity.data.sync.UserDataSyncScheduler
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -12,15 +15,14 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @Singleton
-class PlaybackStateManager @Inject constructor(
+class PlaybackStateManager
+@Inject
+constructor(
     private val mediaRepository: MediaRepository,
     private val playbackRepository: PlaybackRepository,
-    private val syncScheduler: UserDataSyncScheduler
+    private val syncScheduler: UserDataSyncScheduler,
 ) {
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
 
@@ -38,11 +40,7 @@ class PlaybackStateManager @Inject constructor(
         currentItemId = itemId
     }
 
-    fun trackPlaybackSession(
-        sessionId: String,
-        itemId: UUID,
-        mediaSourceId: String
-    ) {
+    fun trackPlaybackSession(sessionId: String, itemId: UUID, mediaSourceId: String) {
         currentSessionId = sessionId
         currentItemId = itemId
         lastKnownMediaSourceId = mediaSourceId
@@ -83,21 +81,28 @@ class PlaybackStateManager @Inject constructor(
             val positionTicks = lastKnownPosition * 10000
 
             if (itemId != null && sessionId != null && !mediaSourceId.isNullOrEmpty()) {
-                val success = playbackRepository.reportPlaybackStop(
-                    itemId = itemId,
-                    sessionId = sessionId,
-                    positionTicks = positionTicks,
-                    mediaSourceId = mediaSourceId
-                )
+                val success =
+                    playbackRepository.reportPlaybackStop(
+                        itemId = itemId,
+                        sessionId = sessionId,
+                        positionTicks = positionTicks,
+                        mediaSourceId = mediaSourceId,
+                    )
 
                 if (success) {
-                    Timber.d("Playback stop reported to Jellyfin: item=$itemId, position=${lastKnownPosition}ms")
+                    Timber.d(
+                        "Playback stop reported to Jellyfin: item=$itemId, position=${lastKnownPosition}ms"
+                    )
                 } else {
-                    Timber.w("Failed to report playback stop, progress saved locally. Scheduling sync...")
+                    Timber.w(
+                        "Failed to report playback stop, progress saved locally. Scheduling sync..."
+                    )
                     syncScheduler.scheduleSyncNow()
                 }
             } else {
-                Timber.w("Cannot report playback stop - missing data: item=$itemId, session=$sessionId, source=$mediaSourceId")
+                Timber.w(
+                    "Cannot report playback stop - missing data: item=$itemId, session=$sessionId, source=$mediaSourceId"
+                )
             }
         } catch (e: Exception) {
             Timber.e(e, "Failed to report playback stop to Jellyfin")
@@ -108,7 +113,8 @@ class PlaybackStateManager @Inject constructor(
     private fun handlePlaybackStopped(itemId: UUID) {
         scope.launch {
             try {
-                val refreshedItem = mediaRepository.refreshItemUserData(itemId, FieldSets.REFRESH_USER_DATA)
+                val refreshedItem =
+                    mediaRepository.refreshItemUserData(itemId, FieldSets.REFRESH_USER_DATA)
 
                 if (refreshedItem != null) {
                     _playbackEvents.emit(PlaybackEvent.Synced(itemId))
@@ -140,5 +146,6 @@ class PlaybackStateManager @Inject constructor(
 
 sealed class PlaybackEvent {
     data class Stopped(val itemId: UUID, val positionTicks: Long) : PlaybackEvent()
+
     data class Synced(val itemId: UUID) : PlaybackEvent()
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/manager/SessionManager.kt b/app/src/main/java/com/makd/afinity/data/manager/SessionManager.kt
index 8a7da2c23..54c4ddfd7 100644
--- a/app/src/main/java/com/makd/afinity/data/manager/SessionManager.kt
+++ b/app/src/main/java/com/makd/afinity/data/manager/SessionManager.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import com.makd.afinity.BuildConfig
 import com.makd.afinity.data.models.server.Server
 import com.makd.afinity.data.models.user.User
+import com.makd.afinity.data.repository.AudiobookshelfRepository
 import com.makd.afinity.data.repository.DatabaseRepository
 import com.makd.afinity.data.repository.JellyseerrRepository
 import com.makd.afinity.data.repository.SecurePreferencesRepository
@@ -11,6 +12,9 @@ import com.makd.afinity.data.repository.auth.AuthRepository
 import com.makd.afinity.data.repository.auth.JellyfinAuthRepository
 import com.makd.afinity.data.repository.server.ServerRepository
 import dagger.hilt.android.qualifiers.ApplicationContext
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -24,33 +28,35 @@ import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.createJellyfin
 import org.jellyfin.sdk.model.ClientInfo
 import timber.log.Timber
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Singleton
 
 data class Session(
     val serverId: String,
     val userId: UUID,
     val serverUrl: String,
     val user: User? = null,
-    val server: Server? = null
+    val server: Server? = null,
 )
 
 sealed class ConnectionState {
     data class Online(val session: Session) : ConnectionState()
+
     data class Offline(val session: Session, val lastSyncTime: Long) : ConnectionState()
+
     data object Disconnected : ConnectionState()
 }
 
 @Singleton
-class SessionManager @Inject constructor(
+class SessionManager
+@Inject
+constructor(
     private val authRepository: AuthRepository,
     private val serverRepository: ServerRepository,
     private val databaseRepository: DatabaseRepository,
     private val sessionPreferences: SessionPreferences,
     private val securePrefsRepository: SecurePreferencesRepository,
     private val jellyseerrRepository: JellyseerrRepository,
-    @ApplicationContext private val context: Context
+    private val audiobookshelfRepository: AudiobookshelfRepository,
+    @ApplicationContext private val context: Context,
 ) {
     private val _currentSession = MutableStateFlow<Session?>(null)
     val currentSession: StateFlow<Session?> = _currentSession.asStateFlow()
@@ -63,9 +69,7 @@ class SessionManager @Inject constructor(
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
 
     init {
-        scope.launch {
-            restoreLastSession()
-        }
+        scope.launch { restoreLastSession() }
     }
 
     suspend fun startSession(
@@ -73,61 +77,66 @@ class SessionManager @Inject constructor(
         serverId: String,
         userId: UUID,
         accessToken: String,
-        caller: String = "Unknown"
-    ): Result<Unit> = withContext(Dispatchers.IO) {
-        try {
-            val user = databaseRepository.getUser(userId)
-            val server = databaseRepository.getServer(serverId)
-
-            serverRepository.setBaseUrl(serverUrl)
-
-            val apiClient = getOrCreateApiClient(serverId, serverUrl)
-            apiClient.update(baseUrl = serverUrl, accessToken = accessToken)
-
-            securePrefsRepository.saveAuthenticationData(
-                accessToken = accessToken,
-                userId = userId,
-                serverId = serverId,
-                serverUrl = serverUrl,
-                username = user?.name ?: "User"
-            )
+        caller: String = "Unknown",
+    ): Result<Unit> =
+        withContext(Dispatchers.IO) {
+            try {
+                val user = databaseRepository.getUser(userId)
+                val server = databaseRepository.getServer(serverId)
 
-            if (user != null) {
-                securePrefsRepository.saveServerUserToken(
-                    serverId = serverId,
-                    userId = userId,
+                serverRepository.setBaseUrl(serverUrl)
+
+                val apiClient = getOrCreateApiClient(serverId, serverUrl)
+                apiClient.update(baseUrl = serverUrl, accessToken = accessToken)
+
+                securePrefsRepository.saveAuthenticationData(
                     accessToken = accessToken,
-                    username = user.name,
-                    serverUrl = serverUrl
+                    userId = userId,
+                    serverId = serverId,
+                    serverUrl = serverUrl,
+                    username = user?.name ?: "User",
                 )
-            }
 
-            if (user != null) {
-                (authRepository as? JellyfinAuthRepository)?.setSessionActive(user)
-                Timber.d("Synced AuthRepository with user: ${user.name}")
+                if (user != null) {
+                    securePrefsRepository.saveServerUserToken(
+                        serverId = serverId,
+                        userId = userId,
+                        accessToken = accessToken,
+                        username = user.name,
+                        serverUrl = serverUrl,
+                    )
+                }
+
+                if (user != null) {
+                    (authRepository as? JellyfinAuthRepository)?.setSessionActive(user)
+                    Timber.d("Synced AuthRepository with user: ${user.name}")
+                }
+
+                jellyseerrRepository.setActiveJellyfinSession(serverId, userId)
+                Timber.d("Linked Jellyseerr session for user: $userId")
+
+                audiobookshelfRepository.setActiveJellyfinSession(serverId, userId)
+                Timber.d("Linked Audiobookshelf session for user: $userId")
+
+                val session =
+                    Session(
+                        serverId = serverId,
+                        userId = userId,
+                        serverUrl = serverUrl,
+                        user = user,
+                        server = server,
+                    )
+                _currentSession.value = session
+                _connectionState.value = ConnectionState.Online(session)
+
+                sessionPreferences.saveActiveSession(serverId, userId, serverUrl)
+                Result.success(Unit)
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to start session")
+                _connectionState.value = ConnectionState.Disconnected
+                Result.failure(e)
             }
-
-            jellyseerrRepository.setActiveJellyfinSession(serverId, userId)
-            Timber.d("Linked Jellyseerr session for user: $userId")
-
-            val session = Session(
-                serverId = serverId,
-                userId = userId,
-                serverUrl = serverUrl,
-                user = user,
-                server = server
-            )
-            _currentSession.value = session
-            _connectionState.value = ConnectionState.Online(session)
-
-            sessionPreferences.saveActiveSession(serverId, userId, serverUrl)
-            Result.success(Unit)
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to start session")
-            _connectionState.value = ConnectionState.Disconnected
-            Result.failure(e)
         }
-    }
 
     fun updateCurrentUser(user: User) {
         val current = _currentSession.value
@@ -138,7 +147,9 @@ class SessionManager @Inject constructor(
     }
 
     suspend fun getOrRestoreApiClient(serverId: String): ApiClient? {
-        apiClients[serverId]?.let { return it }
+        apiClients[serverId]?.let {
+            return it
+        }
 
         val server = databaseRepository.getServer(serverId) ?: return null
         val tokens = securePrefsRepository.getAllServerUserTokens()
@@ -157,31 +168,39 @@ class SessionManager @Inject constructor(
     }
 
     suspend fun switchServer(serverId: String): Result<Unit> {
-        val server = databaseRepository.getServer(serverId) ?: return Result.failure(
-            IllegalArgumentException("Server $serverId not found in database")
-        )
+        val server =
+            databaseRepository.getServer(serverId)
+                ?: return Result.failure(
+                    IllegalArgumentException("Server $serverId not found in database")
+                )
 
-        val lastUserId = securePrefsRepository.getLastUserIdForServer(serverId)
-            ?: return Result.failure(
-                IllegalStateException("No user found for server $serverId")
-            )
+        val lastUserId =
+            securePrefsRepository.getLastUserIdForServer(serverId)
+                ?: return Result.failure(
+                    IllegalStateException("No user found for server $serverId")
+                )
 
-        val token = securePrefsRepository.getServerUserToken(serverId, lastUserId)
-            ?: return Result.failure(
-                IllegalStateException("No authentication token found")
-            )
+        val token =
+            securePrefsRepository.getServerUserToken(serverId, lastUserId)
+                ?: return Result.failure(IllegalStateException("No authentication token found"))
 
         return startSession(server.address, serverId, lastUserId, token, caller = "switchServer")
     }
 
     suspend fun switchUser(serverId: String, userId: UUID): Result<Unit> {
-        val token = securePrefsRepository.getServerUserToken(serverId, userId)
-            ?: return Result.failure(
-                IllegalStateException("No token found for user $userId on server $serverId")
-            )
-        val serverUrl = securePrefsRepository.getAllServerUserTokens()
-            .find { it.serverId == serverId && it.userId == userId }?.serverUrl
-            ?: return Result.failure(IllegalStateException("Could not find Server URL for target user"))
+        val token =
+            securePrefsRepository.getServerUserToken(serverId, userId)
+                ?: return Result.failure(
+                    IllegalStateException("No token found for user $userId on server $serverId")
+                )
+        val serverUrl =
+            securePrefsRepository
+                .getAllServerUserTokens()
+                .find { it.serverId == serverId && it.userId == userId }
+                ?.serverUrl
+                ?: return Result.failure(
+                    IllegalStateException("Could not find Server URL for target user")
+                )
 
         return startSession(serverUrl, serverId, userId, token, caller = "switchUser")
     }
@@ -189,31 +208,33 @@ class SessionManager @Inject constructor(
     private suspend fun restoreLastSession() {
         Timber.d("Attempting to restore last session...")
 
-        val savedSession = sessionPreferences.getActiveSession() ?: run {
-            Timber.d("No saved session found")
-            return
-        }
+        val savedSession =
+            sessionPreferences.getActiveSession()
+                ?: run {
+                    Timber.d("No saved session found")
+                    return
+                }
 
         val serverId = savedSession.serverId
         val userId = savedSession.userId
         val serverUrl = savedSession.serverUrl
 
-        val token = securePrefsRepository.getServerUserToken(
-            serverId,
-            userId
-        ) ?: run {
-            Timber.w("Saved session exists but no token found - clearing")
-            sessionPreferences.clearSession()
-            return
-        }
-
-        val result = startSession(
-            serverUrl,
-            serverId,
-            userId,
-            token,
-            caller = "SessionManager.restoreLastSession"
-        )
+        val token =
+            securePrefsRepository.getServerUserToken(serverId, userId)
+                ?: run {
+                    Timber.w("Saved session exists but no token found - clearing")
+                    sessionPreferences.clearSession()
+                    return
+                }
+
+        val result =
+            startSession(
+                serverUrl,
+                serverId,
+                userId,
+                token,
+                caller = "SessionManager.restoreLastSession",
+            )
 
         if (result.isSuccess) {
             Timber.d("Session restored successfully")
@@ -223,36 +244,41 @@ class SessionManager @Inject constructor(
     }
 
     suspend fun enterOfflineMode() {
-        val session = _currentSession.value ?: run {
-            Timber.w("Cannot enter offline mode - no session")
-            return
-        }
-
-        _connectionState.value = ConnectionState.Offline(
-            session = session,
-            lastSyncTime = System.currentTimeMillis()
-        )
+        val session =
+            _currentSession.value
+                ?: run {
+                    Timber.w("Cannot enter offline mode - no session")
+                    return
+                }
+
+        _connectionState.value =
+            ConnectionState.Offline(session = session, lastSyncTime = System.currentTimeMillis())
         Timber.d("Entered offline mode")
     }
 
     suspend fun returnOnline() {
-        val session = _currentSession.value ?: run {
-            Timber.w("Cannot return online - no session")
-            return
-        }
+        val session =
+            _currentSession.value
+                ?: run {
+                    Timber.w("Cannot return online - no session")
+                    return
+                }
 
         _connectionState.value = ConnectionState.Online(session)
         Timber.d("Returned to online mode")
     }
 
     suspend fun logout() {
-        val session = _currentSession.value ?: run {
-            Timber.w("No session to logout from")
-            return
-        }
+        val session =
+            _currentSession.value
+                ?: run {
+                    Timber.w("No session to logout from")
+                    return
+                }
 
         sessionPreferences.clearSession()
         jellyseerrRepository.clearActiveSession()
+        audiobookshelfRepository.clearActiveSession()
         _currentSession.value = null
         _connectionState.value = ConnectionState.Disconnected
         authRepository.clearAllAuthData()
@@ -272,10 +298,7 @@ class SessionManager @Inject constructor(
         Timber.d("Creating NEW ApiClient for server: $serverId with baseUrl: $serverUrl")
         val jellyfin = createJellyfin {
             this.context = this@SessionManager.context
-            this.clientInfo = ClientInfo(
-                name = "AFinity",
-                version = BuildConfig.VERSION_NAME
-            )
+            this.clientInfo = ClientInfo(name = "AFinity", version = BuildConfig.VERSION_NAME)
         }
         val newClient = jellyfin.createApi(baseUrl = serverUrl)
         apiClients[serverId] = newClient
@@ -298,7 +321,7 @@ class SessionManager @Inject constructor(
                 SavedSession(
                     serverId = token.serverId,
                     userId = token.userId,
-                    serverUrl = token.serverUrl
+                    serverUrl = token.serverUrl,
                 )
             }
         }
@@ -315,4 +338,4 @@ class SessionManager @Inject constructor(
     fun hasActiveSession(): Boolean {
         return _currentSession.value != null
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/manager/SessionPreferences.kt b/app/src/main/java/com/makd/afinity/data/manager/SessionPreferences.kt
index ecf4a00cb..ebac1d0c5 100644
--- a/app/src/main/java/com/makd/afinity/data/manager/SessionPreferences.kt
+++ b/app/src/main/java/com/makd/afinity/data/manager/SessionPreferences.kt
@@ -4,22 +4,16 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
-import kotlinx.coroutines.flow.first
-import timber.log.Timber
 import java.util.UUID
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlinx.coroutines.flow.first
+import timber.log.Timber
 
-data class SavedSession(
-    val serverId: String,
-    val userId: UUID,
-    val serverUrl: String
-)
+data class SavedSession(val serverId: String, val userId: UUID, val serverUrl: String)
 
 @Singleton
-class SessionPreferences @Inject constructor(
-    private val dataStore: DataStore<Preferences>
-) {
+class SessionPreferences @Inject constructor(private val dataStore: DataStore<Preferences>) {
     companion object {
         private val ACTIVE_SERVER_ID = stringPreferencesKey("active_server_id")
         private val ACTIVE_USER_ID = stringPreferencesKey("active_user_id")
@@ -40,14 +34,15 @@ class SessionPreferences @Inject constructor(
     suspend fun getActiveSession(): SavedSession? {
         val prefs = dataStore.data.first()
         val serverId = prefs[ACTIVE_SERVER_ID] ?: return null
-        val userId = prefs[ACTIVE_USER_ID]?.let {
-            try {
-                UUID.fromString(it)
-            } catch (e: IllegalArgumentException) {
-                Timber.w("Invalid UUID in saved session: $it")
-                return null
-            }
-        } ?: return null
+        val userId =
+            prefs[ACTIVE_USER_ID]?.let {
+                try {
+                    UUID.fromString(it)
+                } catch (e: IllegalArgumentException) {
+                    Timber.w("Invalid UUID in saved session: $it")
+                    return null
+                }
+            } ?: return null
         val serverUrl = prefs[ACTIVE_SERVER_URL] ?: return null
 
         return SavedSession(serverId, userId, serverUrl)
@@ -67,4 +62,4 @@ class SessionPreferences @Inject constructor(
         val prefs = dataStore.data.first()
         return prefs[LAST_ACTIVE_TIMESTAMP]?.toLongOrNull()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/GenreItem.kt b/app/src/main/java/com/makd/afinity/data/models/GenreItem.kt
index 51b704b2b..b034fde89 100644
--- a/app/src/main/java/com/makd/afinity/data/models/GenreItem.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/GenreItem.kt
@@ -2,10 +2,7 @@ package com.makd.afinity.data.models
 
 enum class GenreType {
     MOVIE,
-    SHOW
+    SHOW,
 }
 
-data class GenreItem(
-    val name: String,
-    val type: GenreType
-)
\ No newline at end of file
+data class GenreItem(val name: String, val type: GenreType)
diff --git a/app/src/main/java/com/makd/afinity/data/models/HomeScreenSections.kt b/app/src/main/java/com/makd/afinity/data/models/HomeScreenSections.kt
index 130056d96..6ab56ab7c 100644
--- a/app/src/main/java/com/makd/afinity/data/models/HomeScreenSections.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/HomeScreenSections.kt
@@ -3,9 +3,9 @@ package com.makd.afinity.data.models
 import com.makd.afinity.data.models.media.AfinityMovie
 import com.makd.afinity.data.models.media.AfinityPerson
 import com.makd.afinity.data.models.media.AfinityPersonImage
+import java.util.UUID
 import kotlinx.serialization.Serializable
 import org.jellyfin.sdk.model.api.PersonKind
-import java.util.UUID
 
 @Serializable
 data class CachedPersonWithCount(
@@ -13,34 +13,32 @@ data class CachedPersonWithCount(
     val personName: String,
     val personType: String,
     val personRole: String,
-    val appearanceCount: Int
+    val appearanceCount: Int,
 )
 
-data class PersonWithCount(
-    val person: AfinityPerson,
-    val appearanceCount: Int
-) {
+data class PersonWithCount(val person: AfinityPerson, val appearanceCount: Int) {
     fun toCached(): CachedPersonWithCount {
         return CachedPersonWithCount(
             personId = person.id.toString(),
             personName = person.name,
             personType = person.type.name,
             personRole = person.role,
-            appearanceCount = appearanceCount
+            appearanceCount = appearanceCount,
         )
     }
 
     companion object {
         fun fromCached(cached: CachedPersonWithCount): PersonWithCount {
             return PersonWithCount(
-                person = AfinityPerson(
-                    id = UUID.fromString(cached.personId),
-                    name = cached.personName,
-                    type = PersonKind.valueOf(cached.personType),
-                    role = cached.personRole,
-                    image = AfinityPersonImage(uri = null, blurHash = null)
-                ),
-                appearanceCount = cached.appearanceCount
+                person =
+                    AfinityPerson(
+                        id = UUID.fromString(cached.personId),
+                        name = cached.personName,
+                        type = PersonKind.valueOf(cached.personType),
+                        role = cached.personRole,
+                        image = AfinityPersonImage(uri = null, blurHash = null),
+                    ),
+                appearanceCount = cached.appearanceCount,
             )
         }
     }
@@ -51,33 +49,34 @@ enum class PersonSectionType {
     DIRECTED_BY,
     WRITTEN_BY;
 
-    fun toPersonKind(): PersonKind = when (this) {
-        STARRING -> PersonKind.ACTOR
-        DIRECTED_BY -> PersonKind.DIRECTOR
-        WRITTEN_BY -> PersonKind.WRITER
-    }
+    fun toPersonKind(): PersonKind =
+        when (this) {
+            STARRING -> PersonKind.ACTOR
+            DIRECTED_BY -> PersonKind.DIRECTOR
+            WRITTEN_BY -> PersonKind.WRITER
+        }
 }
 
 data class PersonSection(
     val person: AfinityPerson,
     val appearanceCount: Int,
     val items: List<AfinityMovie>,
-    val sectionType: PersonSectionType
+    val sectionType: PersonSectionType,
 )
 
 enum class MovieSectionType {
     BECAUSE_YOU_WATCHED,
-    STARRING_ACTOR_FROM;
+    STARRING_ACTOR_FROM,
 }
 
 data class MovieSection(
     val referenceMovie: AfinityMovie,
     val recommendedItems: List<AfinityMovie>,
-    val sectionType: MovieSectionType
+    val sectionType: MovieSectionType,
 )
 
 data class PersonFromMovieSection(
     val person: AfinityPerson,
     val referenceMovie: AfinityMovie,
-    val items: List<AfinityMovie>
-)
\ No newline at end of file
+    val items: List<AfinityMovie>,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/audiobookshelf/AudiobookshelfItem.kt b/app/src/main/java/com/makd/afinity/data/models/audiobookshelf/AudiobookshelfItem.kt
new file mode 100644
index 000000000..e4c1d9a90
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/data/models/audiobookshelf/AudiobookshelfItem.kt
@@ -0,0 +1,332 @@
+package com.makd.afinity.data.models.audiobookshelf
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.decodeFromJsonElement
+
+@Serializable
+data class LibraryItem(
+    @SerialName("id") val id: String,
+    @SerialName("ino") val ino: String? = null,
+    @SerialName("oldLibraryItemId") val oldLibraryItemId: String? = null,
+    @SerialName("libraryId") val libraryId: String,
+    @SerialName("folderId") val folderId: String? = null,
+    @SerialName("path") val path: String? = null,
+    @SerialName("relPath") val relPath: String? = null,
+    @SerialName("isFile") val isFile: Boolean? = null,
+    @SerialName("mtimeMs") val mtimeMs: Long? = null,
+    @SerialName("ctimeMs") val ctimeMs: Long? = null,
+    @SerialName("birthtimeMs") val birthtimeMs: Long? = null,
+    @SerialName("addedAt") val addedAt: Long? = null,
+    @SerialName("updatedAt") val updatedAt: Long? = null,
+    @SerialName("isMissing") val isMissing: Boolean? = null,
+    @SerialName("isInvalid") val isInvalid: Boolean? = null,
+    @SerialName("mediaType") val mediaType: String,
+    @SerialName("media") val media: Media,
+    @SerialName("numFiles") val numFiles: Int? = null,
+    @SerialName("size") val size: Long? = null,
+    @SerialName("userMediaProgress") val userMediaProgress: MediaProgress? = null,
+    @SerialName("rssFeedUrl") val rssFeedUrl: String? = null,
+)
+
+@Serializable
+data class Media(
+    @SerialName("id") val id: String? = null,
+    @SerialName("libraryItemId") val libraryItemId: String? = null,
+    @SerialName("metadata") val metadata: MediaMetadata,
+    @SerialName("coverPath") val coverPath: String? = null,
+    @SerialName("tags") val tags: List<String>? = null,
+    @SerialName("audioFiles") val audioFiles: List<AudioFile>? = null,
+    @SerialName("chapters") val chapters: List<BookChapter>? = null,
+    @SerialName("duration") val duration: Double? = null,
+    @SerialName("size") val size: Long? = null,
+    @SerialName("tracks") val tracks: List<AudioTrack>? = null,
+    @SerialName("episodes") val episodes: List<PodcastEpisode>? = null,
+    @SerialName("autoDownloadEpisodes") val autoDownloadEpisodes: Boolean? = null,
+    @SerialName("autoDownloadSchedule") val autoDownloadSchedule: String? = null,
+    @SerialName("lastEpisodeCheck") val lastEpisodeCheck: Long? = null,
+    @SerialName("maxEpisodesToKeep") val maxEpisodesToKeep: Int? = null,
+    @SerialName("maxNewEpisodesToDownload") val maxNewEpisodesToDownload: Int? = null,
+    @SerialName("ebookFile") val ebookFile: EbookFile? = null,
+    @SerialName("numTracks") val numTracks: Int? = null,
+    @SerialName("numAudioFiles") val numAudioFiles: Int? = null,
+    @SerialName("numChapters") val numChapters: Int? = null,
+    @SerialName("numMissingParts") val numMissingParts: Int? = null,
+    @SerialName("numInvalidAudioFiles") val numInvalidAudioFiles: Int? = null,
+)
+
+@Serializable
+data class MediaMetadata(
+    @SerialName("title") val title: String? = null,
+    @SerialName("titleIgnorePrefix") val titleIgnorePrefix: String? = null,
+    @SerialName("subtitle") val subtitle: String? = null,
+    @SerialName("authorName") val authorName: String? = null,
+    @SerialName("authorNameLF") val authorNameLF: String? = null,
+    @SerialName("narratorName") val narratorName: String? = null,
+    @SerialName("seriesName") val seriesName: String? = null,
+    @SerialName("genres") val genres: List<String>? = null,
+    @SerialName("publishedYear") val publishedYear: String? = null,
+    @SerialName("publishedDate") val publishedDate: String? = null,
+    @SerialName("publisher") val publisher: String? = null,
+    @SerialName("description") val description: String? = null,
+    @SerialName("isbn") val isbn: String? = null,
+    @SerialName("asin") val asin: String? = null,
+    @SerialName("language") val language: String? = null,
+    @SerialName("explicit") val explicit: Boolean? = null,
+    @SerialName("abridged") val abridged: Boolean? = null,
+    @SerialName("authors") val authors: List<Author>? = null,
+    @SerialName("narrators") val narrators: List<String>? = null,
+    @Serializable(with = SeriesItemListSerializer::class)
+    @SerialName("series")
+    val series: List<SeriesItem>? = null,
+    @SerialName("feedUrl") val feedUrl: String? = null,
+    @SerialName("imageUrl") val imageUrl: String? = null,
+    @SerialName("itunesPageUrl") val itunesPageUrl: String? = null,
+    @SerialName("itunesId") val itunesId: Int? = null,
+    @SerialName("itunesArtistId") val itunesArtistId: Int? = null,
+    @SerialName("type") val type: String? = null,
+    @SerialName("releaseDate") val releaseDate: String? = null,
+    @SerialName("lastCoverSearch") val lastCoverSearch: Long? = null,
+    @SerialName("lastCoverSearchQuery") val lastCoverSearchQuery: String? = null,
+)
+
+@Serializable
+data class Author(
+    @SerialName("id") val id: String,
+    @SerialName("name") val name: String,
+    @SerialName("asin") val asin: String? = null,
+    @SerialName("description") val description: String? = null,
+    @SerialName("imagePath") val imagePath: String? = null,
+    @SerialName("addedAt") val addedAt: Long? = null,
+    @SerialName("updatedAt") val updatedAt: Long? = null,
+    @SerialName("numBooks") val numBooks: Int? = null,
+)
+
+@Serializable
+data class SeriesItem(
+    @SerialName("id") val id: String,
+    @SerialName("name") val name: String,
+    @SerialName("sequence") val sequence: String? = null,
+)
+
+object SeriesItemListSerializer : KSerializer<List<SeriesItem>?> {
+    private val listSerializer = ListSerializer(SeriesItem.serializer())
+
+    override val descriptor: SerialDescriptor = listSerializer.descriptor
+
+    override fun serialize(encoder: Encoder, value: List<SeriesItem>?) {
+        if (value != null) {
+            listSerializer.serialize(encoder, value)
+        } else {
+            encoder.encodeNull()
+        }
+    }
+
+    override fun deserialize(decoder: Decoder): List<SeriesItem>? {
+        val jsonDecoder = decoder as? JsonDecoder ?: return listSerializer.deserialize(decoder)
+        return when (val element = jsonDecoder.decodeJsonElement()) {
+            is JsonArray -> jsonDecoder.json.decodeFromJsonElement(listSerializer, element)
+            is JsonObject ->
+                listOf(jsonDecoder.json.decodeFromJsonElement(SeriesItem.serializer(), element))
+            else -> null
+        }
+    }
+}
+
+@Serializable
+data class AudioFile(
+    @SerialName("index") val index: Int,
+    @SerialName("ino") val ino: String,
+    @SerialName("metadata") val metadata: FileMetadata,
+    @SerialName("addedAt") val addedAt: Long? = null,
+    @SerialName("updatedAt") val updatedAt: Long? = null,
+    @SerialName("trackNumFromMeta") val trackNumFromMeta: Int? = null,
+    @SerialName("discNumFromMeta") val discNumFromMeta: Int? = null,
+    @SerialName("trackNumFromFilename") val trackNumFromFilename: Int? = null,
+    @SerialName("discNumFromFilename") val discNumFromFilename: Int? = null,
+    @SerialName("manuallyVerified") val manuallyVerified: Boolean? = null,
+    @SerialName("invalid") val invalid: Boolean? = null,
+    @SerialName("exclude") val exclude: Boolean? = null,
+    @SerialName("error") val error: String? = null,
+    @SerialName("format") val format: String? = null,
+    @SerialName("duration") val duration: Double? = null,
+    @SerialName("bitRate") val bitRate: Int? = null,
+    @SerialName("language") val language: String? = null,
+    @SerialName("codec") val codec: String? = null,
+    @SerialName("timeBase") val timeBase: String? = null,
+    @SerialName("channels") val channels: Int? = null,
+    @SerialName("channelLayout") val channelLayout: String? = null,
+    @SerialName("embeddedCoverArt") val embeddedCoverArt: String? = null,
+    @SerialName("metaTags") val metaTags: AudioMetaTags? = null,
+    @SerialName("mimeType") val mimeType: String? = null,
+)
+
+@Serializable
+data class FileMetadata(
+    @SerialName("filename") val filename: String,
+    @SerialName("ext") val ext: String? = null,
+    @SerialName("path") val path: String? = null,
+    @SerialName("relPath") val relPath: String? = null,
+    @SerialName("size") val size: Long? = null,
+    @SerialName("mtimeMs") val mtimeMs: Long? = null,
+    @SerialName("ctimeMs") val ctimeMs: Long? = null,
+    @SerialName("birthtimeMs") val birthtimeMs: Long? = null,
+)
+
+@Serializable
+data class AudioMetaTags(
+    @SerialName("tagAlbum") val tagAlbum: String? = null,
+    @SerialName("tagArtist") val tagArtist: String? = null,
+    @SerialName("tagGenre") val tagGenre: String? = null,
+    @SerialName("tagTitle") val tagTitle: String? = null,
+    @SerialName("tagSeries") val tagSeries: String? = null,
+    @SerialName("tagSeriesPart") val tagSeriesPart: String? = null,
+    @SerialName("tagTrack") val tagTrack: String? = null,
+    @SerialName("tagDisc") val tagDisc: String? = null,
+    @SerialName("tagSubtitle") val tagSubtitle: String? = null,
+    @SerialName("tagAlbumArtist") val tagAlbumArtist: String? = null,
+    @SerialName("tagDate") val tagDate: String? = null,
+    @SerialName("tagComposer") val tagComposer: String? = null,
+    @SerialName("tagPublisher") val tagPublisher: String? = null,
+    @SerialName("tagComment") val tagComment: String? = null,
+    @SerialName("tagDescription") val tagDescription: String? = null,
+    @SerialName("tagEncoder") val tagEncoder: String? = null,
+    @SerialName("tagEncodedBy") val tagEncodedBy: String? = null,
+    @SerialName("tagIsbn") val tagIsbn: String? = null,
+    @SerialName("tagLanguage") val tagLanguage: String? = null,
+    @SerialName("tagASIN") val tagASIN: String? = null,
+    @SerialName("tagOverdriveMediaMarker") val tagOverdriveMediaMarker: String? = null,
+    @SerialName("tagOriginalYear") val tagOriginalYear: String? = null,
+    @SerialName("tagReleaseCountry") val tagReleaseCountry: String? = null,
+    @SerialName("tagReleaseType") val tagReleaseType: String? = null,
+    @SerialName("tagReleaseStatus") val tagReleaseStatus: String? = null,
+    @SerialName("tagISRC") val tagISRC: String? = null,
+    @SerialName("tagMusicBrainzTrackId") val tagMusicBrainzTrackId: String? = null,
+    @SerialName("tagMusicBrainzAlbumId") val tagMusicBrainzAlbumId: String? = null,
+    @SerialName("tagMusicBrainzAlbumArtistId") val tagMusicBrainzAlbumArtistId: String? = null,
+    @SerialName("tagMusicBrainzArtistId") val tagMusicBrainzArtistId: String? = null,
+)
+
+@Serializable
+data class EbookFile(
+    @SerialName("ino") val ino: String,
+    @SerialName("metadata") val metadata: FileMetadata,
+    @SerialName("ebookFormat") val ebookFormat: String,
+    @SerialName("addedAt") val addedAt: Long? = null,
+    @SerialName("updatedAt") val updatedAt: Long? = null,
+)
+
+@Serializable
+data class PodcastEpisode(
+    @SerialName("id") val id: String,
+    @SerialName("oldEpisodeId") val oldEpisodeId: String? = null,
+    @SerialName("index") val index: Int? = null,
+    @SerialName("season") val season: String? = null,
+    @SerialName("episode") val episode: String? = null,
+    @SerialName("episodeType") val episodeType: String? = null,
+    @SerialName("title") val title: String,
+    @SerialName("subtitle") val subtitle: String? = null,
+    @SerialName("description") val description: String? = null,
+    @SerialName("enclosure") val enclosure: Enclosure? = null,
+    @SerialName("guid") val guid: String? = null,
+    @SerialName("pubDate") val pubDate: String? = null,
+    @SerialName("chapters") val chapters: List<BookChapter>? = null,
+    @SerialName("audioFile") val audioFile: AudioFile? = null,
+    @SerialName("audioTrack") val audioTrack: AudioTrack? = null,
+    @SerialName("publishedAt") val publishedAt: Long? = null,
+    @SerialName("addedAt") val addedAt: Long? = null,
+    @SerialName("updatedAt") val updatedAt: Long? = null,
+    @SerialName("duration") val duration: Double? = null,
+    @SerialName("size") val size: Long? = null,
+)
+
+@Serializable
+data class Enclosure(
+    @SerialName("url") val url: String,
+    @SerialName("type") val type: String? = null,
+    @SerialName("length") val length: String? = null,
+)
+
+@Serializable
+data class ItemResponse(
+    @SerialName("id") val id: String? = null,
+    @SerialName("ino") val ino: String? = null,
+    @SerialName("oldLibraryItemId") val oldLibraryItemId: String? = null,
+    @SerialName("libraryId") val libraryId: String? = null,
+    @SerialName("folderId") val folderId: String? = null,
+    @SerialName("path") val path: String? = null,
+    @SerialName("relPath") val relPath: String? = null,
+    @SerialName("isFile") val isFile: Boolean? = null,
+    @SerialName("mtimeMs") val mtimeMs: Long? = null,
+    @SerialName("ctimeMs") val ctimeMs: Long? = null,
+    @SerialName("birthtimeMs") val birthtimeMs: Long? = null,
+    @SerialName("addedAt") val addedAt: Long? = null,
+    @SerialName("updatedAt") val updatedAt: Long? = null,
+    @SerialName("isMissing") val isMissing: Boolean? = null,
+    @SerialName("isInvalid") val isInvalid: Boolean? = null,
+    @SerialName("mediaType") val mediaType: String? = null,
+    @SerialName("media") val media: Media? = null,
+    @SerialName("numFiles") val numFiles: Int? = null,
+    @SerialName("size") val size: Long? = null,
+    @SerialName("userMediaProgress") val userMediaProgress: MediaProgress? = null,
+    @SerialName("rssFeedUrl") val rssFeedUrl: String? = null,
+    @SerialName("libraryFiles") val libraryFiles: List<LibraryFile>? = null,
+)
+
+@Serializable
+data class LibraryFile(
+    @SerialName("ino") val ino: String,
+    @SerialName("metadata") val metadata: FileMetadata,
+    @SerialName("addedAt") val addedAt: Long? = null,
+    @SerialName("updatedAt") val updatedAt: Long? = null,
+    @SerialName("fileType") val fileType: String? = null,
+)
+
+@Serializable
+data class SearchResponse(
+    @SerialName("book") val book: List<SearchResultBook>? = null,
+    @SerialName("podcast") val podcast: List<SearchResultPodcast>? = null,
+    @SerialName("narrators") val narrators: List<NarratorResult>? = null,
+    @SerialName("authors") val authors: List<Author>? = null,
+    @SerialName("series") val series: List<SeriesResult>? = null,
+    @SerialName("tags") val tags: List<String>? = null,
+)
+
+@Serializable
+data class SearchResultBook(
+    @SerialName("libraryItem") val libraryItem: LibraryItem,
+    @SerialName("matchKey") val matchKey: String? = null,
+    @SerialName("matchText") val matchText: String? = null,
+)
+
+@Serializable
+data class SearchResultPodcast(
+    @SerialName("libraryItem") val libraryItem: LibraryItem,
+    @SerialName("matchKey") val matchKey: String? = null,
+    @SerialName("matchText") val matchText: String? = null,
+)
+
+@Serializable
+data class NarratorResult(
+    @SerialName("name") val name: String,
+    @SerialName("numBooks") val numBooks: Int? = null,
+)
+
+@Serializable
+data class SeriesResult(
+    @SerialName("series") val series: SeriesItem,
+    @SerialName("books") val books: List<LibraryItem>? = null,
+)
+
+@Serializable
+data class ItemsInProgressResponse(@SerialName("libraryItems") val libraryItems: List<LibraryItem>)
+
+@Serializable data class GenresResponse(@SerialName("genres") val genres: List<String>)
diff --git a/app/src/main/java/com/makd/afinity/data/models/audiobookshelf/AudiobookshelfLibrary.kt b/app/src/main/java/com/makd/afinity/data/models/audiobookshelf/AudiobookshelfLibrary.kt
new file mode 100644
index 000000000..055791157
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/data/models/audiobookshelf/AudiobookshelfLibrary.kt
@@ -0,0 +1,128 @@
+package com.makd.afinity.data.models.audiobookshelf
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonArray
+
+@Serializable
+data class Library(
+    @SerialName("id") val id: String,
+    @SerialName("name") val name: String,
+    @SerialName("folders") val folders: List<Folder>? = null,
+    @SerialName("displayOrder") val displayOrder: Int? = null,
+    @SerialName("icon") val icon: String? = null,
+    @SerialName("mediaType") val mediaType: String,
+    @SerialName("provider") val provider: String? = null,
+    @SerialName("settings") val settings: LibrarySettings? = null,
+    @SerialName("stats") val stats: LibraryStats? = null,
+    @SerialName("createdAt") val createdAt: Long? = null,
+    @SerialName("lastUpdate") val lastUpdate: Long? = null,
+)
+
+@Serializable
+data class Folder(
+    @SerialName("id") val id: String,
+    @SerialName("fullPath") val fullPath: String,
+    @SerialName("libraryId") val libraryId: String? = null,
+    @SerialName("addedAt") val addedAt: Long? = null,
+)
+
+@Serializable
+data class LibrarySettings(
+    @SerialName("coverAspectRatio") val coverAspectRatio: Int? = null,
+    @SerialName("disableWatcher") val disableWatcher: Boolean? = null,
+    @SerialName("skipMatchingMediaWithAsin") val skipMatchingMediaWithAsin: Boolean? = null,
+    @SerialName("skipMatchingMediaWithIsbn") val skipMatchingMediaWithIsbn: Boolean? = null,
+    @SerialName("autoScanCronExpression") val autoScanCronExpression: String? = null,
+    @SerialName("audiobooksOnly") val audiobooksOnly: Boolean? = null,
+    @SerialName("hideSingleBookSeries") val hideSingleBookSeries: Boolean? = null,
+    @SerialName("onlyShowLaterBooksInContinueSeries")
+    val onlyShowLaterBooksInContinueSeries: Boolean? = null,
+    @SerialName("metadataPrecedence") val metadataPrecedence: List<String>? = null,
+    @SerialName("podcastSearchRegion") val podcastSearchRegion: String? = null,
+)
+
+@Serializable
+data class LibraryStats(
+    @SerialName("totalItems") val totalItems: Int? = null,
+    @SerialName("totalSize") val totalSize: Long? = null,
+    @SerialName("totalDuration") val totalDuration: Double? = null,
+    @SerialName("numAudioFiles") val numAudioFiles: Int? = null,
+    @SerialName("numAudioTracks") val numAudioTracks: Int? = null,
+)
+
+@Serializable data class LibrariesResponse(@SerialName("libraries") val libraries: List<Library>)
+
+@Serializable
+data class LibraryResponse(
+    @SerialName("library") val library: Library? = null,
+    @SerialName("issues") val issues: Int? = null,
+    @SerialName("numUserPlaylists") val numUserPlaylists: Int? = null,
+    @SerialName("filterData") val filterData: FilterData? = null,
+)
+
+@Serializable
+data class FilterData(
+    @SerialName("authors") val authors: List<AuthorFilter>? = null,
+    @SerialName("genres") val genres: List<String>? = null,
+    @SerialName("tags") val tags: List<String>? = null,
+    @SerialName("series") val series: List<SeriesFilter>? = null,
+    @SerialName("narrators") val narrators: List<String>? = null,
+    @SerialName("languages") val languages: List<String>? = null,
+    @SerialName("publishers") val publishers: List<String>? = null,
+)
+
+@Serializable
+data class AuthorFilter(@SerialName("id") val id: String, @SerialName("name") val name: String)
+
+@Serializable
+data class SeriesFilter(@SerialName("id") val id: String, @SerialName("name") val name: String)
+
+@Serializable
+data class LibraryItemsResponse(
+    @SerialName("results") val results: List<LibraryItem>,
+    @SerialName("total") val total: Int,
+    @SerialName("limit") val limit: Int,
+    @SerialName("page") val page: Int,
+    @SerialName("sortBy") val sortBy: String? = null,
+    @SerialName("sortDesc") val sortDesc: Boolean? = null,
+    @SerialName("filterBy") val filterBy: String? = null,
+    @SerialName("mediaType") val mediaType: String? = null,
+    @SerialName("minified") val minified: Boolean? = null,
+    @SerialName("collapseseries") val collapseseries: Boolean? = null,
+    @SerialName("include") val include: String? = null,
+)
+
+@Serializable
+data class AudiobookshelfSeries(
+    @SerialName("id") val id: String,
+    @SerialName("name") val name: String,
+    @SerialName("nameIgnorePrefix") val nameIgnorePrefix: String? = null,
+    @SerialName("description") val description: String? = null,
+    @SerialName("addedAt") val addedAt: Long? = null,
+    @SerialName("updatedAt") val updatedAt: Long? = null,
+    @SerialName("libraryId") val libraryId: String? = null,
+    @SerialName("books") val books: List<LibraryItem> = emptyList(),
+)
+
+@Serializable
+data class SeriesListResponse(
+    @SerialName("results") val results: List<AudiobookshelfSeries>,
+    @SerialName("total") val total: Int,
+    @SerialName("limit") val limit: Int,
+    @SerialName("page") val page: Int,
+    @SerialName("sortBy") val sortBy: String? = null,
+    @SerialName("sortDesc") val sortDesc: Boolean? = null,
+    @SerialName("filterBy") val filterBy: String? = null,
+    @SerialName("minified") val minified: Boolean? = null,
+    @SerialName("include") val include: String? = null,
+)
+
+@Serializable
+data class PersonalizedView(
+    @SerialName("id") val id: String,
+    @SerialName("label") val label: String,
+    @SerialName("labelStringKey") val labelStringKey: String? = null,
+    @SerialName("type") val type: String,
+    @SerialName("entities") val entities: JsonArray = JsonArray(emptyList()),
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/audiobookshelf/AudiobookshelfPlayback.kt b/app/src/main/java/com/makd/afinity/data/models/audiobookshelf/AudiobookshelfPlayback.kt
new file mode 100644
index 000000000..9f76eea3e
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/data/models/audiobookshelf/AudiobookshelfPlayback.kt
@@ -0,0 +1,173 @@
+package com.makd.afinity.data.models.audiobookshelf
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class AudioTrack(
+    @SerialName("index") val index: Int,
+    @SerialName("startOffset") val startOffset: Double,
+    @SerialName("duration") val duration: Double,
+    @SerialName("title") val title: String? = null,
+    @SerialName("contentUrl") val contentUrl: String? = null,
+    @SerialName("mimeType") val mimeType: String? = null,
+    @SerialName("codec") val codec: String? = null,
+    @SerialName("metadata") val metadata: FileMetadata? = null,
+)
+
+@Serializable
+data class BookChapter(
+    @SerialName("id") val id: Int,
+    @SerialName("start") val start: Double,
+    @SerialName("end") val end: Double,
+    @SerialName("title") val title: String,
+)
+
+@Serializable
+data class MediaProgress(
+    @SerialName("id") val id: String,
+    @SerialName("libraryItemId") val libraryItemId: String,
+    @SerialName("episodeId") val episodeId: String? = null,
+    @SerialName("duration") val duration: Double,
+    @SerialName("progress") val progress: Double,
+    @SerialName("currentTime") val currentTime: Double,
+    @SerialName("isFinished") val isFinished: Boolean,
+    @SerialName("hideFromContinueListening") val hideFromContinueListening: Boolean? = null,
+    @SerialName("ebookLocation") val ebookLocation: String? = null,
+    @SerialName("ebookProgress") val ebookProgress: Double? = null,
+    @SerialName("lastUpdate") val lastUpdate: Long,
+    @SerialName("startedAt") val startedAt: Long,
+    @SerialName("finishedAt") val finishedAt: Long? = null,
+)
+
+@Serializable
+data class PlaybackSession(
+    @SerialName("id") val id: String,
+    @SerialName("userId") val userId: String,
+    @SerialName("libraryId") val libraryId: String,
+    @SerialName("libraryItemId") val libraryItemId: String,
+    @SerialName("episodeId") val episodeId: String? = null,
+    @SerialName("mediaType") val mediaType: String,
+    @SerialName("mediaMetadata") val mediaMetadata: MediaMetadata? = null,
+    @SerialName("chapters") val chapters: List<BookChapter>? = null,
+    @SerialName("displayTitle") val displayTitle: String? = null,
+    @SerialName("displayAuthor") val displayAuthor: String? = null,
+    @SerialName("coverPath") val coverPath: String? = null,
+    @SerialName("duration") val duration: Double,
+    @SerialName("playMethod") val playMethod: Int,
+    @SerialName("mediaPlayer") val mediaPlayer: String? = null,
+    @SerialName("deviceInfo") val deviceInfo: DeviceInfo? = null,
+    @SerialName("serverVersion") val serverVersion: String? = null,
+    @SerialName("date") val date: String? = null,
+    @SerialName("dayOfWeek") val dayOfWeek: String? = null,
+    @SerialName("timeListening") val timeListening: Double? = null,
+    @SerialName("startTime") val startTime: Double,
+    @SerialName("currentTime") val currentTime: Double,
+    @SerialName("startedAt") val startedAt: Long,
+    @SerialName("updatedAt") val updatedAt: Long,
+    @SerialName("audioTracks") val audioTracks: List<AudioTrack>? = null,
+    @SerialName("videoTrack") val videoTrack: VideoTrack? = null,
+    @SerialName("libraryItem") val libraryItem: LibraryItem? = null,
+)
+
+@Serializable
+data class VideoTrack(
+    @SerialName("index") val index: Int,
+    @SerialName("startOffset") val startOffset: Double? = null,
+    @SerialName("duration") val duration: Double? = null,
+    @SerialName("title") val title: String? = null,
+    @SerialName("contentUrl") val contentUrl: String? = null,
+    @SerialName("mimeType") val mimeType: String? = null,
+    @SerialName("codec") val codec: String? = null,
+)
+
+@Serializable
+data class DeviceInfo(
+    @SerialName("id") val id: String? = null,
+    @SerialName("deviceId") val deviceId: String,
+    @SerialName("ipAddress") val ipAddress: String? = null,
+    @SerialName("browserName") val browserName: String? = null,
+    @SerialName("browserVersion") val browserVersion: String? = null,
+    @SerialName("osName") val osName: String? = null,
+    @SerialName("osVersion") val osVersion: String? = null,
+    @SerialName("deviceType") val deviceType: String? = null,
+    @SerialName("manufacturer") val manufacturer: String? = null,
+    @SerialName("model") val model: String? = null,
+    @SerialName("sdkVersion") val sdkVersion: Int? = null,
+    @SerialName("clientName") val clientName: String? = null,
+    @SerialName("clientVersion") val clientVersion: String? = null,
+)
+
+@Serializable
+data class PlaybackSessionRequest(
+    @SerialName("deviceInfo") val deviceInfo: DeviceInfo,
+    @SerialName("forceDirectPlay") val forceDirectPlay: Boolean? = null,
+    @SerialName("forceTranscode") val forceTranscode: Boolean? = null,
+    @SerialName("supportedMimeTypes") val supportedMimeTypes: List<String>? = null,
+    @SerialName("mediaPlayer") val mediaPlayer: String? = null,
+)
+
+@Serializable
+data class MediaProgressSyncData(
+    @SerialName("currentTime") val currentTime: Double,
+    @SerialName("timeListened") val timeListened: Double,
+    @SerialName("duration") val duration: Double,
+    @SerialName("progress") val progress: Double? = null,
+    @SerialName("isFinished") val isFinished: Boolean? = null,
+)
+
+@Serializable
+data class SyncResponse(
+    @SerialName("id") val id: String? = null,
+    @SerialName("success") val success: Boolean? = null,
+)
+
+@Serializable
+data class ProgressUpdateRequest(
+    @SerialName("currentTime") val currentTime: Double? = null,
+    @SerialName("duration") val duration: Double? = null,
+    @SerialName("progress") val progress: Double? = null,
+    @SerialName("isFinished") val isFinished: Boolean? = null,
+)
+
+@Serializable
+data class BatchLocalSessionRequest(@SerialName("sessions") val sessions: List<LocalSessionData>)
+
+@Serializable
+data class LocalSessionData(
+    @SerialName("id") val id: String,
+    @SerialName("libraryItemId") val libraryItemId: String,
+    @SerialName("episodeId") val episodeId: String? = null,
+    @SerialName("currentTime") val currentTime: Double,
+    @SerialName("timeListening") val timeListening: Double,
+    @SerialName("duration") val duration: Double,
+    @SerialName("progress") val progress: Double,
+    @SerialName("startedAt") val startedAt: Long,
+    @SerialName("updatedAt") val updatedAt: Long,
+)
+
+@Serializable
+data class BatchSyncResponse(
+    @SerialName("results") val results: List<BatchSyncResult>? = null,
+    @SerialName("numSuccessful") val numSuccessful: Int? = null,
+    @SerialName("numFailed") val numFailed: Int? = null,
+)
+
+@Serializable
+data class BatchSyncResult(
+    @SerialName("id") val id: String,
+    @SerialName("success") val success: Boolean,
+    @SerialName("progressSynced") val progressSynced: Boolean? = null,
+    @SerialName("error") val error: String? = null,
+)
+
+enum class PlayMethod(val value: Int) {
+    DIRECT_PLAY(0),
+    DIRECT_STREAM(1),
+    TRANSCODE(2),
+    LOCAL(3);
+
+    companion object {
+        fun fromValue(value: Int): PlayMethod = entries.find { it.value == value } ?: DIRECT_PLAY
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/audiobookshelf/AudiobookshelfUser.kt b/app/src/main/java/com/makd/afinity/data/models/audiobookshelf/AudiobookshelfUser.kt
new file mode 100644
index 000000000..b7a688abd
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/data/models/audiobookshelf/AudiobookshelfUser.kt
@@ -0,0 +1,89 @@
+package com.makd.afinity.data.models.audiobookshelf
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class AudiobookshelfUser(
+    @SerialName("id") val id: String,
+    @SerialName("username") val username: String,
+    @SerialName("type") val type: String? = null,
+    @SerialName("token") val token: String? = null,
+    @SerialName("mediaProgress") val mediaProgress: List<MediaProgress>? = null,
+    @SerialName("bookmarks") val bookmarks: List<Bookmark>? = null,
+    @SerialName("isActive") val isActive: Boolean? = null,
+    @SerialName("isLocked") val isLocked: Boolean? = null,
+    @SerialName("lastSeen") val lastSeen: Long? = null,
+    @SerialName("createdAt") val createdAt: Long? = null,
+    @SerialName("permissions") val permissions: UserPermissions? = null,
+    @SerialName("librariesAccessible") val librariesAccessible: List<String>? = null,
+    @SerialName("itemTagsSelected") val itemTagsSelected: List<String>? = null,
+)
+
+@Serializable
+data class UserPermissions(
+    @SerialName("download") val download: Boolean? = null,
+    @SerialName("update") val update: Boolean? = null,
+    @SerialName("delete") val delete: Boolean? = null,
+    @SerialName("upload") val upload: Boolean? = null,
+    @SerialName("accessAllLibraries") val accessAllLibraries: Boolean? = null,
+    @SerialName("accessAllTags") val accessAllTags: Boolean? = null,
+    @SerialName("accessExplicitContent") val accessExplicitContent: Boolean? = null,
+)
+
+@Serializable
+data class Bookmark(
+    @SerialName("libraryItemId") val libraryItemId: String,
+    @SerialName("title") val title: String,
+    @SerialName("time") val time: Double,
+    @SerialName("createdAt") val createdAt: Long,
+)
+
+@Serializable
+data class LoginRequest(
+    @SerialName("username") val username: String,
+    @SerialName("password") val password: String,
+)
+
+@Serializable
+data class LoginResponse(
+    @SerialName("user") val user: AudiobookshelfUser,
+    @SerialName("userDefaultLibraryId") val userDefaultLibraryId: String? = null,
+    @SerialName("serverSettings") val serverSettings: ServerSettings? = null,
+    @SerialName("ereaderDevices") val ereaderDevices: List<String>? = null,
+)
+
+@Serializable
+data class ServerSettings(
+    @SerialName("id") val id: String? = null,
+    @SerialName("scannerFindCovers") val scannerFindCovers: Boolean? = null,
+    @SerialName("scannerCoverProvider") val scannerCoverProvider: String? = null,
+    @SerialName("scannerParseSubtitle") val scannerParseSubtitle: Boolean? = null,
+    @SerialName("scannerPreferMatchedMetadata") val scannerPreferMatchedMetadata: Boolean? = null,
+    @SerialName("scannerDisableWatcher") val scannerDisableWatcher: Boolean? = null,
+    @SerialName("storeCoverWithItem") val storeCoverWithItem: Boolean? = null,
+    @SerialName("storeMetadataWithItem") val storeMetadataWithItem: Boolean? = null,
+    @SerialName("metadataFileFormat") val metadataFileFormat: String? = null,
+    @SerialName("rateLimitLoginRequests") val rateLimitLoginRequests: Int? = null,
+    @SerialName("rateLimitLoginWindow") val rateLimitLoginWindow: Int? = null,
+    @SerialName("backupSchedule") val backupSchedule: String? = null,
+    @SerialName("backupsToKeep") val backupsToKeep: Int? = null,
+    @SerialName("maxBackupSize") val maxBackupSize: Int? = null,
+    @SerialName("loggerDailyLogsToKeep") val loggerDailyLogsToKeep: Int? = null,
+    @SerialName("loggerScannerLogsToKeep") val loggerScannerLogsToKeep: Int? = null,
+    @SerialName("homeBookshelfView") val homeBookshelfView: Int? = null,
+    @SerialName("bookshelfView") val bookshelfView: Int? = null,
+    @SerialName("sortingIgnorePrefix") val sortingIgnorePrefix: Boolean? = null,
+    @SerialName("sortingPrefixes") val sortingPrefixes: List<String>? = null,
+    @SerialName("chromecastEnabled") val chromecastEnabled: Boolean? = null,
+    @SerialName("dateFormat") val dateFormat: String? = null,
+    @SerialName("language") val language: String? = null,
+    @SerialName("logLevel") val logLevel: Int? = null,
+    @SerialName("version") val version: String? = null,
+)
+
+@Serializable
+data class AuthorizeResponse(
+    @SerialName("user") val user: AudiobookshelfUser,
+    @SerialName("userDefaultLibraryId") val userDefaultLibraryId: String? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/auth/QuickConnectState.kt b/app/src/main/java/com/makd/afinity/data/models/auth/QuickConnectState.kt
index cf774f784..fecd002bf 100644
--- a/app/src/main/java/com/makd/afinity/data/models/auth/QuickConnectState.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/auth/QuickConnectState.kt
@@ -3,5 +3,5 @@ package com.makd.afinity.data.models.auth
 data class QuickConnectState(
     val code: String,
     val secret: String,
-    val authenticated: Boolean = false
-)
\ No newline at end of file
+    val authenticated: Boolean = false,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/common/CollectionType.kt b/app/src/main/java/com/makd/afinity/data/models/common/CollectionType.kt
index 1f824f633..3477ba327 100644
--- a/app/src/main/java/com/makd/afinity/data/models/common/CollectionType.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/common/CollectionType.kt
@@ -10,22 +10,19 @@ enum class CollectionType(val type: String) {
     LiveTv("livetv"),
     BoxSets("boxsets"),
     Mixed("null"),
-    Unknown("unknown"),
-    ;
+    Unknown("unknown");
 
     companion object {
         val defaultValue = Unknown
 
-        val supported = listOf(
-            Movies,
-            TvShows,
-            BoxSets,
-            Mixed,
-            LiveTv,
-        )
+        val supported = listOf(Movies, TvShows, BoxSets, Mixed, LiveTv)
 
         fun fromString(string: String?): CollectionType {
-            if (string == null) { // TODO jellyfin returns null as the collectiontype for mixed libraries. This is obviously wrong, but probably an upstream issue. Should be fixed whenever upstream fixes this
+            if (
+                string == null
+            ) { // TODO jellyfin returns null as the collectiontype for mixed libraries. This is
+                // obviously wrong, but probably an upstream issue. Should be fixed whenever
+                // upstream fixes this
                 return Mixed
             }
 
@@ -36,4 +33,4 @@ enum class CollectionType(val type: String) {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/common/EpisodeLayout.kt b/app/src/main/java/com/makd/afinity/data/models/common/EpisodeLayout.kt
index 00c1e385e..672b894aa 100644
--- a/app/src/main/java/com/makd/afinity/data/models/common/EpisodeLayout.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/common/EpisodeLayout.kt
@@ -16,4 +16,4 @@ enum class EpisodeLayout(val value: String) {
             VERTICAL -> "Vertical List"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/common/SortBy.kt b/app/src/main/java/com/makd/afinity/data/models/common/SortBy.kt
index 8bbdcd4d8..5b1b73e91 100644
--- a/app/src/main/java/com/makd/afinity/data/models/common/SortBy.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/common/SortBy.kt
@@ -9,8 +9,7 @@ enum class SortBy(val sortString: String) {
     RELEASE_DATE("PremiereDate"),
     SERIES_DATE_PLAYED("SeriesDatePlayed"),
     DATE_LAST_CONTENT_ADDED("DateLastContentAdded"),
-    RANDOM("Random"),
-    ;
+    RANDOM("Random");
 
     companion object {
         val defaultValue = NAME
@@ -23,4 +22,4 @@ enum class SortBy(val sortString: String) {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/download/DownloadStatus.kt b/app/src/main/java/com/makd/afinity/data/models/download/DownloadStatus.kt
index 2ddf6b873..73e7fe083 100644
--- a/app/src/main/java/com/makd/afinity/data/models/download/DownloadStatus.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/download/DownloadStatus.kt
@@ -6,5 +6,5 @@ enum class DownloadStatus {
     PAUSED,
     COMPLETED,
     FAILED,
-    CANCELLED
+    CANCELLED,
 }
diff --git a/app/src/main/java/com/makd/afinity/data/models/extensions/AfinityImagesExtensions.kt b/app/src/main/java/com/makd/afinity/data/models/extensions/AfinityImagesExtensions.kt
index 5dbbbe584..6434517fc 100644
--- a/app/src/main/java/com/makd/afinity/data/models/extensions/AfinityImagesExtensions.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/extensions/AfinityImagesExtensions.kt
@@ -2,21 +2,33 @@ package com.makd.afinity.data.models.extensions
 
 import com.makd.afinity.data.models.media.AfinityImages
 
-val AfinityImages.primaryImageUrl: String? get() = primary?.toString()
-val AfinityImages.backdropImageUrl: String? get() = backdrop?.toString()
-val AfinityImages.thumbImageUrl: String? get() = thumb?.toString()
-val AfinityImages.logoImageUrl: String? get() = logo?.toString()
-val AfinityImages.showPrimaryImageUrl: String? get() = showPrimary?.toString()
-val AfinityImages.showBackdropImageUrl: String? get() = showBackdrop?.toString()
-val AfinityImages.showLogoImageUrl: String? get() = showLogo?.toString()
+val AfinityImages.primaryImageUrl: String?
+    get() = primary?.toString()
+val AfinityImages.backdropImageUrl: String?
+    get() = backdrop?.toString()
+val AfinityImages.thumbImageUrl: String?
+    get() = thumb?.toString()
+val AfinityImages.logoImageUrl: String?
+    get() = logo?.toString()
+val AfinityImages.showPrimaryImageUrl: String?
+    get() = showPrimary?.toString()
+val AfinityImages.showBackdropImageUrl: String?
+    get() = showBackdrop?.toString()
+val AfinityImages.showLogoImageUrl: String?
+    get() = showLogo?.toString()
 
-val AfinityImages.primaryBlurHash: String? get() = primaryImageBlurHash
-val AfinityImages.backdropBlurHash: String? get() = backdropImageBlurHash
-val AfinityImages.thumbBlurHash: String? get() = thumbImageBlurHash
-val AfinityImages.logoBlurHash: String? get() = logoImageBlurHash
-val AfinityImages.showBackdropBlurHash: String? get() = showBackdropImageBlurHash
-val AfinityImages.showLogoBlurHash: String? get() = showLogoImageBlurHash
+val AfinityImages.primaryBlurHash: String?
+    get() = primaryImageBlurHash
+val AfinityImages.backdropBlurHash: String?
+    get() = backdropImageBlurHash
+val AfinityImages.thumbBlurHash: String?
+    get() = thumbImageBlurHash
+val AfinityImages.logoBlurHash: String?
+    get() = logoImageBlurHash
+val AfinityImages.showBackdropBlurHash: String?
+    get() = showBackdropImageBlurHash
+val AfinityImages.showLogoBlurHash: String?
+    get() = showLogoImageBlurHash
 val AfinityImages.logoImageUrlWithTransparency: String?
-    get() = logoImageUrl?.let { url ->
-        if (url.contains("?")) "$url&format=png" else "$url?format=png"
-    }
\ No newline at end of file
+    get() =
+        logoImageUrl?.let { url -> if (url.contains("?")) "$url&format=png" else "$url?format=png" }
diff --git a/app/src/main/java/com/makd/afinity/data/models/extensions/JellyfinModelExtensions.kt b/app/src/main/java/com/makd/afinity/data/models/extensions/JellyfinModelExtensions.kt
index 778aef533..0925bffa9 100644
--- a/app/src/main/java/com/makd/afinity/data/models/extensions/JellyfinModelExtensions.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/extensions/JellyfinModelExtensions.kt
@@ -32,14 +32,11 @@ import org.jellyfin.sdk.model.api.ImageType
 import org.jellyfin.sdk.model.api.LocationType
 import org.jellyfin.sdk.model.api.PlayAccess
 
-
 fun BaseItemDto.toAfinityExternalUrls(): List<AfinityExternalUrl>? {
     return externalUrls?.map { it.toAfinityExternalUrl() }
 }
 
-fun BaseItemDto.toAfinityItem(
-    baseUrl: String,
-): AfinityItem? {
+fun BaseItemDto.toAfinityItem(baseUrl: String): AfinityItem? {
     return when (type) {
         BaseItemKind.MOVIE -> toAfinityMovie(baseUrl)
         BaseItemKind.EPISODE -> toAfinityEpisode(baseUrl)
@@ -52,46 +49,50 @@ fun BaseItemDto.toAfinityItem(
     }
 }
 
-fun BaseItemDto.toAfinityMovie(
-    baseUrl: String,
-): AfinityMovie {
+fun BaseItemDto.toAfinityMovie(baseUrl: String): AfinityMovie {
     return AfinityMovie(
         id = id,
         name = name.orEmpty(),
         originalTitle = originalTitle,
         overview = overview.orEmpty(),
-        sources = mediaSources?.map { mediaSource ->
-            AfinitySource(
-                id = mediaSource.id.orEmpty(),
-                name = mediaSource.name.orEmpty(),
-                type = AfinitySourceType.REMOTE,
-                path = mediaSource.path.orEmpty(),
-                size = mediaSource.size ?: 0L,
-                mediaStreams = mediaSource.mediaStreams?.map { mediaStream ->
-                    AfinityMediaStream(
-                        title = mediaStream.title.orEmpty(),
-                        displayTitle = mediaStream.displayTitle,
-                        language = mediaStream.language.orEmpty(),
-                        type = mediaStream.type,
-                        codec = mediaStream.codec.orEmpty(),
-                        isExternal = mediaStream.isExternal,
-                        path = if (mediaStream.isExternal && !mediaStream.deliveryUrl.isNullOrBlank()) {
-                            baseUrl + mediaStream.deliveryUrl
-                        } else {
-                            null
-                        },
-                        channelLayout = mediaStream.channelLayout,
-                        videoRangeType = mediaStream.videoRangeType,
-                        height = mediaStream.height,
-                        width = mediaStream.width,
-                        videoDoViTitle = mediaStream.videoDoViTitle,
-                        index = mediaStream.index,
-                        channels = mediaStream.channels,
-                        isDefault = mediaStream.isDefault,
-                    )
-                } ?: emptyList()
-            )
-        } ?: emptyList(),
+        sources =
+            mediaSources?.map { mediaSource ->
+                AfinitySource(
+                    id = mediaSource.id.orEmpty(),
+                    name = mediaSource.name.orEmpty(),
+                    type = AfinitySourceType.REMOTE,
+                    path = mediaSource.path.orEmpty(),
+                    size = mediaSource.size ?: 0L,
+                    mediaStreams =
+                        mediaSource.mediaStreams?.map { mediaStream ->
+                            AfinityMediaStream(
+                                title = mediaStream.title.orEmpty(),
+                                displayTitle = mediaStream.displayTitle,
+                                language = mediaStream.language.orEmpty(),
+                                type = mediaStream.type,
+                                codec = mediaStream.codec.orEmpty(),
+                                isExternal = mediaStream.isExternal,
+                                path =
+                                    if (
+                                        mediaStream.isExternal &&
+                                            !mediaStream.deliveryUrl.isNullOrBlank()
+                                    ) {
+                                        baseUrl + mediaStream.deliveryUrl
+                                    } else {
+                                        null
+                                    },
+                                channelLayout = mediaStream.channelLayout,
+                                videoRangeType = mediaStream.videoRangeType,
+                                height = mediaStream.height,
+                                width = mediaStream.width,
+                                videoDoViTitle = mediaStream.videoDoViTitle,
+                                index = mediaStream.index,
+                                channels = mediaStream.channels,
+                                isDefault = mediaStream.isDefault,
+                            )
+                        } ?: emptyList(),
+                )
+            } ?: emptyList(),
         played = userData?.played == true,
         favorite = userData?.isFavorite == true,
         canPlay = playAccess != PlayAccess.NONE,
@@ -112,59 +113,64 @@ fun BaseItemDto.toAfinityMovie(
         tagline = taglines?.firstOrNull(),
         images = toAfinityImages(baseUrl),
         chapters = toAfinityChapters(),
-        trickplayInfo = trickplay?.flatMap { (_, widthMap) ->
-            widthMap.map { (width, info) ->
-                width.toString() to info.toAfinityTrickplayInfo()
-            }
-        }?.toMap(),
-        providerIds = providerIds?.mapNotNull { (key, value) ->
-            value?.let { key to it }
-        }?.toMap(),
+        trickplayInfo =
+            trickplay
+                ?.flatMap { (_, widthMap) ->
+                    widthMap.map { (width, info) ->
+                        width.toString() to info.toAfinityTrickplayInfo()
+                    }
+                }
+                ?.toMap(),
+        providerIds = providerIds?.mapNotNull { (key, value) -> value?.let { key to it } }?.toMap(),
         externalUrls = toAfinityExternalUrls(),
         liked = userData?.likes == true,
     )
 }
 
-fun BaseItemDto.toAfinityShow(
-    baseUrl: String,
-): AfinityShow {
+fun BaseItemDto.toAfinityShow(baseUrl: String): AfinityShow {
     return AfinityShow(
         id = id,
         name = name.orEmpty(),
         originalTitle = originalTitle,
         overview = overview.orEmpty(),
-        sources = mediaSources?.map { mediaSource ->
-            AfinitySource(
-                id = mediaSource.id.orEmpty(),
-                name = mediaSource.name.orEmpty(),
-                type = AfinitySourceType.REMOTE,
-                path = mediaSource.path.orEmpty(),
-                size = mediaSource.size ?: 0L,
-                mediaStreams = mediaSource.mediaStreams?.map { mediaStream ->
-                    AfinityMediaStream(
-                        title = mediaStream.title.orEmpty(),
-                        displayTitle = mediaStream.displayTitle,
-                        language = mediaStream.language.orEmpty(),
-                        type = mediaStream.type,
-                        codec = mediaStream.codec.orEmpty(),
-                        isExternal = mediaStream.isExternal,
-                        path = if (mediaStream.isExternal && !mediaStream.deliveryUrl.isNullOrBlank()) {
-                            baseUrl + mediaStream.deliveryUrl
-                        } else {
-                            null
-                        },
-                        channelLayout = mediaStream.channelLayout,
-                        videoRangeType = mediaStream.videoRangeType,
-                        height = mediaStream.height,
-                        width = mediaStream.width,
-                        videoDoViTitle = mediaStream.videoDoViTitle,
-                        index = mediaStream.index,
-                        channels = mediaStream.channels,
-                        isDefault = mediaStream.isDefault,
-                    )
-                } ?: emptyList()
-            )
-        } ?: emptyList(),
+        sources =
+            mediaSources?.map { mediaSource ->
+                AfinitySource(
+                    id = mediaSource.id.orEmpty(),
+                    name = mediaSource.name.orEmpty(),
+                    type = AfinitySourceType.REMOTE,
+                    path = mediaSource.path.orEmpty(),
+                    size = mediaSource.size ?: 0L,
+                    mediaStreams =
+                        mediaSource.mediaStreams?.map { mediaStream ->
+                            AfinityMediaStream(
+                                title = mediaStream.title.orEmpty(),
+                                displayTitle = mediaStream.displayTitle,
+                                language = mediaStream.language.orEmpty(),
+                                type = mediaStream.type,
+                                codec = mediaStream.codec.orEmpty(),
+                                isExternal = mediaStream.isExternal,
+                                path =
+                                    if (
+                                        mediaStream.isExternal &&
+                                            !mediaStream.deliveryUrl.isNullOrBlank()
+                                    ) {
+                                        baseUrl + mediaStream.deliveryUrl
+                                    } else {
+                                        null
+                                    },
+                                channelLayout = mediaStream.channelLayout,
+                                videoRangeType = mediaStream.videoRangeType,
+                                height = mediaStream.height,
+                                width = mediaStream.width,
+                                videoDoViTitle = mediaStream.videoDoViTitle,
+                                index = mediaStream.index,
+                                channels = mediaStream.channels,
+                                isDefault = mediaStream.isDefault,
+                            )
+                        } ?: emptyList(),
+                )
+            } ?: emptyList(),
         seasons = emptyList(),
         played = userData?.played == true,
         favorite = userData?.isFavorite == true,
@@ -187,17 +193,13 @@ fun BaseItemDto.toAfinityShow(
         seasonCount = childCount,
         episodeCount = recursiveItemCount,
         images = toAfinityImages(baseUrl),
-        providerIds = providerIds?.mapNotNull { (key, value) ->
-            value?.let { key to it }
-        }?.toMap(),
+        providerIds = providerIds?.mapNotNull { (key, value) -> value?.let { key to it } }?.toMap(),
         externalUrls = toAfinityExternalUrls(),
         liked = userData?.likes == true,
     )
 }
 
-fun BaseItemDto.toAfinitySeason(
-    baseUrl: String,
-): AfinitySeason {
+fun BaseItemDto.toAfinitySeason(baseUrl: String): AfinitySeason {
     return AfinitySeason(
         id = id,
         name = name.orEmpty(),
@@ -218,17 +220,13 @@ fun BaseItemDto.toAfinitySeason(
         productionYear = productionYear,
         premiereDate = premiereDate,
         people = people?.map { it.toAfinityPerson(baseUrl) } ?: emptyList(),
-        providerIds = providerIds?.mapNotNull { (key, value) ->
-            value?.let { key to it }
-        }?.toMap(),
+        providerIds = providerIds?.mapNotNull { (key, value) -> value?.let { key to it } }?.toMap(),
         externalUrls = toAfinityExternalUrls(),
         liked = userData?.likes == true,
     )
 }
 
-fun BaseItemDto.toAfinityEpisode(
-    baseUrl: String,
-): AfinityEpisode? {
+fun BaseItemDto.toAfinityEpisode(baseUrl: String): AfinityEpisode? {
     return try {
         AfinityEpisode(
             id = id,
@@ -238,38 +236,44 @@ fun BaseItemDto.toAfinityEpisode(
             indexNumber = indexNumber ?: 0,
             indexNumberEnd = indexNumberEnd,
             parentIndexNumber = parentIndexNumber ?: 0,
-            sources = mediaSources?.map { mediaSource ->
-                AfinitySource(
-                    id = mediaSource.id.orEmpty(),
-                    name = mediaSource.name.orEmpty(),
-                    type = AfinitySourceType.REMOTE,
-                    path = mediaSource.path.orEmpty(),
-                    size = mediaSource.size ?: 0L,
-                    mediaStreams = mediaSource.mediaStreams?.map { mediaStream ->
-                        AfinityMediaStream(
-                            title = mediaStream.title.orEmpty(),
-                            displayTitle = mediaStream.displayTitle,
-                            language = mediaStream.language.orEmpty(),
-                            type = mediaStream.type,
-                            codec = mediaStream.codec.orEmpty(),
-                            isExternal = mediaStream.isExternal,
-                            path = if (mediaStream.isExternal && !mediaStream.deliveryUrl.isNullOrBlank()) {
-                                baseUrl + mediaStream.deliveryUrl
-                            } else {
-                                null
-                            },
-                            channelLayout = mediaStream.channelLayout,
-                            videoRangeType = mediaStream.videoRangeType,
-                            height = mediaStream.height,
-                            width = mediaStream.width,
-                            videoDoViTitle = mediaStream.videoDoViTitle,
-                            index = mediaStream.index,
-                            channels = mediaStream.channels,
-                            isDefault = mediaStream.isDefault,
-                        )
-                    } ?: emptyList()
-                )
-            } ?: emptyList(),
+            sources =
+                mediaSources?.map { mediaSource ->
+                    AfinitySource(
+                        id = mediaSource.id.orEmpty(),
+                        name = mediaSource.name.orEmpty(),
+                        type = AfinitySourceType.REMOTE,
+                        path = mediaSource.path.orEmpty(),
+                        size = mediaSource.size ?: 0L,
+                        mediaStreams =
+                            mediaSource.mediaStreams?.map { mediaStream ->
+                                AfinityMediaStream(
+                                    title = mediaStream.title.orEmpty(),
+                                    displayTitle = mediaStream.displayTitle,
+                                    language = mediaStream.language.orEmpty(),
+                                    type = mediaStream.type,
+                                    codec = mediaStream.codec.orEmpty(),
+                                    isExternal = mediaStream.isExternal,
+                                    path =
+                                        if (
+                                            mediaStream.isExternal &&
+                                                !mediaStream.deliveryUrl.isNullOrBlank()
+                                        ) {
+                                            baseUrl + mediaStream.deliveryUrl
+                                        } else {
+                                            null
+                                        },
+                                    channelLayout = mediaStream.channelLayout,
+                                    videoRangeType = mediaStream.videoRangeType,
+                                    height = mediaStream.height,
+                                    width = mediaStream.width,
+                                    videoDoViTitle = mediaStream.videoDoViTitle,
+                                    index = mediaStream.index,
+                                    channels = mediaStream.channels,
+                                    isDefault = mediaStream.isDefault,
+                                )
+                            } ?: emptyList(),
+                    )
+                } ?: emptyList(),
             played = userData?.played == true,
             favorite = userData?.isFavorite == true,
             canPlay = playAccess != PlayAccess.NONE,
@@ -287,14 +291,16 @@ fun BaseItemDto.toAfinityEpisode(
             missing = locationType == LocationType.VIRTUAL,
             images = toAfinityImages(baseUrl),
             chapters = toAfinityChapters(),
-            trickplayInfo = trickplay?.flatMap { (_, widthMap) ->
-                widthMap.map { (width, info) ->
-                    width.toString() to info.toAfinityTrickplayInfo()
-                }
-            }?.toMap(),
-            providerIds = providerIds?.mapNotNull { (key, value) ->
-                value?.let { key to it }
-            }?.toMap(),
+            trickplayInfo =
+                trickplay
+                    ?.flatMap { (_, widthMap) ->
+                        widthMap.map { (width, info) ->
+                            width.toString() to info.toAfinityTrickplayInfo()
+                        }
+                    }
+                    ?.toMap(),
+            providerIds =
+                providerIds?.mapNotNull { (key, value) -> value?.let { key to it } }?.toMap(),
             externalUrls = toAfinityExternalUrls(),
             liked = userData?.likes == true,
         )
@@ -303,9 +309,7 @@ fun BaseItemDto.toAfinityEpisode(
     }
 }
 
-fun BaseItemDto.toAfinityBoxSet(
-    baseUrl: String,
-): AfinityBoxSet {
+fun BaseItemDto.toAfinityBoxSet(baseUrl: String): AfinityBoxSet {
     return AfinityBoxSet(
         id = id,
         name = name.orEmpty(),
@@ -327,17 +331,13 @@ fun BaseItemDto.toAfinityBoxSet(
         communityRating = communityRating,
         officialRating = officialRating,
         people = people?.map { it.toAfinityPerson(baseUrl) } ?: emptyList(),
-        providerIds = providerIds?.mapNotNull { (key, value) ->
-            value?.let { key to it }
-        }?.toMap(),
+        providerIds = providerIds?.mapNotNull { (key, value) -> value?.let { key to it } }?.toMap(),
         externalUrls = toAfinityExternalUrls(),
         liked = userData?.likes == true,
     )
 }
 
-fun BaseItemDto.toAfinityFolder(
-    baseUrl: String,
-): AfinityFolder {
+fun BaseItemDto.toAfinityFolder(baseUrl: String): AfinityFolder {
     return AfinityFolder(
         id = id,
         name = name.orEmpty(),
@@ -345,17 +345,13 @@ fun BaseItemDto.toAfinityFolder(
         favorite = userData?.isFavorite == true,
         unplayedItemCount = userData?.unplayedItemCount,
         images = toAfinityImages(baseUrl),
-        providerIds = providerIds?.mapNotNull { (key, value) ->
-            value?.let { key to it }
-        }?.toMap(),
+        providerIds = providerIds?.mapNotNull { (key, value) -> value?.let { key to it } }?.toMap(),
         externalUrls = toAfinityExternalUrls(),
         liked = userData?.likes == true,
     )
 }
 
-fun BaseItemDto.toAfinityCollection(
-    baseUrl: String,
-): AfinityCollection? {
+fun BaseItemDto.toAfinityCollection(baseUrl: String): AfinityCollection? {
     val type = CollectionType.fromString(collectionType?.serialName)
 
     if (type !in CollectionType.supported) {
@@ -367,16 +363,12 @@ fun BaseItemDto.toAfinityCollection(
         name = name.orEmpty(),
         type = type,
         images = toAfinityImages(baseUrl),
-        providerIds = providerIds?.mapNotNull { (key, value) ->
-            value?.let { key to it }
-        }?.toMap(),
+        providerIds = providerIds?.mapNotNull { (key, value) -> value?.let { key to it } }?.toMap(),
         externalUrls = toAfinityExternalUrls(),
     )
 }
 
-fun BaseItemDto.toAfinityPersonDetail(
-    baseUrl: String,
-): AfinityPersonDetail {
+fun BaseItemDto.toAfinityPersonDetail(baseUrl: String): AfinityPersonDetail {
     return AfinityPersonDetail(
         id = id,
         name = name.orEmpty(),
@@ -388,58 +380,70 @@ fun BaseItemDto.toAfinityPersonDetail(
     )
 }
 
-fun BaseItemDto.toAfinityImages(
-    baseUrl: String,
-): AfinityImages {
+fun BaseItemDto.toAfinityImages(baseUrl: String): AfinityImages {
     val baseUri = baseUrl.toUri()
 
     return AfinityImages(
-        primary = imageTags?.get(ImageType.PRIMARY)?.let { tag ->
-            baseUri.buildUpon()
-                .appendEncodedPath("Items/$id/Images/Primary")
-                .appendQueryParameter("tag", tag)
-                .build()
-        },
-        thumb = imageTags?.get(ImageType.THUMB)?.let { tag ->
-            baseUri.buildUpon()
-                .appendEncodedPath("Items/$id/Images/Thumb")
-                .appendQueryParameter("tag", tag)
-                .build()
-        },
-        backdrop = backdropImageTags?.firstOrNull()?.let { tag ->
-            baseUri.buildUpon()
-                .appendEncodedPath("Items/$id/Images/Backdrop/0")
-                .appendQueryParameter("tag", tag)
-                .build()
-        },
-        logo = imageTags?.get(ImageType.LOGO)?.let { tag ->
-            baseUri.buildUpon()
-                .appendEncodedPath("Items/$id/Images/Logo")
-                .appendQueryParameter("tag", tag)
-                .build()
-        },
-        showPrimary = seriesPrimaryImageTag?.let { tag ->
-            baseUri.buildUpon()
-                .appendEncodedPath("Items/$seriesId/Images/Primary")
-                .appendQueryParameter("tag", tag)
-                .build()
-        },
-        showBackdrop = seriesPrimaryImageTag?.let { tag ->
-            baseUri.buildUpon()
-                .appendEncodedPath("Items/$seriesId/Images/Backdrop/0")
-                .appendQueryParameter("tag", tag)
-                .build()
-        },
-        showLogo = seriesPrimaryImageTag?.let { tag ->
-            baseUri.buildUpon()
-                .appendEncodedPath("Items/$seriesId/Images/Logo")
-                .appendQueryParameter("tag", tag)
-                .build()
-        },
+        primary =
+            imageTags?.get(ImageType.PRIMARY)?.let { tag ->
+                baseUri
+                    .buildUpon()
+                    .appendEncodedPath("Items/$id/Images/Primary")
+                    .appendQueryParameter("tag", tag)
+                    .build()
+            },
+        thumb =
+            imageTags?.get(ImageType.THUMB)?.let { tag ->
+                baseUri
+                    .buildUpon()
+                    .appendEncodedPath("Items/$id/Images/Thumb")
+                    .appendQueryParameter("tag", tag)
+                    .build()
+            },
+        backdrop =
+            backdropImageTags?.firstOrNull()?.let { tag ->
+                baseUri
+                    .buildUpon()
+                    .appendEncodedPath("Items/$id/Images/Backdrop/0")
+                    .appendQueryParameter("tag", tag)
+                    .build()
+            },
+        logo =
+            imageTags?.get(ImageType.LOGO)?.let { tag ->
+                baseUri
+                    .buildUpon()
+                    .appendEncodedPath("Items/$id/Images/Logo")
+                    .appendQueryParameter("tag", tag)
+                    .build()
+            },
+        showPrimary =
+            seriesPrimaryImageTag?.let { tag ->
+                baseUri
+                    .buildUpon()
+                    .appendEncodedPath("Items/$seriesId/Images/Primary")
+                    .appendQueryParameter("tag", tag)
+                    .build()
+            },
+        showBackdrop =
+            seriesPrimaryImageTag?.let { tag ->
+                baseUri
+                    .buildUpon()
+                    .appendEncodedPath("Items/$seriesId/Images/Backdrop/0")
+                    .appendQueryParameter("tag", tag)
+                    .build()
+            },
+        showLogo =
+            seriesPrimaryImageTag?.let { tag ->
+                baseUri
+                    .buildUpon()
+                    .appendEncodedPath("Items/$seriesId/Images/Logo")
+                    .appendQueryParameter("tag", tag)
+                    .build()
+            },
         primaryImageBlurHash = imageBlurHashes?.get(ImageType.PRIMARY)?.values?.firstOrNull(),
         backdropImageBlurHash = imageBlurHashes?.get(ImageType.BACKDROP)?.values?.firstOrNull(),
         thumbImageBlurHash = imageBlurHashes?.get(ImageType.THUMB)?.values?.firstOrNull(),
-        logoImageBlurHash = imageBlurHashes?.get(ImageType.LOGO)?.values?.firstOrNull()
+        logoImageBlurHash = imageBlurHashes?.get(ImageType.LOGO)?.values?.firstOrNull(),
     )
 }
 
@@ -448,14 +452,12 @@ fun BaseItemDto.toAfinityChapters(): List<AfinityChapter> {
         AfinityChapter(
             startPosition = chapter.startPositionTicks / 10000,
             name = chapter.name,
-            imageIndex = index
+            imageIndex = index,
         )
     } ?: emptyList()
 }
 
-fun BaseItemDto.toAfinityVideo(
-    baseUrl: String,
-): AfinityVideo {
+fun BaseItemDto.toAfinityVideo(baseUrl: String): AfinityVideo {
     return AfinityVideo(
         id = id,
         name = name.orEmpty(),
@@ -483,28 +485,27 @@ fun BaseItemDto.toAfinityVideo(
         images = toAfinityImages(baseUrl),
         chapters = toAfinityChapters(),
         trickplayInfo = null,
-        providerIds = providerIds?.mapNotNull { (key, value) ->
-            value?.let { key to it }
-        }?.toMap(),
+        providerIds = providerIds?.mapNotNull { (key, value) -> value?.let { key to it } }?.toMap(),
         externalUrls = toAfinityExternalUrls(),
         liked = userData?.likes == true,
     )
 }
 
-fun BaseItemPerson.toAfinityPerson(
-    baseUrl: String,
-): AfinityPerson {
+fun BaseItemPerson.toAfinityPerson(baseUrl: String): AfinityPerson {
     val baseUri = baseUrl.toUri()
 
-    val personImage = AfinityPersonImage(
-        uri = primaryImageTag?.let { tag ->
-            baseUri.buildUpon()
-                .appendEncodedPath("Items/$id/Images/Primary")
-                .appendQueryParameter("tag", tag)
-                .build()
-        },
-        blurHash = imageBlurHashes?.get(ImageType.PRIMARY)?.get(primaryImageTag),
-    )
+    val personImage =
+        AfinityPersonImage(
+            uri =
+                primaryImageTag?.let { tag ->
+                    baseUri
+                        .buildUpon()
+                        .appendEncodedPath("Items/$id/Images/Primary")
+                        .appendQueryParameter("tag", tag)
+                        .build()
+                },
+            blurHash = imageBlurHashes?.get(ImageType.PRIMARY)?.get(primaryImageTag),
+        )
 
     return AfinityPerson(
         id = id,
@@ -517,13 +518,14 @@ fun BaseItemPerson.toAfinityPerson(
 
 fun BaseItemDto.toAfinityChannel(
     baseUrl: String,
-    currentProgram: AfinityProgram? = null
+    currentProgram: AfinityProgram? = null,
 ): AfinityChannel {
-    val afinityChannelType = when (channelType) {
-        org.jellyfin.sdk.model.api.ChannelType.RADIO -> ChannelType.RADIO
-        org.jellyfin.sdk.model.api.ChannelType.TV -> ChannelType.TV
-        else -> ChannelType.TV
-    }
+    val afinityChannelType =
+        when (channelType) {
+            org.jellyfin.sdk.model.api.ChannelType.RADIO -> ChannelType.RADIO
+            org.jellyfin.sdk.model.api.ChannelType.TV -> ChannelType.TV
+            else -> ChannelType.TV
+        }
 
     return AfinityChannel(
         id = id,
@@ -535,17 +537,13 @@ fun BaseItemDto.toAfinityChannel(
         channelType = afinityChannelType,
         currentProgram = currentProgram,
         serviceName = null,
-        providerIds = providerIds?.mapNotNull { (key, value) ->
-            value?.let { key to it }
-        }?.toMap(),
+        providerIds = providerIds?.mapNotNull { (key, value) -> value?.let { key to it } }?.toMap(),
         externalUrls = toAfinityExternalUrls(),
         liked = userData?.likes == true,
     )
 }
 
-fun BaseItemDto.toAfinityProgram(
-    baseUrl: String,
-): AfinityProgram {
+fun BaseItemDto.toAfinityProgram(baseUrl: String): AfinityProgram {
     return AfinityProgram(
         id = id,
         channelId = channelId ?: id,
@@ -563,6 +561,6 @@ fun BaseItemDto.toAfinityProgram(
         productionYear = productionYear,
         genres = genres ?: emptyList(),
         officialRating = officialRating,
-        communityRating = communityRating
+        communityRating = communityRating,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/CreateRequestBody.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/CreateRequestBody.kt
index c6dbe43a6..c413992d4 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/CreateRequestBody.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/CreateRequestBody.kt
@@ -8,14 +8,8 @@ import kotlinx.serialization.Serializable
 @OptIn(ExperimentalSerializationApi::class)
 @Serializable
 data class CreateRequestBody(
-    @SerialName("mediaId")
-    val tmdbId: Int,
-    @SerialName("mediaType")
-    val mediaType: String,
-    @EncodeDefault(EncodeDefault.Mode.NEVER)
-    @SerialName("seasons")
-    val seasons: List<Int>? = null,
-    @EncodeDefault(EncodeDefault.Mode.NEVER)
-    @SerialName("is4k")
-    val is4k: Boolean = false
-)
\ No newline at end of file
+    @SerialName("mediaId") val tmdbId: Int,
+    @SerialName("mediaType") val mediaType: String,
+    @EncodeDefault(EncodeDefault.Mode.NEVER) @SerialName("seasons") val seasons: List<Int>? = null,
+    @EncodeDefault(EncodeDefault.Mode.NEVER) @SerialName("is4k") val is4k: Boolean = false,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/DiscoverCategory.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/DiscoverCategory.kt
index 97db9780a..14d99feed 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/DiscoverCategory.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/DiscoverCategory.kt
@@ -7,11 +7,12 @@ enum class DiscoverCategory {
     UPCOMING_MOVIES,
     UPCOMING_TV;
 
-    fun getDisplayName(): String = when (this) {
-        TRENDING -> "Trending Now"
-        POPULAR_MOVIES -> "Popular Movies"
-        POPULAR_TV -> "Popular TV Shows"
-        UPCOMING_MOVIES -> "Upcoming Movies"
-        UPCOMING_TV -> "Upcoming TV Shows"
-    }
-}
\ No newline at end of file
+    fun getDisplayName(): String =
+        when (this) {
+            TRENDING -> "Trending Now"
+            POPULAR_MOVIES -> "Popular Movies"
+            POPULAR_TV -> "Popular TV Shows"
+            UPCOMING_MOVIES -> "Upcoming Movies"
+            UPCOMING_TV -> "Upcoming TV Shows"
+        }
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Genre.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Genre.kt
index ae8aba8ab..da2ba0a96 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Genre.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Genre.kt
@@ -5,22 +5,13 @@ import com.makd.afinity.util.GenreDuotoneColorGenerator
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
-@Serializable
-data class Genre(
-    @SerialName("id")
-    val id: Int,
-    @SerialName("name")
-    val name: String
-)
+@Serializable data class Genre(@SerialName("id") val id: Int, @SerialName("name") val name: String)
 
 @Serializable
 data class GenreSliderItem(
-    @SerialName("id")
-    val id: Int,
-    @SerialName("name")
-    val name: String,
-    @SerialName("backdrops")
-    val backdrops: List<String>? = null
+    @SerialName("id") val id: Int,
+    @SerialName("name") val name: String,
+    @SerialName("backdrops") val backdrops: List<String>? = null,
 ) {
     fun getBackdropUrl(baseUrl: String = "https://image.tmdb.org/t/p/w780"): String? {
         return backdrops?.firstOrNull()?.let { "$baseUrl$it" }
@@ -28,13 +19,14 @@ data class GenreSliderItem(
 
     fun getDuotoneBackdropUrl(
         backdropTracker: BackdropTracker? = null,
-        isMovie: Boolean = true
+        isMovie: Boolean = true,
     ): String? {
-        val selectedPath = if (backdropTracker != null) {
-            backdropTracker.selectNextBackdrop(backdrops, id, isMovie)
-        } else {
-            backdrops?.firstOrNull()
-        }
+        val selectedPath =
+            if (backdropTracker != null) {
+                backdropTracker.selectNextBackdrop(backdrops, id, isMovie)
+            } else {
+                backdrops?.firstOrNull()
+            }
 
         return selectedPath?.let { path ->
             val baseUrl = GenreDuotoneColorGenerator.getDuotoneFilterUrl(id)
@@ -43,14 +35,7 @@ data class GenreSliderItem(
     }
 }
 
-@Serializable
-data class GenreListResponse(
-    @SerialName("genres")
-    val genres: List<Genre>
-)
+@Serializable data class GenreListResponse(@SerialName("genres") val genres: List<Genre>)
 
 @Serializable
-data class GenreSliderResponse(
-    @SerialName("genres")
-    val genres: List<GenreSliderItem>
-)
\ No newline at end of file
+data class GenreSliderResponse(@SerialName("genres") val genres: List<GenreSliderItem>)
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/JellyfinLoginRequest.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/JellyfinLoginRequest.kt
index 8ad0172ac..6dcc1816c 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/JellyfinLoginRequest.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/JellyfinLoginRequest.kt
@@ -5,8 +5,6 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class JellyfinLoginRequest(
-    @SerialName("username")
-    val username: String,
-    @SerialName("password")
-    val password: String
-)
\ No newline at end of file
+    @SerialName("username") val username: String,
+    @SerialName("password") val password: String,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/JellyseerrRequest.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/JellyseerrRequest.kt
index dc39eefad..01f0ecc60 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/JellyseerrRequest.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/JellyseerrRequest.kt
@@ -5,38 +5,28 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class JellyseerrRequest(
-    @SerialName("id")
-    val id: Int,
-    @SerialName("status")
-    val status: Int,
-    @SerialName("media")
-    val media: MediaInfo,
-    @SerialName("requestedBy")
-    val requestedBy: RequestUser,
-    @SerialName("modifiedBy")
-    val modifiedBy: RequestUser? = null,
-    @SerialName("createdAt")
-    val createdAt: String,
-    @SerialName("updatedAt")
-    val updatedAt: String,
-    @SerialName("seasons")
-    val seasons: List<SeasonRequest>? = null
+    @SerialName("id") val id: Int,
+    @SerialName("status") val status: Int,
+    @SerialName("media") val media: MediaInfo,
+    @SerialName("requestedBy") val requestedBy: RequestUser,
+    @SerialName("modifiedBy") val modifiedBy: RequestUser? = null,
+    @SerialName("createdAt") val createdAt: String,
+    @SerialName("updatedAt") val updatedAt: String,
+    @SerialName("seasons") val seasons: List<SeasonRequest>? = null,
 ) {
     fun getRequestStatus(): RequestStatus = RequestStatus.fromValue(status)
 
-    fun getMediaType(): MediaType? = try {
-        MediaType.fromApiString(media.mediaType)
-    } catch (e: Exception) {
-        null
-    }
+    fun getMediaType(): MediaType? =
+        try {
+            MediaType.fromApiString(media.mediaType)
+        } catch (e: Exception) {
+            null
+        }
 }
 
 @Serializable
 data class SeasonRequest(
-    @SerialName("id")
-    val id: Int,
-    @SerialName("seasonNumber")
-    val seasonNumber: Int,
-    @SerialName("status")
-    val status: Int
-)
\ No newline at end of file
+    @SerialName("id") val id: Int,
+    @SerialName("seasonNumber") val seasonNumber: Int,
+    @SerialName("status") val status: Int,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/JellyseerrSearchResult.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/JellyseerrSearchResult.kt
index e7c16e22b..f2a907f50 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/JellyseerrSearchResult.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/JellyseerrSearchResult.kt
@@ -5,12 +5,8 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class JellyseerrSearchResult(
-    @SerialName("page")
-    val page: Int = 1,
-    @SerialName("total_pages")
-    val totalPages: Int = 1,
-    @SerialName("total_results")
-    val totalResults: Int = 0,
-    @SerialName("results")
-    val results: List<SearchResultItem> = emptyList()
-)
\ No newline at end of file
+    @SerialName("page") val page: Int = 1,
+    @SerialName("total_pages") val totalPages: Int = 1,
+    @SerialName("total_results") val totalResults: Int = 0,
+    @SerialName("results") val results: List<SearchResultItem> = emptyList(),
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/JellyseerrUser.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/JellyseerrUser.kt
index 13975f8ea..d5f4e85b8 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/JellyseerrUser.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/JellyseerrUser.kt
@@ -5,26 +5,15 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class JellyseerrUser(
-    @SerialName("id")
-    val id: Int,
-    @SerialName("email")
-    val email: String? = null,
-    @SerialName("username")
-    val username: String? = null,
-    @SerialName("displayName")
-    val displayName: String? = null,
-    @SerialName("permissions")
-    val permissions: Int,
-    @SerialName("avatar")
-    val avatar: String? = null,
-    @SerialName("requestCount")
-    val requestCount: Int? = null,
-    @SerialName("movieQuotaLimit")
-    val movieQuotaLimit: Int? = null,
-    @SerialName("movieQuotaDays")
-    val movieQuotaDays: Int? = null,
-    @SerialName("tvQuotaLimit")
-    val tvQuotaLimit: Int? = null,
-    @SerialName("tvQuotaDays")
-    val tvQuotaDays: Int? = null
-)
\ No newline at end of file
+    @SerialName("id") val id: Int,
+    @SerialName("email") val email: String? = null,
+    @SerialName("username") val username: String? = null,
+    @SerialName("displayName") val displayName: String? = null,
+    @SerialName("permissions") val permissions: Int,
+    @SerialName("avatar") val avatar: String? = null,
+    @SerialName("requestCount") val requestCount: Int? = null,
+    @SerialName("movieQuotaLimit") val movieQuotaLimit: Int? = null,
+    @SerialName("movieQuotaDays") val movieQuotaDays: Int? = null,
+    @SerialName("tvQuotaLimit") val tvQuotaLimit: Int? = null,
+    @SerialName("tvQuotaDays") val tvQuotaDays: Int? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/LoginRequest.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/LoginRequest.kt
index afc4d02b4..d34bb4a6b 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/LoginRequest.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/LoginRequest.kt
@@ -5,8 +5,6 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class LoginRequest(
-    @SerialName("email")
-    val email: String,
-    @SerialName("password")
-    val password: String
-)
\ No newline at end of file
+    @SerialName("email") val email: String,
+    @SerialName("password") val password: String,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/LoginResponse.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/LoginResponse.kt
index a4764f49f..94c1c1594 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/LoginResponse.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/LoginResponse.kt
@@ -5,26 +5,15 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class LoginResponse(
-    @SerialName("id")
-    val id: Int,
-    @SerialName("email")
-    val email: String? = null,
-    @SerialName("username")
-    val username: String? = null,
-    @SerialName("displayName")
-    val displayName: String? = null,
-    @SerialName("permissions")
-    val permissions: Int,
-    @SerialName("avatar")
-    val avatar: String? = null,
-    @SerialName("requestCount")
-    val requestCount: Int? = null,
-    @SerialName("movieQuotaLimit")
-    val movieQuotaLimit: Int? = null,
-    @SerialName("movieQuotaDays")
-    val movieQuotaDays: Int? = null,
-    @SerialName("tvQuotaLimit")
-    val tvQuotaLimit: Int? = null,
-    @SerialName("tvQuotaDays")
-    val tvQuotaDays: Int? = null
-)
\ No newline at end of file
+    @SerialName("id") val id: Int,
+    @SerialName("email") val email: String? = null,
+    @SerialName("username") val username: String? = null,
+    @SerialName("displayName") val displayName: String? = null,
+    @SerialName("permissions") val permissions: Int,
+    @SerialName("avatar") val avatar: String? = null,
+    @SerialName("requestCount") val requestCount: Int? = null,
+    @SerialName("movieQuotaLimit") val movieQuotaLimit: Int? = null,
+    @SerialName("movieQuotaDays") val movieQuotaDays: Int? = null,
+    @SerialName("tvQuotaLimit") val tvQuotaLimit: Int? = null,
+    @SerialName("tvQuotaDays") val tvQuotaDays: Int? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/MediaDetails.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/MediaDetails.kt
index 39f9b621e..e27ad4b6c 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/MediaDetails.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/MediaDetails.kt
@@ -5,56 +5,31 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class MediaDetails(
-    @SerialName("id")
-    val id: Int,
-    @SerialName("title")
-    val title: String? = null,
-    @SerialName("name")
-    val name: String? = null,
-    @SerialName("overview")
-    val overview: String? = null,
-    @SerialName("posterPath")
-    val posterPath: String? = null,
-    @SerialName("backdropPath")
-    val backdropPath: String? = null,
-    @SerialName("releaseDate")
-    val releaseDate: String? = null,
-    @SerialName("numberOfSeason")
-    val numberOfSeason: Int? = null,
-    @SerialName("numberOfEpisodes")
-    val numberOfEpisodes: Int? = null,
-    @SerialName("seasons")
-    val seasons: List<Season>? = null,
-    @SerialName("firstAirDate")
-    val firstAirDate: String? = null,
-    @SerialName("lastAirDate")
-    val lastAirDate: String? = null,
-    @SerialName("status")
-    val status: String? = null,
-    @SerialName("voteAverage")
-    val voteAverage: Double? = null,
-    @SerialName("voteCount")
-    val voteCount: Int? = null,
-    @SerialName("popularity")
-    val popularity: Double? = null,
-    @SerialName("inProduction")
-    val inProduction: Boolean? = null,
-    @SerialName("mediaInfo")
-    val mediaInfo: MediaInfo? = null,
-    @SerialName("tagline")
-    val tagline: String? = null,
-    @SerialName("runtime")
-    val runtime: Int? = null,
-    @SerialName("originalLanguage")
-    val originalLanguage: String? = null,
-    @SerialName("genres")
-    val genres: List<Genre>? = null,
-    @SerialName("credits")
-    val credits: Credits? = null,
-    @SerialName("releases")
-    val releases: Releases? = null,
-    @SerialName("ratingsCombined")
-    val ratingsCombined: RatingsCombined? = null
+    @SerialName("id") val id: Int,
+    @SerialName("title") val title: String? = null,
+    @SerialName("name") val name: String? = null,
+    @SerialName("overview") val overview: String? = null,
+    @SerialName("posterPath") val posterPath: String? = null,
+    @SerialName("backdropPath") val backdropPath: String? = null,
+    @SerialName("releaseDate") val releaseDate: String? = null,
+    @SerialName("numberOfSeason") val numberOfSeason: Int? = null,
+    @SerialName("numberOfEpisodes") val numberOfEpisodes: Int? = null,
+    @SerialName("seasons") val seasons: List<Season>? = null,
+    @SerialName("firstAirDate") val firstAirDate: String? = null,
+    @SerialName("lastAirDate") val lastAirDate: String? = null,
+    @SerialName("status") val status: String? = null,
+    @SerialName("voteAverage") val voteAverage: Double? = null,
+    @SerialName("voteCount") val voteCount: Int? = null,
+    @SerialName("popularity") val popularity: Double? = null,
+    @SerialName("inProduction") val inProduction: Boolean? = null,
+    @SerialName("mediaInfo") val mediaInfo: MediaInfo? = null,
+    @SerialName("tagline") val tagline: String? = null,
+    @SerialName("runtime") val runtime: Int? = null,
+    @SerialName("originalLanguage") val originalLanguage: String? = null,
+    @SerialName("genres") val genres: List<Genre>? = null,
+    @SerialName("credits") val credits: Credits? = null,
+    @SerialName("releases") val releases: Releases? = null,
+    @SerialName("ratingsCombined") val ratingsCombined: RatingsCombined? = null,
 ) {
     fun getSeasonCount(): Int {
         return seasons?.filter { (it.seasonNumber ?: 0) > 0 }?.size ?: numberOfSeason ?: 0
@@ -69,9 +44,7 @@ data class MediaDetails(
     }
 
     fun getRating(): String? {
-        return voteAverage?.let {
-            if (it > 0) String.format("%.1f", it) else null
-        }
+        return voteAverage?.let { if (it > 0) String.format("%.1f", it) else null }
     }
 
     fun getYear(): String? {
@@ -96,63 +69,48 @@ data class MediaDetails(
     }
 
     fun getCertification(countryCode: String = "US"): String? {
-        return releases?.results?.firstOrNull { it.iso_3166_1 == countryCode }
-            ?.release_dates?.firstOrNull()?.certification
+        return releases
+            ?.results
+            ?.firstOrNull { it.iso_3166_1 == countryCode }
+            ?.release_dates
+            ?.firstOrNull()
+            ?.certification
     }
 }
 
 @Serializable
 data class Credits(
-    @SerialName("cast")
-    val cast: List<CastMember>? = null,
-    @SerialName("crew")
-    val crew: List<CrewMember>? = null
+    @SerialName("cast") val cast: List<CastMember>? = null,
+    @SerialName("crew") val crew: List<CrewMember>? = null,
 )
 
 @Serializable
 data class CastMember(
-    @SerialName("id")
-    val id: Int,
-    @SerialName("name")
-    val name: String,
-    @SerialName("character")
-    val character: String? = null,
-    @SerialName("profilePath")
-    val profilePath: String? = null
+    @SerialName("id") val id: Int,
+    @SerialName("name") val name: String,
+    @SerialName("character") val character: String? = null,
+    @SerialName("profilePath") val profilePath: String? = null,
 )
 
 @Serializable
 data class CrewMember(
-    @SerialName("id")
-    val id: Int,
-    @SerialName("name")
-    val name: String,
-    @SerialName("job")
-    val job: String,
-    @SerialName("department")
-    val department: String? = null
+    @SerialName("id") val id: Int,
+    @SerialName("name") val name: String,
+    @SerialName("job") val job: String,
+    @SerialName("department") val department: String? = null,
 )
 
-@Serializable
-data class Releases(
-    @SerialName("results")
-    val results: List<ReleaseResult>? = null
-)
+@Serializable data class Releases(@SerialName("results") val results: List<ReleaseResult>? = null)
 
 @Serializable
 data class ReleaseResult(
-    @SerialName("iso_3166_1")
-    val iso_3166_1: String,
-    @SerialName("release_dates")
-    val release_dates: List<ReleaseDate>? = null
+    @SerialName("iso_3166_1") val iso_3166_1: String,
+    @SerialName("release_dates") val release_dates: List<ReleaseDate>? = null,
 )
 
 @Serializable
 data class ReleaseDate(
-    @SerialName("certification")
-    val certification: String? = null,
-    @SerialName("release_date")
-    val release_date: String? = null,
-    @SerialName("type")
-    val type: Int? = null
-)
\ No newline at end of file
+    @SerialName("certification") val certification: String? = null,
+    @SerialName("release_date") val release_date: String? = null,
+    @SerialName("type") val type: Int? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/MediaInfo.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/MediaInfo.kt
index 9a5aa3db5..be01b4fd4 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/MediaInfo.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/MediaInfo.kt
@@ -5,45 +5,27 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class MediaInfo(
-    @SerialName("id")
-    val id: Int,
-    @SerialName("mediaType")
-    val mediaType: String,
-    @SerialName("tmdbId")
-    val tmdbId: Int?,
-    @SerialName("tvdbId")
-    val tvdbId: Int?,
-    @SerialName("status")
-    val status: Int?,
-    @SerialName("mediaAddedAt")
-    val mediaAddedAt: String? = null,
-    @SerialName("seasons")
-    val seasons: List<MediaInfoSeason>? = null,
-    @SerialName("requests")
-    val requests: List<JellyseerrRequest>? = null,
-    @SerialName("createdAt")
-    val createdAt: String? = null,
-    @SerialName("updatedAt")
-    val updatedAt: String? = null,
-    @SerialName("title")
-    val title: String? = null,
-    @SerialName("name")
-    val name: String? = null,
-    @SerialName("posterPath")
-    val posterPath: String? = null,
-    @SerialName("backdropPath")
-    val backdropPath: String? = null,
-    @SerialName("releaseDate")
-    val releaseDate: String? = null,
-    @SerialName("firstAirDate")
-    val firstAirDate: String? = null,
-    @SerialName("jellyfinMediaId")
-    val jellyfinMediaId: String? = null
+    @SerialName("id") val id: Int,
+    @SerialName("mediaType") val mediaType: String,
+    @SerialName("tmdbId") val tmdbId: Int?,
+    @SerialName("tvdbId") val tvdbId: Int?,
+    @SerialName("status") val status: Int?,
+    @SerialName("mediaAddedAt") val mediaAddedAt: String? = null,
+    @SerialName("seasons") val seasons: List<MediaInfoSeason>? = null,
+    @SerialName("requests") val requests: List<JellyseerrRequest>? = null,
+    @SerialName("createdAt") val createdAt: String? = null,
+    @SerialName("updatedAt") val updatedAt: String? = null,
+    @SerialName("title") val title: String? = null,
+    @SerialName("name") val name: String? = null,
+    @SerialName("posterPath") val posterPath: String? = null,
+    @SerialName("backdropPath") val backdropPath: String? = null,
+    @SerialName("releaseDate") val releaseDate: String? = null,
+    @SerialName("firstAirDate") val firstAirDate: String? = null,
+    @SerialName("jellyfinMediaId") val jellyfinMediaId: String? = null,
 ) {
     fun getAvailableSeasons(): List<Int> {
-        return seasons?.filter { season ->
-            season.status == 5
-        }?.mapNotNull { it.seasonNumber } ?: emptyList()
+        return seasons?.filter { season -> season.status == 5 }?.mapNotNull { it.seasonNumber }
+            ?: emptyList()
     }
 
     fun isSeasonAvailable(seasonNumber: Int): Boolean {
@@ -86,10 +68,7 @@ data class MediaInfo(
 
 @Serializable
 data class MediaInfoSeason(
-    @SerialName("id")
-    val id: Int? = null,
-    @SerialName("seasonNumber")
-    val seasonNumber: Int? = null,
-    @SerialName("status")
-    val status: Int? = null
-)
\ No newline at end of file
+    @SerialName("id") val id: Int? = null,
+    @SerialName("seasonNumber") val seasonNumber: Int? = null,
+    @SerialName("status") val status: Int? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/MediaStatus.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/MediaStatus.kt
index c664897dc..69994aa5c 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/MediaStatus.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/MediaStatus.kt
@@ -9,16 +9,16 @@ enum class MediaStatus(val value: Int) {
     DELETED(6);
 
     companion object {
-        fun fromValue(value: Int): MediaStatus =
-            values().find { it.value == value } ?: UNKNOWN
+        fun fromValue(value: Int): MediaStatus = values().find { it.value == value } ?: UNKNOWN
 
-        fun getDisplayName(status: MediaStatus): String = when (status) {
-            UNKNOWN -> "Unknown"
-            PENDING -> "Pending"
-            PROCESSING -> "Processing"
-            PARTIALLY_AVAILABLE -> "Partially Available"
-            AVAILABLE -> "Available"
-            DELETED -> "Deleted"
-        }
+        fun getDisplayName(status: MediaStatus): String =
+            when (status) {
+                UNKNOWN -> "Unknown"
+                PENDING -> "Pending"
+                PROCESSING -> "Processing"
+                PARTIALLY_AVAILABLE -> "Partially Available"
+                AVAILABLE -> "Available"
+                DELETED -> "Deleted"
+            }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/MediaType.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/MediaType.kt
index 945fb9b7e..872db8027 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/MediaType.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/MediaType.kt
@@ -4,16 +4,18 @@ enum class MediaType {
     MOVIE,
     TV;
 
-    fun toApiString(): String = when (this) {
-        MOVIE -> "movie"
-        TV -> "tv"
-    }
+    fun toApiString(): String =
+        when (this) {
+            MOVIE -> "movie"
+            TV -> "tv"
+        }
 
     companion object {
-        fun fromApiString(value: String): MediaType = when (value.lowercase()) {
-            "movie" -> MOVIE
-            "tv" -> TV
-            else -> throw IllegalArgumentException("Unknown media type: $value")
-        }
+        fun fromApiString(value: String): MediaType =
+            when (value.lowercase()) {
+                "movie" -> MOVIE
+                "tv" -> TV
+                else -> throw IllegalArgumentException("Unknown media type: $value")
+            }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Network.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Network.kt
index 7162c2212..3d43b9076 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Network.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Network.kt
@@ -1,38 +1,61 @@
 package com.makd.afinity.data.models.jellyseerr
 
-data class Network(
-    val id: Int, val name: String, val logoPath: String?
-) {
+data class Network(val id: Int, val name: String, val logoPath: String?) {
     companion object {
-        fun getPopularNetworks(): List<Network> = listOf(
-            Network(id = 213, name = "Netflix", logoPath = "/wwemzKWzjKYJFfCeiB57q3r4Bcm.png"),
-            Network(id = 1024, name = "Prime Video", logoPath = "/ifhbNuuVnlwYy5oXA5VIb2YR8AZ.png"),
-            Network(id = 49, name = "HBO", logoPath = "/tuomPhY2UtuPTqqFnKMVHvSb724.png"),
-            Network(id = 2739, name = "Disney+", logoPath = "/gJ8VX6JSu3ciXHuC2dDGAo2lvwM.png"),
-            Network(id = 2552, name = "Apple TV+", logoPath = "/4KAy34EHvRM25Ih8wb82AuGU7zJ.png"),
-            Network(id = 453, name = "Hulu", logoPath = "/pqUTCleNUiTLAVlelGxUgWn1ELh.png"),
-            Network(id = 4353, name = "Discovery+", logoPath = "/1D1bS3Dyw4ScYnFWTlBOvJXC3nb.png"),
-            Network(id = 2, name = "ABC", logoPath = "/ndAvF4JLsliGreX87jAc9GdjmJY.png"),
-            Network(id = 19, name = "Fox", logoPath = "/1DSpHrWyOORkL9N2QHX7Adt31mQ.png"),
-            Network(id = 359, name = "Cinemax", logoPath = "/6mSHSquNpfLgDdv6VnOOvC5Uz2h.png"),
-            Network(id = 174, name = "AMC", logoPath = "/pmvRmATOCaDykE6JrVoeYxlFHw3.png"),
-            Network(id = 67, name = "ShowTime", logoPath = "/Allse9kbjiP6ExaQrnSpIhkurEi.png"),
-            Network(id = 318, name = "Starz", logoPath = "/8GJjw3HHsAJYwIWKIPBPfqMxlEa.png"),
-            Network(id = 71, name = "The CW", logoPath = "/ge9hzeaU7nMtQ4PjkFlc68dGAJ9.png"),
-            Network(id = 6, name = "NBC", logoPath = "/o3OedEP0f9mfZr33jz2BfXOUK5.png"),
-            Network(id = 16, name = "CBS", logoPath = "/nm8d7P7MJNiBLdgIzUK0gkuEA4r.png"),
-            Network(id = 4330, name = "Paramount+", logoPath = "/fi83B1oztoS47xxcemFdPMhIzK.png"),
-            Network(id = 4, name = "BBC One", logoPath = "/mVn7xESaTNmjBUyUtGNvDQd3CT1.png"),
-            Network(
-                id = 56, name = "Cartoon Network", logoPath = "/c5OC6oVCg6QP4eqzW6XIq17CQjI.png"
-            ),
-            Network(id = 80, name = "Adult Swim", logoPath = "/9AKyspxVzywuaMuZ1Bvilu8sXly.png"),
-            Network(id = 13, name = "Nick", logoPath = "/ikZXxg6GnwpzqiZbRPhJGaZapqB.png"),
-            Network(id = 3353, name = "Peacock", logoPath = "/gIAcGTjKKr0KOHL5s4O36roJ8p7.png")
-        )
+        fun getPopularNetworks(): List<Network> =
+            listOf(
+                Network(id = 213, name = "Netflix", logoPath = "/wwemzKWzjKYJFfCeiB57q3r4Bcm.png"),
+                Network(
+                    id = 1024,
+                    name = "Prime Video",
+                    logoPath = "/ifhbNuuVnlwYy5oXA5VIb2YR8AZ.png",
+                ),
+                Network(id = 49, name = "HBO", logoPath = "/tuomPhY2UtuPTqqFnKMVHvSb724.png"),
+                Network(id = 2739, name = "Disney+", logoPath = "/gJ8VX6JSu3ciXHuC2dDGAo2lvwM.png"),
+                Network(
+                    id = 2552,
+                    name = "Apple TV+",
+                    logoPath = "/4KAy34EHvRM25Ih8wb82AuGU7zJ.png",
+                ),
+                Network(id = 453, name = "Hulu", logoPath = "/pqUTCleNUiTLAVlelGxUgWn1ELh.png"),
+                Network(
+                    id = 4353,
+                    name = "Discovery+",
+                    logoPath = "/1D1bS3Dyw4ScYnFWTlBOvJXC3nb.png",
+                ),
+                Network(id = 2, name = "ABC", logoPath = "/ndAvF4JLsliGreX87jAc9GdjmJY.png"),
+                Network(id = 19, name = "Fox", logoPath = "/1DSpHrWyOORkL9N2QHX7Adt31mQ.png"),
+                Network(id = 359, name = "Cinemax", logoPath = "/6mSHSquNpfLgDdv6VnOOvC5Uz2h.png"),
+                Network(id = 174, name = "AMC", logoPath = "/pmvRmATOCaDykE6JrVoeYxlFHw3.png"),
+                Network(id = 67, name = "ShowTime", logoPath = "/Allse9kbjiP6ExaQrnSpIhkurEi.png"),
+                Network(id = 318, name = "Starz", logoPath = "/8GJjw3HHsAJYwIWKIPBPfqMxlEa.png"),
+                Network(id = 71, name = "The CW", logoPath = "/ge9hzeaU7nMtQ4PjkFlc68dGAJ9.png"),
+                Network(id = 6, name = "NBC", logoPath = "/o3OedEP0f9mfZr33jz2BfXOUK5.png"),
+                Network(id = 16, name = "CBS", logoPath = "/nm8d7P7MJNiBLdgIzUK0gkuEA4r.png"),
+                Network(
+                    id = 4330,
+                    name = "Paramount+",
+                    logoPath = "/fi83B1oztoS47xxcemFdPMhIzK.png",
+                ),
+                Network(id = 4, name = "BBC One", logoPath = "/mVn7xESaTNmjBUyUtGNvDQd3CT1.png"),
+                Network(
+                    id = 56,
+                    name = "Cartoon Network",
+                    logoPath = "/c5OC6oVCg6QP4eqzW6XIq17CQjI.png",
+                ),
+                Network(
+                    id = 80,
+                    name = "Adult Swim",
+                    logoPath = "/9AKyspxVzywuaMuZ1Bvilu8sXly.png",
+                ),
+                Network(id = 13, name = "Nick", logoPath = "/ikZXxg6GnwpzqiZbRPhJGaZapqB.png"),
+                Network(id = 3353, name = "Peacock", logoPath = "/gIAcGTjKKr0KOHL5s4O36roJ8p7.png"),
+            )
     }
 
-    fun getImageUrl(baseUrl: String = "https://image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)"): String? {
+    fun getImageUrl(
+        baseUrl: String = "https://image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)"
+    ): String? {
         return logoPath?.let { "$baseUrl$it" }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Permissions.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Permissions.kt
index 90587ff3b..5c72600ae 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Permissions.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Permissions.kt
@@ -25,4 +25,4 @@ fun JellyseerrUser.hasPermission(permission: Int): Boolean {
 
 fun JellyseerrUser.isAdmin(): Boolean {
     return hasPermission(Permissions.ADMIN)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/RatingsCombined.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/RatingsCombined.kt
index 74f7b4c13..8453854bb 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/RatingsCombined.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/RatingsCombined.kt
@@ -5,36 +5,24 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class RatingsCombined(
-    @SerialName("rt")
-    val rt: RottenTomatoesRating? = null,
-    @SerialName("imdb")
-    val imdb: ImdbRating? = null
+    @SerialName("rt") val rt: RottenTomatoesRating? = null,
+    @SerialName("imdb") val imdb: ImdbRating? = null,
 )
 
 @Serializable
 data class RottenTomatoesRating(
-    @SerialName("title")
-    val title: String? = null,
-    @SerialName("url")
-    val url: String? = null,
-    @SerialName("criticsRating")
-    val criticsRating: String? = null,
-    @SerialName("criticsScore")
-    val criticsScore: Int? = null,
-    @SerialName("audienceRating")
-    val audienceRating: String? = null,
-    @SerialName("audienceScore")
-    val audienceScore: Int? = null,
-    @SerialName("year")
-    val year: Int? = null
+    @SerialName("title") val title: String? = null,
+    @SerialName("url") val url: String? = null,
+    @SerialName("criticsRating") val criticsRating: String? = null,
+    @SerialName("criticsScore") val criticsScore: Int? = null,
+    @SerialName("audienceRating") val audienceRating: String? = null,
+    @SerialName("audienceScore") val audienceScore: Int? = null,
+    @SerialName("year") val year: Int? = null,
 )
 
 @Serializable
 data class ImdbRating(
-    @SerialName("title")
-    val title: String? = null,
-    @SerialName("url")
-    val url: String? = null,
-    @SerialName("criticsScore")
-    val criticsScore: Double? = null
-)
\ No newline at end of file
+    @SerialName("title") val title: String? = null,
+    @SerialName("url") val url: String? = null,
+    @SerialName("criticsScore") val criticsScore: Double? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/RequestStatus.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/RequestStatus.kt
index 2c3a17a80..92bd95d53 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/RequestStatus.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/RequestStatus.kt
@@ -8,15 +8,15 @@ enum class RequestStatus(val value: Int) {
     PARTIALLY_AVAILABLE(5);
 
     companion object {
-        fun fromValue(value: Int): RequestStatus =
-            values().find { it.value == value } ?: PENDING
+        fun fromValue(value: Int): RequestStatus = values().find { it.value == value } ?: PENDING
 
-        fun getDisplayName(status: RequestStatus): String = when (status) {
-            PENDING -> "Pending"
-            APPROVED -> "Approved"
-            DECLINED -> "Declined"
-            AVAILABLE -> "Available"
-            PARTIALLY_AVAILABLE -> "Partially Available"
-        }
+        fun getDisplayName(status: RequestStatus): String =
+            when (status) {
+                PENDING -> "Pending"
+                APPROVED -> "Approved"
+                DECLINED -> "Declined"
+                AVAILABLE -> "Available"
+                PARTIALLY_AVAILABLE -> "Partially Available"
+            }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/RequestUser.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/RequestUser.kt
index 6518d5b7f..03d2b9cee 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/RequestUser.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/RequestUser.kt
@@ -5,10 +5,7 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class RequestUser(
-    @SerialName("id")
-    val id: Int,
-    @SerialName("displayName")
-    val displayName: String?,
-    @SerialName("avatar")
-    val avatar: String?
-)
\ No newline at end of file
+    @SerialName("id") val id: Int,
+    @SerialName("displayName") val displayName: String?,
+    @SerialName("avatar") val avatar: String?,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/RequestsResponse.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/RequestsResponse.kt
index d0147adf6..ff6e3acf3 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/RequestsResponse.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/RequestsResponse.kt
@@ -5,20 +5,14 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class RequestsResponse(
-    @SerialName("pageInfo")
-    val pageInfo: PageInfo,
-    @SerialName("results")
-    val results: List<JellyseerrRequest>
+    @SerialName("pageInfo") val pageInfo: PageInfo,
+    @SerialName("results") val results: List<JellyseerrRequest>,
 )
 
 @Serializable
 data class PageInfo(
-    @SerialName("pages")
-    val pages: Int,
-    @SerialName("pageSize")
-    val pageSize: Int,
-    @SerialName("results")
-    val results: Int,
-    @SerialName("page")
-    val page: Int
-)
\ No newline at end of file
+    @SerialName("pages") val pages: Int,
+    @SerialName("pageSize") val pageSize: Int,
+    @SerialName("results") val results: Int,
+    @SerialName("page") val page: Int,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/SearchResultItem.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/SearchResultItem.kt
index 9c94a7505..e8c1cb176 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/SearchResultItem.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/SearchResultItem.kt
@@ -5,50 +5,33 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class SearchResultItem(
-    @SerialName("id")
-    val id: Int,
-    @SerialName("mediaType")
-    val mediaType: String,
-    @SerialName("title")
-    val title: String? = null,
-    @SerialName("name")
-    val name: String? = null,
-    @SerialName("originalTitle")
-    val originalTitle: String? = null,
-    @SerialName("originalName")
-    val originalName: String? = null,
-    @SerialName("overview")
-    val overview: String? = null,
-    @SerialName("posterPath")
-    val posterPath: String? = null,
-    @SerialName("backdropPath")
-    val backdropPath: String? = null,
-    @SerialName("releaseDate")
-    val releaseDate: String? = null,
-    @SerialName("firstAirDate")
-    val firstAirDate: String? = null,
-    @SerialName("voteAverage")
-    val voteAverage: Double? = null,
-    @SerialName("voteCount")
-    val voteCount: Int? = null,
-    @SerialName("popularity")
-    val popularity: Double? = null,
-    @SerialName("genreIds")
-    val genreIds: List<Int>? = null,
-    @SerialName("originalLanguage")
-    val originalLanguage: String? = null,
-    @SerialName("adult")
-    val adult: Boolean? = null,
-    @SerialName("mediaInfo")
-    val mediaInfo: MediaInfo? = null
+    @SerialName("id") val id: Int,
+    @SerialName("mediaType") val mediaType: String,
+    @SerialName("title") val title: String? = null,
+    @SerialName("name") val name: String? = null,
+    @SerialName("originalTitle") val originalTitle: String? = null,
+    @SerialName("originalName") val originalName: String? = null,
+    @SerialName("overview") val overview: String? = null,
+    @SerialName("posterPath") val posterPath: String? = null,
+    @SerialName("backdropPath") val backdropPath: String? = null,
+    @SerialName("releaseDate") val releaseDate: String? = null,
+    @SerialName("firstAirDate") val firstAirDate: String? = null,
+    @SerialName("voteAverage") val voteAverage: Double? = null,
+    @SerialName("voteCount") val voteCount: Int? = null,
+    @SerialName("popularity") val popularity: Double? = null,
+    @SerialName("genreIds") val genreIds: List<Int>? = null,
+    @SerialName("originalLanguage") val originalLanguage: String? = null,
+    @SerialName("adult") val adult: Boolean? = null,
+    @SerialName("mediaInfo") val mediaInfo: MediaInfo? = null,
 ) {
     fun getDisplayTitle(): String = title ?: name ?: originalTitle ?: originalName ?: "Unknown"
 
-    fun getMediaType(): MediaType? = try {
-        MediaType.fromApiString(mediaType)
-    } catch (e: Exception) {
-        null
-    }
+    fun getMediaType(): MediaType? =
+        try {
+            MediaType.fromApiString(mediaType)
+        } catch (e: Exception) {
+            null
+        }
 
     fun getPosterUrl(baseUrl: String = "https://image.tmdb.org/t/p/w500"): String? {
         return posterPath?.let { "$baseUrl$it" }
@@ -72,9 +55,7 @@ data class SearchResultItem(
     }
 
     fun getRating(): String? {
-        return voteAverage?.let {
-            if (it > 0) "${(it * 10).toInt()}%" else null
-        }
+        return voteAverage?.let { if (it > 0) "${(it * 10).toInt()}%" else null }
     }
 
     fun getReleaseYear(): String? {
@@ -85,4 +66,4 @@ data class SearchResultItem(
     fun getBackdropUrl(baseUrl: String = "https://image.tmdb.org/t/p/w1280"): String? {
         return backdropPath?.let { "$baseUrl$it" }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Season.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Season.kt
index 4583297b2..102b5d57c 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Season.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Season.kt
@@ -5,18 +5,11 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class Season(
-    @SerialName("id")
-    val id: Int? = null,
-    @SerialName("seasonNumber")
-    val seasonNumber: Int? = null,
-    @SerialName("episodeCount")
-    val episodeCount: Int? = null,
-    @SerialName("name")
-    val name: String? = null,
-    @SerialName("overview")
-    val overview: String? = null,
-    @SerialName("posterPath")
-    val posterPath: String? = null,
-    @SerialName("airDate")
-    val airDate: String? = null
-)
\ No newline at end of file
+    @SerialName("id") val id: Int? = null,
+    @SerialName("seasonNumber") val seasonNumber: Int? = null,
+    @SerialName("episodeCount") val episodeCount: Int? = null,
+    @SerialName("name") val name: String? = null,
+    @SerialName("overview") val overview: String? = null,
+    @SerialName("posterPath") val posterPath: String? = null,
+    @SerialName("airDate") val airDate: String? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Studio.kt b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Studio.kt
index f73676706..3956ca338 100644
--- a/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Studio.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/jellyseerr/Studio.kt
@@ -1,51 +1,54 @@
 package com.makd.afinity.data.models.jellyseerr
 
-data class Studio(
-    val id: Int,
-    val name: String,
-    val logoPath: String?
-) {
+data class Studio(val id: Int, val name: String, val logoPath: String?) {
     companion object {
-        fun getPopularStudios(): List<Studio> = listOf(
-            Studio(id = 2, name = "Walt Disney", logoPath = "/wdrCwmRnLFJhEoH8GSfymY85KHT.png"),
-            Studio(
-                id = 127928,
-                name = "20th Century",
-                logoPath = "/h0rjX5vjW5r8yEnUBStFarjcLT4.png"
-            ),
-            Studio(id = 34, name = "Sony Pictures", logoPath = "/GagSvqWlyPdkFHMfQ3pNq6ix9P.png"),
-            Studio(
-                id = 4,
-                name = "Paramount Pictures",
-                logoPath = "/fycMZt242LVjagMByZOLUGbCvv3.png"
-            ),
-            Studio(
-                id = 420,
-                name = "Marvel Studios",
-                logoPath = "/hUzeosd33nzE5MCNsZxCGEKTXaQ.png"
-            ),
-            Studio(id = 9993, name = "DC", logoPath = "/2Tc1P3Ac8M479naPp1kYT3izLS5.png"),
-            Studio(id = 3, name = "Pixar", logoPath = "/1TjvGVDMYsj6JBxOAkUHpPEwLf7.png"),
-            Studio(
-                id = 174,
-                name = "Warner Bros. Pictures",
-                logoPath = "/ky0xOc5OrhzkZ1N6KyUxacfQsCk.png"
-            ),
-            Studio(
-                id = 33,
-                name = "Universal Pictures",
-                logoPath = "/8lvHyhjr8oUKOOy2dKXoALWKdp0.png"
-            ),
-            Studio(
-                id = 7,
-                name = "DreamWorks Pictures",
-                logoPath = "/vru2SssLX3FPhnKZGtYw00pVIS9.png"
-            ),
-            Studio(id = 41077, name = "A24", logoPath = "/1ZXsGaFPgrgS6ZZGS37AqD5uU12.png")
-        )
+        fun getPopularStudios(): List<Studio> =
+            listOf(
+                Studio(id = 2, name = "Walt Disney", logoPath = "/wdrCwmRnLFJhEoH8GSfymY85KHT.png"),
+                Studio(
+                    id = 127928,
+                    name = "20th Century",
+                    logoPath = "/h0rjX5vjW5r8yEnUBStFarjcLT4.png",
+                ),
+                Studio(
+                    id = 34,
+                    name = "Sony Pictures",
+                    logoPath = "/GagSvqWlyPdkFHMfQ3pNq6ix9P.png",
+                ),
+                Studio(
+                    id = 4,
+                    name = "Paramount Pictures",
+                    logoPath = "/fycMZt242LVjagMByZOLUGbCvv3.png",
+                ),
+                Studio(
+                    id = 420,
+                    name = "Marvel Studios",
+                    logoPath = "/hUzeosd33nzE5MCNsZxCGEKTXaQ.png",
+                ),
+                Studio(id = 9993, name = "DC", logoPath = "/2Tc1P3Ac8M479naPp1kYT3izLS5.png"),
+                Studio(id = 3, name = "Pixar", logoPath = "/1TjvGVDMYsj6JBxOAkUHpPEwLf7.png"),
+                Studio(
+                    id = 174,
+                    name = "Warner Bros. Pictures",
+                    logoPath = "/ky0xOc5OrhzkZ1N6KyUxacfQsCk.png",
+                ),
+                Studio(
+                    id = 33,
+                    name = "Universal Pictures",
+                    logoPath = "/8lvHyhjr8oUKOOy2dKXoALWKdp0.png",
+                ),
+                Studio(
+                    id = 7,
+                    name = "DreamWorks Pictures",
+                    logoPath = "/vru2SssLX3FPhnKZGtYw00pVIS9.png",
+                ),
+                Studio(id = 41077, name = "A24", logoPath = "/1ZXsGaFPgrgS6ZZGS37AqD5uU12.png"),
+            )
     }
 
-    fun getImageUrl(baseUrl: String = "https://image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)"): String? {
+    fun getImageUrl(
+        baseUrl: String = "https://image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)"
+    ): String? {
         return logoPath?.let { "$baseUrl$it" }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/livetv/AfinityChannel.kt b/app/src/main/java/com/makd/afinity/data/models/livetv/AfinityChannel.kt
index cb6b99d89..b0dfaf3ee 100644
--- a/app/src/main/java/com/makd/afinity/data/models/livetv/AfinityChannel.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/livetv/AfinityChannel.kt
@@ -28,5 +28,5 @@ data class AfinityChannel(
     val channelNumber: String?,
     val channelType: ChannelType,
     val currentProgram: AfinityProgram? = null,
-    val serviceName: String?
-) : AfinityItem
\ No newline at end of file
+    val serviceName: String?,
+) : AfinityItem
diff --git a/app/src/main/java/com/makd/afinity/data/models/livetv/AfinityProgram.kt b/app/src/main/java/com/makd/afinity/data/models/livetv/AfinityProgram.kt
index 7feda6fd6..8e2f1453e 100644
--- a/app/src/main/java/com/makd/afinity/data/models/livetv/AfinityProgram.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/livetv/AfinityProgram.kt
@@ -21,7 +21,7 @@ data class AfinityProgram(
     val productionYear: Int?,
     val genres: List<String>,
     val officialRating: String?,
-    val communityRating: Float?
+    val communityRating: Float?,
 ) {
     val durationMinutes: Long?
         get() {
@@ -44,4 +44,4 @@ data class AfinityProgram(
         val now = LocalDateTime.now()
         return now.isAfter(startDate) && now.isBefore(endDate)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/livetv/ChannelType.kt b/app/src/main/java/com/makd/afinity/data/models/livetv/ChannelType.kt
index 32bfff259..367181c58 100644
--- a/app/src/main/java/com/makd/afinity/data/models/livetv/ChannelType.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/livetv/ChannelType.kt
@@ -2,5 +2,5 @@ package com.makd.afinity.data.models.livetv
 
 enum class ChannelType {
     TV,
-    RADIO
-}
\ No newline at end of file
+    RADIO,
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinityBoxSet.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinityBoxSet.kt
index f91f5d36f..e5cd3127b 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinityBoxSet.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinityBoxSet.kt
@@ -1,8 +1,8 @@
 package com.makd.afinity.data.models.media
 
 import com.makd.afinity.data.repository.JellyfinRepository
-import org.jellyfin.sdk.model.api.BaseItemDto
 import java.util.UUID
+import org.jellyfin.sdk.model.api.BaseItemDto
 
 data class AfinityBoxSet(
     override val id: UUID,
@@ -31,9 +31,7 @@ data class AfinityBoxSet(
     override val externalUrls: List<AfinityExternalUrl>?,
 ) : AfinityItem
 
-fun BaseItemDto.toAfinityBoxSet(
-    jellyfinRepository: JellyfinRepository,
-): AfinityBoxSet {
+fun BaseItemDto.toAfinityBoxSet(jellyfinRepository: JellyfinRepository): AfinityBoxSet {
     return AfinityBoxSet(
         id = id,
         name = name.orEmpty(),
@@ -42,9 +40,7 @@ fun BaseItemDto.toAfinityBoxSet(
         favorite = userData?.isFavorite == true,
         liked = userData?.likes == true,
         images = toAfinityImages(jellyfinRepository),
-        providerIds = providerIds?.mapNotNull { (key, value) ->
-            value?.let { key to it }
-        }?.toMap(),
-        externalUrls = externalUrls?.map { it.toAfinityExternalUrl() }
+        providerIds = providerIds?.mapNotNull { (key, value) -> value?.let { key to it } }?.toMap(),
+        externalUrls = externalUrls?.map { it.toAfinityExternalUrl() },
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinityChapter.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinityChapter.kt
index 6ebbee3eb..c0c573b59 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinityChapter.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinityChapter.kt
@@ -1,8 +1,8 @@
 package com.makd.afinity.data.models.media
 
+import java.util.UUID
 import kotlinx.serialization.Serializable
 import org.jellyfin.sdk.model.api.BaseItemDto
-import java.util.UUID
 
 @Serializable
 data class AfinityChapter(
@@ -16,13 +16,11 @@ fun BaseItemDto.toAfinityChapters(): List<AfinityChapter> {
         AfinityChapter(
             startPosition = chapter.startPositionTicks / 10000,
             name = chapter.name,
-            imageIndex = index
+            imageIndex = index,
         )
     } ?: emptyList()
 }
 
 fun AfinityChapter.getChapterImageUrl(baseUrl: String, itemId: UUID): String? {
-    return imageIndex?.let { index ->
-        "$baseUrl/Items/$itemId/Images/Chapter/$index"
-    }
-}
\ No newline at end of file
+    return imageIndex?.let { index -> "$baseUrl/Items/$itemId/Images/Chapter/$index" }
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinityCollection.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinityCollection.kt
index 893cf0f95..5af90c9ae 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinityCollection.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinityCollection.kt
@@ -2,8 +2,8 @@ package com.makd.afinity.data.models.media
 
 import com.makd.afinity.data.models.common.CollectionType
 import com.makd.afinity.data.repository.JellyfinRepository
-import org.jellyfin.sdk.model.api.BaseItemDto
 import java.util.UUID
+import org.jellyfin.sdk.model.api.BaseItemDto
 
 data class AfinityCollection(
     override val id: UUID,
@@ -26,9 +26,7 @@ data class AfinityCollection(
     override val externalUrls: List<AfinityExternalUrl>?,
 ) : AfinityItem
 
-fun BaseItemDto.toAfinityCollection(
-    jellyfinRepository: JellyfinRepository,
-): AfinityCollection? {
+fun BaseItemDto.toAfinityCollection(jellyfinRepository: JellyfinRepository): AfinityCollection? {
     val type = CollectionType.fromString(collectionType?.serialName)
 
     if (type !in CollectionType.supported) {
@@ -43,9 +41,7 @@ fun BaseItemDto.toAfinityCollection(
         favorite = userData?.isFavorite == true,
         liked = userData?.likes == true,
         images = toAfinityImages(jellyfinRepository),
-        providerIds = providerIds?.mapNotNull { (key, value) ->
-            value?.let { key to it }
-        }?.toMap(),
-        externalUrls = externalUrls?.map { it.toAfinityExternalUrl() }
+        providerIds = providerIds?.mapNotNull { (key, value) -> value?.let { key to it } }?.toMap(),
+        externalUrls = externalUrls?.map { it.toAfinityExternalUrl() },
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinityEpisode.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinityEpisode.kt
index 7b5e75132..f25e257e3 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinityEpisode.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinityEpisode.kt
@@ -5,11 +5,11 @@ import com.makd.afinity.data.database.dao.ServerDatabaseDao
 import com.makd.afinity.data.database.entities.AfinityEpisodeDto
 import com.makd.afinity.data.models.extensions.logoBlurHash
 import com.makd.afinity.data.repository.JellyfinRepository
+import java.util.UUID
 import org.jellyfin.sdk.model.DateTime
 import org.jellyfin.sdk.model.api.BaseItemDto
 import org.jellyfin.sdk.model.api.LocationType
 import org.jellyfin.sdk.model.api.PlayAccess
-import java.util.UUID
 
 data class AfinityEpisode(
     override val id: UUID,
@@ -53,17 +53,18 @@ suspend fun BaseItemDto.toAfinityEpisode(
     if (database != null) {
         sources.addAll(database.getSources(id).map { it.toAfinitySource(database) })
     }
-    val seriesLogoInfo = try {
-        if (seriesId != null) {
-            val seriesItem = jellyfinRepository.getItem(seriesId!!)
-            val seriesImages = seriesItem?.toAfinityImages(jellyfinRepository)
-            Pair(seriesImages?.logo, seriesImages?.logoBlurHash)
-        } else {
+    val seriesLogoInfo =
+        try {
+            if (seriesId != null) {
+                val seriesItem = jellyfinRepository.getItem(seriesId!!)
+                val seriesImages = seriesItem?.toAfinityImages(jellyfinRepository)
+                Pair(seriesImages?.logo, seriesImages?.logoBlurHash)
+            } else {
+                Pair(null, null)
+            }
+        } catch (e: Exception) {
             Pair(null, null)
         }
-    } catch (e: Exception) {
-        Pair(null, null)
-    }
     return try {
         AfinityEpisode(
             id = id,
@@ -92,18 +93,21 @@ suspend fun BaseItemDto.toAfinityEpisode(
             missing = locationType == LocationType.VIRTUAL,
             images = toAfinityImages(jellyfinRepository),
             chapters = toAfinityChapters(),
-            trickplayInfo = trickplay?.mapValues { it.value[it.value.keys.max()]!!.toAfinityTrickplayInfo() },
-            providerIds = providerIds?.mapNotNull { (key, value) ->
-                value?.let { key to it }
-            }?.toMap(),
-            externalUrls = externalUrls?.map { it.toAfinityExternalUrl() }
+            trickplayInfo =
+                trickplay?.mapValues { it.value[it.value.keys.max()]!!.toAfinityTrickplayInfo() },
+            providerIds =
+                providerIds?.mapNotNull { (key, value) -> value?.let { key to it } }?.toMap(),
+            externalUrls = externalUrls?.map { it.toAfinityExternalUrl() },
         )
     } catch (_: NullPointerException) {
         null
     }
 }
 
-suspend fun AfinityEpisodeDto.toAfinityEpisode(database: ServerDatabaseDao, userId: UUID): AfinityEpisode {
+suspend fun AfinityEpisodeDto.toAfinityEpisode(
+    database: ServerDatabaseDao,
+    userId: UUID,
+): AfinityEpisode {
     val userData = database.getUserDataOrCreateNew(id, userId, serverId)
     val sources = database.getSources(id).map { it.toAfinitySource(database) }
     val trickplayInfos = mutableMapOf<String, AfinityTrickplayInfo>()
@@ -140,6 +144,6 @@ suspend fun AfinityEpisodeDto.toAfinityEpisode(database: ServerDatabaseDao, user
         chapters = chapters ?: emptyList(),
         trickplayInfo = trickplayInfos,
         providerIds = null,
-        externalUrls = null
+        externalUrls = null,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinityExternalUrl.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinityExternalUrl.kt
index 10857d791..8b770cbc2 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinityExternalUrl.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinityExternalUrl.kt
@@ -2,14 +2,8 @@ package com.makd.afinity.data.models.media
 
 import org.jellyfin.sdk.model.api.ExternalUrl
 
-data class AfinityExternalUrl(
-    val name: String?,
-    val url: String?
-)
+data class AfinityExternalUrl(val name: String?, val url: String?)
 
 fun ExternalUrl.toAfinityExternalUrl(): AfinityExternalUrl {
-    return AfinityExternalUrl(
-        name = name,
-        url = url
-    )
-}
\ No newline at end of file
+    return AfinityExternalUrl(name = name, url = url)
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinityFolder.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinityFolder.kt
index 54ccbf021..2050e3bbd 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinityFolder.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinityFolder.kt
@@ -1,8 +1,8 @@
 package com.makd.afinity.data.models.media
 
 import com.makd.afinity.data.repository.JellyfinRepository
-import org.jellyfin.sdk.model.api.BaseItemDto
 import java.util.UUID
+import org.jellyfin.sdk.model.api.BaseItemDto
 
 data class AfinityFolder(
     override val id: UUID,
@@ -24,9 +24,7 @@ data class AfinityFolder(
     override val externalUrls: List<AfinityExternalUrl>?,
 ) : AfinityItem
 
-fun BaseItemDto.toAfinityFolder(
-    jellyfinRepository: JellyfinRepository,
-): AfinityFolder {
+fun BaseItemDto.toAfinityFolder(jellyfinRepository: JellyfinRepository): AfinityFolder {
     return AfinityFolder(
         id = id,
         name = name.orEmpty(),
@@ -35,9 +33,7 @@ fun BaseItemDto.toAfinityFolder(
         liked = userData?.likes == true,
         unplayedItemCount = userData?.unplayedItemCount,
         images = toAfinityImages(jellyfinRepository),
-        providerIds = providerIds?.mapNotNull { (key, value) ->
-            value?.let { key to it }
-        }?.toMap(),
-        externalUrls = externalUrls?.map { it.toAfinityExternalUrl() }
+        providerIds = providerIds?.mapNotNull { (key, value) -> value?.let { key to it } }?.toMap(),
+        externalUrls = externalUrls?.map { it.toAfinityExternalUrl() },
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinityImages.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinityImages.kt
index fc769bff4..d8d9277a4 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinityImages.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinityImages.kt
@@ -22,52 +22,64 @@ data class AfinityImages(
     val showLogoImageBlurHash: String? = null,
 )
 
-fun BaseItemDto.toAfinityImages(
-    jellyfinRepository: JellyfinRepository,
-): AfinityImages {
+fun BaseItemDto.toAfinityImages(jellyfinRepository: JellyfinRepository): AfinityImages {
     val baseUrl = Uri.parse(jellyfinRepository.getBaseUrl())
-    val primary = imageTags?.get(ImageType.PRIMARY)?.let { tag ->
-        baseUrl.buildUpon()
-            .appendEncodedPath("items/$id/Images/${ImageType.PRIMARY}")
-            .appendQueryParameter("tag", tag)
-            .build()
-    }
-    val thumb = imageTags?.get(ImageType.THUMB)?.let { tag ->
-        baseUrl.buildUpon()
-            .appendEncodedPath("items/$id/Images/${ImageType.THUMB}")
-            .appendQueryParameter("tag", tag)
-            .build()
-    }
-    val backdrop = backdropImageTags?.firstOrNull()?.let { tag ->
-        baseUrl.buildUpon()
-            .appendEncodedPath("items/$id/Images/${ImageType.BACKDROP}/0")
-            .appendQueryParameter("tag", tag)
-            .build()
-    }
-    val logo = imageTags?.get(ImageType.LOGO)?.let { tag ->
-        baseUrl.buildUpon()
-            .appendEncodedPath("items/$id/Images/${ImageType.LOGO}")
-            .appendQueryParameter("tag", tag)
-            .build()
-    }
-    val showPrimary = seriesPrimaryImageTag?.let { tag ->
-        baseUrl.buildUpon()
-            .appendEncodedPath("items/$seriesId/Images/${ImageType.PRIMARY}")
-            .appendQueryParameter("tag", tag)
-            .build()
-    }
-    val showBackdrop = seriesPrimaryImageTag?.let { tag ->
-        baseUrl.buildUpon()
-            .appendEncodedPath("items/$seriesId/Images/${ImageType.BACKDROP}/0")
-            .appendQueryParameter("tag", tag)
-            .build()
-    }
-    val showLogo = seriesPrimaryImageTag?.let { tag ->
-        baseUrl.buildUpon()
-            .appendEncodedPath("items/$seriesId/Images/${ImageType.LOGO}")
-            .appendQueryParameter("tag", tag)
-            .build()
-    }
+    val primary =
+        imageTags?.get(ImageType.PRIMARY)?.let { tag ->
+            baseUrl
+                .buildUpon()
+                .appendEncodedPath("items/$id/Images/${ImageType.PRIMARY}")
+                .appendQueryParameter("tag", tag)
+                .build()
+        }
+    val thumb =
+        imageTags?.get(ImageType.THUMB)?.let { tag ->
+            baseUrl
+                .buildUpon()
+                .appendEncodedPath("items/$id/Images/${ImageType.THUMB}")
+                .appendQueryParameter("tag", tag)
+                .build()
+        }
+    val backdrop =
+        backdropImageTags?.firstOrNull()?.let { tag ->
+            baseUrl
+                .buildUpon()
+                .appendEncodedPath("items/$id/Images/${ImageType.BACKDROP}/0")
+                .appendQueryParameter("tag", tag)
+                .build()
+        }
+    val logo =
+        imageTags?.get(ImageType.LOGO)?.let { tag ->
+            baseUrl
+                .buildUpon()
+                .appendEncodedPath("items/$id/Images/${ImageType.LOGO}")
+                .appendQueryParameter("tag", tag)
+                .build()
+        }
+    val showPrimary =
+        seriesPrimaryImageTag?.let { tag ->
+            baseUrl
+                .buildUpon()
+                .appendEncodedPath("items/$seriesId/Images/${ImageType.PRIMARY}")
+                .appendQueryParameter("tag", tag)
+                .build()
+        }
+    val showBackdrop =
+        seriesPrimaryImageTag?.let { tag ->
+            baseUrl
+                .buildUpon()
+                .appendEncodedPath("items/$seriesId/Images/${ImageType.BACKDROP}/0")
+                .appendQueryParameter("tag", tag)
+                .build()
+        }
+    val showLogo =
+        seriesPrimaryImageTag?.let { tag ->
+            baseUrl
+                .buildUpon()
+                .appendEncodedPath("items/$seriesId/Images/${ImageType.LOGO}")
+                .appendQueryParameter("tag", tag)
+                .build()
+        }
 
     return AfinityImages(
         primary = primary,
@@ -77,12 +89,18 @@ fun BaseItemDto.toAfinityImages(
         showPrimary = showPrimary,
         showBackdrop = showBackdrop,
         showLogo = showLogo,
-        primaryImageBlurHash = imageBlurHashes?.get(ImageType.PRIMARY)?.get(imageTags?.get(ImageType.PRIMARY)),
-        backdropImageBlurHash = imageBlurHashes?.get(ImageType.BACKDROP)?.get(backdropImageTags?.firstOrNull()),
-        thumbImageBlurHash = imageBlurHashes?.get(ImageType.THUMB)?.get(imageTags?.get(ImageType.THUMB)),
-        logoImageBlurHash = imageBlurHashes?.get(ImageType.LOGO)?.get(imageTags?.get(ImageType.LOGO)),
-        showPrimaryImageBlurHash = imageBlurHashes?.get(ImageType.PRIMARY)?.get(seriesPrimaryImageTag),
-        showBackdropImageBlurHash = imageBlurHashes?.get(ImageType.BACKDROP)?.get(seriesPrimaryImageTag),
+        primaryImageBlurHash =
+            imageBlurHashes?.get(ImageType.PRIMARY)?.get(imageTags?.get(ImageType.PRIMARY)),
+        backdropImageBlurHash =
+            imageBlurHashes?.get(ImageType.BACKDROP)?.get(backdropImageTags?.firstOrNull()),
+        thumbImageBlurHash =
+            imageBlurHashes?.get(ImageType.THUMB)?.get(imageTags?.get(ImageType.THUMB)),
+        logoImageBlurHash =
+            imageBlurHashes?.get(ImageType.LOGO)?.get(imageTags?.get(ImageType.LOGO)),
+        showPrimaryImageBlurHash =
+            imageBlurHashes?.get(ImageType.PRIMARY)?.get(seriesPrimaryImageTag),
+        showBackdropImageBlurHash =
+            imageBlurHashes?.get(ImageType.BACKDROP)?.get(seriesPrimaryImageTag),
         showLogoImageBlurHash = imageBlurHashes?.get(ImageType.LOGO)?.get(seriesPrimaryImageTag),
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinityItem.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinityItem.kt
index 76a8d308d..6ce44d30c 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinityItem.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinityItem.kt
@@ -3,9 +3,9 @@ package com.makd.afinity.data.models.media
 import com.makd.afinity.data.database.dao.ServerDatabaseDao
 import com.makd.afinity.data.models.extensions.toAfinityChannel
 import com.makd.afinity.data.repository.JellyfinRepository
+import java.util.UUID
 import org.jellyfin.sdk.model.api.BaseItemDto
 import org.jellyfin.sdk.model.api.BaseItemKind
-import java.util.UUID
 
 interface AfinityItem {
     val id: UUID
@@ -44,9 +44,13 @@ suspend fun BaseItemDto.toAfinityItem(
 }
 
 fun AfinityItem.isDownloading(): Boolean {
-    return sources.filter { it.type == AfinitySourceType.LOCAL }.any { it.path.endsWith(".download") }
+    return sources
+        .filter { it.type == AfinitySourceType.LOCAL }
+        .any { it.path.endsWith(".download") }
 }
 
 fun AfinityItem.isDownloaded(): Boolean {
-    return sources.filter { it.type == AfinitySourceType.LOCAL }.any { !it.path.endsWith(".download") }
-}
\ No newline at end of file
+    return sources
+        .filter { it.type == AfinitySourceType.LOCAL }
+        .any { !it.path.endsWith(".download") }
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinityMediaStream.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinityMediaStream.kt
index 26c96f797..a014a43aa 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinityMediaStream.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinityMediaStream.kt
@@ -32,11 +32,12 @@ fun MediaStream.toAfinityMediaStream(jellyfinRepository: JellyfinRepository): Af
         type = type,
         codec = codec.orEmpty(),
         isExternal = isExternal,
-        path = if (isExternal && !deliveryUrl.isNullOrBlank()) {
-            jellyfinRepository.getBaseUrl() + deliveryUrl
-        } else {
-            null
-        },
+        path =
+            if (isExternal && !deliveryUrl.isNullOrBlank()) {
+                jellyfinRepository.getBaseUrl() + deliveryUrl
+            } else {
+                null
+            },
         channelLayout = channelLayout,
         videoRangeType = videoRangeType,
         height = height,
@@ -66,4 +67,4 @@ fun AfinityMediaStreamDto.toAfinityMediaStream(): AfinityMediaStream {
         channels = null,
         isDefault = false,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinityMovie.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinityMovie.kt
index 8814b98d6..8e377dd8c 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinityMovie.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinityMovie.kt
@@ -2,10 +2,10 @@ package com.makd.afinity.data.models.media
 
 import com.makd.afinity.data.database.dao.ServerDatabaseDao
 import com.makd.afinity.data.repository.JellyfinRepository
-import org.jellyfin.sdk.model.api.BaseItemDto
-import org.jellyfin.sdk.model.api.PlayAccess
 import java.time.LocalDateTime
 import java.util.UUID
+import org.jellyfin.sdk.model.api.BaseItemDto
+import org.jellyfin.sdk.model.api.PlayAccess
 
 data class AfinityMovie(
     override val id: UUID,
@@ -77,10 +77,9 @@ suspend fun BaseItemDto.toAfinityMovie(
         trailer = remoteTrailers?.getOrNull(0)?.url,
         images = toAfinityImages(jellyfinRepository),
         chapters = toAfinityChapters(),
-        trickplayInfo = trickplay?.mapValues { it.value[it.value.keys.max()]!!.toAfinityTrickplayInfo() },
-        providerIds = providerIds?.mapNotNull { (key, value) ->
-            value?.let { key to it }
-        }?.toMap(),
-        externalUrls = externalUrls?.map { it.toAfinityExternalUrl() }
+        trickplayInfo =
+            trickplay?.mapValues { it.value[it.value.keys.max()]!!.toAfinityTrickplayInfo() },
+        providerIds = providerIds?.mapNotNull { (key, value) -> value?.let { key to it } }?.toMap(),
+        externalUrls = externalUrls?.map { it.toAfinityExternalUrl() },
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinityPerson.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinityPerson.kt
index c8017010b..2b454f79d 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinityPerson.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinityPerson.kt
@@ -2,27 +2,24 @@ package com.makd.afinity.data.models.media
 
 import android.net.Uri
 import com.makd.afinity.data.repository.JellyfinRepository
+import java.util.UUID
 import org.jellyfin.sdk.model.api.BaseItemPerson
 import org.jellyfin.sdk.model.api.ImageType
 import org.jellyfin.sdk.model.api.PersonKind
-import java.util.UUID
 
-data class AfinityPersonImage(
-    val uri: Uri?,
-    val blurHash: String?,
-)
+data class AfinityPersonImage(val uri: Uri?, val blurHash: String?)
 
-fun BaseItemPerson.toAfinityImage(
-    repository: JellyfinRepository,
-): AfinityPersonImage {
+fun BaseItemPerson.toAfinityImage(repository: JellyfinRepository): AfinityPersonImage {
     val baseUrl = Uri.parse(repository.getBaseUrl())
     return AfinityPersonImage(
-        uri = primaryImageTag?.let { tag ->
-            baseUrl.buildUpon()
-                .appendEncodedPath("items/$id/Images/${ImageType.PRIMARY}")
-                .appendQueryParameter("tag", tag)
-                .build()
-        },
+        uri =
+            primaryImageTag?.let { tag ->
+                baseUrl
+                    .buildUpon()
+                    .appendEncodedPath("items/$id/Images/${ImageType.PRIMARY}")
+                    .appendQueryParameter("tag", tag)
+                    .build()
+            },
         blurHash = imageBlurHashes?.get(ImageType.PRIMARY)?.get(primaryImageTag),
     )
 }
@@ -35,9 +32,7 @@ data class AfinityPerson(
     val image: AfinityPersonImage,
 )
 
-fun BaseItemPerson.toAfinityPerson(
-    repository: JellyfinRepository,
-): AfinityPerson {
+fun BaseItemPerson.toAfinityPerson(repository: JellyfinRepository): AfinityPerson {
     return AfinityPerson(
         id = id,
         name = name.orEmpty(),
@@ -45,4 +40,4 @@ fun BaseItemPerson.toAfinityPerson(
         role = role.orEmpty(),
         image = toAfinityImage(repository),
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinityPersonDetail.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinityPersonDetail.kt
index ab11fb26c..b3238cdb7 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinityPersonDetail.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinityPersonDetail.kt
@@ -1,9 +1,9 @@
 package com.makd.afinity.data.models.media
 
 import com.makd.afinity.data.repository.JellyfinRepository
-import org.jellyfin.sdk.model.api.BaseItemDto
 import java.time.LocalDateTime
 import java.util.UUID
+import org.jellyfin.sdk.model.api.BaseItemDto
 
 data class AfinityPersonDetail(
     val id: UUID,
@@ -15,9 +15,7 @@ data class AfinityPersonDetail(
     val externalUrls: List<AfinityExternalUrl>?,
 )
 
-fun BaseItemDto.toAfinityPersonDetail(
-    repository: JellyfinRepository,
-): AfinityPersonDetail {
+fun BaseItemDto.toAfinityPersonDetail(repository: JellyfinRepository): AfinityPersonDetail {
     return AfinityPersonDetail(
         id = id,
         name = name.orEmpty(),
@@ -27,4 +25,4 @@ fun BaseItemDto.toAfinityPersonDetail(
         productionLocations = productionLocations ?: emptyList(),
         externalUrls = externalUrls?.map { it.toAfinityExternalUrl() },
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinityRecommendation.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinityRecommendation.kt
index e4bca19eb..c5aba25ea 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinityRecommendation.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinityRecommendation.kt
@@ -4,7 +4,7 @@ data class AfinityRecommendationCategory(
     val title: String,
     val items: List<AfinityItem>,
     val recommendationType: RecommendationType,
-    val baselineItemName: String?
+    val baselineItemName: String?,
 )
 
 enum class RecommendationType {
@@ -14,17 +14,24 @@ enum class RecommendationType {
     HAS_ACTOR_FROM_RECENTLY_PLAYED,
     HAS_LIKED_DIRECTOR,
     HAS_LIKED_ACTOR,
-    RECOMMENDED_FOR_YOU
+    RECOMMENDED_FOR_YOU,
 }
 
-fun org.jellyfin.sdk.model.api.RecommendationType.toAfinityRecommendationType(): RecommendationType {
+fun org.jellyfin.sdk.model.api.RecommendationType.toAfinityRecommendationType():
+    RecommendationType {
     return when (this) {
-        org.jellyfin.sdk.model.api.RecommendationType.SIMILAR_TO_RECENTLY_PLAYED -> RecommendationType.SIMILAR_TO_RECENTLY_PLAYED
-        org.jellyfin.sdk.model.api.RecommendationType.SIMILAR_TO_LIKED_ITEM -> RecommendationType.SIMILAR_TO_LIKED_ITEM
-        org.jellyfin.sdk.model.api.RecommendationType.HAS_DIRECTOR_FROM_RECENTLY_PLAYED -> RecommendationType.HAS_DIRECTOR_FROM_RECENTLY_PLAYED
-        org.jellyfin.sdk.model.api.RecommendationType.HAS_ACTOR_FROM_RECENTLY_PLAYED -> RecommendationType.HAS_ACTOR_FROM_RECENTLY_PLAYED
-        org.jellyfin.sdk.model.api.RecommendationType.HAS_LIKED_DIRECTOR -> RecommendationType.HAS_LIKED_DIRECTOR
-        org.jellyfin.sdk.model.api.RecommendationType.HAS_LIKED_ACTOR -> RecommendationType.HAS_LIKED_ACTOR
+        org.jellyfin.sdk.model.api.RecommendationType.SIMILAR_TO_RECENTLY_PLAYED ->
+            RecommendationType.SIMILAR_TO_RECENTLY_PLAYED
+        org.jellyfin.sdk.model.api.RecommendationType.SIMILAR_TO_LIKED_ITEM ->
+            RecommendationType.SIMILAR_TO_LIKED_ITEM
+        org.jellyfin.sdk.model.api.RecommendationType.HAS_DIRECTOR_FROM_RECENTLY_PLAYED ->
+            RecommendationType.HAS_DIRECTOR_FROM_RECENTLY_PLAYED
+        org.jellyfin.sdk.model.api.RecommendationType.HAS_ACTOR_FROM_RECENTLY_PLAYED ->
+            RecommendationType.HAS_ACTOR_FROM_RECENTLY_PLAYED
+        org.jellyfin.sdk.model.api.RecommendationType.HAS_LIKED_DIRECTOR ->
+            RecommendationType.HAS_LIKED_DIRECTOR
+        org.jellyfin.sdk.model.api.RecommendationType.HAS_LIKED_ACTOR ->
+            RecommendationType.HAS_LIKED_ACTOR
     }
 }
 
@@ -34,10 +41,12 @@ fun RecommendationType.buildTitle(baselineItemName: String?): String {
             baselineItemName?.let { "Because you watched $it" } ?: "Similar to Recently Watched"
         RecommendationType.SIMILAR_TO_LIKED_ITEM ->
             baselineItemName?.let { "Because you liked $it" } ?: "Similar to Liked Items"
-        RecommendationType.HAS_ACTOR_FROM_RECENTLY_PLAYED, RecommendationType.HAS_LIKED_ACTOR ->
+        RecommendationType.HAS_ACTOR_FROM_RECENTLY_PLAYED,
+        RecommendationType.HAS_LIKED_ACTOR ->
             baselineItemName?.let { "Starring $it" } ?: "Featuring Actors You Like"
-        RecommendationType.HAS_DIRECTOR_FROM_RECENTLY_PLAYED, RecommendationType.HAS_LIKED_DIRECTOR ->
+        RecommendationType.HAS_DIRECTOR_FROM_RECENTLY_PLAYED,
+        RecommendationType.HAS_LIKED_DIRECTOR ->
             baselineItemName?.let { "Directed by $it" } ?: "From Directors You Like"
         RecommendationType.RECOMMENDED_FOR_YOU -> "Recommended for You"
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinitySeason.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinitySeason.kt
index 79501e330..25b972e02 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinitySeason.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinitySeason.kt
@@ -1,10 +1,10 @@
 package com.makd.afinity.data.models.media
 
 import com.makd.afinity.data.repository.JellyfinRepository
-import org.jellyfin.sdk.model.api.BaseItemDto
-import org.jellyfin.sdk.model.api.PlayAccess
 import java.time.LocalDateTime
 import java.util.UUID
+import org.jellyfin.sdk.model.api.BaseItemDto
+import org.jellyfin.sdk.model.api.PlayAccess
 
 data class AfinitySeason(
     override val id: UUID,
@@ -34,9 +34,7 @@ data class AfinitySeason(
     override val externalUrls: List<AfinityExternalUrl>?,
 ) : AfinityItem
 
-fun BaseItemDto.toAfinitySeason(
-    jellyfinRepository: JellyfinRepository,
-): AfinitySeason {
+fun BaseItemDto.toAfinitySeason(jellyfinRepository: JellyfinRepository): AfinitySeason {
     return AfinitySeason(
         id = id,
         name = name.orEmpty(),
@@ -58,9 +56,7 @@ fun BaseItemDto.toAfinitySeason(
         productionYear = productionYear,
         premiereDate = premiereDate,
         people = people?.map { it.toAfinityPerson(jellyfinRepository) } ?: emptyList(),
-        providerIds = providerIds?.mapNotNull { (key, value) ->
-            value?.let { key to it }
-        }?.toMap(),
-        externalUrls = externalUrls?.map { it.toAfinityExternalUrl() }
+        providerIds = providerIds?.mapNotNull { (key, value) -> value?.let { key to it } }?.toMap(),
+        externalUrls = externalUrls?.map { it.toAfinityExternalUrl() },
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinitySegment.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinitySegment.kt
index 873f94d66..dce855cc0 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinitySegment.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinitySegment.kt
@@ -5,30 +5,28 @@ import org.jellyfin.sdk.model.api.MediaSegmentDto
 import org.jellyfin.sdk.model.api.MediaSegmentType
 
 enum class AfinitySegmentType {
-    INTRO, OUTRO, RECAP, PREVIEW, COMMERCIAL, UNKNOWN
+    INTRO,
+    OUTRO,
+    RECAP,
+    PREVIEW,
+    COMMERCIAL,
+    UNKNOWN,
 }
 
-private fun MediaSegmentType.toAfinitySegmentType(): AfinitySegmentType = when (this) {
-    MediaSegmentType.UNKNOWN -> AfinitySegmentType.UNKNOWN
-    MediaSegmentType.INTRO -> AfinitySegmentType.INTRO
-    MediaSegmentType.OUTRO -> AfinitySegmentType.OUTRO
-    MediaSegmentType.RECAP -> AfinitySegmentType.RECAP
-    MediaSegmentType.PREVIEW -> AfinitySegmentType.PREVIEW
-    MediaSegmentType.COMMERCIAL -> AfinitySegmentType.COMMERCIAL
-}
+private fun MediaSegmentType.toAfinitySegmentType(): AfinitySegmentType =
+    when (this) {
+        MediaSegmentType.UNKNOWN -> AfinitySegmentType.UNKNOWN
+        MediaSegmentType.INTRO -> AfinitySegmentType.INTRO
+        MediaSegmentType.OUTRO -> AfinitySegmentType.OUTRO
+        MediaSegmentType.RECAP -> AfinitySegmentType.RECAP
+        MediaSegmentType.PREVIEW -> AfinitySegmentType.PREVIEW
+        MediaSegmentType.COMMERCIAL -> AfinitySegmentType.COMMERCIAL
+    }
 
-data class AfinitySegment(
-    val type: AfinitySegmentType,
-    val startTicks: Long,
-    val endTicks: Long,
-)
+data class AfinitySegment(val type: AfinitySegmentType, val startTicks: Long, val endTicks: Long)
 
 fun AfinitySegmentDto.toAfinitySegment(): AfinitySegment {
-    return AfinitySegment(
-        type = type,
-        startTicks = startTicks,
-        endTicks = endTicks,
-    )
+    return AfinitySegment(type = type, startTicks = startTicks, endTicks = endTicks)
 }
 
 fun MediaSegmentDto.toAfinitySegment(): AfinitySegment {
@@ -37,4 +35,4 @@ fun MediaSegmentDto.toAfinitySegment(): AfinitySegment {
         startTicks = startTicks / 10000,
         endTicks = endTicks / 10000,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinityShow.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinityShow.kt
index f9c274ea1..87242f987 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinityShow.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinityShow.kt
@@ -1,11 +1,11 @@
 package com.makd.afinity.data.models.media
 
 import com.makd.afinity.data.repository.JellyfinRepository
+import java.time.LocalDateTime
+import java.util.UUID
 import org.jellyfin.sdk.model.DateTime
 import org.jellyfin.sdk.model.api.BaseItemDto
 import org.jellyfin.sdk.model.api.PlayAccess
-import java.time.LocalDateTime
-import java.util.UUID
 
 data class AfinityShow(
     override val id: UUID,
@@ -43,9 +43,7 @@ data class AfinityShow(
     override val externalUrls: List<AfinityExternalUrl>?,
 ) : AfinityItem
 
-fun BaseItemDto.toAfinityShow(
-    jellyfinRepository: JellyfinRepository,
-): AfinityShow {
+fun BaseItemDto.toAfinityShow(jellyfinRepository: JellyfinRepository): AfinityShow {
     return AfinityShow(
         id = id,
         name = name.orEmpty(),
@@ -75,9 +73,7 @@ fun BaseItemDto.toAfinityShow(
         seasonCount = childCount,
         episodeCount = recursiveItemCount,
         images = toAfinityImages(jellyfinRepository),
-        providerIds = providerIds?.mapNotNull { (key, value) ->
-            value?.let { key to it }
-        }?.toMap(),
-        externalUrls = externalUrls?.map { it.toAfinityExternalUrl() }
+        providerIds = providerIds?.mapNotNull { (key, value) -> value?.let { key to it } }?.toMap(),
+        externalUrls = externalUrls?.map { it.toAfinityExternalUrl() },
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinitySource.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinitySource.kt
index 82852a681..85beb9488 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinitySource.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinitySource.kt
@@ -3,10 +3,10 @@ package com.makd.afinity.data.models.media
 import com.makd.afinity.data.database.dao.ServerDatabaseDao
 import com.makd.afinity.data.database.entities.AfinitySourceDto
 import com.makd.afinity.data.repository.JellyfinRepository
-import org.jellyfin.sdk.model.api.MediaProtocol
-import org.jellyfin.sdk.model.api.MediaSourceInfo
 import java.io.File
 import java.util.UUID
+import org.jellyfin.sdk.model.api.MediaProtocol
+import org.jellyfin.sdk.model.api.MediaSourceInfo
 
 data class AfinitySource(
     val id: String,
@@ -23,37 +23,38 @@ suspend fun MediaSourceInfo.toAfinitySource(
     itemId: UUID,
     includePath: Boolean = false,
 ): AfinitySource {
-    val path = when (protocol) {
-        MediaProtocol.FILE -> {
-            try {
-                if (includePath) jellyfinRepository.getStreamUrl(itemId, id.orEmpty()) else ""
-            } catch (e: Exception) {
-                ""
+    val path =
+        when (protocol) {
+            MediaProtocol.FILE -> {
+                try {
+                    if (includePath) jellyfinRepository.getStreamUrl(itemId, id.orEmpty()) else ""
+                } catch (e: Exception) {
+                    ""
+                }
             }
+            MediaProtocol.HTTP -> this.path.orEmpty()
+            else -> ""
         }
-        MediaProtocol.HTTP -> this.path.orEmpty()
-        else -> ""
-    }
     return AfinitySource(
         id = id.orEmpty(),
         name = name.orEmpty(),
         type = AfinitySourceType.REMOTE,
         path = path,
         size = size ?: 0,
-        mediaStreams = mediaStreams?.map { it.toAfinityMediaStream(jellyfinRepository) } ?: emptyList(),
+        mediaStreams =
+            mediaStreams?.map { it.toAfinityMediaStream(jellyfinRepository) } ?: emptyList(),
     )
 }
 
-suspend fun AfinitySourceDto.toAfinitySource(
-    serverDatabaseDao: ServerDatabaseDao,
-): AfinitySource {
+suspend fun AfinitySourceDto.toAfinitySource(serverDatabaseDao: ServerDatabaseDao): AfinitySource {
     return AfinitySource(
         id = id,
         name = name,
         type = type,
         path = path,
         size = File(path).length(),
-        mediaStreams = serverDatabaseDao.getMediaStreamsBySourceId(id).map { it.toAfinityMediaStream() },
+        mediaStreams =
+            serverDatabaseDao.getMediaStreamsBySourceId(id).map { it.toAfinityMediaStream() },
         downloadId = downloadId,
     )
 }
@@ -61,4 +62,4 @@ suspend fun AfinitySourceDto.toAfinitySource(
 enum class AfinitySourceType {
     REMOTE,
     LOCAL,
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinitySources.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinitySources.kt
index d4e558b63..241240e5b 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinitySources.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinitySources.kt
@@ -4,4 +4,4 @@ interface AfinitySources {
     val sources: List<AfinitySource>
     val runtimeTicks: Long
     val trickplayInfo: Map<String, AfinityTrickplayInfo>?
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinityStudio.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinityStudio.kt
index 82aba50fa..bde2b8a93 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinityStudio.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinityStudio.kt
@@ -6,5 +6,5 @@ data class AfinityStudio(
     val id: UUID,
     val name: String,
     val primaryImageUrl: String?,
-    val itemCount: Int = 0
-)
\ No newline at end of file
+    val itemCount: Int = 0,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinityTrickplayInfo.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinityTrickplayInfo.kt
index adefbb2e3..58e24da16 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinityTrickplayInfo.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinityTrickplayInfo.kt
@@ -35,4 +35,4 @@ fun AfinityTrickplayInfoDto.toAfinityTrickplayInfo(): AfinityTrickplayInfo {
         interval = interval,
         bandwidth = bandwidth,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/AfinityVideo.kt b/app/src/main/java/com/makd/afinity/data/models/media/AfinityVideo.kt
index 0549fa002..80fb35979 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/AfinityVideo.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/AfinityVideo.kt
@@ -21,7 +21,6 @@ data class AfinityVideo(
     override val chapters: List<AfinityChapter>,
     override val providerIds: Map<String, String>?,
     override val externalUrls: List<AfinityExternalUrl>?,
-
     val premiereDate: LocalDateTime?,
     val people: List<AfinityPerson>,
     val genres: List<String>,
@@ -34,4 +33,4 @@ data class AfinityVideo(
     val trailer: String?,
     val tagline: String?,
     val trickplayInfo: AfinityTrickplayInfo?,
-) : AfinityItem
\ No newline at end of file
+) : AfinityItem
diff --git a/app/src/main/java/com/makd/afinity/data/models/media/VideoMetadata.kt b/app/src/main/java/com/makd/afinity/data/models/media/VideoMetadata.kt
index c0883d652..21fc7c90b 100644
--- a/app/src/main/java/com/makd/afinity/data/models/media/VideoMetadata.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/media/VideoMetadata.kt
@@ -21,8 +21,7 @@ enum class VideoCodec(val raw: String) {
     H264("H.264"),
     HEVC("HEVC"),
     VVC("VVC"),
-    AV1("AV1"),
-    ;
+    AV1("AV1");
 
     override fun toString() = super.toString().lowercase()
 }
@@ -51,8 +50,7 @@ enum class AudioCodec(val raw: String) {
     VORBIS("VORBIS"),
     DTS("DTS"),
     TRUEHD("TrueHD"),
-    OPUS("OPUS"),
-    ;
+    OPUS("OPUS");
 
     override fun toString() = super.toString().lowercase()
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/player/ExternalSubtitle.kt b/app/src/main/java/com/makd/afinity/data/models/player/ExternalSubtitle.kt
index 862574a22..5cd7fce9b 100644
--- a/app/src/main/java/com/makd/afinity/data/models/player/ExternalSubtitle.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/player/ExternalSubtitle.kt
@@ -10,4 +10,4 @@ data class ExternalSubtitle(
     val language: String?,
     val uri: Uri,
     val mimeType: String,
-) : Parcelable
\ No newline at end of file
+) : Parcelable
diff --git a/app/src/main/java/com/makd/afinity/data/models/player/MpvOptions.kt b/app/src/main/java/com/makd/afinity/data/models/player/MpvOptions.kt
index a8740b021..b5c76f25e 100644
--- a/app/src/main/java/com/makd/afinity/data/models/player/MpvOptions.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/player/MpvOptions.kt
@@ -7,6 +7,7 @@ enum class MpvHwDec(val value: String) {
 
     companion object {
         val default = MEDIACODEC_COPY
+
         fun fromValue(value: String): MpvHwDec {
             return entries.find { it.value == value } ?: default
         }
@@ -27,6 +28,7 @@ enum class MpvVideoOutput(val value: String) {
 
     companion object {
         val default = GPU_NEXT
+
         fun fromValue(value: String): MpvVideoOutput {
             return entries.find { it.value == value } ?: default
         }
@@ -47,6 +49,7 @@ enum class MpvAudioOutput(val value: String) {
 
     companion object {
         val default = AUDIOTRACK
+
         fun fromValue(value: String): MpvAudioOutput {
             return entries.find { it.value == value } ?: default
         }
diff --git a/app/src/main/java/com/makd/afinity/data/models/player/PlayerState.kt b/app/src/main/java/com/makd/afinity/data/models/player/PlayerState.kt
index 911c52183..eb34bf939 100644
--- a/app/src/main/java/com/makd/afinity/data/models/player/PlayerState.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/player/PlayerState.kt
@@ -23,50 +23,64 @@ data class PlayerState(
     val isFullscreen: Boolean = true,
     val sessionId: String? = null,
     val isControlsLocked: Boolean = false,
-    val isInPictureInPictureMode: Boolean = false
+    val isInPictureInPictureMode: Boolean = false,
 )
 
-data class PlayerError(
-    val code: Int,
-    val message: String,
-    val cause: Throwable? = null
-)
+data class PlayerError(val code: Int, val message: String, val cause: Throwable? = null)
 
 sealed class PlayerEvent {
     object Play : PlayerEvent()
+
     object Pause : PlayerEvent()
+
     object Stop : PlayerEvent()
+
     data class Seek(val positionMs: Long) : PlayerEvent()
+
     data class SeekRelative(val deltaMs: Long) : PlayerEvent()
+
     data class SetVolume(val volume: Int) : PlayerEvent()
+
     data class SetBrightness(val brightness: Float) : PlayerEvent()
+
     data class SetPlaybackSpeed(val speed: Float) : PlayerEvent()
+
     data class SwitchToTrack(val trackType: Int, val index: Int) : PlayerEvent()
+
     object ToggleControls : PlayerEvent()
+
     object ToggleLock : PlayerEvent()
+
     object ToggleFullscreen : PlayerEvent()
+
     object EnterPictureInPicture : PlayerEvent()
+
     data class LoadMedia(
         val item: AfinityItem,
         val mediaSourceId: String,
         val audioStreamIndex: Int? = null,
         val subtitleStreamIndex: Int? = null,
-        val startPositionMs: Long = 0L
+        val startPositionMs: Long = 0L,
     ) : PlayerEvent()
 
     data class LoadLiveChannel(
         val channelId: UUID,
         val channelName: String,
-        val streamUrl: String
+        val streamUrl: String,
     ) : PlayerEvent()
 
     data class SkipSegment(val segment: AfinitySegment) : PlayerEvent()
 
     object OnSeekBarDragStart : PlayerEvent()
+
     data class OnSeekBarValueChange(val positionMs: Long) : PlayerEvent()
+
     object OnSeekBarDragFinished : PlayerEvent()
+
     object ToggleRemainingTime : PlayerEvent()
+
     data class SetVideoZoomMode(val mode: VideoZoomMode) : PlayerEvent()
+
     data object CycleVideoZoomMode : PlayerEvent()
 }
 
@@ -79,5 +93,5 @@ data class GestureConfig(
     val gestureExclusionAreaVertical: Float = 48f,
     val gestureExclusionAreaHorizontal: Float = 24f,
     val minimumDragThreshold: Float = 15f,
-    val gestureAccumulationThreshold: Float = 30f
-)
\ No newline at end of file
+    val gestureAccumulationThreshold: Float = 30f,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/player/SubtitlePreferences.kt b/app/src/main/java/com/makd/afinity/data/models/player/SubtitlePreferences.kt
index c4e7fa6b0..e24d488fb 100644
--- a/app/src/main/java/com/makd/afinity/data/models/player/SubtitlePreferences.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/player/SubtitlePreferences.kt
@@ -11,16 +11,13 @@ data class SubtitlePreferences(
     val textSize: Float = 1.0f,
     val bold: Boolean = false,
     val italic: Boolean = false,
-
     val outlineStyle: SubtitleOutlineStyle = SubtitleOutlineStyle.NONE,
     val outlineColor: Int = Color.BLACK,
     val outlineSize: Float = 0f,
-
     val backgroundColor: Int = Color.TRANSPARENT,
     val windowColor: Int = Color.TRANSPARENT,
-
     val verticalPosition: SubtitleVerticalPosition = SubtitleVerticalPosition.BOTTOM,
-    val horizontalAlignment: SubtitleHorizontalAlignment = SubtitleHorizontalAlignment.CENTER
+    val horizontalAlignment: SubtitleHorizontalAlignment = SubtitleHorizontalAlignment.CENTER,
 ) {
     companion object {
         val DEFAULT = SubtitlePreferences()
@@ -100,4 +97,4 @@ enum class SubtitleHorizontalAlignment(val displayName: String, val mpvValue: St
             return entries.find { it.name == value } ?: CENTER
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/player/Trickplay.kt b/app/src/main/java/com/makd/afinity/data/models/player/Trickplay.kt
index caad5d564..bf1ab6183 100644
--- a/app/src/main/java/com/makd/afinity/data/models/player/Trickplay.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/player/Trickplay.kt
@@ -2,7 +2,4 @@ package com.makd.afinity.data.models.player
 
 import androidx.compose.ui.graphics.ImageBitmap
 
-data class Trickplay(
-    val interval: Int,
-    val images: List<ImageBitmap>,
-)
\ No newline at end of file
+data class Trickplay(val interval: Int, val images: List<ImageBitmap>)
diff --git a/app/src/main/java/com/makd/afinity/data/models/player/VideoZoomMode.kt b/app/src/main/java/com/makd/afinity/data/models/player/VideoZoomMode.kt
index 81fc45e8d..827dd6059 100644
--- a/app/src/main/java/com/makd/afinity/data/models/player/VideoZoomMode.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/player/VideoZoomMode.kt
@@ -43,7 +43,6 @@ enum class VideoZoomMode(val value: Int) {
         }
     }
 
-
     fun toggle(): VideoZoomMode {
         return when (this) {
             FIT -> ZOOM
@@ -51,4 +50,4 @@ enum class VideoZoomMode(val value: Int) {
             STRETCH -> FIT
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/server/Server.kt b/app/src/main/java/com/makd/afinity/data/models/server/Server.kt
index 0d02083a0..cb9e9697b 100644
--- a/app/src/main/java/com/makd/afinity/data/models/server/Server.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/server/Server.kt
@@ -2,13 +2,11 @@ package com.makd.afinity.data.models.server
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import java.util.UUID
 
 @Entity(tableName = "servers")
 data class Server(
-    @PrimaryKey
-    val id: String,
+    @PrimaryKey val id: String,
     val name: String,
     val version: String? = null,
-    val address: String
-)
\ No newline at end of file
+    val address: String,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/server/ServerAddress.kt b/app/src/main/java/com/makd/afinity/data/models/server/ServerAddress.kt
index 5b03869c0..53832fb8f 100644
--- a/app/src/main/java/com/makd/afinity/data/models/server/ServerAddress.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/server/ServerAddress.kt
@@ -8,19 +8,18 @@ import java.util.UUID
 
 @Entity(
     tableName = "serverAddresses",
-    foreignKeys = [
-        ForeignKey(
-            entity = Server::class,
-            parentColumns = arrayOf("id"),
-            childColumns = arrayOf("serverId"),
-            onDelete = ForeignKey.CASCADE,
-        ),
-    ],
+    foreignKeys =
+        [
+            ForeignKey(
+                entity = Server::class,
+                parentColumns = arrayOf("id"),
+                childColumns = arrayOf("serverId"),
+                onDelete = ForeignKey.CASCADE,
+            )
+        ],
 )
 data class ServerAddress(
-    @PrimaryKey
-    val id: UUID,
-    @ColumnInfo(index = true)
-    val serverId: String,
+    @PrimaryKey val id: UUID,
+    @ColumnInfo(index = true) val serverId: String,
     val address: String,
-)
\ No newline at end of file
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/server/ServerWithAddresses.kt b/app/src/main/java/com/makd/afinity/data/models/server/ServerWithAddresses.kt
index 037612115..3e58fca50 100644
--- a/app/src/main/java/com/makd/afinity/data/models/server/ServerWithAddresses.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/server/ServerWithAddresses.kt
@@ -4,11 +4,6 @@ import androidx.room.Embedded
 import androidx.room.Relation
 
 data class ServerWithAddresses(
-    @Embedded
-    val server: Server,
-    @Relation(
-        parentColumn = "id",
-        entityColumn = "serverId",
-    )
-    val addresses: List<ServerAddress>,
-)
\ No newline at end of file
+    @Embedded val server: Server,
+    @Relation(parentColumn = "id", entityColumn = "serverId") val addresses: List<ServerAddress>,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/server/ServerWithAddressesAndUsers.kt b/app/src/main/java/com/makd/afinity/data/models/server/ServerWithAddressesAndUsers.kt
index 259964bce..e56b03e95 100644
--- a/app/src/main/java/com/makd/afinity/data/models/server/ServerWithAddressesAndUsers.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/server/ServerWithAddressesAndUsers.kt
@@ -5,16 +5,7 @@ import androidx.room.Relation
 import com.makd.afinity.data.models.user.User
 
 data class ServerWithAddressesAndUsers(
-    @Embedded
-    val server: Server,
-    @Relation(
-        parentColumn = "id",
-        entityColumn = "serverId",
-    )
-    val addresses: List<ServerAddress>,
-    @Relation(
-        parentColumn = "id",
-        entityColumn = "serverId",
-    )
-    val users: List<User>,
-)
\ No newline at end of file
+    @Embedded val server: Server,
+    @Relation(parentColumn = "id", entityColumn = "serverId") val addresses: List<ServerAddress>,
+    @Relation(parentColumn = "id", entityColumn = "serverId") val users: List<User>,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/server/ServerWithUsers.kt b/app/src/main/java/com/makd/afinity/data/models/server/ServerWithUsers.kt
index 8f65f19ae..fe10e6fce 100644
--- a/app/src/main/java/com/makd/afinity/data/models/server/ServerWithUsers.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/server/ServerWithUsers.kt
@@ -5,11 +5,6 @@ import androidx.room.Relation
 import com.makd.afinity.data.models.user.User
 
 data class ServerWithUsers(
-    @Embedded
-    val server: Server,
-    @Relation(
-        parentColumn = "id",
-        entityColumn = "serverId",
-    )
-    val users: List<User>,
-)
\ No newline at end of file
+    @Embedded val server: Server,
+    @Relation(parentColumn = "id", entityColumn = "serverId") val users: List<User>,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/models/user/AfinityUserDataDto.kt b/app/src/main/java/com/makd/afinity/data/models/user/AfinityUserDataDto.kt
index 080974ec6..9d9217439 100644
--- a/app/src/main/java/com/makd/afinity/data/models/user/AfinityUserDataDto.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/user/AfinityUserDataDto.kt
@@ -4,10 +4,7 @@ import androidx.room.Entity
 import com.makd.afinity.data.models.media.AfinityItem
 import java.util.UUID
 
-@Entity(
-    tableName = "userdata",
-    primaryKeys = ["userId", "itemId", "serverId"],
-)
+@Entity(tableName = "userdata", primaryKeys = ["userId", "itemId", "serverId"])
 data class AfinityUserDataDto(
     val userId: UUID,
     val itemId: UUID,
@@ -27,4 +24,4 @@ fun AfinityItem.toAfinityUserDataDto(userId: UUID, serverId: String): AfinityUse
         favorite = favorite,
         playbackPositionTicks = playbackPositionTicks,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/models/user/User.kt b/app/src/main/java/com/makd/afinity/data/models/user/User.kt
index d7ca0e1c6..ad34874c2 100644
--- a/app/src/main/java/com/makd/afinity/data/models/user/User.kt
+++ b/app/src/main/java/com/makd/afinity/data/models/user/User.kt
@@ -9,21 +9,20 @@ import java.util.UUID
 
 @Entity(
     tableName = "users",
-    foreignKeys = [
-        ForeignKey(
-            entity = Server::class,
-            parentColumns = arrayOf("id"),
-            childColumns = arrayOf("serverId"),
-            onDelete = ForeignKey.CASCADE,
-        ),
-    ],
+    foreignKeys =
+        [
+            ForeignKey(
+                entity = Server::class,
+                parentColumns = arrayOf("id"),
+                childColumns = arrayOf("serverId"),
+                onDelete = ForeignKey.CASCADE,
+            )
+        ],
 )
 data class User(
-    @PrimaryKey
-    val id: UUID,
+    @PrimaryKey val id: UUID,
     val name: String,
-    @ColumnInfo(index = true)
-    val serverId: String,
+    @ColumnInfo(index = true) val serverId: String,
     val accessToken: String? = null,
     val primaryImageTag: String? = null,
-)
\ No newline at end of file
+)
diff --git a/app/src/main/java/com/makd/afinity/data/network/AudiobookshelfApiService.kt b/app/src/main/java/com/makd/afinity/data/network/AudiobookshelfApiService.kt
new file mode 100644
index 000000000..becec4c1f
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/data/network/AudiobookshelfApiService.kt
@@ -0,0 +1,142 @@
+package com.makd.afinity.data.network
+
+import com.makd.afinity.data.models.audiobookshelf.AudiobookshelfUser
+import com.makd.afinity.data.models.audiobookshelf.AuthorizeResponse
+import com.makd.afinity.data.models.audiobookshelf.BatchLocalSessionRequest
+import com.makd.afinity.data.models.audiobookshelf.BatchSyncResponse
+import com.makd.afinity.data.models.audiobookshelf.GenresResponse
+import com.makd.afinity.data.models.audiobookshelf.ItemResponse
+import com.makd.afinity.data.models.audiobookshelf.ItemsInProgressResponse
+import com.makd.afinity.data.models.audiobookshelf.LibrariesResponse
+import com.makd.afinity.data.models.audiobookshelf.LibraryItemsResponse
+import com.makd.afinity.data.models.audiobookshelf.LibraryResponse
+import com.makd.afinity.data.models.audiobookshelf.LoginRequest
+import com.makd.afinity.data.models.audiobookshelf.LoginResponse
+import com.makd.afinity.data.models.audiobookshelf.MediaProgress
+import com.makd.afinity.data.models.audiobookshelf.MediaProgressSyncData
+import com.makd.afinity.data.models.audiobookshelf.PersonalizedView
+import com.makd.afinity.data.models.audiobookshelf.PlaybackSession
+import com.makd.afinity.data.models.audiobookshelf.PlaybackSessionRequest
+import com.makd.afinity.data.models.audiobookshelf.ProgressUpdateRequest
+import com.makd.afinity.data.models.audiobookshelf.SearchResponse
+import com.makd.afinity.data.models.audiobookshelf.SeriesListResponse
+import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.PATCH
+import retrofit2.http.POST
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+interface AudiobookshelfApiService {
+
+    @POST("api/authorize") suspend fun authorize(): Response<AuthorizeResponse>
+
+    @POST("login") suspend fun login(@Body credentials: LoginRequest): Response<LoginResponse>
+
+    @GET("api/libraries") suspend fun getLibraries(): Response<LibrariesResponse>
+
+    @GET("api/libraries/{libraryId}")
+    suspend fun getLibrary(
+        @Path("libraryId") id: String,
+        @Query("include") include: String? = null,
+    ): Response<LibraryResponse>
+
+    @GET("api/libraries/{libraryId}/items")
+    suspend fun getLibraryItems(
+        @Path("libraryId") id: String,
+        @Query("minified") minified: Int = 1,
+        @Query("limit") limit: Int = 100,
+        @Query("page") page: Int = 0,
+        @Query("sort") sort: String? = null,
+        @Query("desc") desc: Int? = null,
+        @Query("filter") filter: String? = null,
+        @Query("include") include: String? = null,
+        @Query("collapseseries") collapseseries: Int? = null,
+    ): Response<LibraryItemsResponse>
+
+    @GET("api/libraries/{libraryId}/series")
+    suspend fun getSeries(
+        @Path("libraryId") id: String,
+        @Query("sort") sort: String = "name",
+        @Query("desc") desc: Int = 0,
+        @Query("filter") filter: String = "all",
+        @Query("limit") limit: Int = 100,
+        @Query("page") page: Int = 0,
+        @Query("minified") minified: Int = 1,
+        @Query("include") include: String = "progress",
+    ): Response<SeriesListResponse>
+
+    @GET("api/libraries/{libraryId}/personalized")
+    suspend fun getPersonalized(
+        @Path("libraryId") id: String,
+        @Query("limit") limit: Int? = null,
+        @Query("include") include: String? = null,
+    ): Response<List<PersonalizedView>>
+
+    @GET("api/libraries/{libraryId}/search")
+    suspend fun search(
+        @Path("libraryId") id: String,
+        @Query("q") query: String,
+        @Query("limit") limit: Int? = null,
+    ): Response<SearchResponse>
+
+    @GET("api/items/{itemId}")
+    suspend fun getItem(
+        @Path("itemId") id: String,
+        @Query("expanded") expanded: Int = 1,
+        @Query("include") include: String? = "progress",
+    ): Response<ItemResponse>
+
+    @GET("api/genres") suspend fun getGenres(): Response<GenresResponse>
+
+    @GET("api/me") suspend fun getMe(): Response<AudiobookshelfUser>
+
+    @GET("api/me/items-in-progress")
+    suspend fun getItemsInProgress(
+        @Query("limit") limit: Int? = null
+    ): Response<ItemsInProgressResponse>
+
+    @PATCH("api/me/progress/{itemId}")
+    suspend fun updateProgress(
+        @Path("itemId") id: String,
+        @Body progress: ProgressUpdateRequest,
+    ): Response<MediaProgress>
+
+    @PATCH("api/me/progress/{itemId}/{episodeId}")
+    suspend fun updateEpisodeProgress(
+        @Path("itemId") itemId: String,
+        @Path("episodeId") episodeId: String,
+        @Body progress: ProgressUpdateRequest,
+    ): Response<MediaProgress>
+
+    @POST("api/items/{itemId}/play")
+    suspend fun startPlaybackSession(
+        @Path("itemId") itemId: String,
+        @Body request: PlaybackSessionRequest,
+    ): Response<PlaybackSession>
+
+    @POST("api/items/{itemId}/play/{episodeId}")
+    suspend fun startEpisodePlaybackSession(
+        @Path("itemId") itemId: String,
+        @Path("episodeId") episodeId: String,
+        @Body request: PlaybackSessionRequest,
+    ): Response<PlaybackSession>
+
+    @POST("api/session/{sessionId}/sync")
+    suspend fun syncPlaybackSession(
+        @Path("sessionId") id: String,
+        @Body syncData: MediaProgressSyncData,
+    ): Response<Unit>
+
+    @POST("api/session/{sessionId}/close")
+    suspend fun closePlaybackSession(
+        @Path("sessionId") id: String,
+        @Body syncData: MediaProgressSyncData? = null,
+    ): Response<Unit>
+
+    @POST("api/session/local-all")
+    suspend fun syncAllLocalSessions(
+        @Body request: BatchLocalSessionRequest
+    ): Response<BatchSyncResponse>
+}
diff --git a/app/src/main/java/com/makd/afinity/data/network/JellyseerrApiService.kt b/app/src/main/java/com/makd/afinity/data/network/JellyseerrApiService.kt
index a61264f0c..ba869271b 100644
--- a/app/src/main/java/com/makd/afinity/data/network/JellyseerrApiService.kt
+++ b/app/src/main/java/com/makd/afinity/data/network/JellyseerrApiService.kt
@@ -7,9 +7,9 @@ import com.makd.afinity.data.models.jellyseerr.JellyseerrSearchResult
 import com.makd.afinity.data.models.jellyseerr.JellyseerrUser
 import com.makd.afinity.data.models.jellyseerr.LoginRequest
 import com.makd.afinity.data.models.jellyseerr.LoginResponse
-import com.makd.afinity.data.models.jellyseerr.RequestsResponse
 import com.makd.afinity.data.models.jellyseerr.MediaDetails
 import com.makd.afinity.data.models.jellyseerr.RatingsCombined
+import com.makd.afinity.data.models.jellyseerr.RequestsResponse
 import com.makd.afinity.data.models.jellyseerr.RottenTomatoesRating
 import retrofit2.Response
 import retrofit2.http.Body
@@ -27,11 +27,9 @@ interface JellyseerrApiService {
     @POST("api/v1/auth/jellyfin")
     suspend fun loginJellyfin(@Body request: JellyfinLoginRequest): Response<LoginResponse>
 
-    @GET("api/v1/auth/me")
-    suspend fun getCurrentUser(): Response<JellyseerrUser>
+    @GET("api/v1/auth/me") suspend fun getCurrentUser(): Response<JellyseerrUser>
 
-    @POST("api/v1/auth/logout")
-    suspend fun logout(): Response<Unit>
+    @POST("api/v1/auth/logout") suspend fun logout(): Response<Unit>
 
     @POST("api/v1/request")
     suspend fun createRequest(@Body request: CreateRequestBody): Response<JellyseerrRequest>
@@ -41,7 +39,7 @@ interface JellyseerrApiService {
         @Query("take") take: Int = 20,
         @Query("skip") skip: Int = 0,
         @Query("filter") filter: String? = null,
-        @Query("sort") sort: String? = "added"
+        @Query("sort") sort: String? = "added",
     ): Response<RequestsResponse>
 
     @GET("api/v1/request/{requestId}")
@@ -60,14 +58,14 @@ interface JellyseerrApiService {
     suspend fun search(
         @Query("query") query: String,
         @Query("page") page: Int = 1,
-        @Query("language") language: String = "en"
+        @Query("language") language: String = "en",
     ): Response<JellyseerrSearchResult>
 
     @GET("api/v1/search/multi")
     suspend fun searchMulti(
         @Query("query") query: String,
         @Query("page") page: Int = 1,
-        @Query("language") language: String = "en"
+        @Query("language") language: String = "en",
     ): Response<JellyseerrSearchResult>
 
     @GET("api/v1/movie/{movieId}")
@@ -85,7 +83,7 @@ interface JellyseerrApiService {
     @GET("api/v1/discover/trending")
     suspend fun getTrending(
         @Query("page") page: Int = 1,
-        @Query("language") language: String = "en"
+        @Query("language") language: String = "en",
     ): Response<JellyseerrSearchResult>
 
     @GET("api/v1/discover/movies")
@@ -93,7 +91,7 @@ interface JellyseerrApiService {
         @Query("page") page: Int = 1,
         @Query("language") language: String = "en",
         @Query("sortBy") sortBy: String = "popularity.desc",
-        @Query("studio") studio: Int? = null
+        @Query("studio") studio: Int? = null,
     ): Response<JellyseerrSearchResult>
 
     @GET("api/v1/discover/tv")
@@ -101,19 +99,19 @@ interface JellyseerrApiService {
         @Query("page") page: Int = 1,
         @Query("language") language: String = "en",
         @Query("sortBy") sortBy: String = "popularity.desc",
-        @Query("network") network: Int? = null
+        @Query("network") network: Int? = null,
     ): Response<JellyseerrSearchResult>
 
     @GET("api/v1/discover/movies/upcoming")
     suspend fun getUpcomingMovies(
         @Query("page") page: Int = 1,
-        @Query("language") language: String = "en"
+        @Query("language") language: String = "en",
     ): Response<JellyseerrSearchResult>
 
     @GET("api/v1/discover/tv/upcoming")
     suspend fun getUpcomingTv(
         @Query("page") page: Int = 1,
-        @Query("language") language: String = "en"
+        @Query("language") language: String = "en",
     ): Response<JellyseerrSearchResult>
 
     @GET("api/v1/genres/movie")
@@ -140,13 +138,13 @@ interface JellyseerrApiService {
     suspend fun getMoviesByGenre(
         @Path("genreId") genreId: Int,
         @Query("page") page: Int = 1,
-        @Query("language") language: String = "en"
+        @Query("language") language: String = "en",
     ): Response<JellyseerrSearchResult>
 
     @GET("api/v1/discover/tv/genre/{genreId}")
     suspend fun getTvByGenre(
         @Path("genreId") genreId: Int,
         @Query("page") page: Int = 1,
-        @Query("language") language: String = "en"
+        @Query("language") language: String = "en",
     ): Response<JellyseerrSearchResult>
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/paging/EpisodesPagingSource.kt b/app/src/main/java/com/makd/afinity/data/paging/EpisodesPagingSource.kt
index 355650889..d84725ded 100644
--- a/app/src/main/java/com/makd/afinity/data/paging/EpisodesPagingSource.kt
+++ b/app/src/main/java/com/makd/afinity/data/paging/EpisodesPagingSource.kt
@@ -5,13 +5,13 @@ import androidx.paging.PagingState
 import com.makd.afinity.data.models.media.AfinityEpisode
 import com.makd.afinity.data.repository.FieldSets
 import com.makd.afinity.data.repository.media.MediaRepository
-import timber.log.Timber
 import java.util.UUID
+import timber.log.Timber
 
 class EpisodesPagingSource(
     private val mediaRepository: MediaRepository,
     private val seasonId: UUID,
-    private val seriesId: UUID
+    private val seriesId: UUID,
 ) : PagingSource<Int, AfinityEpisode>() {
 
     companion object {
@@ -29,24 +29,29 @@ class EpisodesPagingSource(
 
             if (allEpisodes == null) {
                 Timber.d("EpisodesPagingSource: Loading all episodes from API")
-                allEpisodes = mediaRepository.getEpisodes(
-                    seasonId = seasonId,
-                    seriesId = seriesId,
-                    fields = FieldSets.EPISODE_LIST
-                ).sortedBy { it.indexNumber ?: 0 }
+                allEpisodes =
+                    mediaRepository
+                        .getEpisodes(
+                            seasonId = seasonId,
+                            seriesId = seriesId,
+                            fields = FieldSets.EPISODE_LIST,
+                        )
+                        .sortedBy { it.indexNumber ?: 0 }
                 Timber.d("EpisodesPagingSource: Loaded ${allEpisodes?.size} total episodes")
             }
 
-            val paginatedEpisodes = allEpisodes!!
-                .drop(startIndex)
-                .take(PAGE_SIZE)
+            val paginatedEpisodes = allEpisodes!!.drop(startIndex).take(PAGE_SIZE)
 
-            Timber.d("EpisodesPagingSource: Returning page $page with ${paginatedEpisodes.size} episodes")
+            Timber.d(
+                "EpisodesPagingSource: Returning page $page with ${paginatedEpisodes.size} episodes"
+            )
 
             LoadResult.Page(
                 data = paginatedEpisodes,
                 prevKey = if (page == 0) null else page - 1,
-                nextKey = if (startIndex + paginatedEpisodes.size >= allEpisodes!!.size) null else page + 1
+                nextKey =
+                    if (startIndex + paginatedEpisodes.size >= allEpisodes!!.size) null
+                    else page + 1,
             )
         } catch (e: Exception) {
             Timber.e(e, "Failed to load episodes page")
@@ -61,4 +66,4 @@ class EpisodesPagingSource(
             anchorPage?.prevKey?.plus(1) ?: anchorPage?.nextKey?.minus(1)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/paging/JellyfinItemsPagingSource.kt b/app/src/main/java/com/makd/afinity/data/paging/JellyfinItemsPagingSource.kt
index 7206bbb5e..ccbc7bc9c 100644
--- a/app/src/main/java/com/makd/afinity/data/paging/JellyfinItemsPagingSource.kt
+++ b/app/src/main/java/com/makd/afinity/data/paging/JellyfinItemsPagingSource.kt
@@ -8,8 +8,8 @@ import com.makd.afinity.data.models.extensions.toAfinityItem
 import com.makd.afinity.data.models.media.AfinityItem
 import com.makd.afinity.data.repository.media.MediaRepository
 import com.makd.afinity.ui.library.FilterType
-import timber.log.Timber
 import java.util.UUID
+import timber.log.Timber
 
 class JellyfinItemsPagingSource(
     private val mediaRepository: MediaRepository,
@@ -20,7 +20,7 @@ class JellyfinItemsPagingSource(
     private val filter: FilterType,
     private val baseUrl: String,
     private val nameStartsWith: String? = null,
-    private val studioName: String? = null
+    private val studioName: String? = null,
 ) : PagingSource<Int, AfinityItem>() {
 
     companion object {
@@ -32,139 +32,158 @@ class JellyfinItemsPagingSource(
             val page = params.key ?: 0
             val startIndex = page * PAGE_SIZE
 
-            Timber.d("PagingSource load: page=$page, nameStartsWith='$nameStartsWith', libraryType=$libraryType")
-
-            val filterIsPlayed = when (filter) {
-                FilterType.WATCHED -> true
-                FilterType.UNWATCHED -> false
-                else -> null
-            }
-
-            val filterIsLiked = when (filter) {
-                FilterType.WATCHLIST -> true
-                else -> null
-            }
-
-            val items = if (nameStartsWith != null || studioName != null) {
-                val includeTypes = when (libraryType) {
-                    CollectionType.TvShows -> listOf("SERIES")
-                    CollectionType.Movies -> listOf("MOVIE")
-                    CollectionType.BoxSets -> listOf("BOXSET")
-                    CollectionType.Mixed -> listOf("MOVIE", "SERIES", "BOXSET", "FOLDER")
-                    else -> listOf("MOVIE", "SERIES", "BOXSET", "FOLDER")
-                }
+            Timber.d(
+                "PagingSource load: page=$page, nameStartsWith='$nameStartsWith', libraryType=$libraryType"
+            )
 
-                val response = mediaRepository.getItems(
-                    parentId = parentId,
-                    sortBy = sortBy,
-                    sortDescending = sortDescending,
-                    limit = PAGE_SIZE,
-                    startIndex = startIndex,
-                    includeItemTypes = includeTypes,
-                    isFavorite = when (filter) {
-                        FilterType.FAVORITES -> true
-                        else -> null
-                    },
-                    isPlayed = filterIsPlayed,
-                    isLiked = filterIsLiked,
-                    nameStartsWith = nameStartsWith,
-                    studios = if (studioName != null) listOf(studioName) else emptyList()
-                )
-
-                response.items?.mapNotNull { it.toAfinityItem(baseUrl) } ?: emptyList()
-
-            } else {
-                when (libraryType) {
-                    CollectionType.TvShows -> {
-                        if (filter == FilterType.FAVORITES || filter == FilterType.WATCHLIST) {
-                            val response = mediaRepository.getItems(
-                                parentId = parentId,
-                                sortBy = sortBy,
-                                sortDescending = sortDescending,
-                                limit = PAGE_SIZE,
-                                startIndex = startIndex,
-                                includeItemTypes = listOf("SERIES"),
-                                isFavorite = when (filter) {
-                                    FilterType.FAVORITES -> true
-                                    else -> null
-                                },
-                                isPlayed = filterIsPlayed,
-                                isLiked = filterIsLiked
-                            )
-                            response.items?.mapNotNull { it.toAfinityItem(baseUrl) } ?: emptyList()
-                        } else {
-                            mediaRepository.getShows(
-                                parentId = parentId,
-                                sortBy = sortBy,
-                                sortDescending = sortDescending,
-                                limit = PAGE_SIZE,
-                                startIndex = startIndex,
-                                isPlayed = filterIsPlayed
-                            )
-                        }
-                    }
+            val filterIsPlayed =
+                when (filter) {
+                    FilterType.WATCHED -> true
+                    FilterType.UNWATCHED -> false
+                    else -> null
+                }
 
-                    CollectionType.Movies -> {
-                        if (filter == FilterType.FAVORITES || filter == FilterType.WATCHLIST) {
-                            val response = mediaRepository.getItems(
-                                parentId = parentId,
-                                sortBy = sortBy,
-                                sortDescending = sortDescending,
-                                limit = PAGE_SIZE,
-                                startIndex = startIndex,
-                                includeItemTypes = listOf("MOVIE"),
-                                isFavorite = when (filter) {
-                                    FilterType.FAVORITES -> true
-                                    else -> null
-                                },
-                                isPlayed = filterIsPlayed,
-                                isLiked = filterIsLiked
-                            )
-                            response.items?.mapNotNull { it.toAfinityItem(baseUrl) } ?: emptyList()
-                        } else {
-                            mediaRepository.getMovies(
-                                parentId = parentId,
-                                sortBy = sortBy,
-                                sortDescending = sortDescending,
-                                limit = PAGE_SIZE,
-                                startIndex = startIndex,
-                                isPlayed = filterIsPlayed
-                            )
-                        }
-                    }
+            val filterIsLiked =
+                when (filter) {
+                    FilterType.WATCHLIST -> true
+                    else -> null
+                }
 
-                    else -> {
-                        val includeTypes = when (libraryType) {
+            val items =
+                if (nameStartsWith != null || studioName != null) {
+                    val includeTypes =
+                        when (libraryType) {
+                            CollectionType.TvShows -> listOf("SERIES")
+                            CollectionType.Movies -> listOf("MOVIE")
                             CollectionType.BoxSets -> listOf("BOXSET")
                             CollectionType.Mixed -> listOf("MOVIE", "SERIES", "BOXSET", "FOLDER")
                             else -> listOf("MOVIE", "SERIES", "BOXSET", "FOLDER")
                         }
 
-                        val response = mediaRepository.getItems(
+                    val response =
+                        mediaRepository.getItems(
                             parentId = parentId,
                             sortBy = sortBy,
                             sortDescending = sortDescending,
                             limit = PAGE_SIZE,
                             startIndex = startIndex,
                             includeItemTypes = includeTypes,
-                            isFavorite = when (filter) {
-                                FilterType.FAVORITES -> true
-                                else -> null
-                            },
+                            isFavorite =
+                                when (filter) {
+                                    FilterType.FAVORITES -> true
+                                    else -> null
+                                },
                             isPlayed = filterIsPlayed,
-                            isLiked = filterIsLiked
+                            isLiked = filterIsLiked,
+                            nameStartsWith = nameStartsWith,
+                            studios = if (studioName != null) listOf(studioName) else emptyList(),
                         )
-                        response.items?.mapNotNull { it.toAfinityItem(baseUrl) } ?: emptyList()
+
+                    response.items?.mapNotNull { it.toAfinityItem(baseUrl) } ?: emptyList()
+                } else {
+                    when (libraryType) {
+                        CollectionType.TvShows -> {
+                            if (filter == FilterType.FAVORITES || filter == FilterType.WATCHLIST) {
+                                val response =
+                                    mediaRepository.getItems(
+                                        parentId = parentId,
+                                        sortBy = sortBy,
+                                        sortDescending = sortDescending,
+                                        limit = PAGE_SIZE,
+                                        startIndex = startIndex,
+                                        includeItemTypes = listOf("SERIES"),
+                                        isFavorite =
+                                            when (filter) {
+                                                FilterType.FAVORITES -> true
+                                                else -> null
+                                            },
+                                        isPlayed = filterIsPlayed,
+                                        isLiked = filterIsLiked,
+                                    )
+                                response.items?.mapNotNull { it.toAfinityItem(baseUrl) }
+                                    ?: emptyList()
+                            } else {
+                                mediaRepository.getShows(
+                                    parentId = parentId,
+                                    sortBy = sortBy,
+                                    sortDescending = sortDescending,
+                                    limit = PAGE_SIZE,
+                                    startIndex = startIndex,
+                                    isPlayed = filterIsPlayed,
+                                )
+                            }
+                        }
+
+                        CollectionType.Movies -> {
+                            if (filter == FilterType.FAVORITES || filter == FilterType.WATCHLIST) {
+                                val response =
+                                    mediaRepository.getItems(
+                                        parentId = parentId,
+                                        sortBy = sortBy,
+                                        sortDescending = sortDescending,
+                                        limit = PAGE_SIZE,
+                                        startIndex = startIndex,
+                                        includeItemTypes = listOf("MOVIE"),
+                                        isFavorite =
+                                            when (filter) {
+                                                FilterType.FAVORITES -> true
+                                                else -> null
+                                            },
+                                        isPlayed = filterIsPlayed,
+                                        isLiked = filterIsLiked,
+                                    )
+                                response.items?.mapNotNull { it.toAfinityItem(baseUrl) }
+                                    ?: emptyList()
+                            } else {
+                                mediaRepository.getMovies(
+                                    parentId = parentId,
+                                    sortBy = sortBy,
+                                    sortDescending = sortDescending,
+                                    limit = PAGE_SIZE,
+                                    startIndex = startIndex,
+                                    isPlayed = filterIsPlayed,
+                                )
+                            }
+                        }
+
+                        else -> {
+                            val includeTypes =
+                                when (libraryType) {
+                                    CollectionType.BoxSets -> listOf("BOXSET")
+                                    CollectionType.Mixed ->
+                                        listOf("MOVIE", "SERIES", "BOXSET", "FOLDER")
+                                    else -> listOf("MOVIE", "SERIES", "BOXSET", "FOLDER")
+                                }
+
+                            val response =
+                                mediaRepository.getItems(
+                                    parentId = parentId,
+                                    sortBy = sortBy,
+                                    sortDescending = sortDescending,
+                                    limit = PAGE_SIZE,
+                                    startIndex = startIndex,
+                                    includeItemTypes = includeTypes,
+                                    isFavorite =
+                                        when (filter) {
+                                            FilterType.FAVORITES -> true
+                                            else -> null
+                                        },
+                                    isPlayed = filterIsPlayed,
+                                    isLiked = filterIsLiked,
+                                )
+                            response.items?.mapNotNull { it.toAfinityItem(baseUrl) } ?: emptyList()
+                        }
                     }
                 }
-            }
 
-            Timber.d("PagingSource: Loaded ${items.size} items for nameStartsWith='$nameStartsWith'")
+            Timber.d(
+                "PagingSource: Loaded ${items.size} items for nameStartsWith='$nameStartsWith'"
+            )
 
             LoadResult.Page(
                 data = items,
                 prevKey = if (page == 0) null else page - 1,
-                nextKey = if (items.isEmpty() || items.size < PAGE_SIZE) null else page + 1
+                nextKey = if (items.isEmpty() || items.size < PAGE_SIZE) null else page + 1,
             )
         } catch (e: Exception) {
             Timber.e(e, "Failed to load page")
@@ -178,4 +197,4 @@ class JellyfinItemsPagingSource(
             anchorPage?.prevKey?.plus(1) ?: anchorPage?.nextKey?.minus(1)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/AppDataRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/AppDataRepository.kt
index e4f48415a..b81687af5 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/AppDataRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/AppDataRepository.kt
@@ -10,8 +10,6 @@ import com.makd.afinity.data.database.entities.GenreShowCacheEntity
 import com.makd.afinity.data.database.entities.PersonSectionCacheEntity
 import com.makd.afinity.data.database.entities.TopPeopleCacheEntity
 import com.makd.afinity.data.manager.SessionManager
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.SupervisorJob
 import com.makd.afinity.data.models.CachedPersonWithCount
 import com.makd.afinity.data.models.GenreItem
 import com.makd.afinity.data.models.GenreType
@@ -31,7 +29,14 @@ import com.makd.afinity.data.models.media.AfinityShow
 import com.makd.afinity.data.models.media.AfinityStudio
 import com.makd.afinity.util.JellyfinImageUrlBuilder
 import dagger.hilt.android.qualifiers.ApplicationContext
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.random.Random
+import kotlin.time.Duration.Companion.hours
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
@@ -47,20 +52,17 @@ import kotlinx.serialization.json.Json
 import org.jellyfin.sdk.model.api.ItemFields
 import org.jellyfin.sdk.model.api.PersonKind
 import timber.log.Timber
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Singleton
-import kotlin.random.Random
-import kotlin.time.Duration.Companion.hours
 
 @Singleton
-class AppDataRepository @Inject constructor(
+class AppDataRepository
+@Inject
+constructor(
     @ApplicationContext private val context: Context,
     private val jellyfinRepository: JellyfinRepository,
     private val preferencesRepository: PreferencesRepository,
     private val database: AfinityDatabase,
     private val sessionManager: SessionManager,
-    private val jellyfinImageUrlBuilder: JellyfinImageUrlBuilder
+    private val jellyfinImageUrlBuilder: JellyfinImageUrlBuilder,
 ) {
     private val GENRE_CACHE_TTL = 12.hours.inWholeMilliseconds
     private val PERSON_SECTION_CACHE_TTL = 48.hours.inWholeMilliseconds
@@ -100,30 +102,32 @@ class AppDataRepository @Inject constructor(
     val separateTvLibrarySections: StateFlow<List<Pair<AfinityCollection, List<AfinityShow>>>> =
         _separateTvLibrarySections.asStateFlow()
 
-    val userProfileImageUrl: StateFlow<String?> = sessionManager.currentSession
-        .map { session ->
-            if (session?.user != null && !session.user.primaryImageTag.isNullOrBlank()) {
-                val url = jellyfinImageUrlBuilder.buildUserPrimaryImageUrl(
-                    baseUrl = session.serverUrl,
-                    userId = session.user.id.toString(),
-                    tag = session.user.primaryImageTag
-                )
+    val userProfileImageUrl: StateFlow<String?> =
+        sessionManager.currentSession
+            .map { session ->
+                if (session?.user != null && !session.user.primaryImageTag.isNullOrBlank()) {
+                    val url =
+                        jellyfinImageUrlBuilder.buildUserPrimaryImageUrl(
+                            baseUrl = session.serverUrl,
+                            userId = session.user.id.toString(),
+                            tag = session.user.primaryImageTag,
+                        )
 
-                if (session.user.accessToken != null) {
-                    val separator = if (url.contains("?")) "&" else "?"
-                    "$url${separator}api_key=${session.user.accessToken}"
+                    if (session.user.accessToken != null) {
+                        val separator = if (url.contains("?")) "&" else "?"
+                        "$url${separator}api_key=${session.user.accessToken}"
+                    } else {
+                        url
+                    }
                 } else {
-                    url
+                    null
                 }
-            } else {
-                null
             }
-        }
-        .stateIn(
-            scope = CoroutineScope(Dispatchers.IO + SupervisorJob()),
-            started = SharingStarted.WhileSubscribed(5000),
-            initialValue = null
-        )
+            .stateIn(
+                scope = CoroutineScope(Dispatchers.IO + SupervisorJob()),
+                started = SharingStarted.WhileSubscribed(5000),
+                initialValue = null,
+            )
 
     private val _latestMovies = MutableStateFlow<List<AfinityMovie>>(emptyList())
     val latestMovies: StateFlow<List<AfinityMovie>> = _latestMovies.asStateFlow()
@@ -174,8 +178,14 @@ class AppDataRepository @Inject constructor(
             sessionManager.currentSession.collect { session ->
                 val newSessionId = session?.let { "${it.serverId}_${it.userId}" }
 
-                if (currentSessionId != null && newSessionId != currentSessionId && newSessionId != null) {
-                    Timber.d("Session changed from $currentSessionId to $newSessionId - clearing and reloading data")
+                if (
+                    currentSessionId != null &&
+                        newSessionId != currentSessionId &&
+                        newSessionId != null
+                ) {
+                    Timber.d(
+                        "Session changed from $currentSessionId to $newSessionId - clearing and reloading data"
+                    )
                     clearAllData()
 
                     kotlinx.coroutines.delay(300)
@@ -258,17 +268,14 @@ class AppDataRepository @Inject constructor(
 
         scope.launch {
             jellyfinRepository.getLatestMediaFlow().collect { liveData ->
-                val filteredData = liveData.filter { item ->
-                    item is AfinityMovie || item is AfinityShow
-                }
+                val filteredData =
+                    liveData.filter { item -> item is AfinityMovie || item is AfinityShow }
                 _latestMedia.value = filteredData
             }
         }
 
         scope.launch {
-            jellyfinRepository.getNextUpFlow().collect { liveData ->
-                _nextUp.value = liveData
-            }
+            jellyfinRepository.getNextUpFlow().collect { liveData -> _nextUp.value = liveData }
         }
     }
 
@@ -286,10 +293,11 @@ class AppDataRepository @Inject constructor(
             val libraries = _libraries.value
             if (libraries.isNotEmpty()) {
                 Timber.d("Reloading home data (preserving highest rated)...")
-                val (latestMovies, latestTvSeries, highestRated) = loadHomeSpecificData(
-                    libraries = libraries,
-                    existingHighestRated = _highestRated.value
-                )
+                val (latestMovies, latestTvSeries, highestRated) =
+                    loadHomeSpecificData(
+                        libraries = libraries,
+                        existingHighestRated = _highestRated.value,
+                    )
                 _latestMovies.value = latestMovies
                 _latestTvSeries.value = latestTvSeries
                 _highestRated.value = highestRated
@@ -303,9 +311,7 @@ class AppDataRepository @Inject constructor(
     private suspend fun loadLatestMedia(): List<AfinityItem> {
         return try {
             val allLatestMedia = jellyfinRepository.getLatestMedia(limit = 15)
-            allLatestMedia.filter { item ->
-                item is AfinityMovie || item is AfinityShow
-            }
+            allLatestMedia.filter { item -> item is AfinityMovie || item is AfinityShow }
         } catch (e: Exception) {
             Timber.e(e, "Failed to load latest media")
             emptyList()
@@ -315,20 +321,19 @@ class AppDataRepository @Inject constructor(
     private suspend fun loadHeroCarousel(): List<AfinityItem> {
         return try {
             val baseUrl = jellyfinRepository.getBaseUrl()
-            val randomHeroItems = jellyfinRepository.getItems(
-                includeItemTypes = listOf("MOVIE", "SERIES"),
-                sortBy = SortBy.RANDOM,
-                sortDescending = false,
-                limit = 15,
-                isPlayed = false,
-                fields = FieldSets.HERO_CAROUSEL,
-                imageTypes = listOf("Logo", "Backdrop"),
-                hasOverview = true,
-            )
+            val randomHeroItems =
+                jellyfinRepository.getItems(
+                    includeItemTypes = listOf("MOVIE", "SERIES"),
+                    sortBy = SortBy.RANDOM,
+                    sortDescending = false,
+                    limit = 15,
+                    isPlayed = false,
+                    fields = FieldSets.HERO_CAROUSEL,
+                    imageTypes = listOf("Logo", "Backdrop"),
+                    hasOverview = true,
+                )
 
-            randomHeroItems.items
-                ?.mapNotNull { it.toAfinityItem(baseUrl) }
-                ?: emptyList()
+            randomHeroItems.items?.mapNotNull { it.toAfinityItem(baseUrl) } ?: emptyList()
         } catch (e: Exception) {
             Timber.e(e, "Failed to load hero carousel items")
             emptyList()
@@ -364,7 +369,7 @@ class AppDataRepository @Inject constructor(
 
     private suspend fun loadHomeSpecificData(
         libraries: List<AfinityCollection>,
-        existingHighestRated: List<AfinityItem>? = null
+        existingHighestRated: List<AfinityItem>? = null,
     ): Triple<List<AfinityMovie>, List<AfinityShow>, List<AfinityItem>> {
         return try {
             val movieLibraries = libraries.filter { it.type == CollectionType.Movies }
@@ -372,85 +377,104 @@ class AppDataRepository @Inject constructor(
 
             val useJellyfinDefault = preferencesRepository.getHomeSortByDateAdded()
 
-            val (movieResults, showResults) = coroutineScope {
-                val moviesDeferred = async {
-                    if (useJellyfinDefault) {
-                        movieLibraries.map { library ->
-                            async {
-                                try {
-                                    val items = jellyfinRepository.getLatestMedia(
-                                        parentId = library.id,
-                                        limit = 30
-                                    ).filterIsInstance<AfinityMovie>()
-                                    library to items
-                                } catch (e: Exception) {
-                                    library to emptyList()
+            val (movieResults, showResults) =
+                coroutineScope {
+                    val moviesDeferred = async {
+                        if (useJellyfinDefault) {
+                            movieLibraries
+                                .map { library ->
+                                    async {
+                                        try {
+                                            val items =
+                                                jellyfinRepository
+                                                    .getLatestMedia(
+                                                        parentId = library.id,
+                                                        limit = 30,
+                                                    )
+                                                    .filterIsInstance<AfinityMovie>()
+                                            library to items
+                                        } catch (e: Exception) {
+                                            library to emptyList()
+                                        }
+                                    }
                                 }
-                            }
-                        }.awaitAll()
-                    } else {
-                        movieLibraries.map { library ->
-                            async {
-                                try {
-                                    library to jellyfinRepository.getMovies(
-                                        parentId = library.id,
-                                        sortBy = SortBy.RELEASE_DATE,
-                                        sortDescending = true,
-                                        limit = 30,
-                                        isPlayed = false
-                                    )
-                                } catch (e: Exception) {
-                                    library to emptyList()
+                                .awaitAll()
+                        } else {
+                            movieLibraries
+                                .map { library ->
+                                    async {
+                                        try {
+                                            library to
+                                                jellyfinRepository.getMovies(
+                                                    parentId = library.id,
+                                                    sortBy = SortBy.RELEASE_DATE,
+                                                    sortDescending = true,
+                                                    limit = 30,
+                                                    isPlayed = false,
+                                                )
+                                        } catch (e: Exception) {
+                                            library to emptyList()
+                                        }
+                                    }
                                 }
-                            }
-                        }.awaitAll()
+                                .awaitAll()
+                        }
                     }
-                }
 
-                val showsDeferred = async {
-                    if (useJellyfinDefault) {
-                        tvLibraries.map { library ->
-                            async {
-                                try {
-                                    val items = jellyfinRepository.getLatestMedia(
-                                        parentId = library.id,
-                                        limit = 30
-                                    ).filterIsInstance<AfinityShow>()
-                                    library to items
-                                } catch (e: Exception) {
-                                    library to emptyList()
+                    val showsDeferred = async {
+                        if (useJellyfinDefault) {
+                            tvLibraries
+                                .map { library ->
+                                    async {
+                                        try {
+                                            val items =
+                                                jellyfinRepository
+                                                    .getLatestMedia(
+                                                        parentId = library.id,
+                                                        limit = 30,
+                                                    )
+                                                    .filterIsInstance<AfinityShow>()
+                                            library to items
+                                        } catch (e: Exception) {
+                                            library to emptyList()
+                                        }
+                                    }
                                 }
-                            }
-                        }.awaitAll()
-                    } else {
-                        tvLibraries.map { library ->
-                            async {
-                                try {
-                                    library to jellyfinRepository.getShows(
-                                        parentId = library.id,
-                                        sortBy = SortBy.RELEASE_DATE,
-                                        sortDescending = true,
-                                        limit = 30,
-                                        isPlayed = false
-                                    )
-                                } catch (e: Exception) {
-                                    library to emptyList()
+                                .awaitAll()
+                        } else {
+                            tvLibraries
+                                .map { library ->
+                                    async {
+                                        try {
+                                            library to
+                                                jellyfinRepository.getShows(
+                                                    parentId = library.id,
+                                                    sortBy = SortBy.RELEASE_DATE,
+                                                    sortDescending = true,
+                                                    limit = 30,
+                                                    isPlayed = false,
+                                                )
+                                        } catch (e: Exception) {
+                                            library to emptyList()
+                                        }
+                                    }
                                 }
-                            }
-                        }.awaitAll()
+                                .awaitAll()
+                        }
                     }
-                }
 
-                Pair(moviesDeferred.await(), showsDeferred.await())
-            }
+                    Pair(moviesDeferred.await(), showsDeferred.await())
+                }
 
-            _separateMovieLibrarySections.value = movieResults
-                .filter { it.second.isNotEmpty() }
-                .map { (library, movies) -> library to movies.filter { !it.played }.take(15) }
+            _separateMovieLibrarySections.value =
+                movieResults
+                    .filter { it.second.isNotEmpty() }
+                    .map { (library, movies) -> library to movies.filter { !it.played }.take(15) }
 
-            _separateTvLibrarySections.value = showResults
-                .filter { it.second.isNotEmpty() }
-                .map { (library, shows) -> library to shows.filter { !it.played }.take(15) }
+            _separateTvLibrarySections.value =
+                showResults
+                    .filter { it.second.isNotEmpty() }
+                    .map { (library, shows) -> library to shows.filter { !it.played }.take(15) }
 
             val allMoviesIncludingWatched = movieResults.flatMap { it.second }
             val allSeriesIncludingWatched = showResults.flatMap { it.second }
@@ -458,37 +482,36 @@ class AppDataRepository @Inject constructor(
             val allLatestMovies = allMoviesIncludingWatched.filter { !it.played }
             val allLatestSeries = allSeriesIncludingWatched.filter { !it.played }
 
-            val latestMovies = if (useJellyfinDefault) {
-                allLatestMovies.sortedByDescending { it.dateCreated }.take(15)
-            } else {
-                allLatestMovies.sortedByDescending { it.premiereDate }.take(15)
-            }
-
-            val latestTvSeries = if (useJellyfinDefault) {
-                allLatestSeries.sortedByDescending { it.dateCreated }.take(15)
-            } else {
-                allLatestSeries.sortedByDescending { it.premiereDate }.take(15)
-            }
-
-            val highestRated = existingHighestRated ?: run {
-                val highRatedMovies = allMoviesIncludingWatched.filter {
-                    (it.communityRating ?: 0f) > 6.5f
+            val latestMovies =
+                if (useJellyfinDefault) {
+                    allLatestMovies.sortedByDescending { it.dateCreated }.take(15)
+                } else {
+                    allLatestMovies.sortedByDescending { it.premiereDate }.take(15)
                 }
-                val highRatedShows = allSeriesIncludingWatched.filter {
-                    (it.communityRating ?: 0f) > 6.5f
+
+            val latestTvSeries =
+                if (useJellyfinDefault) {
+                    allLatestSeries.sortedByDescending { it.dateCreated }.take(15)
+                } else {
+                    allLatestSeries.sortedByDescending { it.premiereDate }.take(15)
                 }
 
-                (highRatedMovies + highRatedShows)
-                    .shuffled()
-                    .take(10)
-                    .sortedByDescending {
-                        when (it) {
-                            is AfinityMovie -> it.communityRating ?: 0f
-                            is AfinityShow -> it.communityRating ?: 0f
-                            else -> 0f
+            val highestRated =
+                existingHighestRated
+                    ?: run {
+                        val highRatedMovies =
+                            allMoviesIncludingWatched.filter { (it.communityRating ?: 0f) > 6.5f }
+                        val highRatedShows =
+                            allSeriesIncludingWatched.filter { (it.communityRating ?: 0f) > 6.5f }
+
+                        (highRatedMovies + highRatedShows).shuffled().take(10).sortedByDescending {
+                            when (it) {
+                                is AfinityMovie -> it.communityRating ?: 0f
+                                is AfinityShow -> it.communityRating ?: 0f
+                                else -> 0f
+                            }
                         }
                     }
-            }
 
             Triple(latestMovies, latestTvSeries, highestRated)
         } catch (e: Exception) {
@@ -508,20 +531,22 @@ class AppDataRepository @Inject constructor(
                 if (isFresh) return
             }
 
-            val genres = jellyfinRepository.getGenres(
-                parentId = null,
-                limit = null,
-                includeItemTypes = listOf("MOVIE")
-            )
+            val genres =
+                jellyfinRepository.getGenres(
+                    parentId = null,
+                    limit = null,
+                    includeItemTypes = listOf("MOVIE"),
+                )
 
             val timestamp = System.currentTimeMillis()
-            val genreEntities = genres.map { genreName ->
-                com.makd.afinity.data.database.entities.GenreCacheEntity(
-                    genreName = genreName,
-                    lastFetchedTimestamp = timestamp,
-                    movieCount = 0
-                )
-            }
+            val genreEntities =
+                genres.map { genreName ->
+                    com.makd.afinity.data.database.entities.GenreCacheEntity(
+                        genreName = genreName,
+                        lastFetchedTimestamp = timestamp,
+                        movieCount = 0,
+                    )
+                }
             genreCacheDao.insertGenreCaches(genreEntities)
         } catch (e: Exception) {
             Timber.e(e, "Failed to load genres")
@@ -537,9 +562,10 @@ class AppDataRepository @Inject constructor(
 
                 val cachedMovieEntities = genreCacheDao.getCachedMoviesForGenre(genre)
                 if (cachedMovieEntities.isNotEmpty()) {
-                    val cachedMovies = cachedMovieEntities.mapNotNull { entity ->
-                        afinityTypeConverters.toAfinityMovie(entity.movieData)
-                    }
+                    val cachedMovies =
+                        cachedMovieEntities.mapNotNull { entity ->
+                            afinityTypeConverters.toAfinityMovie(entity.movieData)
+                        }
 
                     if (cachedMovies.isNotEmpty()) {
                         _genreMovies.value += (genre to cachedMovies)
@@ -553,23 +579,25 @@ class AppDataRepository @Inject constructor(
                     }
                 }
 
-                val movies = jellyfinRepository.getMoviesByGenre(
-                    genre = genre,
-                    limit = limit,
-                    shuffle = true
-                )
+                val movies =
+                    jellyfinRepository.getMoviesByGenre(
+                        genre = genre,
+                        limit = limit,
+                        shuffle = true,
+                    )
 
                 if (movies.isNotEmpty()) {
                     val timestamp = System.currentTimeMillis()
-                    val movieEntities = movies.mapIndexed { index, movie ->
-                        GenreMovieCacheEntity(
-                            genreName = genre,
-                            movieId = movie.id.toString(),
-                            movieData = afinityTypeConverters.fromAfinityMovie(movie) ?: "",
-                            position = index,
-                            cachedTimestamp = timestamp
-                        )
-                    }
+                    val movieEntities =
+                        movies.mapIndexed { index, movie ->
+                            GenreMovieCacheEntity(
+                                genreName = genre,
+                                movieId = movie.id.toString(),
+                                movieData = afinityTypeConverters.fromAfinityMovie(movie) ?: "",
+                                position = index,
+                                cachedTimestamp = timestamp,
+                            )
+                        }
                     genreCacheDao.cacheGenreWithMovies(genre, movieEntities, timestamp)
                 }
 
@@ -581,13 +609,15 @@ class AppDataRepository @Inject constructor(
 
                 try {
                     val fallbackEntities = genreCacheDao.getCachedMoviesForGenre(genre)
-                    val fallbackMovies = fallbackEntities.mapNotNull { entity ->
-                        afinityTypeConverters.toAfinityMovie(entity.movieData)
-                    }
+                    val fallbackMovies =
+                        fallbackEntities.mapNotNull { entity ->
+                            afinityTypeConverters.toAfinityMovie(entity.movieData)
+                        }
                     if (fallbackMovies.isNotEmpty()) {
                         _genreMovies.value += (genre to fallbackMovies)
                     }
-                } catch (cacheError: Exception) { /* Ignore */
+                } catch (cacheError: Exception) {
+                    /* Ignore */
                 }
             }
         }
@@ -627,20 +657,22 @@ class AppDataRepository @Inject constructor(
                 if (isFresh) return
             }
 
-            val genres = jellyfinRepository.getGenres(
-                parentId = null,
-                limit = null,
-                includeItemTypes = listOf("SERIES")
-            )
+            val genres =
+                jellyfinRepository.getGenres(
+                    parentId = null,
+                    limit = null,
+                    includeItemTypes = listOf("SERIES"),
+                )
 
             val timestamp = System.currentTimeMillis()
-            val genreEntities = genres.map { genreName ->
-                com.makd.afinity.data.database.entities.ShowGenreCacheEntity(
-                    genreName = genreName,
-                    lastFetchedTimestamp = timestamp,
-                    showCount = 0
-                )
-            }
+            val genreEntities =
+                genres.map { genreName ->
+                    com.makd.afinity.data.database.entities.ShowGenreCacheEntity(
+                        genreName = genreName,
+                        lastFetchedTimestamp = timestamp,
+                        showCount = 0,
+                    )
+                }
             genreCacheDao.insertShowGenreCaches(genreEntities)
         } catch (e: Exception) {
             Timber.e(e, "Failed to load show genres")
@@ -655,9 +687,10 @@ class AppDataRepository @Inject constructor(
 
             val cachedShowEntities = genreCacheDao.getCachedShowsForGenre(genre)
             if (cachedShowEntities.isNotEmpty()) {
-                val cachedShows = cachedShowEntities.mapNotNull { entity ->
-                    afinityTypeConverters.toAfinityShow(entity.showData)
-                }
+                val cachedShows =
+                    cachedShowEntities.mapNotNull { entity ->
+                        afinityTypeConverters.toAfinityShow(entity.showData)
+                    }
 
                 if (cachedShows.isNotEmpty()) {
                     _genreShows.value += (genre to cachedShows)
@@ -670,23 +703,21 @@ class AppDataRepository @Inject constructor(
                 }
             }
 
-            val shows = jellyfinRepository.getShowsByGenre(
-                genre = genre,
-                limit = limit,
-                shuffle = true
-            )
+            val shows =
+                jellyfinRepository.getShowsByGenre(genre = genre, limit = limit, shuffle = true)
 
             if (shows.isNotEmpty()) {
                 val timestamp = System.currentTimeMillis()
-                val showEntities = shows.mapIndexed { index, show ->
-                    GenreShowCacheEntity(
-                        genreName = genre,
-                        showId = show.id.toString(),
-                        showData = afinityTypeConverters.fromAfinityShow(show) ?: "",
-                        position = index,
-                        cachedTimestamp = timestamp
-                    )
-                }
+                val showEntities =
+                    shows.mapIndexed { index, show ->
+                        GenreShowCacheEntity(
+                            genreName = genre,
+                            showId = show.id.toString(),
+                            showData = afinityTypeConverters.fromAfinityShow(show) ?: "",
+                            position = index,
+                            cachedTimestamp = timestamp,
+                        )
+                    }
                 genreCacheDao.cacheGenreWithShows(genre, showEntities, timestamp)
             }
 
@@ -702,9 +733,10 @@ class AppDataRepository @Inject constructor(
         try {
             val cachedStudios = studioCacheDao.getAllCachedStudios()
             if (cachedStudios.isNotEmpty()) {
-                val studios = cachedStudios.mapNotNull { entity ->
-                    afinityTypeConverters.toAfinityStudio(entity.studioData)
-                }
+                val studios =
+                    cachedStudios.mapNotNull { entity ->
+                        afinityTypeConverters.toAfinityStudio(entity.studioData)
+                    }
 
                 if (studios.isNotEmpty()) {
                     _studios.value = studios
@@ -714,22 +746,24 @@ class AppDataRepository @Inject constructor(
                 }
             }
 
-            val studios: List<AfinityStudio> = jellyfinRepository.getStudios(
-                parentId = null,
-                limit = 15,
-                includeItemTypes = listOf("MOVIE", "SERIES")
-            )
+            val studios: List<AfinityStudio> =
+                jellyfinRepository.getStudios(
+                    parentId = null,
+                    limit = 15,
+                    includeItemTypes = listOf("MOVIE", "SERIES"),
+                )
 
             if (studios.isNotEmpty()) {
                 val timestamp = System.currentTimeMillis()
-                val studioEntities = studios.mapIndexed { index: Int, studio: AfinityStudio ->
-                    com.makd.afinity.data.database.entities.StudioCacheEntity(
-                        studioId = studio.id.toString(),
-                        studioData = afinityTypeConverters.fromAfinityStudio(studio) ?: "",
-                        position = index,
-                        cachedTimestamp = timestamp
-                    )
-                }
+                val studioEntities =
+                    studios.mapIndexed { index: Int, studio: AfinityStudio ->
+                        com.makd.afinity.data.database.entities.StudioCacheEntity(
+                            studioId = studio.id.toString(),
+                            studioData = afinityTypeConverters.fromAfinityStudio(studio) ?: "",
+                            position = index,
+                            cachedTimestamp = timestamp,
+                        )
+                    }
                 studioCacheDao.replaceStudios(studioEntities)
             }
 
@@ -742,35 +776,32 @@ class AppDataRepository @Inject constructor(
     private fun filterItemsByPersonRole(
         items: List<AfinityItem>,
         personId: UUID,
-        personType: PersonKind
+        personType: PersonKind,
     ): List<AfinityItem> {
         return items.filter { item ->
-            val people = when (item) {
-                is AfinityMovie -> item.people
-                is AfinityShow -> item.people
-                is AfinityEpisode -> item.people
-                else -> emptyList()
-            }
-            people.any { person ->
-                person.id == personId && person.type == personType
-            }
+            val people =
+                when (item) {
+                    is AfinityMovie -> item.people
+                    is AfinityShow -> item.people
+                    is AfinityEpisode -> item.people
+                    else -> emptyList()
+                }
+            people.any { person -> person.id == personId && person.type == personType }
         }
     }
 
     suspend fun getTopPeople(
         type: PersonKind,
         limit: Int = 100,
-        minAppearances: Int = 10
+        minAppearances: Int = 10,
     ): List<PersonWithCount> {
         try {
             val cached = topPeopleDao.getCachedTopPeople(type.name)
             val currentTime = System.currentTimeMillis()
 
-            if (cached != null && topPeopleDao.isTopPeopleCacheFresh(
-                    type.name,
-                    PEOPLE_CACHE_TTL,
-                    currentTime
-                )
+            if (
+                cached != null &&
+                    topPeopleDao.isTopPeopleCacheFresh(type.name, PEOPLE_CACHE_TTL, currentTime)
             ) {
                 val cachedData =
                     json.decodeFromString<List<CachedPersonWithCount>>(cached.peopleData)
@@ -783,61 +814,70 @@ class AppDataRepository @Inject constructor(
             val scanLimit = 150
             val peopleFrequency = mutableMapOf<String, Pair<AfinityPerson, Int>>()
 
-            val moviesResponse = jellyfinRepository.getItems(
-                includeItemTypes = listOf("Movie"),
-                fields = listOf(ItemFields.PEOPLE),
-                limit = scanLimit,
-                sortBy = SortBy.DATE_ADDED,
-                sortDescending = true
-            )
+            val moviesResponse =
+                jellyfinRepository.getItems(
+                    includeItemTypes = listOf("Movie"),
+                    fields = listOf(ItemFields.PEOPLE),
+                    limit = scanLimit,
+                    sortBy = SortBy.DATE_ADDED,
+                    sortDescending = true,
+                )
 
             val movies = moviesResponse.items ?: emptyList()
 
             movies.forEach { movieItem ->
-                movieItem.people?.filter { it.type == type }?.forEach { personDto ->
-                    val key = personDto.name ?: return@forEach
-
-                    if (!peopleFrequency.containsKey(key)) {
-                        val id = personDto.id
-                        val primaryTag = personDto.primaryImageTag
-
-                        val imageUri = primaryTag?.let { tag ->
-                            baseUrl.toUri().buildUpon()
-                                .appendEncodedPath("Items/$id/Images/Primary")
-                                .appendQueryParameter("tag", tag)
-                                .build()
-                        }
+                movieItem.people
+                    ?.filter { it.type == type }
+                    ?.forEach { personDto ->
+                        val key = personDto.name ?: return@forEach
+
+                        if (!peopleFrequency.containsKey(key)) {
+                            val id = personDto.id
+                            val primaryTag = personDto.primaryImageTag
+
+                            val imageUri =
+                                primaryTag?.let { tag ->
+                                    baseUrl
+                                        .toUri()
+                                        .buildUpon()
+                                        .appendEncodedPath("Items/$id/Images/Primary")
+                                        .appendQueryParameter("tag", tag)
+                                        .build()
+                                }
 
-                        val afinityPerson = AfinityPerson(
-                            id = id,
-                            name = key,
-                            type = type,
-                            role = personDto.role ?: type.name,
-                            image = AfinityPersonImage(imageUri, null)
-                        )
-                        peopleFrequency[key] = afinityPerson to 1
-                    } else {
-                        val current = peopleFrequency[key]!!
-                        peopleFrequency[key] = current.first to (current.second + 1)
+                            val afinityPerson =
+                                AfinityPerson(
+                                    id = id,
+                                    name = key,
+                                    type = type,
+                                    role = personDto.role ?: type.name,
+                                    image = AfinityPersonImage(imageUri, null),
+                                )
+                            peopleFrequency[key] = afinityPerson to 1
+                        } else {
+                            val current = peopleFrequency[key]!!
+                            peopleFrequency[key] = current.first to (current.second + 1)
+                        }
                     }
-                }
             }
 
-            val mappedPeople = peopleFrequency.values
-                .filter { it.second >= 2 }
-                .sortedByDescending { it.second }
-                .take(limit)
-                .map { PersonWithCount(it.first, it.second) }
+            val mappedPeople =
+                peopleFrequency.values
+                    .filter { it.second >= 2 }
+                    .sortedByDescending { it.second }
+                    .take(limit)
+                    .map { PersonWithCount(it.first, it.second) }
 
             Timber.d("Scan complete: Found ${mappedPeople.size} ${type.name}s")
 
             if (mappedPeople.isNotEmpty()) {
                 val cachedData = mappedPeople.map { it.toCached() }
-                val entity = TopPeopleCacheEntity(
-                    personType = type.name,
-                    peopleData = json.encodeToString(cachedData),
-                    cachedTimestamp = System.currentTimeMillis()
-                )
+                val entity =
+                    TopPeopleCacheEntity(
+                        personType = type.name,
+                        peopleData = json.encodeToString(cachedData),
+                        cachedTimestamp = System.currentTimeMillis(),
+                    )
                 topPeopleDao.insertTopPeople(entity)
             }
 
@@ -850,7 +890,7 @@ class AppDataRepository @Inject constructor(
 
     suspend fun getPersonSection(
         personWithCount: PersonWithCount,
-        sectionType: PersonSectionType
+        sectionType: PersonSectionType,
     ): PersonSection? {
         try {
             val person = personWithCount.person
@@ -859,60 +899,66 @@ class AppDataRepository @Inject constructor(
             val cached = personSectionDao.getCachedSection(cacheKey)
             val currentTime = System.currentTimeMillis()
 
-            if (cached != null && personSectionDao.isSectionCacheFresh(
-                    cacheKey,
-                    PERSON_SECTION_CACHE_TTL,
-                    currentTime
-                )
+            if (
+                cached != null &&
+                    personSectionDao.isSectionCacheFresh(
+                        cacheKey,
+                        PERSON_SECTION_CACHE_TTL,
+                        currentTime,
+                    )
             ) {
-                val cachedPersonData = PersonWithCount.fromCached(
-                    json.decodeFromString<CachedPersonWithCount>(cached.personData)
-                )
-                val cachedItems = json.decodeFromString<List<String>>(cached.itemsData)
-                    .mapNotNull { afinityTypeConverters.toAfinityMovie(it) }
+                val cachedPersonData =
+                    PersonWithCount.fromCached(
+                        json.decodeFromString<CachedPersonWithCount>(cached.personData)
+                    )
+                val cachedItems =
+                    json.decodeFromString<List<String>>(cached.itemsData).mapNotNull {
+                        afinityTypeConverters.toAfinityMovie(it)
+                    }
                 return PersonSection(
                     person = cachedPersonData.person,
                     appearanceCount = cachedPersonData.appearanceCount,
                     items = cachedItems,
-                    sectionType = sectionType
+                    sectionType = sectionType,
                 )
             }
 
-            val allPersonItems = jellyfinRepository.getPersonItems(
-                personId = person.id,
-                includeItemTypes = listOf("MOVIE", "SERIES"),
-                fields = listOf(ItemFields.PEOPLE)
-            )
+            val allPersonItems =
+                jellyfinRepository.getPersonItems(
+                    personId = person.id,
+                    includeItemTypes = listOf("MOVIE", "SERIES"),
+                    fields = listOf(ItemFields.PEOPLE),
+                )
 
-            val filteredItems = filterItemsByPersonRole(
-                items = allPersonItems,
-                personId = person.id,
-                personType = sectionType.toPersonKind()
-            )
+            val filteredItems =
+                filterItemsByPersonRole(
+                    items = allPersonItems,
+                    personId = person.id,
+                    personType = sectionType.toPersonKind(),
+                )
 
             if (filteredItems.size < 5) return null
 
-            val selectedItems = filteredItems
-                .filterIsInstance<AfinityMovie>()
-                .shuffled()
-                .take(20)
+            val selectedItems = filteredItems.filterIsInstance<AfinityMovie>().shuffled().take(20)
 
-            val section = PersonSection(
-                person = person,
-                appearanceCount = personWithCount.appearanceCount,
-                items = selectedItems,
-                sectionType = sectionType
-            )
+            val section =
+                PersonSection(
+                    person = person,
+                    appearanceCount = personWithCount.appearanceCount,
+                    items = selectedItems,
+                    sectionType = sectionType,
+                )
 
             val movieJsonStrings =
                 selectedItems.mapNotNull { afinityTypeConverters.fromAfinityMovie(it) }
-            val entity = PersonSectionCacheEntity(
-                cacheKey = cacheKey,
-                personData = json.encodeToString(personWithCount.toCached()),
-                itemsData = json.encodeToString(movieJsonStrings),
-                sectionType = sectionType.name,
-                cachedTimestamp = currentTime
-            )
+            val entity =
+                PersonSectionCacheEntity(
+                    cacheKey = cacheKey,
+                    personData = json.encodeToString(personWithCount.toCached()),
+                    itemsData = json.encodeToString(movieJsonStrings),
+                    sectionType = sectionType.name,
+                    cachedTimestamp = currentTime,
+                )
             personSectionDao.insertSection(entity)
 
             return section
@@ -922,9 +968,7 @@ class AppDataRepository @Inject constructor(
         }
     }
 
-    suspend fun getRandomRecentlyWatchedMovie(
-        excludedMovies: Set<UUID>
-    ): AfinityMovie? {
+    suspend fun getRandomRecentlyWatchedMovie(excludedMovies: Set<UUID>): AfinityMovie? {
         try {
             val now = System.currentTimeMillis()
             val cached = recentWatchedCache
@@ -933,12 +977,13 @@ class AppDataRepository @Inject constructor(
                 if (cached != null && now - cached.first < RECENT_WATCHED_CACHE_TTL) {
                     cached.second
                 } else {
-                    val movies = jellyfinRepository.getMovies(
-                        sortBy = SortBy.DATE_PLAYED,
-                        sortDescending = true,
-                        limit = 10,
-                        isPlayed = true
-                    )
+                    val movies =
+                        jellyfinRepository.getMovies(
+                            sortBy = SortBy.DATE_PLAYED,
+                            sortDescending = true,
+                            limit = 10,
+                            isPlayed = true,
+                        )
                     recentWatchedCache = now to movies
                     movies
                 }
@@ -998,4 +1043,4 @@ class AppDataRepository @Inject constructor(
         _separateMovieLibrarySections.value = emptyList()
         _separateTvLibrarySections.value = emptyList()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/AudiobookshelfRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/AudiobookshelfRepository.kt
new file mode 100644
index 000000000..aeee81c18
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/data/repository/AudiobookshelfRepository.kt
@@ -0,0 +1,122 @@
+package com.makd.afinity.data.repository
+
+import com.makd.afinity.data.models.audiobookshelf.AudiobookshelfSeries
+import com.makd.afinity.data.models.audiobookshelf.AudiobookshelfUser
+import com.makd.afinity.data.models.audiobookshelf.Library
+import com.makd.afinity.data.models.audiobookshelf.LibraryItem
+import com.makd.afinity.data.models.audiobookshelf.MediaProgress
+import com.makd.afinity.data.models.audiobookshelf.PersonalizedView
+import com.makd.afinity.data.models.audiobookshelf.PlaybackSession
+import com.makd.afinity.data.models.audiobookshelf.SearchResponse
+import java.util.UUID
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.StateFlow
+
+data class ItemWithProgress(val item: LibraryItem, val progress: MediaProgress?)
+
+interface AudiobookshelfRepository {
+
+    suspend fun setActiveJellyfinSession(serverId: String, userId: UUID)
+
+    fun clearActiveSession()
+
+    val currentSessionId: StateFlow<String?>
+
+    val isAuthenticated: StateFlow<Boolean>
+
+    val currentConfig: StateFlow<AudiobookshelfConfig?>
+
+    suspend fun login(
+        serverUrl: String,
+        username: String,
+        password: String,
+    ): Result<AudiobookshelfUser>
+
+    suspend fun logout(): Result<Unit>
+
+    suspend fun validateToken(): Result<Boolean>
+
+    suspend fun setServerUrl(url: String)
+
+    suspend fun getServerUrl(): String?
+
+    suspend fun hasValidConfiguration(): Boolean
+
+    fun getLibrariesFlow(): Flow<List<Library>>
+
+    suspend fun refreshLibraries(): Result<List<Library>>
+
+    suspend fun getLibrary(libraryId: String): Result<Library>
+
+    fun getLibraryItemsFlow(libraryId: String): Flow<List<LibraryItem>>
+
+    suspend fun refreshLibraryItems(
+        libraryId: String,
+        limit: Int = 100,
+        page: Int = 0,
+    ): Result<List<LibraryItem>>
+
+    suspend fun getItemDetails(itemId: String): Result<LibraryItem>
+
+    suspend fun searchLibrary(libraryId: String, query: String): Result<SearchResponse>
+
+    suspend fun getSeries(
+        libraryId: String,
+        limit: Int = 100,
+        page: Int = 0,
+    ): Result<List<AudiobookshelfSeries>>
+
+    suspend fun getSeriesItems(
+        libraryId: String,
+        seriesId: String,
+        limit: Int = 4,
+    ): Result<SeriesItemsResult>
+
+    suspend fun getPersonalized(libraryId: String): Result<List<PersonalizedView>>
+
+    fun getInProgressItemsFlow(): Flow<List<ItemWithProgress>>
+
+    suspend fun refreshProgress(): Result<List<MediaProgress>>
+
+    suspend fun updateProgress(
+        itemId: String,
+        episodeId: String?,
+        currentTime: Double,
+        duration: Double,
+        isFinished: Boolean,
+    ): Result<MediaProgress>
+
+    fun getProgressForItemFlow(itemId: String): Flow<MediaProgress?>
+
+    suspend fun startPlaybackSession(itemId: String, episodeId: String?): Result<PlaybackSession>
+
+    suspend fun syncPlaybackSession(
+        sessionId: String,
+        timeListened: Double,
+        currentTime: Double,
+        duration: Double,
+    ): Result<Unit>
+
+    suspend fun closePlaybackSession(
+        sessionId: String,
+        currentTime: Double,
+        timeListened: Double,
+        duration: Double,
+    ): Result<Unit>
+
+    suspend fun syncPendingProgress(): Result<Int>
+
+    suspend fun getGenres(): Result<List<String>>
+
+    suspend fun getLibraryItemsByGenre(libraryId: String, genre: String): Result<List<LibraryItem>>
+
+    suspend fun getGenreItemsLimited(
+        libraryId: String,
+        genre: String,
+        limit: Int,
+    ): Result<List<LibraryItem>>
+}
+
+data class AudiobookshelfConfig(val serverUrl: String, val absUserId: String, val username: String)
+
+data class SeriesItemsResult(val items: List<LibraryItem>, val totalBooks: Int)
diff --git a/app/src/main/java/com/makd/afinity/data/repository/DatabaseRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/DatabaseRepository.kt
index d9a188d57..fdf2214d0 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/DatabaseRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/DatabaseRepository.kt
@@ -19,125 +19,216 @@ import com.makd.afinity.data.models.server.ServerWithAddresses
 import com.makd.afinity.data.models.server.ServerWithAddressesAndUsers
 import com.makd.afinity.data.models.user.AfinityUserDataDto
 import com.makd.afinity.data.models.user.User
-import kotlinx.coroutines.flow.Flow
 import java.util.UUID
+import kotlinx.coroutines.flow.Flow
 
 interface DatabaseRepository {
 
     suspend fun insertServer(server: Server)
+
     suspend fun updateServer(server: Server)
+
     suspend fun deleteServer(serverId: String)
+
     suspend fun getServer(serverId: String): Server?
+
     suspend fun getAllServers(): List<Server>
+
     fun getAllServersFlow(): Flow<List<Server>>
 
     suspend fun insertServerAddress(serverAddress: ServerAddress)
+
     suspend fun updateServerAddress(serverAddress: ServerAddress)
+
     suspend fun deleteServerAddress(addressId: UUID)
+
     suspend fun getServerAddresses(serverId: String): List<ServerAddress>
+
     suspend fun getServerWithAddresses(serverId: String): ServerWithAddresses?
+
     suspend fun getServerWithAddressesAndUsers(serverId: String): ServerWithAddressesAndUsers?
 
     suspend fun insertUser(user: User)
+
     suspend fun updateUser(user: User)
+
     suspend fun deleteUser(userId: UUID)
+
     suspend fun getUser(userId: UUID): User?
+
     suspend fun getUsersForServer(serverId: String): List<User>
+
     suspend fun getAllUsers(): List<User>
+
     suspend fun getCurrentUser(): User?
 
     suspend fun insertMovie(movie: AfinityMovie, serverId: String? = null)
+
     suspend fun updateMovie(movie: AfinityMovie)
+
     suspend fun deleteMovie(movieId: UUID)
+
     suspend fun getMovie(movieId: UUID, userId: UUID): AfinityMovie?
+
     suspend fun getAllMovies(userId: UUID, serverId: String? = null): List<AfinityMovie>
+
     suspend fun searchMovies(query: String, userId: UUID): List<AfinityMovie>
+
     fun getMoviesFlow(userId: UUID): Flow<List<AfinityMovie>>
 
     suspend fun insertShow(show: AfinityShow, serverId: String? = null)
+
     suspend fun updateShow(show: AfinityShow)
+
     suspend fun deleteShow(showId: UUID)
+
     suspend fun getShow(showId: UUID, userId: UUID): AfinityShow?
+
     suspend fun getAllShows(userId: UUID, serverId: String? = null): List<AfinityShow>
+
     suspend fun searchShows(query: String, userId: UUID): List<AfinityShow>
+
     fun getShowsFlow(userId: UUID): Flow<List<AfinityShow>>
 
     suspend fun insertSeason(season: AfinitySeason, serverId: String? = null)
+
     suspend fun updateSeason(season: AfinitySeason)
+
     suspend fun deleteSeason(seasonId: UUID)
+
     suspend fun getSeason(seasonId: UUID, userId: UUID): AfinitySeason?
+
     suspend fun getSeasonsForShow(showId: UUID, userId: UUID): List<AfinitySeason>
 
     suspend fun insertEpisode(episode: AfinityEpisode, serverId: String? = null)
+
     suspend fun updateEpisode(episode: AfinityEpisode)
+
     suspend fun deleteEpisode(episodeId: UUID)
+
     suspend fun getEpisode(episodeId: UUID, userId: UUID): AfinityEpisode?
+
     suspend fun getEpisodesForSeason(seasonId: UUID, userId: UUID): List<AfinityEpisode>
+
     suspend fun getEpisodesForShow(showId: UUID, userId: UUID): List<AfinityEpisode>
+
     suspend fun getNextEpisodesToWatch(userId: UUID, limit: Int = 16): List<AfinityEpisode>
+
     suspend fun searchEpisodes(query: String, userId: UUID): List<AfinityEpisode>
+
     fun getEpisodesFlow(seasonId: UUID, userId: UUID): Flow<List<AfinityEpisode>>
 
     suspend fun insertSource(source: AfinitySource, itemId: UUID)
+
     suspend fun updateSource(source: AfinitySource)
+
     suspend fun deleteSource(sourceId: String)
+
     suspend fun getSource(sourceId: String): AfinitySource?
+
     suspend fun getSourcesForItem(itemId: UUID): List<AfinitySource>
 
     suspend fun insertMediaStream(stream: AfinityMediaStream, sourceId: String)
+
     suspend fun updateMediaStream(stream: AfinityMediaStream)
+
     suspend fun deleteMediaStream(streamId: UUID)
+
     suspend fun getMediaStreamsForSource(sourceId: String): List<AfinityMediaStream>
 
     suspend fun insertTrickplayInfo(trickplayInfo: AfinityTrickplayInfo, sourceId: String)
+
     suspend fun updateTrickplayInfo(trickplayInfo: AfinityTrickplayInfo)
+
     suspend fun deleteTrickplayInfo(sourceId: String)
+
     suspend fun getTrickplayInfo(sourceId: String): AfinityTrickplayInfo?
 
     suspend fun insertSegment(segment: AfinitySegment, itemId: UUID)
+
     suspend fun updateSegment(segment: AfinitySegment, itemId: UUID)
+
     suspend fun deleteSegment(itemId: UUID, segmentType: AfinitySegmentType)
+
     suspend fun getSegmentsForItem(itemId: UUID): List<AfinitySegment>
 
     suspend fun insertUserData(userData: AfinityUserDataDto)
+
     suspend fun updateUserData(userData: AfinityUserDataDto)
+
     suspend fun deleteUserData(userId: UUID, itemId: UUID)
+
     suspend fun getUserData(userId: UUID, itemId: UUID): AfinityUserDataDto?
+
     suspend fun getUserDataOrCreateNew(itemId: UUID, userId: UUID): AfinityUserDataDto
+
     suspend fun getAllUserDataToSync(userId: UUID): List<AfinityUserDataDto>
+
     suspend fun getAllUserDataToSync(userId: UUID, serverId: String): List<AfinityUserDataDto>
+
     suspend fun markUserDataSynced(userId: UUID, itemId: UUID)
+
     suspend fun markUserDataSynced(userId: UUID, itemId: UUID, serverId: String)
 
     suspend fun getFavoriteMovies(userId: UUID): List<AfinityMovie>
+
     suspend fun getFavoriteShows(userId: UUID): List<AfinityShow>
+
     suspend fun getFavoriteEpisodes(userId: UUID): List<AfinityEpisode>
+
     fun getFavoriteMoviesFlow(userId: UUID): Flow<List<AfinityMovie>>
+
     fun getFavoriteShowsFlow(userId: UUID): Flow<List<AfinityShow>>
 
     suspend fun getRecentlyWatchedItems(userId: UUID, limit: Int = 20): List<AfinityItem>
+
     suspend fun getContinueWatchingMovies(userId: UUID, limit: Int = 16): List<AfinityMovie>
+
     suspend fun getContinueWatchingEpisodes(userId: UUID, limit: Int = 16): List<AfinityEpisode>
+
     fun getContinueWatchingFlow(userId: UUID): Flow<List<AfinityItem>>
 
     suspend fun searchAllItems(query: String, userId: UUID): List<AfinityItem>
 
     suspend fun clearAllData()
+
     suspend fun clearServerData(serverId: String)
+
     suspend fun clearUserData(userId: UUID)
+
     suspend fun getDatabaseSize(): Long
 
     suspend fun insertDownload(download: DownloadDto)
+
     suspend fun getDownload(downloadId: UUID): DownloadDto?
+
     suspend fun getDownloadByItemId(itemId: UUID): DownloadDto?
-    suspend fun getDownloadByItemIdScoped(itemId: UUID, serverId: String, userId: UUID): DownloadDto?
+
+    suspend fun getDownloadByItemIdScoped(
+        itemId: UUID,
+        serverId: String,
+        userId: UUID,
+    ): DownloadDto?
+
     fun getAllDownloadsFlow(): Flow<List<DownloadDto>>
+
     fun getAllDownloadsFlowScoped(serverId: String, userId: UUID): Flow<List<DownloadDto>>
+
     fun getDownloadsByStatusFlow(statuses: List<DownloadStatus>): Flow<List<DownloadDto>>
-    fun getDownloadsByStatusFlowScoped(statuses: List<DownloadStatus>, serverId: String, userId: UUID): Flow<List<DownloadDto>>
+
+    fun getDownloadsByStatusFlowScoped(
+        statuses: List<DownloadStatus>,
+        serverId: String,
+        userId: UUID,
+    ): Flow<List<DownloadDto>>
+
     suspend fun getTotalBytesForServer(serverId: String): Long
+
     suspend fun getTotalBytesAllServers(): Long
+
     suspend fun backfillEmptyServerIds(serverId: String, userId: UUID)
+
     suspend fun deleteDownload(downloadId: UUID)
+
     suspend fun getSources(itemId: UUID): List<AfinitySourceDto>
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/FieldSets.kt b/app/src/main/java/com/makd/afinity/data/repository/FieldSets.kt
index b9e2a1442..300baae82 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/FieldSets.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/FieldSets.kt
@@ -4,109 +4,102 @@ import org.jellyfin.sdk.model.api.ItemFields
 
 object FieldSets {
 
-    val HERO_CAROUSEL = listOf(
-        ItemFields.GENRES,
-        ItemFields.OVERVIEW,
-        ItemFields.REMOTE_TRAILERS,
-        ItemFields.CHILD_COUNT
-    )
-
-    val MEDIA_ITEM_CARDS = listOf(
-        ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
-        ItemFields.CHILD_COUNT,
-        ItemFields.RECURSIVE_ITEM_COUNT,
-        ItemFields.DATE_CREATED,
-        ItemFields.DATE_LAST_MEDIA_ADDED
-    )
-
-    val CONTINUE_WATCHING = listOf(
-        ItemFields.PRIMARY_IMAGE_ASPECT_RATIO
-    )
-
-    val NEXT_UP = listOf(
-        ItemFields.PRIMARY_IMAGE_ASPECT_RATIO
-    )
-
-    val LIBRARY_GRID = listOf(
-        ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
-        ItemFields.RECURSIVE_ITEM_COUNT
-    )
-
-    val SEARCH_RESULTS = listOf(
-        ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
-        ItemFields.OVERVIEW,
-        ItemFields.RECURSIVE_ITEM_COUNT
-    )
-
-    val ITEM_DETAIL = listOf(
-        ItemFields.OVERVIEW,
-        ItemFields.GENRES,
-        ItemFields.PEOPLE,
-        ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
-        ItemFields.MEDIA_SOURCES,
-        ItemFields.MEDIA_STREAMS,
-        ItemFields.TRICKPLAY,
-        ItemFields.CHAPTERS,
-        ItemFields.EXTERNAL_URLS,
-        ItemFields.TAGLINES,
-        ItemFields.PROVIDER_IDS,
-        ItemFields.STUDIOS,
-        ItemFields.DATE_CREATED,
-        ItemFields.CHILD_COUNT,
-        ItemFields.RECURSIVE_ITEM_COUNT,
-        ItemFields.PRODUCTION_LOCATIONS,
-        ItemFields.REMOTE_TRAILERS
-    )
+    val HERO_CAROUSEL =
+        listOf(
+            ItemFields.GENRES,
+            ItemFields.OVERVIEW,
+            ItemFields.REMOTE_TRAILERS,
+            ItemFields.CHILD_COUNT,
+        )
+
+    val MEDIA_ITEM_CARDS =
+        listOf(
+            ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
+            ItemFields.CHILD_COUNT,
+            ItemFields.RECURSIVE_ITEM_COUNT,
+            ItemFields.DATE_CREATED,
+            ItemFields.DATE_LAST_MEDIA_ADDED,
+        )
+
+    val CONTINUE_WATCHING = listOf(ItemFields.PRIMARY_IMAGE_ASPECT_RATIO)
+
+    val NEXT_UP = listOf(ItemFields.PRIMARY_IMAGE_ASPECT_RATIO)
+
+    val LIBRARY_GRID =
+        listOf(ItemFields.PRIMARY_IMAGE_ASPECT_RATIO, ItemFields.RECURSIVE_ITEM_COUNT)
+
+    val SEARCH_RESULTS =
+        listOf(
+            ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
+            ItemFields.OVERVIEW,
+            ItemFields.RECURSIVE_ITEM_COUNT,
+        )
+
+    val ITEM_DETAIL =
+        listOf(
+            ItemFields.OVERVIEW,
+            ItemFields.GENRES,
+            ItemFields.PEOPLE,
+            ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
+            ItemFields.MEDIA_SOURCES,
+            ItemFields.MEDIA_STREAMS,
+            ItemFields.TRICKPLAY,
+            ItemFields.CHAPTERS,
+            ItemFields.EXTERNAL_URLS,
+            ItemFields.TAGLINES,
+            ItemFields.PROVIDER_IDS,
+            ItemFields.STUDIOS,
+            ItemFields.DATE_CREATED,
+            ItemFields.CHILD_COUNT,
+            ItemFields.RECURSIVE_ITEM_COUNT,
+            ItemFields.PRODUCTION_LOCATIONS,
+            ItemFields.REMOTE_TRAILERS,
+        )
 
     val SIMILAR_ITEMS = MEDIA_ITEM_CARDS
 
-    val PLAYER = listOf(
-        ItemFields.MEDIA_SOURCES,
-        ItemFields.MEDIA_STREAMS,
-        ItemFields.TRICKPLAY,
-        ItemFields.CHAPTERS,
-        ItemFields.PRIMARY_IMAGE_ASPECT_RATIO
-    )
-
-    val EPISODE_LIST = listOf(
-        ItemFields.OVERVIEW,
-        ItemFields.PRIMARY_IMAGE_ASPECT_RATIO
-    )
-
-    val SEASON_DETAIL = listOf(
-        ItemFields.OVERVIEW,
-        ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
-        ItemFields.TAGLINES,
-        ItemFields.EXTERNAL_URLS,
-        ItemFields.PEOPLE
-    )
-
-    val PERSON_DETAIL = listOf(
-        ItemFields.OVERVIEW,
-        ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
-        ItemFields.EXTERNAL_URLS,
-        ItemFields.PRODUCTION_LOCATIONS
-    )
+    val PLAYER =
+        listOf(
+            ItemFields.MEDIA_SOURCES,
+            ItemFields.MEDIA_STREAMS,
+            ItemFields.TRICKPLAY,
+            ItemFields.CHAPTERS,
+            ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
+        )
+
+    val EPISODE_LIST = listOf(ItemFields.OVERVIEW, ItemFields.PRIMARY_IMAGE_ASPECT_RATIO)
+
+    val SEASON_DETAIL =
+        listOf(
+            ItemFields.OVERVIEW,
+            ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
+            ItemFields.TAGLINES,
+            ItemFields.EXTERNAL_URLS,
+            ItemFields.PEOPLE,
+        )
+
+    val PERSON_DETAIL =
+        listOf(
+            ItemFields.OVERVIEW,
+            ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
+            ItemFields.EXTERNAL_URLS,
+            ItemFields.PRODUCTION_LOCATIONS,
+        )
 
     val REFRESH_USER_DATA = emptyList<ItemFields>()
 
-    val CACHE_CONTINUE_WATCHING = listOf(
-        ItemFields.OVERVIEW,
-        ItemFields.GENRES,
-        ItemFields.PRIMARY_IMAGE_ASPECT_RATIO
-    )
-
-    val CACHE_LATEST_MEDIA = listOf(
-        ItemFields.OVERVIEW,
-        ItemFields.GENRES,
-        ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
-        ItemFields.CHILD_COUNT,
-        ItemFields.RECURSIVE_ITEM_COUNT
-    )
-
-    val CACHE_NEXT_UP = listOf(
-        ItemFields.OVERVIEW,
-        ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
-        ItemFields.AIR_TIME
-    )
-}
\ No newline at end of file
+    val CACHE_CONTINUE_WATCHING =
+        listOf(ItemFields.OVERVIEW, ItemFields.GENRES, ItemFields.PRIMARY_IMAGE_ASPECT_RATIO)
+
+    val CACHE_LATEST_MEDIA =
+        listOf(
+            ItemFields.OVERVIEW,
+            ItemFields.GENRES,
+            ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
+            ItemFields.CHILD_COUNT,
+            ItemFields.RECURSIVE_ITEM_COUNT,
+        )
+
+    val CACHE_NEXT_UP =
+        listOf(ItemFields.OVERVIEW, ItemFields.PRIMARY_IMAGE_ASPECT_RATIO, ItemFields.AIR_TIME)
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/JellyfinRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/JellyfinRepository.kt
index 766872a1c..1cd3f5ad3 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/JellyfinRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/JellyfinRepository.kt
@@ -17,70 +17,78 @@ import com.makd.afinity.data.models.server.Server
 import com.makd.afinity.data.models.user.User
 import com.makd.afinity.data.repository.server.JellyfinServerRepository
 import com.makd.afinity.ui.library.FilterType
+import java.util.UUID
 import kotlinx.coroutines.flow.Flow
 import org.jellyfin.sdk.model.api.AuthenticationResult
 import org.jellyfin.sdk.model.api.BaseItemDto
 import org.jellyfin.sdk.model.api.BaseItemDtoQueryResult
 import org.jellyfin.sdk.model.api.ItemFields
 import org.jellyfin.sdk.model.api.ItemFilter
-import java.util.UUID
 
 interface JellyfinRepository {
 
     fun getBaseUrl(): String
+
     suspend fun setBaseUrl(baseUrl: String)
+
     suspend fun discoverServers(): List<Server>
+
     suspend fun discoverServersFlow(): Flow<List<Server>>
+
     suspend fun validateServer(serverUrl: String): JellyfinServerRepository.ServerConnectionResult
+
     suspend fun refreshServerInfo()
 
     suspend fun authenticateByName(username: String, password: String): AuthenticationResult?
+
     suspend fun authenticateWithQuickConnect(secret: String): AuthenticationResult?
+
     suspend fun logout()
 
     suspend fun initiateQuickConnect(): QuickConnectState?
+
     suspend fun getQuickConnectState(secret: String): QuickConnectState?
 
     suspend fun getCurrentUser(): User?
+
     suspend fun getPublicUsers(): List<User>
+
     suspend fun getUserProfileImageUrl(): String?
 
     suspend fun getNextUp(limit: Int = 16): List<AfinityEpisode>
+
     fun getNextUpFlow(): Flow<List<AfinityEpisode>>
+
     suspend fun getLibraries(): List<AfinityCollection>
-    suspend fun getLatestMedia(
-        parentId: UUID? = null,
-        limit: Int = 16
-    ): List<AfinityItem>
 
-    suspend fun getContinueWatching(
-        limit: Int = 12
-    ): List<AfinityItem>
+    suspend fun getLatestMedia(parentId: UUID? = null, limit: Int = 16): List<AfinityItem>
+
+    suspend fun getContinueWatching(limit: Int = 12): List<AfinityItem>
 
     suspend fun getGenres(
         parentId: UUID? = null,
         limit: Int? = null,
-        includeItemTypes: List<String> = emptyList()
+        includeItemTypes: List<String> = emptyList(),
     ): List<String>
 
     suspend fun getMoviesByGenre(
         genre: String,
         parentId: UUID? = null,
         limit: Int = 20,
-        shuffle: Boolean = true
+        shuffle: Boolean = true,
     ): List<AfinityMovie>
 
     suspend fun getShowsByGenre(
         genre: String,
         parentId: UUID? = null,
         limit: Int = 20,
-        shuffle: Boolean = true
+        shuffle: Boolean = true,
     ): List<AfinityShow>
 
     suspend fun getStudios(
         parentId: UUID? = null,
         limit: Int? = null,
-        includeItemTypes: List<String> = emptyList()
+        includeItemTypes: List<String> = emptyList(),
     ): List<AfinityStudio>
 
     suspend fun getItems(
@@ -101,22 +109,21 @@ interface JellyfinRepository {
         fields: List<ItemFields>? = null,
         imageTypes: List<String> = emptyList(),
         hasOverview: Boolean? = null,
-        filters: List<ItemFilter> = emptyList()
+        filters: List<ItemFilter> = emptyList(),
     ): BaseItemDtoQueryResult
 
-    suspend fun getItem(
-        itemId: UUID,
-        fields: List<ItemFields>? = null
-    ): BaseItemDto?
+    suspend fun getItem(itemId: UUID, fields: List<ItemFields>? = null): BaseItemDto?
 
     suspend fun getItemById(itemId: UUID): AfinityItem?
+
     suspend fun getSimilarItems(
         itemId: UUID,
         limit: Int = 12,
-        fields: List<ItemFields>? = null
+        fields: List<ItemFields>? = null,
     ): List<AfinityItem>
 
     suspend fun getEpisodeToPlay(seriesId: UUID): AfinityEpisode?
+
     suspend fun getEpisodeToPlayForSeason(seasonId: UUID, seriesId: UUID): AfinityEpisode?
 
     suspend fun getMovies(
@@ -126,7 +133,7 @@ interface JellyfinRepository {
         limit: Int? = null,
         startIndex: Int = 0,
         searchTerm: String? = null,
-        isPlayed: Boolean? = null
+        isPlayed: Boolean? = null,
     ): List<AfinityMovie>
 
     suspend fun getShows(
@@ -136,20 +143,20 @@ interface JellyfinRepository {
         limit: Int? = null,
         startIndex: Int = 0,
         searchTerm: String? = null,
-        isPlayed: Boolean? = null
+        isPlayed: Boolean? = null,
     ): List<AfinityShow>
 
     suspend fun getSeasons(
         seriesId: UUID,
         sortBy: SortBy = SortBy.NAME,
         sortDescending: Boolean = false,
-        fields: List<ItemFields>? = null
+        fields: List<ItemFields>? = null,
     ): List<AfinitySeason>
 
     suspend fun getEpisodes(
         seasonId: UUID,
         seriesId: UUID,
-        fields: List<ItemFields>? = null
+        fields: List<ItemFields>? = null,
     ): List<AfinityEpisode>
 
     suspend fun getSeriesNextEpisode(seriesId: UUID): AfinityEpisode?
@@ -157,32 +164,29 @@ interface JellyfinRepository {
     suspend fun getSpecialFeatures(itemId: UUID, userId: UUID): List<AfinityItem>
 
     suspend fun getPersonDetail(personId: UUID): AfinityPersonDetail?
+
     suspend fun getPersonItems(
         personId: UUID,
         includeItemTypes: List<String> = emptyList(),
         limit: Int? = null,
         startIndex: Int = 0,
-        fields: List<ItemFields>? = null
+        fields: List<ItemFields>? = null,
     ): List<AfinityItem>
 
     suspend fun reportPlaybackStart(
         itemId: UUID,
         positionTicks: Long = 0,
-        sessionId: String? = null
+        sessionId: String? = null,
     )
 
     suspend fun reportPlaybackProgress(
         itemId: UUID,
         positionTicks: Long,
         isPaused: Boolean = false,
-        sessionId: String? = null
+        sessionId: String? = null,
     )
 
-    suspend fun reportPlaybackStopped(
-        itemId: UUID,
-        positionTicks: Long,
-        sessionId: String? = null
-    )
+    suspend fun reportPlaybackStopped(itemId: UUID, positionTicks: Long, sessionId: String? = null)
 
     suspend fun getStreamUrl(
         itemId: UUID,
@@ -190,7 +194,7 @@ interface JellyfinRepository {
         maxBitrate: Int? = null,
         audioStreamIndex: Int? = null,
         subtitleStreamIndex: Int? = null,
-        videoStreamIndex: Int? = null
+        videoStreamIndex: Int? = null,
     ): String
 
     suspend fun getImageUrl(
@@ -200,7 +204,7 @@ interface JellyfinRepository {
         tag: String? = null,
         maxWidth: Int? = null,
         maxHeight: Int? = null,
-        quality: Int? = null
+        quality: Int? = null,
     ): String
 
     fun getItemsPaging(
@@ -211,29 +215,34 @@ interface JellyfinRepository {
         filter: FilterType,
         nameStartsWith: String? = null,
         fields: List<ItemFields>? = null,
-        studioName: String? = null
+        studioName: String? = null,
     ): Flow<PagingData<AfinityItem>>
 
     suspend fun getFavoriteMovies(): List<AfinityMovie>
+
     suspend fun getFavoriteShows(): List<AfinityShow>
+
     suspend fun getFavoriteEpisodes(): List<AfinityEpisode>
+
     suspend fun getFavoriteSeasons(): List<AfinitySeason>
-    suspend fun getFavoriteBoxSets(): List<AfinityBoxSet>
 
+    suspend fun getFavoriteBoxSets(): List<AfinityBoxSet>
 
     fun getLibrariesFlow(): Flow<List<AfinityCollection>>
+
     fun getLatestMediaFlow(parentId: UUID? = null): Flow<List<AfinityItem>>
+
     fun getContinueWatchingFlow(): Flow<List<AfinityItem>>
 
     suspend fun getMoviesWithPeople(
         startIndex: Int = 0,
         limit: Int = 500,
-        fields: List<ItemFields>? = null
+        fields: List<ItemFields>? = null,
     ): List<AfinityMovie>
 
     suspend fun getSimilarMovies(
         movieId: UUID,
         limit: Int = 32,
-        fields: List<ItemFields>? = null
+        fields: List<ItemFields>? = null,
     ): List<AfinityMovie>
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/JellyseerrRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/JellyseerrRepository.kt
index 5da78cfbf..88e62f884 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/JellyseerrRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/JellyseerrRepository.kt
@@ -4,21 +4,20 @@ import com.makd.afinity.data.models.jellyseerr.GenreSliderItem
 import com.makd.afinity.data.models.jellyseerr.JellyseerrRequest
 import com.makd.afinity.data.models.jellyseerr.JellyseerrSearchResult
 import com.makd.afinity.data.models.jellyseerr.JellyseerrUser
+import com.makd.afinity.data.models.jellyseerr.MediaDetails
 import com.makd.afinity.data.models.jellyseerr.MediaType
 import com.makd.afinity.data.models.jellyseerr.SearchResultItem
-import com.makd.afinity.data.models.jellyseerr.MediaDetails
+import java.util.UUID
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
-import java.util.UUID
 
-data class RequestEvent(
-    val request: JellyseerrRequest
-)
+data class RequestEvent(val request: JellyseerrRequest)
 
 interface JellyseerrRepository {
 
     suspend fun setActiveJellyfinSession(serverId: String, userId: UUID)
+
     fun clearActiveSession()
 
     val currentSessionId: StateFlow<String?>
@@ -26,29 +25,34 @@ interface JellyseerrRepository {
     suspend fun login(
         email: String,
         password: String,
-        useJellyfinAuth: Boolean = false
+        useJellyfinAuth: Boolean = false,
     ): Result<JellyseerrUser>
 
     suspend fun logout(): Result<Unit>
+
     suspend fun getCurrentUser(): Result<JellyseerrUser>
+
     suspend fun isLoggedIn(): Boolean
+
     val isAuthenticated: StateFlow<Boolean>
     val requestEvents: SharedFlow<RequestEvent>
 
     suspend fun setServerUrl(url: String)
+
     suspend fun getServerUrl(): String?
+
     suspend fun hasValidConfiguration(): Boolean
 
     suspend fun createRequest(
         mediaId: Int,
         mediaType: MediaType,
-        seasons: List<Int>? = null
+        seasons: List<Int>? = null,
     ): Result<JellyseerrRequest>
 
     suspend fun getRequests(
         take: Int = 20,
         skip: Int = 0,
-        filter: String? = null
+        filter: String? = null,
     ): Result<List<JellyseerrRequest>>
 
     fun observeRequests(): Flow<List<JellyseerrRequest>>
@@ -69,31 +73,38 @@ interface JellyseerrRepository {
 
     suspend fun findMediaByName(
         name: String,
-        mediaType: MediaType? = null
+        mediaType: MediaType? = null,
     ): Result<List<SearchResultItem>>
 
     suspend fun getTrending(page: Int = 1, limit: Int? = null): Result<JellyseerrSearchResult>
+
     suspend fun getDiscoverMovies(
         page: Int = 1,
         sortBy: String = "popularity.desc",
         studio: Int? = null,
-        limit: Int? = null
+        limit: Int? = null,
     ): Result<JellyseerrSearchResult>
 
     suspend fun getDiscoverTv(
         page: Int = 1,
         sortBy: String = "popularity.desc",
         network: Int? = null,
-        limit: Int? = null
+        limit: Int? = null,
     ): Result<JellyseerrSearchResult>
 
     suspend fun getUpcomingMovies(page: Int = 1, limit: Int? = null): Result<JellyseerrSearchResult>
+
     suspend fun getUpcomingTv(page: Int = 1, limit: Int? = null): Result<JellyseerrSearchResult>
 
     suspend fun getMoviesByStudio(studioId: Int, page: Int = 1): Result<JellyseerrSearchResult>
+
     suspend fun getTvByNetwork(networkId: Int, page: Int = 1): Result<JellyseerrSearchResult>
+
     suspend fun getMovieGenreSlider(): Result<List<GenreSliderItem>>
+
     suspend fun getTvGenreSlider(): Result<List<GenreSliderItem>>
+
     suspend fun getMoviesByGenre(genreId: Int, page: Int = 1): Result<JellyseerrSearchResult>
+
     suspend fun getTvByGenre(genreId: Int, page: Int = 1): Result<JellyseerrSearchResult>
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/PreferencesRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/PreferencesRepository.kt
index 838029b93..0293b323d 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/PreferencesRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/PreferencesRepository.kt
@@ -12,141 +12,208 @@ import kotlinx.coroutines.flow.Flow
 interface PreferencesRepository {
 
     suspend fun setCurrentServerId(serverId: String?)
+
     suspend fun getCurrentServerId(): String?
+
     fun getCurrentServerIdFlow(): Flow<String?>
 
     suspend fun setCurrentUserId(userId: String?)
+
     suspend fun getCurrentUserId(): String?
+
     fun getCurrentUserIdFlow(): Flow<String?>
 
     suspend fun setRememberLogin(remember: Boolean)
+
     suspend fun getRememberLogin(): Boolean
 
     suspend fun setDefaultSortBy(sortBy: SortBy)
+
     suspend fun getDefaultSortBy(): SortBy
 
     suspend fun setSortDescending(descending: Boolean)
+
     suspend fun getSortDescending(): Boolean
 
     suspend fun setItemsPerPage(count: Int)
+
     suspend fun getItemsPerPage(): Int
 
     suspend fun setAutoPlay(autoPlay: Boolean)
+
     suspend fun getAutoPlay(): Boolean
+
     fun getAutoPlayFlow(): Flow<Boolean>
 
     suspend fun setMaxBitrate(bitrate: Int?)
+
     suspend fun getMaxBitrate(): Int?
 
     suspend fun setSkipIntroEnabled(enabled: Boolean)
+
     suspend fun getSkipIntroEnabled(): Boolean
+
     fun getSkipIntroEnabledFlow(): Flow<Boolean>
 
     suspend fun setSkipOutroEnabled(enabled: Boolean)
+
     suspend fun getSkipOutroEnabled(): Boolean
+
     fun getSkipOutroEnabledFlow(): Flow<Boolean>
 
     val useExoPlayer: Flow<Boolean>
+
     suspend fun setUseExoPlayer(value: Boolean)
 
     suspend fun setMpvHwDec(hwDec: MpvHwDec)
+
     suspend fun getMpvHwDec(): MpvHwDec
+
     fun getMpvHwDecFlow(): Flow<MpvHwDec>
 
     suspend fun setMpvVideoOutput(videoOutput: MpvVideoOutput)
+
     suspend fun getMpvVideoOutput(): MpvVideoOutput
+
     fun getMpvVideoOutputFlow(): Flow<MpvVideoOutput>
 
     suspend fun setMpvAudioOutput(audioOutput: MpvAudioOutput)
+
     suspend fun getMpvAudioOutput(): MpvAudioOutput
+
     fun getMpvAudioOutputFlow(): Flow<MpvAudioOutput>
 
     suspend fun setPreferredAudioLanguage(language: String)
+
     suspend fun getPreferredAudioLanguage(): String
+
     fun getPreferredAudioLanguageFlow(): Flow<String>
 
     suspend fun setPreferredSubtitleLanguage(language: String)
+
     suspend fun getPreferredSubtitleLanguage(): String
+
     fun getPreferredSubtitleLanguageFlow(): Flow<String>
 
     suspend fun setThemeMode(mode: String)
+
     suspend fun getThemeMode(): String
+
     fun getThemeModeFlow(): Flow<String>
 
     suspend fun setDynamicColors(enabled: Boolean)
+
     suspend fun getDynamicColors(): Boolean
+
     fun getDynamicColorsFlow(): Flow<Boolean>
 
     suspend fun setPipGestureEnabled(enabled: Boolean)
+
     suspend fun getPipGestureEnabled(): Boolean
+
     fun getPipGestureEnabledFlow(): Flow<Boolean>
 
     suspend fun setPipBackgroundPlay(enabled: Boolean)
+
     suspend fun getPipBackgroundPlay(): Boolean
+
     fun getPipBackgroundPlayFlow(): Flow<Boolean>
 
     suspend fun setGridLayout(enabled: Boolean)
+
     suspend fun getGridLayout(): Boolean
 
     suspend fun setCombineLibrarySections(combine: Boolean)
+
     suspend fun getCombineLibrarySections(): Boolean
+
     fun getCombineLibrarySectionsFlow(): Flow<Boolean>
+
     suspend fun setHomeSortByDateAdded(sortByDateAdded: Boolean)
+
     suspend fun getHomeSortByDateAdded(): Boolean
+
     fun getHomeSortByDateAddedFlow(): Flow<Boolean>
 
     suspend fun setDownloadOverWifiOnly(wifiOnly: Boolean)
+
     suspend fun getDownloadOverWifiOnly(): Boolean
 
     suspend fun setDownloadQuality(quality: String)
+
     suspend fun getDownloadQuality(): String
 
     suspend fun setMaxDownloads(maxDownloads: Int)
+
     suspend fun getMaxDownloads(): Int
 
     suspend fun setSyncEnabled(enabled: Boolean)
+
     suspend fun getSyncEnabled(): Boolean
 
     suspend fun setSyncInterval(intervalMinutes: Int)
+
     suspend fun getSyncInterval(): Int
 
     suspend fun setLastSyncTime(timestamp: Long)
+
     suspend fun getLastSyncTime(): Long
 
     suspend fun setUpdateCheckFrequency(hours: Int)
+
     suspend fun getUpdateCheckFrequency(): Int
+
     fun getUpdateCheckFrequencyFlow(): Flow<Int>
 
     suspend fun setLastUpdateCheck(timestamp: Long)
+
     suspend fun getLastUpdateCheck(): Long
 
     suspend fun setCrashReporting(enabled: Boolean)
+
     suspend fun getCrashReporting(): Boolean
 
     suspend fun setUsageAnalytics(enabled: Boolean)
+
     suspend fun getUsageAnalytics(): Boolean
 
     suspend fun setOfflineMode(enabled: Boolean)
+
     suspend fun getOfflineMode(): Boolean
+
     fun getOfflineModeFlow(): Flow<Boolean>
 
     suspend fun setSubtitlePreferences(preferences: SubtitlePreferences)
+
     suspend fun getSubtitlePreferences(): SubtitlePreferences
+
     fun getSubtitlePreferencesFlow(): Flow<SubtitlePreferences>
 
     suspend fun setLogoAutoHide(enabled: Boolean)
+
     suspend fun getLogoAutoHide(): Boolean
+
     fun getLogoAutoHideFlow(): Flow<Boolean>
 
     suspend fun setDefaultVideoZoomMode(mode: VideoZoomMode)
+
     suspend fun getDefaultVideoZoomMode(): VideoZoomMode
+
     fun getDefaultVideoZoomModeFlow(): Flow<VideoZoomMode>
 
     suspend fun setEpisodeLayout(layout: EpisodeLayout)
+
     suspend fun getEpisodeLayout(): EpisodeLayout
+
     fun getEpisodeLayoutFlow(): Flow<EpisodeLayout>
 
+    suspend fun setNotificationPermissionDeclined(declined: Boolean)
+
+    suspend fun getNotificationPermissionDeclined(): Boolean
+
     suspend fun clearAllPreferences()
+
     suspend fun clearServerPreferences()
+
     suspend fun clearUserPreferences()
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/SecurePreferencesRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/SecurePreferencesRepository.kt
index 808327e63..6fb14dda8 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/SecurePreferencesRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/SecurePreferencesRepository.kt
@@ -1,73 +1,139 @@
 package com.makd.afinity.data.repository
 
-import kotlinx.coroutines.flow.Flow
 import java.util.UUID
+import kotlinx.coroutines.flow.Flow
 
 data class ServerUserToken(
     val serverId: String,
     val userId: UUID,
     val accessToken: String,
     val username: String,
-    val serverUrl: String
+    val serverUrl: String,
 )
 
 interface SecurePreferencesRepository {
 
     suspend fun saveAuthenticationData(
-        accessToken: String, userId: UUID, serverId: String, serverUrl: String, username: String
+        accessToken: String,
+        userId: UUID,
+        serverId: String,
+        serverUrl: String,
+        username: String,
     )
 
     suspend fun getAccessToken(): String?
+
     suspend fun getSavedUserId(): String?
+
     suspend fun getSavedServerId(): String?
+
     suspend fun getSavedServerUrl(): String?
+
     suspend fun getSavedUsername(): String?
+
     suspend fun clearAuthenticationData()
+
     suspend fun hasValidAuthData(): Boolean
+
     fun getAuthenticationStateFlow(): Flow<Boolean>
 
     suspend fun saveServerUserToken(
-        serverId: String, userId: UUID, accessToken: String, username: String, serverUrl: String
+        serverId: String,
+        userId: UUID,
+        accessToken: String,
+        username: String,
+        serverUrl: String,
     )
 
     suspend fun getServerUserToken(serverId: String, userId: UUID): String?
+
     suspend fun getLastUserIdForServer(serverId: String): UUID?
+
     suspend fun getAllServerUserTokens(): List<ServerUserToken>
+
     suspend fun clearServerUserToken(serverId: String, userId: UUID)
+
     suspend fun clearAllServerTokens(serverId: String)
 
     suspend fun saveDeviceId(deviceId: String)
+
     suspend fun getDeviceId(): String?
 
     suspend fun saveApiKey(key: String)
+
     suspend fun getApiKey(): String?
 
     suspend fun clearAllSecureData()
+
     suspend fun saveJellyseerrAuthForUser(
         jellyfinServerId: String,
         jellyfinUserId: UUID,
         url: String,
         cookie: String,
-        username: String
+        username: String,
     )
 
     suspend fun switchJellyseerrContext(jellyfinServerId: String, jellyfinUserId: UUID): Boolean
+
     fun clearActiveJellyseerrCache()
+
     suspend fun getJellyseerrAuthForUser(
-        jellyfinServerId: String, jellyfinUserId: UUID
+        jellyfinServerId: String,
+        jellyfinUserId: UUID,
     ): Triple<String?, String?, String?>
 
     suspend fun clearJellyseerrAuthForUser(jellyfinServerId: String, jellyfinUserId: UUID)
+
     suspend fun getJellyseerrServerUrl(): String?
+
     suspend fun getJellyseerrCookie(): String?
+
     suspend fun getJellyseerrUsername(): String?
+
     suspend fun hasValidJellyseerrAuth(): Boolean
 
     suspend fun saveJellyseerrServerUrl(url: String)
+
     fun getCachedJellyseerrServerUrl(): String?
+
     fun getCachedJellyseerrCookie(): String?
 
     suspend fun saveJellyseerrCookie(cookie: String)
+
     suspend fun saveJellyseerrUsername(username: String)
+
     suspend fun clearJellyseerrAuthData()
-}
\ No newline at end of file
+
+    suspend fun saveAudiobookshelfAuthForUser(
+        jellyfinServerId: String,
+        jellyfinUserId: UUID,
+        serverUrl: String,
+        accessToken: String,
+        absUserId: String,
+        username: String,
+    )
+
+    suspend fun switchAudiobookshelfContext(jellyfinServerId: String, jellyfinUserId: UUID): Boolean
+
+    fun clearActiveAudiobookshelfCache()
+
+    suspend fun getAudiobookshelfAuthForUser(
+        jellyfinServerId: String,
+        jellyfinUserId: UUID,
+    ): AudiobookshelfAuthData?
+
+    suspend fun clearAudiobookshelfAuthForUser(jellyfinServerId: String, jellyfinUserId: UUID)
+
+    fun getCachedAudiobookshelfServerUrl(): String?
+
+    fun getCachedAudiobookshelfToken(): String?
+
+    suspend fun hasValidAudiobookshelfAuth(): Boolean
+}
+
+data class AudiobookshelfAuthData(
+    val serverUrl: String,
+    val accessToken: String,
+    val absUserId: String,
+    val username: String,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/repository/audiobookshelf/AudiobookshelfRepositoryImpl.kt b/app/src/main/java/com/makd/afinity/data/repository/audiobookshelf/AudiobookshelfRepositoryImpl.kt
new file mode 100644
index 000000000..18d52d5c7
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/data/repository/audiobookshelf/AudiobookshelfRepositoryImpl.kt
@@ -0,0 +1,1168 @@
+package com.makd.afinity.data.repository.audiobookshelf
+
+import android.os.Build
+import com.makd.afinity.BuildConfig
+import com.makd.afinity.data.database.AfinityDatabase
+import com.makd.afinity.data.database.entities.AudiobookshelfConfigEntity
+import com.makd.afinity.data.database.entities.AudiobookshelfItemEntity
+import com.makd.afinity.data.database.entities.AudiobookshelfLibraryEntity
+import com.makd.afinity.data.database.entities.AudiobookshelfProgressEntity
+import com.makd.afinity.data.models.audiobookshelf.AudiobookshelfSeries
+import com.makd.afinity.data.models.audiobookshelf.AudiobookshelfUser
+import com.makd.afinity.data.models.audiobookshelf.DeviceInfo
+import com.makd.afinity.data.models.audiobookshelf.Library
+import com.makd.afinity.data.models.audiobookshelf.LibraryItem
+import com.makd.afinity.data.models.audiobookshelf.LoginRequest
+import com.makd.afinity.data.models.audiobookshelf.MediaProgress
+import com.makd.afinity.data.models.audiobookshelf.MediaProgressSyncData
+import com.makd.afinity.data.models.audiobookshelf.PersonalizedView
+import com.makd.afinity.data.models.audiobookshelf.PlaybackSession
+import com.makd.afinity.data.models.audiobookshelf.PlaybackSessionRequest
+import com.makd.afinity.data.models.audiobookshelf.ProgressUpdateRequest
+import com.makd.afinity.data.models.audiobookshelf.SearchResponse
+import com.makd.afinity.data.network.AudiobookshelfApiService
+import com.makd.afinity.data.repository.AudiobookshelfConfig
+import com.makd.afinity.data.repository.AudiobookshelfRepository
+import com.makd.afinity.data.repository.ItemWithProgress
+import com.makd.afinity.data.repository.SecurePreferencesRepository
+import com.makd.afinity.data.repository.SeriesItemsResult
+import com.makd.afinity.util.NetworkConnectivityMonitor
+import dagger.Lazy
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import timber.log.Timber
+
+@Singleton
+class AudiobookshelfRepositoryImpl
+@Inject
+constructor(
+    private val apiService: Lazy<AudiobookshelfApiService>,
+    private val securePreferencesRepository: SecurePreferencesRepository,
+    private val database: AfinityDatabase,
+    private val networkConnectivityMonitor: NetworkConnectivityMonitor,
+) : AudiobookshelfRepository {
+
+    private val audiobookshelfDao = database.audiobookshelfDao()
+    private val json = Json { ignoreUnknownKeys = true }
+
+    private val _isAuthenticated = MutableStateFlow(false)
+    override val isAuthenticated: StateFlow<Boolean> = _isAuthenticated.asStateFlow()
+
+    private val _currentSessionId = MutableStateFlow<String?>(null)
+    override val currentSessionId: StateFlow<String?> = _currentSessionId.asStateFlow()
+
+    private val _currentConfig = MutableStateFlow<AudiobookshelfConfig?>(null)
+    override val currentConfig: StateFlow<AudiobookshelfConfig?> = _currentConfig.asStateFlow()
+
+    private var activeContext: Pair<String, UUID>? = null
+
+    private var pendingServerUrl: String? = null
+
+    companion object {
+        private const val CACHE_VALIDITY_MS = 5 * 60 * 1000L
+    }
+
+    override suspend fun setActiveJellyfinSession(serverId: String, userId: UUID) {
+        Timber.d("Switching Audiobookshelf context to Server: $serverId, User: $userId")
+        _isAuthenticated.value = false
+        _currentConfig.value = null
+        activeContext = serverId to userId
+        _currentSessionId.value = "${serverId}_$userId"
+
+        val hasAuth = securePreferencesRepository.switchAudiobookshelfContext(serverId, userId)
+        val config = audiobookshelfDao.getConfig(serverId, userId.toString())
+
+        if (hasAuth && config?.isLoggedIn == true) {
+            _isAuthenticated.value = true
+            _currentConfig.value =
+                AudiobookshelfConfig(
+                    serverUrl = config.serverUrl,
+                    absUserId = config.absUserId,
+                    username = config.username,
+                )
+        }
+
+        Timber.d("Audiobookshelf Context Switched. Authenticated: ${_isAuthenticated.value}")
+    }
+
+    override fun clearActiveSession() {
+        activeContext = null
+        _currentSessionId.value = null
+        securePreferencesRepository.clearActiveAudiobookshelfCache()
+        _isAuthenticated.value = false
+        _currentConfig.value = null
+        pendingServerUrl = null
+        Timber.d("Audiobookshelf active session cleared")
+    }
+
+    override suspend fun login(
+        serverUrl: String,
+        username: String,
+        password: String,
+    ): Result<AudiobookshelfUser> {
+        return withContext(Dispatchers.IO) {
+            val (currentServerId, currentUserId) =
+                activeContext
+                    ?: return@withContext Result.failure(Exception("No active Jellyfin session"))
+
+            try {
+                if (!networkConnectivityMonitor.isCurrentlyConnected()) {
+                    return@withContext Result.failure(Exception("No network connection"))
+                }
+
+                pendingServerUrl = serverUrl
+                securePreferencesRepository.saveAudiobookshelfAuthForUser(
+                    jellyfinServerId = currentServerId,
+                    jellyfinUserId = currentUserId,
+                    serverUrl = serverUrl,
+                    accessToken = "",
+                    absUserId = "",
+                    username = username,
+                )
+
+                val loginRequest = LoginRequest(username, password)
+                val response = apiService.get().login(loginRequest)
+
+                if (response.isSuccessful && response.body() != null) {
+                    val loginResponse = response.body()!!
+                    val user = loginResponse.user
+                    val token =
+                        user.token
+                            ?: return@withContext Result.failure(Exception("No token received"))
+
+                    securePreferencesRepository.saveAudiobookshelfAuthForUser(
+                        jellyfinServerId = currentServerId,
+                        jellyfinUserId = currentUserId,
+                        serverUrl = serverUrl,
+                        accessToken = token,
+                        absUserId = user.id,
+                        username = user.username,
+                    )
+
+                    audiobookshelfDao.insertConfig(
+                        AudiobookshelfConfigEntity(
+                            jellyfinServerId = currentServerId,
+                            jellyfinUserId = currentUserId.toString(),
+                            serverUrl = serverUrl,
+                            absUserId = user.id,
+                            username = user.username,
+                            isLoggedIn = true,
+                            lastSync = System.currentTimeMillis(),
+                        )
+                    )
+
+                    _isAuthenticated.value = true
+                    _currentConfig.value =
+                        AudiobookshelfConfig(
+                            serverUrl = serverUrl,
+                            absUserId = user.id,
+                            username = user.username,
+                        )
+
+                    user.mediaProgress?.let { progressList ->
+                        progressList.forEach { progress -> cacheProgress(progress) }
+                    }
+
+                    Timber.d("Audiobookshelf login successful for user: ${user.username}")
+                    Result.success(user)
+                } else {
+                    val errorMsg = "Login failed: ${response.code()} - ${response.message()}"
+                    Timber.e(errorMsg)
+                    pendingServerUrl = null
+                    Result.failure(Exception(errorMsg))
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Audiobookshelf login failed")
+                pendingServerUrl = null
+                Result.failure(e)
+            }
+        }
+    }
+
+    override suspend fun logout(): Result<Unit> {
+        return withContext(Dispatchers.IO) {
+            val (currentServerId, currentUserId) =
+                activeContext ?: return@withContext Result.failure(Exception("No active session"))
+
+            try {
+                securePreferencesRepository.clearAudiobookshelfAuthForUser(
+                    currentServerId,
+                    currentUserId,
+                )
+
+                audiobookshelfDao.deleteConfig(currentServerId, currentUserId.toString())
+                audiobookshelfDao.deleteAllLibraries(currentServerId, currentUserId.toString())
+                audiobookshelfDao.deleteAllItems(currentServerId, currentUserId.toString())
+                audiobookshelfDao.deleteAllProgress(currentServerId, currentUserId.toString())
+
+                _isAuthenticated.value = false
+                _currentConfig.value = null
+                pendingServerUrl = null
+
+                Timber.d("Audiobookshelf logout successful")
+                Result.success(Unit)
+            } catch (e: Exception) {
+                Timber.e(e, "Audiobookshelf logout failed")
+                Result.failure(e)
+            }
+        }
+    }
+
+    override suspend fun validateToken(): Result<Boolean> {
+        return withContext(Dispatchers.IO) {
+            try {
+                if (!networkConnectivityMonitor.isCurrentlyConnected()) {
+                    return@withContext Result.failure(Exception("No network connection"))
+                }
+
+                val response = apiService.get().authorize()
+                if (response.isSuccessful && response.body() != null) {
+                    Result.success(true)
+                } else {
+                    _isAuthenticated.value = false
+                    Result.success(false)
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Token validation failed")
+                Result.failure(e)
+            }
+        }
+    }
+
+    override suspend fun setServerUrl(url: String) {
+        pendingServerUrl = url
+    }
+
+    override suspend fun getServerUrl(): String? {
+        return pendingServerUrl ?: _currentConfig.value?.serverUrl
+    }
+
+    override suspend fun hasValidConfiguration(): Boolean {
+        return _isAuthenticated.value && _currentConfig.value != null
+    }
+
+    override fun getLibrariesFlow(): Flow<List<Library>> {
+        val (serverId, userId) = activeContext ?: return flowOf(emptyList())
+        return audiobookshelfDao.getLibrariesFlow(serverId, userId.toString()).map { entities ->
+            entities.map { it.toLibrary() }
+        }
+    }
+
+    override suspend fun refreshLibraries(): Result<List<Library>> {
+        return withContext(Dispatchers.IO) {
+            val (currentServerId, currentUserId) =
+                activeContext ?: return@withContext Result.failure(Exception("No active session"))
+
+            try {
+                if (!networkConnectivityMonitor.isCurrentlyConnected()) {
+                    return@withContext Result.failure(Exception("No network connection"))
+                }
+
+                val response = apiService.get().getLibraries()
+
+                if (response.isSuccessful && response.body() != null) {
+                    val libraries = response.body()!!.libraries
+
+                    val entities =
+                        libraries.mapIndexed { index, library ->
+                            AudiobookshelfLibraryEntity(
+                                id = library.id,
+                                jellyfinServerId = currentServerId,
+                                jellyfinUserId = currentUserId.toString(),
+                                name = library.name,
+                                mediaType = library.mediaType,
+                                icon = library.icon,
+                                displayOrder = library.displayOrder ?: index,
+                                totalItems = library.stats?.totalItems ?: 0,
+                                totalDuration = library.stats?.totalDuration,
+                                lastUpdated = library.lastUpdate ?: System.currentTimeMillis(),
+                                cachedAt = System.currentTimeMillis(),
+                            )
+                        }
+
+                    audiobookshelfDao.deleteAllLibraries(currentServerId, currentUserId.toString())
+                    audiobookshelfDao.insertLibraries(entities)
+
+                    Result.success(libraries)
+                } else {
+                    Result.failure(Exception("Failed to fetch libraries: ${response.message()}"))
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to refresh libraries")
+                Result.failure(e)
+            }
+        }
+    }
+
+    override suspend fun getLibrary(libraryId: String): Result<Library> {
+        return withContext(Dispatchers.IO) {
+            try {
+                if (!networkConnectivityMonitor.isCurrentlyConnected()) {
+                    return@withContext Result.failure(Exception("No network connection"))
+                }
+
+                val response = apiService.get().getLibrary(libraryId)
+
+                if (response.isSuccessful && response.body()?.library != null) {
+                    Result.success(response.body()!!.library!!)
+                } else {
+                    Result.failure(Exception("Failed to fetch library: ${response.message()}"))
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get library")
+                Result.failure(e)
+            }
+        }
+    }
+
+    override fun getLibraryItemsFlow(libraryId: String): Flow<List<LibraryItem>> {
+        val (serverId, userId) = activeContext ?: return flowOf(emptyList())
+        return audiobookshelfDao.getItemsFlow(serverId, userId.toString(), libraryId).map { entities
+            ->
+            entities.map { it.toLibraryItem() }
+        }
+    }
+
+    override suspend fun refreshLibraryItems(
+        libraryId: String,
+        limit: Int,
+        page: Int,
+    ): Result<List<LibraryItem>> {
+        return withContext(Dispatchers.IO) {
+            val (currentServerId, currentUserId) =
+                activeContext ?: return@withContext Result.failure(Exception("No active session"))
+
+            try {
+                if (!networkConnectivityMonitor.isCurrentlyConnected()) {
+                    return@withContext Result.failure(Exception("No network connection"))
+                }
+
+                val allItems = mutableListOf<LibraryItem>()
+                var currentPage = 0
+                var totalFetched = 0
+                var total = Int.MAX_VALUE
+                var isFirstPage = true
+
+                while (totalFetched < total) {
+                    val response =
+                        apiService
+                            .get()
+                            .getLibraryItems(
+                                id = libraryId,
+                                limit = limit,
+                                page = currentPage,
+                                include = "progress",
+                                sort = "media.metadata.title",
+                            )
+
+                    if (response.isSuccessful && response.body() != null) {
+                        val body = response.body()!!
+                        total = body.total
+                        val items = body.results
+
+                        val entities =
+                            items.map { item ->
+                                item.toEntity(currentServerId, currentUserId.toString())
+                            }
+
+                        if (isFirstPage) {
+                            audiobookshelfDao.deleteItemsByLibrary(
+                                currentServerId,
+                                currentUserId.toString(),
+                                libraryId,
+                            )
+                            isFirstPage = false
+                        }
+                        audiobookshelfDao.insertItems(entities)
+                        items.forEach { item ->
+                            item.userMediaProgress?.let { progress -> cacheProgress(progress) }
+                        }
+
+                        allItems.addAll(items)
+                        totalFetched += items.size
+                        currentPage++
+
+                        Timber.d(
+                            "Fetched items page $currentPage: ${items.size} items, total: $total"
+                        )
+
+                        if (items.isEmpty()) break
+                    } else {
+                        return@withContext Result.failure(
+                            Exception("Failed to fetch items: ${response.message()}")
+                        )
+                    }
+                }
+
+                Timber.d("Fetched all ${allItems.size} items for library $libraryId")
+                Result.success(allItems)
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to refresh library items")
+                Result.failure(e)
+            }
+        }
+    }
+
+    override suspend fun getItemDetails(itemId: String): Result<LibraryItem> {
+        return withContext(Dispatchers.IO) {
+            val (currentServerId, currentUserId) =
+                activeContext ?: return@withContext Result.failure(Exception("No active session"))
+
+            try {
+                if (!networkConnectivityMonitor.isCurrentlyConnected()) {
+                    val cached =
+                        audiobookshelfDao.getItem(itemId, currentServerId, currentUserId.toString())
+                    if (cached != null) {
+                        return@withContext Result.success(cached.toLibraryItem())
+                    }
+                    return@withContext Result.failure(Exception("No network connection"))
+                }
+
+                val response = apiService.get().getItem(itemId)
+
+                if (response.isSuccessful && response.body() != null) {
+                    val itemResponse = response.body()!!
+                    val item =
+                        LibraryItem(
+                            id = itemResponse.id ?: itemId,
+                            ino = itemResponse.ino,
+                            libraryId = itemResponse.libraryId ?: "",
+                            mediaType = itemResponse.mediaType ?: "book",
+                            media = itemResponse.media!!,
+                            addedAt = itemResponse.addedAt,
+                            updatedAt = itemResponse.updatedAt,
+                            userMediaProgress = itemResponse.userMediaProgress,
+                        )
+                    audiobookshelfDao.insertItem(
+                        item.toEntity(currentServerId, currentUserId.toString())
+                    )
+
+                    itemResponse.userMediaProgress?.let { progress -> cacheProgress(progress) }
+
+                    Result.success(item)
+                } else {
+                    Result.failure(Exception("Failed to fetch item: ${response.message()}"))
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get item details")
+                Result.failure(e)
+            }
+        }
+    }
+
+    override suspend fun searchLibrary(libraryId: String, query: String): Result<SearchResponse> {
+        return withContext(Dispatchers.IO) {
+            try {
+                if (!networkConnectivityMonitor.isCurrentlyConnected()) {
+                    return@withContext Result.failure(Exception("No network connection"))
+                }
+
+                val response = apiService.get().search(libraryId, query, limit = 25)
+
+                if (response.isSuccessful && response.body() != null) {
+                    Result.success(response.body()!!)
+                } else {
+                    Result.failure(Exception("Search failed: ${response.message()}"))
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to search library")
+                Result.failure(e)
+            }
+        }
+    }
+
+    override suspend fun getSeries(
+        libraryId: String,
+        limit: Int,
+        page: Int,
+    ): Result<List<AudiobookshelfSeries>> {
+        return withContext(Dispatchers.IO) {
+            try {
+                if (!networkConnectivityMonitor.isCurrentlyConnected()) {
+                    return@withContext Result.failure(Exception("No network connection"))
+                }
+
+                val allSeries = mutableListOf<AudiobookshelfSeries>()
+                var currentPage = 0
+                var totalFetched = 0
+                var total = Int.MAX_VALUE
+
+                while (totalFetched < total) {
+                    val response =
+                        apiService
+                            .get()
+                            .getSeries(id = libraryId, limit = limit, page = currentPage)
+
+                    if (response.isSuccessful && response.body() != null) {
+                        val body = response.body()!!
+                        total = body.total
+                        allSeries.addAll(body.results)
+                        totalFetched += body.results.size
+                        currentPage++
+
+                        Timber.d(
+                            "Fetched series page $currentPage: ${body.results.size} items, total: $total"
+                        )
+
+                        if (body.results.isEmpty()) break
+                    } else {
+                        return@withContext Result.failure(
+                            Exception("Failed to fetch series: ${response.message()}")
+                        )
+                    }
+                }
+
+                Timber.d("Fetched all ${allSeries.size} series for library $libraryId")
+                Result.success(allSeries)
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get series for library $libraryId")
+                Result.failure(e)
+            }
+        }
+    }
+
+    override suspend fun getSeriesItems(
+        libraryId: String,
+        seriesId: String,
+        limit: Int,
+    ): Result<SeriesItemsResult> {
+        return withContext(Dispatchers.IO) {
+            try {
+                if (!networkConnectivityMonitor.isCurrentlyConnected()) {
+                    return@withContext Result.failure(Exception("No network connection"))
+                }
+
+                val encodedFilter =
+                    "series." +
+                        java.net.URLEncoder.encode(
+                            android.util.Base64.encodeToString(
+                                seriesId.toByteArray(),
+                                android.util.Base64.NO_WRAP,
+                            ),
+                            "UTF-8",
+                        )
+
+                val response =
+                    apiService
+                        .get()
+                        .getLibraryItems(
+                            id = libraryId,
+                            limit = limit,
+                            page = 0,
+                            filter = encodedFilter,
+                            minified = 1,
+                        )
+
+                if (response.isSuccessful && response.body() != null) {
+                    val body = response.body()!!
+                    Result.success(SeriesItemsResult(items = body.results, totalBooks = body.total))
+                } else {
+                    Result.failure(Exception("Failed to fetch series items: ${response.message()}"))
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get series items for series: $seriesId")
+                Result.failure(e)
+            }
+        }
+    }
+
+    override suspend fun getPersonalized(libraryId: String): Result<List<PersonalizedView>> {
+        return withContext(Dispatchers.IO) {
+            try {
+                if (!networkConnectivityMonitor.isCurrentlyConnected()) {
+                    return@withContext Result.failure(Exception("No network connection"))
+                }
+
+                val response = apiService.get().getPersonalized(libraryId)
+
+                if (response.isSuccessful && response.body() != null) {
+                    Result.success(response.body()!!)
+                } else {
+                    Result.failure(Exception("Failed to fetch personalized: ${response.message()}"))
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get personalized")
+                Result.failure(e)
+            }
+        }
+    }
+
+    override fun getInProgressItemsFlow(): Flow<List<ItemWithProgress>> {
+        val (serverId, userId) = activeContext ?: return flowOf(emptyList())
+
+        val progressFlow = audiobookshelfDao.getInProgressFlow(serverId, userId.toString())
+        val itemsFlow = audiobookshelfDao.getItemsFlow(serverId, userId.toString(), "")
+        return progressFlow.map { progressList ->
+            progressList.mapNotNull { progress ->
+                val item =
+                    audiobookshelfDao.getItem(progress.libraryItemId, serverId, userId.toString())
+                item?.let {
+                    ItemWithProgress(
+                        item = it.toLibraryItem(),
+                        progress = progress.toMediaProgress(),
+                    )
+                }
+            }
+        }
+    }
+
+    override suspend fun refreshProgress(): Result<List<MediaProgress>> {
+        return withContext(Dispatchers.IO) {
+            val (currentServerId, currentUserId) =
+                activeContext ?: return@withContext Result.failure(Exception("No active session"))
+
+            try {
+                if (!networkConnectivityMonitor.isCurrentlyConnected()) {
+                    return@withContext Result.failure(Exception("No network connection"))
+                }
+
+                val response = apiService.get().getItemsInProgress()
+
+                if (response.isSuccessful && response.body() != null) {
+                    val items = response.body()!!.libraryItems
+                    val progressList = items.mapNotNull { it.userMediaProgress }
+                    items.forEach { item ->
+                        audiobookshelfDao.insertItem(
+                            item.toEntity(currentServerId, currentUserId.toString())
+                        )
+                        item.userMediaProgress?.let { progress -> cacheProgress(progress) }
+                    }
+
+                    Result.success(progressList)
+                } else {
+                    Result.failure(Exception("Failed to fetch progress: ${response.message()}"))
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to refresh progress")
+                Result.failure(e)
+            }
+        }
+    }
+
+    override suspend fun updateProgress(
+        itemId: String,
+        episodeId: String?,
+        currentTime: Double,
+        duration: Double,
+        isFinished: Boolean,
+    ): Result<MediaProgress> {
+        return withContext(Dispatchers.IO) {
+            val (currentServerId, currentUserId) =
+                activeContext ?: return@withContext Result.failure(Exception("No active session"))
+
+            try {
+                val progress = if (duration > 0) currentTime / duration else 0.0
+                val request =
+                    ProgressUpdateRequest(
+                        currentTime = currentTime,
+                        duration = duration,
+                        progress = progress,
+                        isFinished = isFinished,
+                    )
+
+                if (networkConnectivityMonitor.isCurrentlyConnected()) {
+                    val response =
+                        if (episodeId != null) {
+                            apiService.get().updateEpisodeProgress(itemId, episodeId, request)
+                        } else {
+                            apiService.get().updateProgress(itemId, request)
+                        }
+
+                    if (response.isSuccessful && response.body() != null) {
+                        val mediaProgress = response.body()!!
+                        cacheProgress(mediaProgress)
+                        return@withContext Result.success(mediaProgress)
+                    }
+                }
+                val localProgress =
+                    AudiobookshelfProgressEntity(
+                        id = "${itemId}_${episodeId ?: ""}",
+                        jellyfinServerId = currentServerId,
+                        jellyfinUserId = currentUserId.toString(),
+                        libraryItemId = itemId,
+                        episodeId = episodeId,
+                        currentTime = currentTime,
+                        duration = duration,
+                        progress = progress,
+                        isFinished = isFinished,
+                        lastUpdate = System.currentTimeMillis(),
+                        startedAt = System.currentTimeMillis(),
+                        finishedAt = if (isFinished) System.currentTimeMillis() else null,
+                        pendingSync = true,
+                    )
+                audiobookshelfDao.insertProgress(localProgress)
+
+                Result.success(localProgress.toMediaProgress())
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to update progress")
+                Result.failure(e)
+            }
+        }
+    }
+
+    override fun getProgressForItemFlow(itemId: String): Flow<MediaProgress?> {
+        val (serverId, userId) = activeContext ?: return flowOf(null)
+        return audiobookshelfDao.getProgressForItemFlow(itemId, serverId, userId.toString()).map {
+            it?.toMediaProgress()
+        }
+    }
+
+    override suspend fun startPlaybackSession(
+        itemId: String,
+        episodeId: String?,
+    ): Result<PlaybackSession> {
+        return withContext(Dispatchers.IO) {
+            try {
+                if (!networkConnectivityMonitor.isCurrentlyConnected()) {
+                    return@withContext Result.failure(Exception("No network connection"))
+                }
+
+                val deviceInfo =
+                    DeviceInfo(
+                        deviceId = getDeviceId(),
+                        manufacturer = Build.MANUFACTURER,
+                        model = Build.MODEL,
+                        sdkVersion = Build.VERSION.SDK_INT,
+                        clientName = "AFinity",
+                        clientVersion = BuildConfig.VERSION_NAME,
+                    )
+
+                val request =
+                    PlaybackSessionRequest(
+                        deviceInfo = deviceInfo,
+                        forceDirectPlay = true,
+                        mediaPlayer = "ExoPlayer",
+                        supportedMimeTypes =
+                            listOf(
+                                "audio/mpeg",
+                                "audio/mp4",
+                                "audio/ogg",
+                                "audio/flac",
+                                "audio/wav",
+                            ),
+                    )
+
+                val response =
+                    if (episodeId != null) {
+                        apiService.get().startEpisodePlaybackSession(itemId, episodeId, request)
+                    } else {
+                        apiService.get().startPlaybackSession(itemId, request)
+                    }
+
+                if (response.isSuccessful && response.body() != null) {
+                    val session = response.body()!!
+                    Timber.d(
+                        "Playback session received: id=${session.id}, mediaType=${session.mediaType}"
+                    )
+                    Timber.d(
+                        "Session displayTitle=${session.displayTitle}, displayAuthor=${session.displayAuthor}"
+                    )
+                    Timber.d(
+                        "Session audioTracks=${session.audioTracks?.size ?: 0}, chapters=${session.chapters?.size ?: 0}"
+                    )
+                    Timber.d("Session episodeId=${session.episodeId}, duration=${session.duration}")
+                    Result.success(session)
+                } else {
+                    val errorBody = response.errorBody()?.string()
+                    Timber.e(
+                        "Failed to start session: ${response.code()} - ${response.message()}, body=$errorBody"
+                    )
+                    Result.failure(Exception("Failed to start session: ${response.message()}"))
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to start playback session")
+                Result.failure(e)
+            }
+        }
+    }
+
+    override suspend fun syncPlaybackSession(
+        sessionId: String,
+        timeListened: Double,
+        currentTime: Double,
+        duration: Double,
+    ): Result<Unit> {
+        return withContext(Dispatchers.IO) {
+            try {
+                if (!networkConnectivityMonitor.isCurrentlyConnected()) {
+                    return@withContext Result.failure(Exception("No network connection"))
+                }
+
+                val syncData =
+                    MediaProgressSyncData(
+                        currentTime = currentTime,
+                        timeListened = timeListened,
+                        duration = duration,
+                        progress = if (duration > 0) currentTime / duration else 0.0,
+                    )
+
+                val response = apiService.get().syncPlaybackSession(sessionId, syncData)
+
+                if (response.isSuccessful) {
+                    Result.success(Unit)
+                } else {
+                    Result.failure(Exception("Failed to sync session: ${response.message()}"))
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to sync playback session")
+                Result.failure(e)
+            }
+        }
+    }
+
+    override suspend fun closePlaybackSession(
+        sessionId: String,
+        currentTime: Double,
+        timeListened: Double,
+        duration: Double,
+    ): Result<Unit> {
+        return withContext(Dispatchers.IO) {
+            try {
+                if (!networkConnectivityMonitor.isCurrentlyConnected()) {
+                    return@withContext Result.failure(Exception("No network connection"))
+                }
+
+                val syncData =
+                    MediaProgressSyncData(
+                        currentTime = currentTime,
+                        timeListened = timeListened,
+                        duration = duration,
+                        progress = if (duration > 0) currentTime / duration else 0.0,
+                    )
+
+                val response = apiService.get().closePlaybackSession(sessionId, syncData)
+
+                if (response.isSuccessful) {
+                    Result.success(Unit)
+                } else {
+                    Result.failure(Exception("Failed to close session: ${response.message()}"))
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to close playback session")
+                Result.failure(e)
+            }
+        }
+    }
+
+    override suspend fun getGenres(): Result<List<String>> {
+        return withContext(Dispatchers.IO) {
+            try {
+                if (!networkConnectivityMonitor.isCurrentlyConnected()) {
+                    return@withContext Result.failure(Exception("No network connection"))
+                }
+
+                val response = apiService.get().getGenres()
+
+                if (response.isSuccessful && response.body() != null) {
+                    val genres = response.body()!!.genres.sorted()
+                    Timber.d("Fetched ${genres.size} genres from Audiobookshelf")
+                    Result.success(genres)
+                } else {
+                    Result.failure(Exception("Failed to fetch genres: ${response.message()}"))
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get genres")
+                Result.failure(e)
+            }
+        }
+    }
+
+    override suspend fun getLibraryItemsByGenre(
+        libraryId: String,
+        genre: String,
+    ): Result<List<LibraryItem>> {
+        return withContext(Dispatchers.IO) {
+            try {
+                if (!networkConnectivityMonitor.isCurrentlyConnected()) {
+                    return@withContext Result.failure(Exception("No network connection"))
+                }
+
+                val encodedFilter =
+                    "genres." +
+                        java.net.URLEncoder.encode(
+                            android.util.Base64.encodeToString(
+                                genre.toByteArray(),
+                                android.util.Base64.NO_WRAP,
+                            ),
+                            "UTF-8",
+                        )
+
+                val allItems = mutableListOf<LibraryItem>()
+                var currentPage = 0
+                var totalFetched = 0
+                var total = Int.MAX_VALUE
+
+                while (totalFetched < total) {
+                    val response =
+                        apiService
+                            .get()
+                            .getLibraryItems(
+                                id = libraryId,
+                                limit = 100,
+                                page = currentPage,
+                                filter = encodedFilter,
+                                minified = 0,
+                                include = "progress",
+                            )
+
+                    if (response.isSuccessful && response.body() != null) {
+                        val body = response.body()!!
+                        total = body.total
+                        allItems.addAll(body.results)
+                        totalFetched += body.results.size
+                        currentPage++
+
+                        if (body.results.isEmpty()) break
+                    } else {
+                        return@withContext Result.failure(
+                            Exception("Failed to fetch items by genre: ${response.message()}")
+                        )
+                    }
+                }
+
+                Timber.d("Fetched ${allItems.size} items for genre '$genre' in library $libraryId")
+                Result.success(allItems)
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get items by genre '$genre'")
+                Result.failure(e)
+            }
+        }
+    }
+
+    override suspend fun getGenreItemsLimited(
+        libraryId: String,
+        genre: String,
+        limit: Int,
+    ): Result<List<LibraryItem>> {
+        return withContext(Dispatchers.IO) {
+            try {
+                if (!networkConnectivityMonitor.isCurrentlyConnected()) {
+                    return@withContext Result.failure(Exception("No network connection"))
+                }
+
+                val encodedFilter =
+                    "genres." +
+                        java.net.URLEncoder.encode(
+                            android.util.Base64.encodeToString(
+                                genre.toByteArray(),
+                                android.util.Base64.NO_WRAP,
+                            ),
+                            "UTF-8",
+                        )
+
+                val response =
+                    apiService
+                        .get()
+                        .getLibraryItems(
+                            id = libraryId,
+                            limit = limit,
+                            page = 0,
+                            filter = encodedFilter,
+                            minified = 0,
+                            include = "progress",
+                        )
+
+                if (response.isSuccessful && response.body() != null) {
+                    val items = response.body()!!.results
+                    Timber.d(
+                        "Fetched ${items.size} items for genre '$genre' in library $libraryId (limit=$limit)"
+                    )
+                    Result.success(items)
+                } else {
+                    Result.failure(
+                        Exception("Failed to fetch genre items: ${response.message()}")
+                    )
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get limited items for genre '$genre'")
+                Result.failure(e)
+            }
+        }
+    }
+
+    override suspend fun syncPendingProgress(): Result<Int> {
+        return withContext(Dispatchers.IO) {
+            val (currentServerId, currentUserId) =
+                activeContext ?: return@withContext Result.failure(Exception("No active session"))
+
+            if (!networkConnectivityMonitor.isCurrentlyConnected()) {
+                return@withContext Result.failure(Exception("No network connection"))
+            }
+
+            try {
+                val pendingProgress =
+                    audiobookshelfDao.getPendingSyncProgress(
+                        currentServerId,
+                        currentUserId.toString(),
+                    )
+
+                var syncedCount = 0
+
+                pendingProgress.forEach { progress ->
+                    try {
+                        val request =
+                            ProgressUpdateRequest(
+                                currentTime = progress.currentTime,
+                                duration = progress.duration,
+                                progress = progress.progress,
+                                isFinished = progress.isFinished,
+                            )
+
+                        val response =
+                            if (progress.episodeId != null) {
+                                apiService
+                                    .get()
+                                    .updateEpisodeProgress(
+                                        progress.libraryItemId,
+                                        progress.episodeId,
+                                        request,
+                                    )
+                            } else {
+                                apiService.get().updateProgress(progress.libraryItemId, request)
+                            }
+
+                        if (response.isSuccessful) {
+                            audiobookshelfDao.markSynced(
+                                progress.id,
+                                currentServerId,
+                                currentUserId.toString(),
+                            )
+                            syncedCount++
+                        }
+                    } catch (e: Exception) {
+                        Timber.w(e, "Failed to sync progress for item ${progress.libraryItemId}")
+                    }
+                }
+
+                Result.success(syncedCount)
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to sync pending progress")
+                Result.failure(e)
+            }
+        }
+    }
+
+    private suspend fun cacheProgress(progress: MediaProgress) {
+        val (currentServerId, currentUserId) = activeContext ?: return
+
+        val entity =
+            AudiobookshelfProgressEntity(
+                id = progress.id,
+                jellyfinServerId = currentServerId,
+                jellyfinUserId = currentUserId.toString(),
+                libraryItemId = progress.libraryItemId,
+                episodeId = progress.episodeId,
+                currentTime = progress.currentTime,
+                duration = progress.duration,
+                progress = progress.progress,
+                isFinished = progress.isFinished,
+                lastUpdate = progress.lastUpdate,
+                startedAt = progress.startedAt,
+                finishedAt = progress.finishedAt,
+                pendingSync = false,
+            )
+
+        audiobookshelfDao.insertProgress(entity)
+    }
+
+    private fun getDeviceId(): String {
+        return "${Build.MANUFACTURER}_${Build.MODEL}_${Build.ID}".replace(" ", "_")
+    }
+
+    private fun AudiobookshelfLibraryEntity.toLibrary(): Library {
+        return Library(
+            id = id,
+            name = name,
+            mediaType = mediaType,
+            icon = icon,
+            displayOrder = displayOrder,
+        )
+    }
+
+    private fun LibraryItem.toEntity(serverId: String, userId: String): AudiobookshelfItemEntity {
+        return AudiobookshelfItemEntity(
+            id = id,
+            jellyfinServerId = serverId,
+            jellyfinUserId = userId,
+            libraryId = libraryId,
+            title = media.metadata.title ?: "Unknown",
+            authorName = media.metadata.authorName,
+            narratorName = media.metadata.narratorName,
+            seriesName = media.metadata.seriesName,
+            seriesSequence = media.metadata.series?.firstOrNull()?.sequence,
+            mediaType = mediaType,
+            duration = media.duration,
+            coverUrl = media.coverPath,
+            description = media.metadata.description,
+            publishedYear = media.metadata.publishedYear,
+            genres = media.metadata.genres?.let { json.encodeToString(it) },
+            numTracks = media.numTracks,
+            numChapters = media.numChapters,
+            addedAt = addedAt,
+            updatedAt = updatedAt,
+            cachedAt = System.currentTimeMillis(),
+        )
+    }
+
+    private fun AudiobookshelfItemEntity.toLibraryItem(): LibraryItem {
+        val genres =
+            genres?.let {
+                try {
+                    json.decodeFromString<List<String>>(it)
+                } catch (e: Exception) {
+                    null
+                }
+            }
+
+        return LibraryItem(
+            id = id,
+            libraryId = libraryId,
+            mediaType = mediaType,
+            media =
+                com.makd.afinity.data.models.audiobookshelf.Media(
+                    metadata =
+                        com.makd.afinity.data.models.audiobookshelf.MediaMetadata(
+                            title = title,
+                            authorName = authorName,
+                            narratorName = narratorName,
+                            seriesName = seriesName,
+                            description = description,
+                            publishedYear = publishedYear,
+                            genres = genres,
+                        ),
+                    duration = duration,
+                    coverPath = coverUrl,
+                    numTracks = numTracks,
+                    numChapters = numChapters,
+                ),
+            addedAt = addedAt,
+            updatedAt = updatedAt,
+        )
+    }
+
+    private fun AudiobookshelfProgressEntity.toMediaProgress(): MediaProgress {
+        return MediaProgress(
+            id = id,
+            libraryItemId = libraryItemId,
+            episodeId = episodeId,
+            duration = duration,
+            progress = progress,
+            currentTime = currentTime,
+            isFinished = isFinished,
+            lastUpdate = lastUpdate,
+            startedAt = startedAt,
+            finishedAt = finishedAt,
+        )
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/auth/AuthRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/auth/AuthRepository.kt
index a38e04c9f..05beed568 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/auth/AuthRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/auth/AuthRepository.kt
@@ -14,25 +14,35 @@ interface AuthRepository {
 
     suspend fun hasValidSavedAuth(): Boolean
 
-    suspend fun saveAuthenticationData(authResult: AuthenticationResult, serverUrl: String, username: String)
+    suspend fun saveAuthenticationData(
+        authResult: AuthenticationResult,
+        serverUrl: String,
+        username: String,
+    )
 
     suspend fun clearAllAuthData()
 
     suspend fun authenticateByName(username: String, password: String): AuthResult
+
     suspend fun authenticateWithQuickConnect(secret: String): AuthResult
+
     suspend fun logout()
 
     suspend fun initiateQuickConnect(): QuickConnectState?
+
     suspend fun getQuickConnectState(secret: String): QuickConnectState?
 
     suspend fun getCurrentUser(): User?
+
     suspend fun getPublicUsers(): List<User>
 
     fun hasValidToken(): Boolean
+
     fun getAccessToken(): String?
 
     sealed class AuthResult {
         data class Success(val authResult: AuthenticationResult) : AuthResult()
+
         data class Error(val message: String) : AuthResult()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/auth/JellyfinAuthRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/auth/JellyfinAuthRepository.kt
index 417bf65f1..969730eca 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/auth/JellyfinAuthRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/auth/JellyfinAuthRepository.kt
@@ -7,6 +7,10 @@ import com.makd.afinity.data.models.user.User
 import com.makd.afinity.data.repository.DatabaseRepository
 import com.makd.afinity.data.repository.SecurePreferencesRepository
 import com.makd.afinity.util.NetworkConnectivityMonitor
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Provider
+import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -26,18 +30,16 @@ import org.jellyfin.sdk.model.api.ClientCapabilitiesDto
 import org.jellyfin.sdk.model.api.GeneralCommandType
 import org.jellyfin.sdk.model.api.MediaType
 import timber.log.Timber
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Provider
-import javax.inject.Singleton
 
 @Singleton
-class JellyfinAuthRepository @Inject constructor(
+class JellyfinAuthRepository
+@Inject
+constructor(
     private val apiClient: ApiClient,
     private val sessionManagerProvider: Provider<SessionManager>,
     private val securePreferencesRepository: SecurePreferencesRepository,
     private val networkConnectivityMonitor: NetworkConnectivityMonitor,
-    private val databaseRepository: DatabaseRepository
+    private val databaseRepository: DatabaseRepository,
 ) : AuthRepository {
 
     private val sessionManager: SessionManager
@@ -67,42 +69,51 @@ class JellyfinAuthRepository @Inject constructor(
                 val serverUrl = securePreferencesRepository.getSavedServerUrl()
                 val username = securePreferencesRepository.getSavedUsername()
 
-                if (accessToken.isNullOrBlank() || userId.isNullOrBlank() ||
-                    serverUrl.isNullOrBlank() || username.isNullOrBlank()
+                if (
+                    accessToken.isNullOrBlank() ||
+                        userId.isNullOrBlank() ||
+                        serverUrl.isNullOrBlank() ||
+                        username.isNullOrBlank()
                 ) {
-                    Timber.w("Incomplete encrypted auth data found, clearing and requiring fresh login")
+                    Timber.w(
+                        "Incomplete encrypted auth data found, clearing and requiring fresh login"
+                    )
                     clearAllAuthData()
                     return@withContext false
                 }
 
-                val userUuid = try {
-                    UUID.fromString(userId)
-                } catch (e: IllegalArgumentException) {
-                    Timber.e(e, "Invalid UUID format in saved data")
-                    clearAllAuthData()
-                    return@withContext false
-                }
+                val userUuid =
+                    try {
+                        UUID.fromString(userId)
+                    } catch (e: IllegalArgumentException) {
+                        Timber.e(e, "Invalid UUID format in saved data")
+                        clearAllAuthData()
+                        return@withContext false
+                    }
 
-                val user = User(
-                    id = userUuid,
-                    name = username,
-                    serverId = serverId ?: "",
-                    accessToken = accessToken,
-                    primaryImageTag = null
-                )
+                val user =
+                    User(
+                        id = userUuid,
+                        name = username,
+                        serverId = serverId ?: "",
+                        accessToken = accessToken,
+                        primaryImageTag = null,
+                    )
 
                 apiClient.update(baseUrl = serverUrl, accessToken = accessToken)
                 _currentUser.value = user
                 _isAuthenticated.value = true
 
-                sessionManager.startSession(
-                    serverUrl = serverUrl,
-                    serverId = serverId ?: "",
-                    userId = userUuid,
-                    accessToken = accessToken
-                ).onFailure { e ->
-                    Timber.w(e, "SessionManager start failed during restore (non-fatal)")
-                }
+                sessionManager
+                    .startSession(
+                        serverUrl = serverUrl,
+                        serverId = serverId ?: "",
+                        userId = userUuid,
+                        accessToken = accessToken,
+                    )
+                    .onFailure { e ->
+                        Timber.w(e, "SessionManager start failed during restore (non-fatal)")
+                    }
 
                 Timber.d("Optimistically restored session for user: $username")
 
@@ -113,10 +124,11 @@ class JellyfinAuthRepository @Inject constructor(
                 }
 
                 try {
-                    val response = withTimeoutOrNull(5000L) {
-                        val userApi = UserApi(apiClient)
-                        userApi.getCurrentUser()
-                    }
+                    val response =
+                        withTimeoutOrNull(5000L) {
+                            val userApi = UserApi(apiClient)
+                            userApi.getCurrentUser()
+                        }
 
                     if (response?.content != null) {
                         val userDto = response.content!!
@@ -129,10 +141,14 @@ class JellyfinAuthRepository @Inject constructor(
                             Timber.w("Failed to update user in DB during restore")
                         }
 
-                        Timber.d("Session validated with server successfully (ImageTag: ${updatedUser.primaryImageTag})")
+                        Timber.d(
+                            "Session validated with server successfully (ImageTag: ${updatedUser.primaryImageTag})"
+                        )
                         return@withContext true
                     } else {
-                        Timber.w("Server validation timed out - keeping optimistic session (assuming server reachable but slow)")
+                        Timber.w(
+                            "Server validation timed out - keeping optimistic session (assuming server reachable but slow)"
+                        )
                         return@withContext true
                     }
                 } catch (e: InvalidStatusException) {
@@ -151,7 +167,6 @@ class JellyfinAuthRepository @Inject constructor(
                     Timber.e(e, "Unexpected error during validation - keeping optimistic session")
                     return@withContext true
                 }
-
             } catch (e: Exception) {
                 Timber.e(e, "Critical error during auth restoration")
                 return@withContext false
@@ -166,7 +181,7 @@ class JellyfinAuthRepository @Inject constructor(
     override suspend fun saveAuthenticationData(
         authResult: AuthenticationResult,
         serverUrl: String,
-        username: String
+        username: String,
     ) {
         try {
             val accessToken = authResult.accessToken ?: return
@@ -178,7 +193,7 @@ class JellyfinAuthRepository @Inject constructor(
                 userId = userId,
                 serverId = serverId,
                 serverUrl = serverUrl,
-                username = username
+                username = username,
             )
 
             Timber.d("Saved authentication data to encrypted storage for user: $username")
@@ -199,15 +214,16 @@ class JellyfinAuthRepository @Inject constructor(
 
     override suspend fun authenticateByName(
         username: String,
-        password: String
+        password: String,
     ): AuthRepository.AuthResult {
         return withContext(Dispatchers.IO) {
             try {
                 val userApi = UserApi(apiClient)
-                val authRequest = org.jellyfin.sdk.model.api.AuthenticateUserByName(
-                    username = username,
-                    pw = password
-                )
+                val authRequest =
+                    org.jellyfin.sdk.model.api.AuthenticateUserByName(
+                        username = username,
+                        pw = password,
+                    )
                 val response = userApi.authenticateUserByName(authRequest)
 
                 val authResult = response.content
@@ -223,10 +239,14 @@ class JellyfinAuthRepository @Inject constructor(
                 }
             } catch (e: ApiClientException) {
                 Timber.e(e, "Authentication failed")
-                AuthRepository.AuthResult.Error("Authentication failed: ${e.message ?: "Unknown error"}")
+                AuthRepository.AuthResult.Error(
+                    "Authentication failed: ${e.message ?: "Unknown error"}"
+                )
             } catch (e: Exception) {
                 Timber.e(e, "Unexpected error during authentication")
-                AuthRepository.AuthResult.Error("Authentication failed: ${e.message ?: "Unknown error"}")
+                AuthRepository.AuthResult.Error(
+                    "Authentication failed: ${e.message ?: "Unknown error"}"
+                )
             }
         }
     }
@@ -235,9 +255,8 @@ class JellyfinAuthRepository @Inject constructor(
         return withContext(Dispatchers.IO) {
             try {
                 val userApi = UserApi(apiClient)
-                val quickConnectRequest = org.jellyfin.sdk.model.api.QuickConnectDto(
-                    secret = secret
-                )
+                val quickConnectRequest =
+                    org.jellyfin.sdk.model.api.QuickConnectDto(secret = secret)
                 val response = userApi.authenticateWithQuickConnect(quickConnectRequest)
 
                 val authResult = response.content
@@ -254,10 +273,14 @@ class JellyfinAuthRepository @Inject constructor(
                 }
             } catch (e: ApiClientException) {
                 Timber.e(e, "QuickConnect authentication failed")
-                AuthRepository.AuthResult.Error("QuickConnect failed: ${e.message ?: "Unknown error"}")
+                AuthRepository.AuthResult.Error(
+                    "QuickConnect failed: ${e.message ?: "Unknown error"}"
+                )
             } catch (e: Exception) {
                 Timber.e(e, "Unexpected error during QuickConnect authentication")
-                AuthRepository.AuthResult.Error("QuickConnect failed: ${e.message ?: "Unknown error"}")
+                AuthRepository.AuthResult.Error(
+                    "QuickConnect failed: ${e.message ?: "Unknown error"}"
+                )
             }
         }
     }
@@ -272,7 +295,7 @@ class JellyfinAuthRepository @Inject constructor(
                     QuickConnectState(
                         code = result.code ?: "",
                         secret = result.secret ?: "",
-                        authenticated = result.authenticated ?: false
+                        authenticated = result.authenticated ?: false,
                     )
                 }
             } catch (e: ApiClientException) {
@@ -295,7 +318,7 @@ class JellyfinAuthRepository @Inject constructor(
                     QuickConnectState(
                         code = result.code ?: "",
                         secret = result.secret ?: "",
-                        authenticated = result.authenticated ?: false
+                        authenticated = result.authenticated ?: false,
                     )
                 }
             } catch (e: ApiClientException) {
@@ -314,7 +337,9 @@ class JellyfinAuthRepository @Inject constructor(
                 sessionManager.logout()
 
                 clearAllAuthData()
-                Timber.d("Successfully logged out and cleared encrypted data (token kept for re-login)")
+                Timber.d(
+                    "Successfully logged out and cleared encrypted data (token kept for re-login)"
+                )
             } catch (e: Exception) {
                 Timber.e(e, "Error during logout, clearing encrypted state anyway")
                 sessionManager.logout()
@@ -331,13 +356,14 @@ class JellyfinAuthRepository @Inject constructor(
                 val userApi = UserApi(apiClient)
                 val response = userApi.getCurrentUser()
                 response.content?.let { userDto ->
-                    val user = User(
-                        id = userDto.id,
-                        name = userDto.name ?: "",
-                        serverId = "",
-                        accessToken = apiClient.accessToken,
-                        primaryImageTag = userDto.primaryImageTag
-                    )
+                    val user =
+                        User(
+                            id = userDto.id,
+                            name = userDto.name ?: "",
+                            serverId = "",
+                            accessToken = apiClient.accessToken,
+                            primaryImageTag = userDto.primaryImageTag,
+                        )
                     _currentUser.value = user
                     user
                 }
@@ -362,7 +388,7 @@ class JellyfinAuthRepository @Inject constructor(
                         name = userDto.name ?: "",
                         serverId = "",
                         accessToken = null,
-                        primaryImageTag = userDto.primaryImageTag
+                        primaryImageTag = userDto.primaryImageTag,
                     )
                 } ?: emptyList()
             } catch (e: ApiClientException) {
@@ -385,7 +411,9 @@ class JellyfinAuthRepository @Inject constructor(
 
         apiClient.update(baseUrl = serverUrl, accessToken = accessToken)
 
-        Timber.d("ApiClient AFTER update - baseUrl: ${apiClient.baseUrl}, hasToken: ${!apiClient.accessToken.isNullOrBlank()}")
+        Timber.d(
+            "ApiClient AFTER update - baseUrl: ${apiClient.baseUrl}, hasToken: ${!apiClient.accessToken.isNullOrBlank()}"
+        )
         _currentUser.value = user
         _isAuthenticated.value = true
     }
@@ -401,13 +429,14 @@ class JellyfinAuthRepository @Inject constructor(
             _isAuthenticated.value = true
 
             authResult.user?.let { userDto ->
-                val user = User(
-                    id = userDto.id,
-                    name = userDto.name ?: username,
-                    serverId = authResult.serverId ?: "",
-                    accessToken = token,
-                    primaryImageTag = userDto.primaryImageTag
-                )
+                val user =
+                    User(
+                        id = userDto.id,
+                        name = userDto.name ?: username,
+                        serverId = authResult.serverId ?: "",
+                        accessToken = token,
+                        primaryImageTag = userDto.primaryImageTag,
+                    )
                 _currentUser.value = user
 
                 try {
@@ -421,51 +450,49 @@ class JellyfinAuthRepository @Inject constructor(
                 val serverId = authResult.serverId ?: ""
                 val userId = userDto.id
 
-                sessionManager.startSession(
-                    serverUrl = serverUrl,
-                    serverId = serverId,
-                    userId = userId,
-                    accessToken = token
-                ).onFailure { e ->
-                    Timber.e(e, "Failed to start session via SessionManager")
-                }
+                sessionManager
+                    .startSession(
+                        serverUrl = serverUrl,
+                        serverId = serverId,
+                        userId = userId,
+                        accessToken = token,
+                    )
+                    .onFailure { e -> Timber.e(e, "Failed to start session via SessionManager") }
             }
 
             Timber.d("Successfully authenticated user: $username")
-            CoroutineScope(Dispatchers.IO).launch {
-                registerClientCapabilities()
-            }
-        } ?: run {
-            Timber.w("Authentication succeeded but no access token received")
-        }
+            CoroutineScope(Dispatchers.IO).launch { registerClientCapabilities() }
+        } ?: run { Timber.w("Authentication succeeded but no access token received") }
     }
 
     private suspend fun registerClientCapabilities() {
         try {
             val sessionApi = SessionApi(apiClient)
-            val capabilities = ClientCapabilitiesDto(
-                playableMediaTypes = listOf(MediaType.VIDEO),
-                supportedCommands = listOf(
-                    GeneralCommandType.VOLUME_UP,
-                    GeneralCommandType.VOLUME_DOWN,
-                    GeneralCommandType.TOGGLE_MUTE,
-                    GeneralCommandType.SET_AUDIO_STREAM_INDEX,
-                    GeneralCommandType.SET_SUBTITLE_STREAM_INDEX,
-                    GeneralCommandType.MUTE,
-                    GeneralCommandType.UNMUTE,
-                    GeneralCommandType.SET_VOLUME,
-                    GeneralCommandType.DISPLAY_MESSAGE,
-                    GeneralCommandType.PLAY,
-                    GeneralCommandType.PLAY_STATE,
-                    GeneralCommandType.PLAY_NEXT,
-                    GeneralCommandType.PLAY_MEDIA_SOURCE,
-                ),
-                supportsMediaControl = true,
-                supportsPersistentIdentifier = true,
-                deviceProfile = null,
-                appStoreUrl = null,
-                iconUrl = AppConstants.CLIENT_ICON_URL
-            )
+            val capabilities =
+                ClientCapabilitiesDto(
+                    playableMediaTypes = listOf(MediaType.VIDEO),
+                    supportedCommands =
+                        listOf(
+                            GeneralCommandType.VOLUME_UP,
+                            GeneralCommandType.VOLUME_DOWN,
+                            GeneralCommandType.TOGGLE_MUTE,
+                            GeneralCommandType.SET_AUDIO_STREAM_INDEX,
+                            GeneralCommandType.SET_SUBTITLE_STREAM_INDEX,
+                            GeneralCommandType.MUTE,
+                            GeneralCommandType.UNMUTE,
+                            GeneralCommandType.SET_VOLUME,
+                            GeneralCommandType.DISPLAY_MESSAGE,
+                            GeneralCommandType.PLAY,
+                            GeneralCommandType.PLAY_STATE,
+                            GeneralCommandType.PLAY_NEXT,
+                            GeneralCommandType.PLAY_MEDIA_SOURCE,
+                        ),
+                    supportsMediaControl = true,
+                    supportsPersistentIdentifier = true,
+                    deviceProfile = null,
+                    appStoreUrl = null,
+                    iconUrl = AppConstants.CLIENT_ICON_URL,
+                )
 
             sessionApi.postFullCapabilities(data = capabilities)
             Timber.d("Successfully registered client capabilities with icon URL")
@@ -481,4 +508,4 @@ class JellyfinAuthRepository @Inject constructor(
         _isAuthenticated.value = false
         _currentUser.value = null
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/download/DownloadRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/download/DownloadRepository.kt
index d741edf7c..8553569ad 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/download/DownloadRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/download/DownloadRepository.kt
@@ -2,8 +2,8 @@ package com.makd.afinity.data.repository.download
 
 import com.makd.afinity.data.models.download.DownloadInfo
 import com.makd.afinity.data.models.download.DownloadStatus
-import kotlinx.coroutines.flow.Flow
 import java.util.UUID
+import kotlinx.coroutines.flow.Flow
 
 interface DownloadRepository {
 
diff --git a/app/src/main/java/com/makd/afinity/data/repository/download/JellyfinDownloadRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/download/JellyfinDownloadRepository.kt
index 9d23244bc..9d1373cfd 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/download/JellyfinDownloadRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/download/JellyfinDownloadRepository.kt
@@ -25,6 +25,10 @@ import com.makd.afinity.data.workers.MediaDownloadWorker
 import com.makd.afinity.data.workers.SubtitleDownloadWorker
 import com.makd.afinity.data.workers.TrickplayDownloadWorker
 import dagger.hilt.android.qualifiers.ApplicationContext
+import java.io.File
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
@@ -35,13 +39,11 @@ import kotlinx.coroutines.withContext
 import org.jellyfin.sdk.model.api.BaseItemKind
 import org.jellyfin.sdk.model.api.ItemFields
 import timber.log.Timber
-import java.io.File
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @Singleton
-class JellyfinDownloadRepository @Inject constructor(
+class JellyfinDownloadRepository
+@Inject
+constructor(
     @ApplicationContext private val context: Context,
     private val sessionManager: SessionManager,
     private val mediaRepository: MediaRepository,
@@ -60,77 +62,93 @@ class JellyfinDownloadRepository @Inject constructor(
     }
 
     private val downloadDir: File
-        get() = File(context.getExternalFilesDir(null), "AFinity/Downloads").also {
-            if (!it.exists()) it.mkdirs()
-        }
+        get() =
+            File(context.getExternalFilesDir(null), "AFinity/Downloads").also {
+                if (!it.exists()) it.mkdirs()
+            }
 
     override suspend fun startDownload(itemId: UUID, sourceId: String): Result<UUID> =
         withContext(Dispatchers.IO) {
             return@withContext try {
-                val currentSession = sessionManager.currentSession.value
-                    ?: return@withContext Result.failure(Exception("No active session"))
+                val currentSession =
+                    sessionManager.currentSession.value
+                        ?: return@withContext Result.failure(Exception("No active session"))
 
                 val userId = currentSession.userId
                 val serverId = currentSession.serverId
                 val baseUrl = currentSession.serverUrl
 
-                val existingDownload = databaseRepository.getDownloadByItemIdScoped(itemId, serverId, userId)
+                val existingDownload =
+                    databaseRepository.getDownloadByItemIdScoped(itemId, serverId, userId)
                 if (existingDownload != null) {
                     if (existingDownload.status == DownloadStatus.COMPLETED) {
                         return@withContext Result.failure(Exception("Item already downloaded"))
                     }
-                    if (existingDownload.status == DownloadStatus.DOWNLOADING ||
-                        existingDownload.status == DownloadStatus.QUEUED
+                    if (
+                        existingDownload.status == DownloadStatus.DOWNLOADING ||
+                            existingDownload.status == DownloadStatus.QUEUED
                     ) {
-                        return@withContext Result.failure(Exception("Item is already being downloaded"))
+                        return@withContext Result.failure(
+                            Exception("Item is already being downloaded")
+                        )
                     }
                 }
 
-                val baseItemDto = mediaRepository.getItem(
-                    itemId = itemId,
-                    fields = listOf(
-                        ItemFields.MEDIA_SOURCES,
-                        ItemFields.MEDIA_STREAMS,
-                        ItemFields.OVERVIEW
-                    )
-                ) ?: return@withContext Result.failure(Exception("Item not found"))
-
-                val item = when (baseItemDto.type) {
-                    BaseItemKind.MOVIE -> baseItemDto.toAfinityMovie(baseUrl)
-                    BaseItemKind.EPISODE -> baseItemDto.toAfinityEpisode(baseUrl)
-                        ?: return@withContext Result.failure(Exception("Failed to convert episode"))
-
-                    else -> return@withContext Result.failure(
-                        Exception("Unsupported item type: ${baseItemDto.type}")
-                    )
-                }
+                val baseItemDto =
+                    mediaRepository.getItem(
+                        itemId = itemId,
+                        fields =
+                            listOf(
+                                ItemFields.MEDIA_SOURCES,
+                                ItemFields.MEDIA_STREAMS,
+                                ItemFields.OVERVIEW,
+                            ),
+                    ) ?: return@withContext Result.failure(Exception("Item not found"))
+
+                val item =
+                    when (baseItemDto.type) {
+                        BaseItemKind.MOVIE -> baseItemDto.toAfinityMovie(baseUrl)
+                        BaseItemKind.EPISODE ->
+                            baseItemDto.toAfinityEpisode(baseUrl)
+                                ?: return@withContext Result.failure(
+                                    Exception("Failed to convert episode")
+                                )
+
+                        else ->
+                            return@withContext Result.failure(
+                                Exception("Unsupported item type: ${baseItemDto.type}")
+                            )
+                    }
 
-                val source = item.sources.find { it.id == sourceId }
-                    ?: return@withContext Result.failure(Exception("Source not found"))
+                val source =
+                    item.sources.find { it.id == sourceId }
+                        ?: return@withContext Result.failure(Exception("Source not found"))
 
                 val downloadId = UUID.randomUUID()
-                val download = DownloadDto(
-                    id = downloadId,
-                    itemId = itemId,
-                    itemName = item.name,
-                    itemType = when (item) {
-                        is AfinityMovie -> "Movie"
-                        is AfinityEpisode -> "Episode"
-                        else -> "Unknown"
-                    },
-                    sourceId = sourceId,
-                    sourceName = source.name,
-                    status = DownloadStatus.QUEUED,
-                    progress = 0f,
-                    bytesDownloaded = 0L,
-                    totalBytes = source.size,
-                    filePath = null,
-                    error = null,
-                    createdAt = System.currentTimeMillis(),
-                    updatedAt = System.currentTimeMillis(),
-                    serverId = serverId,
-                    userId = userId
-                )
+                val download =
+                    DownloadDto(
+                        id = downloadId,
+                        itemId = itemId,
+                        itemName = item.name,
+                        itemType =
+                            when (item) {
+                                is AfinityMovie -> "Movie"
+                                is AfinityEpisode -> "Episode"
+                                else -> "Unknown"
+                            },
+                        sourceId = sourceId,
+                        sourceName = source.name,
+                        status = DownloadStatus.QUEUED,
+                        progress = 0f,
+                        bytesDownloaded = 0L,
+                        totalBytes = source.size,
+                        filePath = null,
+                        error = null,
+                        createdAt = System.currentTimeMillis(),
+                        updatedAt = System.currentTimeMillis(),
+                        serverId = serverId,
+                        userId = userId,
+                    )
 
                 databaseRepository.insertDownload(download)
 
@@ -145,53 +163,59 @@ class JellyfinDownloadRepository @Inject constructor(
 
     private suspend fun queueDownloadWork(
         download: DownloadDto,
-        policy: ExistingWorkPolicy = ExistingWorkPolicy.KEEP
+        policy: ExistingWorkPolicy = ExistingWorkPolicy.KEEP,
     ) {
         val wifiOnly = preferencesRepository.getDownloadOverWifiOnly()
 
-        val constraints = Constraints.Builder()
-            .setRequiredNetworkType(if (wifiOnly) NetworkType.UNMETERED else NetworkType.CONNECTED)
-            .setRequiresStorageNotLow(true)
-            .build()
-
-        val inputData = Data.Builder()
-            .putString(KEY_DOWNLOAD_ID, download.id.toString())
-            .putString(KEY_ITEM_ID, download.itemId.toString())
-            .putString(KEY_SOURCE_ID, download.sourceId)
-            .putString(KEY_ITEM_NAME, download.itemName)
-            .putString(KEY_ITEM_TYPE, download.itemType)
-            .build()
-
-        val mediaDownloadRequest = OneTimeWorkRequestBuilder<MediaDownloadWorker>()
-            .setConstraints(constraints)
-            .setInputData(inputData)
-            .addTag("download_${download.id}")
-            .addTag("download_active")
-            .build()
-
-        val trickplayDownloadRequest = OneTimeWorkRequestBuilder<TrickplayDownloadWorker>()
-            .setConstraints(constraints)
-            .setInputData(inputData)
-            .addTag("download_${download.id}")
-            .build()
-
-        val imageDownloadRequest = OneTimeWorkRequestBuilder<ImageDownloadWorker>()
-            .setConstraints(constraints)
-            .setInputData(inputData)
-            .addTag("download_${download.id}")
-            .build()
-
-        val subtitleDownloadRequest = OneTimeWorkRequestBuilder<SubtitleDownloadWorker>()
-            .setConstraints(constraints)
-            .setInputData(inputData)
-            .addTag("download_${download.id}")
-            .build()
-
-        workManager.beginUniqueWork(
-            "download_${download.id}",
-            policy,
-            mediaDownloadRequest
-        ).then(listOf(trickplayDownloadRequest, imageDownloadRequest, subtitleDownloadRequest))
+        val constraints =
+            Constraints.Builder()
+                .setRequiredNetworkType(
+                    if (wifiOnly) NetworkType.UNMETERED else NetworkType.CONNECTED
+                )
+                .setRequiresStorageNotLow(true)
+                .build()
+
+        val inputData =
+            Data.Builder()
+                .putString(KEY_DOWNLOAD_ID, download.id.toString())
+                .putString(KEY_ITEM_ID, download.itemId.toString())
+                .putString(KEY_SOURCE_ID, download.sourceId)
+                .putString(KEY_ITEM_NAME, download.itemName)
+                .putString(KEY_ITEM_TYPE, download.itemType)
+                .build()
+
+        val mediaDownloadRequest =
+            OneTimeWorkRequestBuilder<MediaDownloadWorker>()
+                .setConstraints(constraints)
+                .setInputData(inputData)
+                .addTag("download_${download.id}")
+                .addTag("download_active")
+                .build()
+
+        val trickplayDownloadRequest =
+            OneTimeWorkRequestBuilder<TrickplayDownloadWorker>()
+                .setConstraints(constraints)
+                .setInputData(inputData)
+                .addTag("download_${download.id}")
+                .build()
+
+        val imageDownloadRequest =
+            OneTimeWorkRequestBuilder<ImageDownloadWorker>()
+                .setConstraints(constraints)
+                .setInputData(inputData)
+                .addTag("download_${download.id}")
+                .build()
+
+        val subtitleDownloadRequest =
+            OneTimeWorkRequestBuilder<SubtitleDownloadWorker>()
+                .setConstraints(constraints)
+                .setInputData(inputData)
+                .addTag("download_${download.id}")
+                .build()
+
+        workManager
+            .beginUniqueWork("download_${download.id}", policy, mediaDownloadRequest)
+            .then(listOf(trickplayDownloadRequest, imageDownloadRequest, subtitleDownloadRequest))
             .enqueue()
     }
 
@@ -205,7 +229,7 @@ class JellyfinDownloadRepository @Inject constructor(
                     databaseRepository.insertDownload(
                         download.copy(
                             status = DownloadStatus.PAUSED,
-                            updatedAt = System.currentTimeMillis()
+                            updatedAt = System.currentTimeMillis(),
                         )
                     )
                 }
@@ -220,18 +244,23 @@ class JellyfinDownloadRepository @Inject constructor(
     override suspend fun resumeDownload(downloadId: UUID): Result<Unit> =
         withContext(Dispatchers.IO) {
             return@withContext try {
-                val download = databaseRepository.getDownload(downloadId)
-                    ?: return@withContext Result.failure(Exception("Download not found"))
-
-                if (download.status != DownloadStatus.PAUSED && download.status != DownloadStatus.FAILED) {
+                val download =
+                    databaseRepository.getDownload(downloadId)
+                        ?: return@withContext Result.failure(Exception("Download not found"))
+
+                if (
+                    download.status != DownloadStatus.PAUSED &&
+                        download.status != DownloadStatus.FAILED
+                ) {
                     return@withContext Result.failure(Exception("Download is not paused or failed"))
                 }
 
-                val updatedDownload = download.copy(
-                    status = DownloadStatus.QUEUED,
-                    error = null,
-                    updatedAt = System.currentTimeMillis()
-                )
+                val updatedDownload =
+                    download.copy(
+                        status = DownloadStatus.QUEUED,
+                        error = null,
+                        updatedAt = System.currentTimeMillis(),
+                    )
                 databaseRepository.insertDownload(updatedDownload)
 
                 queueDownloadWork(updatedDownload, ExistingWorkPolicy.REPLACE)
@@ -253,14 +282,16 @@ class JellyfinDownloadRepository @Inject constructor(
                     val itemDir = getItemDownloadDirectory(download.itemId)
                     val mediaDir = File(itemDir, "media")
                     if (mediaDir.exists()) {
-                        mediaDir.listFiles { _, name ->
-                            name.startsWith(download.sourceId)
-                        }?.forEach { file ->
-                            Timber.d("Deleting download file: ${file.name}")
-                            file.delete()
-                        }
+                        mediaDir
+                            .listFiles { _, name -> name.startsWith(download.sourceId) }
+                            ?.forEach { file ->
+                                Timber.d("Deleting download file: ${file.name}")
+                                file.delete()
+                            }
                     }
-                    if (itemDir.exists() && (itemDir.listFiles()?.isEmpty() == true ||
+                    if (
+                        itemDir.exists() &&
+                            (itemDir.listFiles()?.isEmpty() == true ||
                                 itemDir.listFiles()?.all {
                                     it.name == "media" && it.listFiles()?.isEmpty() == true
                                 } == true)
@@ -280,8 +311,9 @@ class JellyfinDownloadRepository @Inject constructor(
     override suspend fun deleteDownload(downloadId: UUID): Result<Unit> =
         withContext(Dispatchers.IO) {
             return@withContext try {
-                val download = databaseRepository.getDownload(downloadId)
-                    ?: return@withContext Result.failure(Exception("Download not found"))
+                val download =
+                    databaseRepository.getDownload(downloadId)
+                        ?: return@withContext Result.failure(Exception("Download not found"))
 
                 val itemFolder = File(downloadDir, download.itemId.toString())
                 if (itemFolder.exists()) {
@@ -289,7 +321,8 @@ class JellyfinDownloadRepository @Inject constructor(
                 }
 
                 val sources = databaseRepository.getSources(download.itemId)
-                sources.filter { it.type == AfinitySourceType.LOCAL }
+                sources
+                    .filter { it.type == AfinitySourceType.LOCAL }
                     .forEach { databaseRepository.deleteSource(it.id) }
 
                 databaseRepository.deleteDownload(downloadId)
@@ -302,14 +335,14 @@ class JellyfinDownloadRepository @Inject constructor(
         }
 
     override suspend fun getDownload(downloadId: UUID): DownloadInfo? =
-        withContext(Dispatchers.IO) {
-            databaseRepository.getDownload(downloadId)?.toDownloadInfo()
-        }
+        withContext(Dispatchers.IO) { databaseRepository.getDownload(downloadId)?.toDownloadInfo() }
 
     override suspend fun getDownloadByItemId(itemId: UUID): DownloadInfo? =
         withContext(Dispatchers.IO) {
             val session = sessionManager.currentSession.value ?: return@withContext null
-            databaseRepository.getDownloadByItemIdScoped(itemId, session.serverId, session.userId)?.toDownloadInfo()
+            databaseRepository
+                .getDownloadByItemIdScoped(itemId, session.serverId, session.userId)
+                ?.toDownloadInfo()
         }
 
     @OptIn(ExperimentalCoroutinesApi::class)
@@ -323,63 +356,85 @@ class JellyfinDownloadRepository @Inject constructor(
     }
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    override fun getDownloadsByStatusFlow(statuses: List<DownloadStatus>): Flow<List<DownloadInfo>> {
+    override fun getDownloadsByStatusFlow(
+        statuses: List<DownloadStatus>
+    ): Flow<List<DownloadInfo>> {
         return sessionManager.currentSession
             .filterNotNull()
             .flatMapLatest { session ->
-                databaseRepository.getDownloadsByStatusFlowScoped(statuses, session.serverId, session.userId)
+                databaseRepository.getDownloadsByStatusFlowScoped(
+                    statuses,
+                    session.serverId,
+                    session.userId,
+                )
             }
             .map { downloads -> downloads.map { it.toDownloadInfo() } }
     }
 
     override fun getActiveDownloadsFlow(): Flow<List<DownloadInfo>> {
         return getDownloadsByStatusFlow(
-            listOf(DownloadStatus.QUEUED, DownloadStatus.DOWNLOADING, DownloadStatus.PAUSED, DownloadStatus.FAILED)
+            listOf(
+                DownloadStatus.QUEUED,
+                DownloadStatus.DOWNLOADING,
+                DownloadStatus.PAUSED,
+                DownloadStatus.FAILED,
+            )
         )
     }
 
     override fun getCompletedDownloadsFlow(): Flow<List<DownloadInfo>> {
-        return getDownloadsByStatusFlow(
-            listOf(DownloadStatus.COMPLETED)
-        )
+        return getDownloadsByStatusFlow(listOf(DownloadStatus.COMPLETED))
     }
 
-    override suspend fun isItemDownloaded(itemId: UUID): Boolean = withContext(Dispatchers.IO) {
-        val session = sessionManager.currentSession.value ?: return@withContext false
-        val download = databaseRepository.getDownloadByItemIdScoped(itemId, session.serverId, session.userId)
-        download?.status == DownloadStatus.COMPLETED
-    }
+    override suspend fun isItemDownloaded(itemId: UUID): Boolean =
+        withContext(Dispatchers.IO) {
+            val session = sessionManager.currentSession.value ?: return@withContext false
+            val download =
+                databaseRepository.getDownloadByItemIdScoped(
+                    itemId,
+                    session.serverId,
+                    session.userId,
+                )
+            download?.status == DownloadStatus.COMPLETED
+        }
 
-    override suspend fun isItemDownloading(itemId: UUID): Boolean = withContext(Dispatchers.IO) {
-        val session = sessionManager.currentSession.value ?: return@withContext false
-        val download = databaseRepository.getDownloadByItemIdScoped(itemId, session.serverId, session.userId)
-        download?.status == DownloadStatus.DOWNLOADING || download?.status == DownloadStatus.QUEUED
-    }
+    override suspend fun isItemDownloading(itemId: UUID): Boolean =
+        withContext(Dispatchers.IO) {
+            val session = sessionManager.currentSession.value ?: return@withContext false
+            val download =
+                databaseRepository.getDownloadByItemIdScoped(
+                    itemId,
+                    session.serverId,
+                    session.userId,
+                )
+            download?.status == DownloadStatus.DOWNLOADING ||
+                download?.status == DownloadStatus.QUEUED
+        }
 
-    override suspend fun getTotalStorageUsed(): Long = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val session = sessionManager.currentSession.value ?: return@withContext 0L
-            databaseRepository.getTotalBytesForServer(session.serverId)
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to calculate storage used")
-            0L
+    override suspend fun getTotalStorageUsed(): Long =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val session = sessionManager.currentSession.value ?: return@withContext 0L
+                databaseRepository.getTotalBytesForServer(session.serverId)
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to calculate storage used")
+                0L
+            }
         }
-    }
 
-    override suspend fun getTotalStorageUsedAllServers(): Long = withContext(Dispatchers.IO) {
-        return@withContext try {
-            databaseRepository.getTotalBytesAllServers()
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to calculate total storage used")
-            0L
+    override suspend fun getTotalStorageUsedAllServers(): Long =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                databaseRepository.getTotalBytesAllServers()
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to calculate total storage used")
+                0L
+            }
         }
-    }
 
     fun getDownloadDirectory(): File = downloadDir
 
     fun getItemDownloadDirectory(itemId: UUID): File {
-        return File(downloadDir, itemId.toString()).also {
-            if (!it.exists()) it.mkdirs()
-        }
+        return File(downloadDir, itemId.toString()).also { if (!it.exists()) it.mkdirs() }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/impl/DatabaseRepositoryImpl.kt b/app/src/main/java/com/makd/afinity/data/repository/impl/DatabaseRepositoryImpl.kt
index 3f4cc9478..8639329bd 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/impl/DatabaseRepositoryImpl.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/impl/DatabaseRepositoryImpl.kt
@@ -11,7 +11,6 @@ import com.makd.afinity.data.database.dao.ShowDao
 import com.makd.afinity.data.database.dao.SourceDao
 import com.makd.afinity.data.database.dao.UserDao
 import com.makd.afinity.data.database.dao.UserDataDao
-import com.makd.afinity.data.manager.SessionManager
 import com.makd.afinity.data.database.entities.AfinityEpisodeDto
 import com.makd.afinity.data.database.entities.AfinityMovieDto
 import com.makd.afinity.data.database.entities.AfinitySeasonDto
@@ -26,6 +25,7 @@ import com.makd.afinity.data.database.entities.toAfinitySegmentsDto
 import com.makd.afinity.data.database.entities.toAfinityShowDto
 import com.makd.afinity.data.database.entities.toAfinitySourceDto
 import com.makd.afinity.data.database.entities.toAfinityTrickplayInfoDto
+import com.makd.afinity.data.manager.SessionManager
 import com.makd.afinity.data.models.download.DownloadStatus
 import com.makd.afinity.data.models.media.AfinityEpisode
 import com.makd.afinity.data.models.media.AfinityImages
@@ -49,19 +49,21 @@ import com.makd.afinity.data.models.server.ServerWithAddressesAndUsers
 import com.makd.afinity.data.models.user.AfinityUserDataDto
 import com.makd.afinity.data.models.user.User
 import com.makd.afinity.data.repository.DatabaseRepository
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Provider
+import javax.inject.Singleton
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Provider
-import javax.inject.Singleton
 
 @OptIn(ExperimentalCoroutinesApi::class)
 @Singleton
-class DatabaseRepositoryImpl @Inject constructor(
+class DatabaseRepositoryImpl
+@Inject
+constructor(
     private val sessionManagerProvider: Provider<SessionManager>,
     private val serverDao: ServerDao,
     private val serverAddressDao: ServerAddressDao,
@@ -73,7 +75,7 @@ class DatabaseRepositoryImpl @Inject constructor(
     private val sourceDao: SourceDao,
     private val mediaStreamDao: MediaStreamDao,
     private val userDataDao: UserDataDao,
-    private val serverDatabaseDao: ServerDatabaseDao
+    private val serverDatabaseDao: ServerDatabaseDao,
 ) : DatabaseRepository {
 
     private val sessionManager: SessionManager
@@ -123,7 +125,9 @@ class DatabaseRepositoryImpl @Inject constructor(
         return serverDao.getServerWithAddresses(serverId)
     }
 
-    override suspend fun getServerWithAddressesAndUsers(serverId: String): ServerWithAddressesAndUsers? {
+    override suspend fun getServerWithAddressesAndUsers(
+        serverId: String
+    ): ServerWithAddressesAndUsers? {
         return serverDao.getServerWithAddressesAndUsers(serverId)
     }
 
@@ -176,7 +180,8 @@ class DatabaseRepositoryImpl @Inject constructor(
     }
 
     override suspend fun getAllMovies(userId: UUID, serverId: String?): List<AfinityMovie> {
-        val actualServerId = serverId ?: sessionManager.currentSession.value?.serverId ?: return emptyList()
+        val actualServerId =
+            serverId ?: sessionManager.currentSession.value?.serverId ?: return emptyList()
         return movieDao.getMovies(actualServerId).map {
             it.toAfinityMovie(serverDatabaseDao, userId)
         }
@@ -190,13 +195,11 @@ class DatabaseRepositoryImpl @Inject constructor(
     }
 
     override fun getMoviesFlow(userId: UUID): Flow<List<AfinityMovie>> {
-        return sessionManager.currentSession
-            .filterNotNull()
-            .flatMapLatest { session ->
-                movieDao.getMoviesFlow(session.serverId).map { movieDtos ->
-                    movieDtos.map { it.toAfinityMovie(serverDatabaseDao, userId) }
-                }
+        return sessionManager.currentSession.filterNotNull().flatMapLatest { session ->
+            movieDao.getMoviesFlow(session.serverId).map { movieDtos ->
+                movieDtos.map { it.toAfinityMovie(serverDatabaseDao, userId) }
             }
+        }
     }
 
     override suspend fun insertShow(show: AfinityShow, serverId: String?) {
@@ -220,10 +223,9 @@ class DatabaseRepositoryImpl @Inject constructor(
     }
 
     override suspend fun getAllShows(userId: UUID, serverId: String?): List<AfinityShow> {
-        val actualServerId = serverId ?: sessionManager.currentSession.value?.serverId ?: return emptyList()
-        return showDao.getShows(actualServerId).map {
-            it.toAfinityShow(serverDatabaseDao, userId)
-        }
+        val actualServerId =
+            serverId ?: sessionManager.currentSession.value?.serverId ?: return emptyList()
+        return showDao.getShows(actualServerId).map { it.toAfinityShow(serverDatabaseDao, userId) }
     }
 
     override suspend fun searchShows(query: String, userId: UUID): List<AfinityShow> {
@@ -234,13 +236,11 @@ class DatabaseRepositoryImpl @Inject constructor(
     }
 
     override fun getShowsFlow(userId: UUID): Flow<List<AfinityShow>> {
-        return sessionManager.currentSession
-            .filterNotNull()
-            .flatMapLatest { session ->
-                showDao.getShowsFlow(session.serverId).map { showDtos ->
-                    showDtos.map { it.toAfinityShow(serverDatabaseDao, userId) }
-                }
+        return sessionManager.currentSession.filterNotNull().flatMapLatest { session ->
+            showDao.getShowsFlow(session.serverId).map { showDtos ->
+                showDtos.map { it.toAfinityShow(serverDatabaseDao, userId) }
             }
+        }
     }
 
     override suspend fun insertSeason(season: AfinitySeason, serverId: String?) {
@@ -319,13 +319,11 @@ class DatabaseRepositoryImpl @Inject constructor(
     }
 
     override fun getEpisodesFlow(seasonId: UUID, userId: UUID): Flow<List<AfinityEpisode>> {
-        return sessionManager.currentSession
-            .filterNotNull()
-            .flatMapLatest { session ->
-                episodeDao.getEpisodesForSeasonFlow(seasonId, session.serverId).map { episodeDtos ->
-                    episodeDtos.map { it.toAfinityEpisode(serverDatabaseDao, userId) }
-                }
+        return sessionManager.currentSession.filterNotNull().flatMapLatest { session ->
+            episodeDao.getEpisodesForSeasonFlow(seasonId, session.serverId).map { episodeDtos ->
+                episodeDtos.map { it.toAfinityEpisode(serverDatabaseDao, userId) }
             }
+        }
     }
 
     override suspend fun insertSource(source: AfinitySource, itemId: UUID) {
@@ -349,9 +347,7 @@ class DatabaseRepositoryImpl @Inject constructor(
     }
 
     override suspend fun getSourcesForItem(itemId: UUID): List<AfinitySource> {
-        return sourceDao.getSourcesForItem(itemId).map {
-            it.toAfinitySource(serverDatabaseDao)
-        }
+        return sourceDao.getSourcesForItem(itemId).map { it.toAfinitySource(serverDatabaseDao) }
     }
 
     override suspend fun insertMediaStream(stream: AfinityMediaStream, sourceId: String) {
@@ -360,30 +356,26 @@ class DatabaseRepositoryImpl @Inject constructor(
         )
     }
 
-    override suspend fun updateMediaStream(stream: AfinityMediaStream) {
-    }
+    override suspend fun updateMediaStream(stream: AfinityMediaStream) {}
 
     override suspend fun deleteMediaStream(streamId: UUID) {
         mediaStreamDao.deleteMediaStreamById(streamId)
     }
 
     override suspend fun getMediaStreamsForSource(sourceId: String): List<AfinityMediaStream> {
-        return mediaStreamDao.getMediaStreamsBySourceId(sourceId).map {
-            it.toAfinityMediaStream()
-        }
+        return mediaStreamDao.getMediaStreamsBySourceId(sourceId).map { it.toAfinityMediaStream() }
     }
 
-    override suspend fun insertTrickplayInfo(trickplayInfo: AfinityTrickplayInfo, sourceId: String) {
-        serverDatabaseDao.insertTrickplayInfo(
-            trickplayInfo.toAfinityTrickplayInfoDto(sourceId)
-        )
+    override suspend fun insertTrickplayInfo(
+        trickplayInfo: AfinityTrickplayInfo,
+        sourceId: String,
+    ) {
+        serverDatabaseDao.insertTrickplayInfo(trickplayInfo.toAfinityTrickplayInfoDto(sourceId))
     }
 
-    override suspend fun updateTrickplayInfo(trickplayInfo: AfinityTrickplayInfo) {
-    }
+    override suspend fun updateTrickplayInfo(trickplayInfo: AfinityTrickplayInfo) {}
 
-    override suspend fun deleteTrickplayInfo(sourceId: String) {
-    }
+    override suspend fun deleteTrickplayInfo(sourceId: String) {}
 
     override suspend fun getTrickplayInfo(sourceId: String): AfinityTrickplayInfo? {
         return serverDatabaseDao.getTrickplayInfo(sourceId)?.toAfinityTrickplayInfo()
@@ -397,13 +389,10 @@ class DatabaseRepositoryImpl @Inject constructor(
         serverDatabaseDao.insertSegment(segment.toAfinitySegmentsDto(itemId))
     }
 
-    override suspend fun deleteSegment(itemId: UUID, segmentType: AfinitySegmentType) {
-    }
+    override suspend fun deleteSegment(itemId: UUID, segmentType: AfinitySegmentType) {}
 
     override suspend fun getSegmentsForItem(itemId: UUID): List<AfinitySegment> {
-        return serverDatabaseDao.getSegmentsForItem(itemId).map {
-            it.toAfinitySegment()
-        }
+        return serverDatabaseDao.getSegmentsForItem(itemId).map { it.toAfinitySegment() }
     }
 
     override suspend fun insertUserData(userData: AfinityUserDataDto) {
@@ -434,7 +423,10 @@ class DatabaseRepositoryImpl @Inject constructor(
         return userDataDao.getUnsyncedUserData(userId, serverId)
     }
 
-    override suspend fun getAllUserDataToSync(userId: UUID, serverId: String): List<AfinityUserDataDto> {
+    override suspend fun getAllUserDataToSync(
+        userId: UUID,
+        serverId: String,
+    ): List<AfinityUserDataDto> {
         return userDataDao.getUnsyncedUserData(userId, serverId)
     }
 
@@ -466,29 +458,21 @@ class DatabaseRepositoryImpl @Inject constructor(
     }
 
     override fun getFavoriteMoviesFlow(userId: UUID): Flow<List<AfinityMovie>> {
-        return sessionManager.currentSession
-            .filterNotNull()
-            .flatMapLatest { session ->
-                userDataDao.getFavoriteItemsFlow(userId, session.serverId).map { userDataList ->
-                    val movieIds = userDataList.map { it.itemId }
-                    movieIds.mapNotNull { movieId ->
-                        getMovie(movieId, userId)
-                    }
-                }
+        return sessionManager.currentSession.filterNotNull().flatMapLatest { session ->
+            userDataDao.getFavoriteItemsFlow(userId, session.serverId).map { userDataList ->
+                val movieIds = userDataList.map { it.itemId }
+                movieIds.mapNotNull { movieId -> getMovie(movieId, userId) }
             }
+        }
     }
 
     override fun getFavoriteShowsFlow(userId: UUID): Flow<List<AfinityShow>> {
-        return sessionManager.currentSession
-            .filterNotNull()
-            .flatMapLatest { session ->
-                userDataDao.getFavoriteItemsFlow(userId, session.serverId).map { userDataList ->
-                    val showIds = userDataList.map { it.itemId }
-                    showIds.mapNotNull { showId ->
-                        getShow(showId, userId)
-                    }
-                }
+        return sessionManager.currentSession.filterNotNull().flatMapLatest { session ->
+            userDataDao.getFavoriteItemsFlow(userId, session.serverId).map { userDataList ->
+                val showIds = userDataList.map { it.itemId }
+                showIds.mapNotNull { showId -> getShow(showId, userId) }
             }
+        }
     }
 
     override suspend fun getRecentlyWatchedItems(userId: UUID, limit: Int): List<AfinityItem> {
@@ -503,28 +487,29 @@ class DatabaseRepositoryImpl @Inject constructor(
         }
     }
 
-    override suspend fun getContinueWatchingEpisodes(userId: UUID, limit: Int): List<AfinityEpisode> {
+    override suspend fun getContinueWatchingEpisodes(
+        userId: UUID,
+        limit: Int,
+    ): List<AfinityEpisode> {
         return serverDatabaseDao.getContinueWatchingEpisodes(userId, limit).map {
             it.toAfinityEpisode(serverDatabaseDao, userId)
         }
     }
 
     override fun getContinueWatchingFlow(userId: UUID): Flow<List<AfinityItem>> {
-        return sessionManager.currentSession
-            .filterNotNull()
-            .flatMapLatest { session ->
-                userDataDao.getContinueWatchingItemsFlow(userId, session.serverId).map { userDataList ->
-                    val itemIds = userDataList.map { it.itemId }
-                    val items = mutableListOf<AfinityItem>()
-
-                    itemIds.forEach { itemId ->
-                        getMovie(itemId, userId)?.let { items.add(it) }
-                            ?: getEpisode(itemId, userId)?.let { items.add(it) }
-                    }
-
-                    items
+        return sessionManager.currentSession.filterNotNull().flatMapLatest { session ->
+            userDataDao.getContinueWatchingItemsFlow(userId, session.serverId).map { userDataList ->
+                val itemIds = userDataList.map { it.itemId }
+                val items = mutableListOf<AfinityItem>()
+
+                itemIds.forEach { itemId ->
+                    getMovie(itemId, userId)?.let { items.add(it) }
+                        ?: getEpisode(itemId, userId)?.let { items.add(it) }
                 }
+
+                items
             }
+        }
     }
 
     override suspend fun searchAllItems(query: String, userId: UUID): List<AfinityItem> {
@@ -555,7 +540,7 @@ class DatabaseRepositoryImpl @Inject constructor(
 
     private suspend fun AfinityMovieDto.toAfinityMovie(
         database: ServerDatabaseDao,
-        userId: UUID
+        userId: UUID,
     ): AfinityMovie {
         val userData = database.getUserDataOrCreateNew(id, userId, serverId)
         val sources = database.getSources(id).map { it.toAfinitySource(database) }
@@ -595,12 +580,12 @@ class DatabaseRepositoryImpl @Inject constructor(
             providerIds = null,
             externalUrls = null,
             liked = false,
-            )
+        )
     }
 
     private suspend fun AfinityShowDto.toAfinityShow(
         database: ServerDatabaseDao,
-        userId: UUID
+        userId: UUID,
     ): AfinityShow {
         val userData = database.getUserDataOrCreateNew(id, userId, serverId)
         val seasonDtos = database.getSeasonsForSeries(id)
@@ -637,12 +622,12 @@ class DatabaseRepositoryImpl @Inject constructor(
             providerIds = null,
             externalUrls = null,
             liked = false,
-            )
+        )
     }
 
     private suspend fun AfinitySeasonDto.toAfinitySeason(
         database: ServerDatabaseDao,
-        userId: UUID
+        userId: UUID,
     ): AfinitySeason {
         val userData = database.getUserDataOrCreateNew(id, userId, serverId)
         val episodeDtos = database.getEpisodesForSeason(id)
@@ -676,7 +661,7 @@ class DatabaseRepositoryImpl @Inject constructor(
 
     private suspend fun AfinityEpisodeDto.toAfinityEpisode(
         database: ServerDatabaseDao,
-        userId: UUID
+        userId: UUID,
     ): AfinityEpisode {
         val userData = database.getUserDataOrCreateNew(id, userId, serverId)
         val sources = database.getSources(id).map { it.toAfinitySource(database) }
@@ -730,7 +715,11 @@ class DatabaseRepositoryImpl @Inject constructor(
         return serverDatabaseDao.getDownloadByItemId(itemId)
     }
 
-    override suspend fun getDownloadByItemIdScoped(itemId: UUID, serverId: String, userId: UUID): DownloadDto? {
+    override suspend fun getDownloadByItemIdScoped(
+        itemId: UUID,
+        serverId: String,
+        userId: UUID,
+    ): DownloadDto? {
         return serverDatabaseDao.getDownloadByItemIdScoped(itemId, serverId, userId)
     }
 
@@ -738,7 +727,10 @@ class DatabaseRepositoryImpl @Inject constructor(
         return serverDatabaseDao.getAllDownloadsFlow()
     }
 
-    override fun getAllDownloadsFlowScoped(serverId: String, userId: UUID): Flow<List<DownloadDto>> {
+    override fun getAllDownloadsFlowScoped(
+        serverId: String,
+        userId: UUID,
+    ): Flow<List<DownloadDto>> {
         return serverDatabaseDao.getAllDownloadsFlowScoped(serverId, userId)
     }
 
@@ -746,7 +738,11 @@ class DatabaseRepositoryImpl @Inject constructor(
         return serverDatabaseDao.getDownloadsByStatusFlow(statuses)
     }
 
-    override fun getDownloadsByStatusFlowScoped(statuses: List<DownloadStatus>, serverId: String, userId: UUID): Flow<List<DownloadDto>> {
+    override fun getDownloadsByStatusFlowScoped(
+        statuses: List<DownloadStatus>,
+        serverId: String,
+        userId: UUID,
+    ): Flow<List<DownloadDto>> {
         return serverDatabaseDao.getDownloadsByStatusFlowScoped(statuses, serverId, userId)
     }
 
@@ -769,4 +765,4 @@ class DatabaseRepositoryImpl @Inject constructor(
     override suspend fun getSources(itemId: UUID): List<AfinitySourceDto> {
         return serverDatabaseDao.getSources(itemId)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/impl/JellyfinRepositoryImpl.kt b/app/src/main/java/com/makd/afinity/data/repository/impl/JellyfinRepositoryImpl.kt
index e69561884..2dfe1ea9c 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/impl/JellyfinRepositoryImpl.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/impl/JellyfinRepositoryImpl.kt
@@ -1,6 +1,5 @@
 package com.makd.afinity.data.repository.impl
 
-
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
@@ -30,32 +29,28 @@ import com.makd.afinity.data.repository.server.JellyfinServerRepository
 import com.makd.afinity.data.repository.server.ServerRepository
 import com.makd.afinity.data.repository.userdata.UserDataRepository
 import com.makd.afinity.ui.library.FilterType
-import kotlinx.coroutines.Dispatchers
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.withContext
-import org.jellyfin.sdk.api.client.exception.ApiClientException
-import org.jellyfin.sdk.api.operations.ItemsApi
 import org.jellyfin.sdk.model.api.AuthenticationResult
 import org.jellyfin.sdk.model.api.BaseItemDto
 import org.jellyfin.sdk.model.api.BaseItemDtoQueryResult
-import org.jellyfin.sdk.model.api.BaseItemKind
 import org.jellyfin.sdk.model.api.ItemFields
 import org.jellyfin.sdk.model.api.ItemFilter
 import timber.log.Timber
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Singleton
-
 
 @Singleton
-class JellyfinRepositoryImpl @Inject constructor(
+class JellyfinRepositoryImpl
+@Inject
+constructor(
     private val serverRepository: ServerRepository,
     private val authRepository: AuthRepository,
     private val mediaRepository: MediaRepository,
     private val userDataRepository: UserDataRepository,
     private val playbackRepository: PlaybackRepository,
-    private val database: AfinityDatabase
+    private val database: AfinityDatabase,
 ) : JellyfinRepository {
 
     override fun getBaseUrl(): String {
@@ -84,12 +79,16 @@ class JellyfinRepositoryImpl @Inject constructor(
         }
     }
 
-    override suspend fun validateServer(serverUrl: String): JellyfinServerRepository.ServerConnectionResult {
+    override suspend fun validateServer(
+        serverUrl: String
+    ): JellyfinServerRepository.ServerConnectionResult {
         return try {
             serverRepository.testServerConnection(serverUrl)
         } catch (e: Exception) {
             Timber.e(e, "Failed to validate server: $serverUrl")
-            JellyfinServerRepository.ServerConnectionResult.Error("Failed to validate server: ${e.message ?: "Unknown error"}")
+            JellyfinServerRepository.ServerConnectionResult.Error(
+                "Failed to validate server: ${e.message ?: "Unknown error"}"
+            )
         }
     }
 
@@ -97,7 +96,10 @@ class JellyfinRepositoryImpl @Inject constructor(
         serverRepository.refreshServerInfo()
     }
 
-    override suspend fun authenticateByName(username: String, password: String): AuthenticationResult? {
+    override suspend fun authenticateByName(
+        username: String,
+        password: String,
+    ): AuthenticationResult? {
         return try {
             when (val result = authRepository.authenticateByName(username, password)) {
                 is AuthRepository.AuthResult.Success -> result.authResult
@@ -205,7 +207,12 @@ class JellyfinRepositoryImpl @Inject constructor(
 
     override suspend fun getNextUp(limit: Int): List<AfinityEpisode> {
         return try {
-            mediaRepository.getNextUp(seriesId = null, limit = limit, fields = FieldSets.NEXT_UP, enableResumable = false)
+            mediaRepository.getNextUp(
+                seriesId = null,
+                limit = limit,
+                fields = FieldSets.NEXT_UP,
+                enableResumable = false,
+            )
         } catch (e: Exception) {
             Timber.e(e, "Failed to get next up episodes")
             emptyList()
@@ -224,7 +231,7 @@ class JellyfinRepositoryImpl @Inject constructor(
     override suspend fun getGenres(
         parentId: UUID?,
         limit: Int?,
-        includeItemTypes: List<String>
+        includeItemTypes: List<String>,
     ): List<String> {
         return try {
             mediaRepository.getGenres(parentId, limit, includeItemTypes)
@@ -238,7 +245,7 @@ class JellyfinRepositoryImpl @Inject constructor(
         genre: String,
         parentId: UUID?,
         limit: Int,
-        shuffle: Boolean
+        shuffle: Boolean,
     ): List<AfinityMovie> {
         return try {
             mediaRepository.getMoviesByGenre(genre, parentId, limit, shuffle)
@@ -252,7 +259,7 @@ class JellyfinRepositoryImpl @Inject constructor(
         genre: String,
         parentId: UUID?,
         limit: Int,
-        shuffle: Boolean
+        shuffle: Boolean,
     ): List<AfinityShow> {
         return try {
             mediaRepository.getShowsByGenre(genre, parentId, limit, shuffle)
@@ -265,7 +272,7 @@ class JellyfinRepositoryImpl @Inject constructor(
     override suspend fun getStudios(
         parentId: UUID?,
         limit: Int?,
-        includeItemTypes: List<String>
+        includeItemTypes: List<String>,
     ): List<com.makd.afinity.data.models.media.AfinityStudio> {
         return try {
             mediaRepository.getStudios(parentId, limit, includeItemTypes)
@@ -283,27 +290,25 @@ class JellyfinRepositoryImpl @Inject constructor(
         filter: FilterType,
         nameStartsWith: String?,
         fields: List<ItemFields>?,
-        studioName: String?
+        studioName: String?,
     ): Flow<PagingData<AfinityItem>> {
         return Pager(
-            config = PagingConfig(
-                pageSize = 50,
-                enablePlaceholders = false,
-                initialLoadSize = 50
-            )
-        ) {
-            JellyfinItemsPagingSource(
-                mediaRepository = mediaRepository,
-                parentId = parentId,
-                libraryType = libraryType,
-                sortBy = sortBy,
-                sortDescending = sortDescending,
-                filter = filter,
-                baseUrl = getBaseUrl(),
-                nameStartsWith = nameStartsWith,
-                studioName = studioName
-            )
-        }.flow
+                config =
+                    PagingConfig(pageSize = 50, enablePlaceholders = false, initialLoadSize = 50)
+            ) {
+                JellyfinItemsPagingSource(
+                    mediaRepository = mediaRepository,
+                    parentId = parentId,
+                    libraryType = libraryType,
+                    sortBy = sortBy,
+                    sortDescending = sortDescending,
+                    filter = filter,
+                    baseUrl = getBaseUrl(),
+                    nameStartsWith = nameStartsWith,
+                    studioName = studioName,
+                )
+            }
+            .flow
     }
 
     override suspend fun getItems(
@@ -324,13 +329,27 @@ class JellyfinRepositoryImpl @Inject constructor(
         fields: List<ItemFields>?,
         imageTypes: List<String>,
         hasOverview: Boolean?,
-        filters: List<ItemFilter>
+        filters: List<ItemFilter>,
     ): BaseItemDtoQueryResult {
         return try {
             mediaRepository.getItems(
-                parentId, collectionTypes, sortBy, sortDescending, limit, startIndex,
-                searchTerm, includeItemTypes, genres, years, isFavorite, isPlayed, isLiked, nameStartsWith, fields,
-                imageTypes, hasOverview
+                parentId,
+                collectionTypes,
+                sortBy,
+                sortDescending,
+                limit,
+                startIndex,
+                searchTerm,
+                includeItemTypes,
+                genres,
+                years,
+                isFavorite,
+                isPlayed,
+                isLiked,
+                nameStartsWith,
+                fields,
+                imageTypes,
+                hasOverview,
             )
         } catch (e: Exception) {
             Timber.e(e, "Failed to get items")
@@ -338,10 +357,7 @@ class JellyfinRepositoryImpl @Inject constructor(
         }
     }
 
-    override suspend fun getItem(
-        itemId: UUID,
-        fields: List<ItemFields>?
-    ): BaseItemDto? {
+    override suspend fun getItem(itemId: UUID, fields: List<ItemFields>?): BaseItemDto? {
         return try {
             mediaRepository.getItem(itemId, fields)
         } catch (e: Exception) {
@@ -364,7 +380,7 @@ class JellyfinRepositoryImpl @Inject constructor(
     override suspend fun getSimilarItems(
         itemId: UUID,
         limit: Int,
-        fields: List<ItemFields>?
+        fields: List<ItemFields>?,
     ): List<AfinityItem> {
         return try {
             mediaRepository.getSimilarItems(itemId, limit, fields)
@@ -381,10 +397,18 @@ class JellyfinRepositoryImpl @Inject constructor(
         limit: Int?,
         startIndex: Int,
         searchTerm: String?,
-        isPlayed: Boolean?
+        isPlayed: Boolean?,
     ): List<AfinityMovie> {
         return try {
-            mediaRepository.getMovies(parentId, sortBy, sortDescending, limit, startIndex, searchTerm, isPlayed)
+            mediaRepository.getMovies(
+                parentId,
+                sortBy,
+                sortDescending,
+                limit,
+                startIndex,
+                searchTerm,
+                isPlayed,
+            )
         } catch (e: Exception) {
             Timber.e(e, "Failed to get movies")
             emptyList()
@@ -398,10 +422,18 @@ class JellyfinRepositoryImpl @Inject constructor(
         limit: Int?,
         startIndex: Int,
         searchTerm: String?,
-        isPlayed: Boolean?
+        isPlayed: Boolean?,
     ): List<AfinityShow> {
         return try {
-            mediaRepository.getShows(parentId, sortBy, sortDescending, limit, startIndex, searchTerm, isPlayed)
+            mediaRepository.getShows(
+                parentId,
+                sortBy,
+                sortDescending,
+                limit,
+                startIndex,
+                searchTerm,
+                isPlayed,
+            )
         } catch (e: Exception) {
             Timber.e(e, "Failed to get shows")
             emptyList()
@@ -412,7 +444,7 @@ class JellyfinRepositoryImpl @Inject constructor(
         seriesId: UUID,
         sortBy: SortBy,
         sortDescending: Boolean,
-        fields: List<ItemFields>?
+        fields: List<ItemFields>?,
     ): List<AfinitySeason> {
         return try {
             mediaRepository.getSeasons(seriesId, fields)
@@ -425,7 +457,7 @@ class JellyfinRepositoryImpl @Inject constructor(
     override suspend fun getEpisodes(
         seasonId: UUID,
         seriesId: UUID,
-        fields: List<ItemFields>?
+        fields: List<ItemFields>?,
     ): List<AfinityEpisode> {
         return try {
             mediaRepository.getEpisodes(seasonId, seriesId, fields)
@@ -467,7 +499,7 @@ class JellyfinRepositoryImpl @Inject constructor(
         includeItemTypes: List<String>,
         limit: Int?,
         startIndex: Int,
-        fields: List<ItemFields>?
+        fields: List<ItemFields>?,
     ): List<AfinityItem> {
         return try {
             mediaRepository.getPersonItems(personId, includeItemTypes, fields)
@@ -480,7 +512,7 @@ class JellyfinRepositoryImpl @Inject constructor(
     override suspend fun reportPlaybackStart(
         itemId: UUID,
         positionTicks: Long,
-        sessionId: String?
+        sessionId: String?,
     ) {
         try {
             val actualSessionId = sessionId ?: playbackRepository.getActiveSession() ?: return
@@ -488,7 +520,7 @@ class JellyfinRepositoryImpl @Inject constructor(
                 itemId = itemId,
                 sessionId = actualSessionId,
                 mediaSourceId = itemId.toString(),
-                playMethod = "DirectPlay"
+                playMethod = "DirectPlay",
             )
         } catch (e: Exception) {
             Timber.e(e, "Failed to report playback start: $itemId")
@@ -499,7 +531,7 @@ class JellyfinRepositoryImpl @Inject constructor(
         itemId: UUID,
         positionTicks: Long,
         isPaused: Boolean,
-        sessionId: String?
+        sessionId: String?,
     ) {
         try {
             val actualSessionId = sessionId ?: playbackRepository.getActiveSession() ?: return
@@ -508,7 +540,7 @@ class JellyfinRepositoryImpl @Inject constructor(
                 sessionId = actualSessionId,
                 positionTicks = positionTicks,
                 isPaused = isPaused,
-                playMethod = "DirectPlay"
+                playMethod = "DirectPlay",
             )
         } catch (e: Exception) {
             Timber.e(e, "Failed to report playback progress: $itemId")
@@ -518,7 +550,7 @@ class JellyfinRepositoryImpl @Inject constructor(
     override suspend fun reportPlaybackStopped(
         itemId: UUID,
         positionTicks: Long,
-        sessionId: String?
+        sessionId: String?,
     ) {
         try {
             val actualSessionId = sessionId ?: playbackRepository.getActiveSession() ?: return
@@ -526,7 +558,7 @@ class JellyfinRepositoryImpl @Inject constructor(
                 itemId = itemId,
                 sessionId = actualSessionId,
                 positionTicks = positionTicks,
-                mediaSourceId = itemId.toString()
+                mediaSourceId = itemId.toString(),
             )
         } catch (e: Exception) {
             Timber.e(e, "Failed to report playback stopped: $itemId")
@@ -539,7 +571,7 @@ class JellyfinRepositoryImpl @Inject constructor(
         maxBitrate: Int?,
         audioStreamIndex: Int?,
         subtitleStreamIndex: Int?,
-        videoStreamIndex: Int?
+        videoStreamIndex: Int?,
     ): String {
         return try {
             serverRepository.buildStreamUrl(
@@ -548,7 +580,7 @@ class JellyfinRepositoryImpl @Inject constructor(
                 maxBitrate,
                 audioStreamIndex,
                 subtitleStreamIndex,
-                videoStreamIndex
+                videoStreamIndex,
             )
         } catch (e: Exception) {
             Timber.e(e, "Failed to get stream URL for item: $itemId")
@@ -563,7 +595,7 @@ class JellyfinRepositoryImpl @Inject constructor(
         tag: String?,
         maxWidth: Int?,
         maxHeight: Int?,
-        quality: Int?
+        quality: Int?,
     ): String {
         return try {
             serverRepository.buildImageUrl(
@@ -573,7 +605,7 @@ class JellyfinRepositoryImpl @Inject constructor(
                 tag = tag,
                 maxWidth = maxWidth,
                 maxHeight = maxHeight,
-                quality = quality
+                quality = quality,
             )
         } catch (e: Exception) {
             Timber.e(e, "Failed to get image URL for item: $itemId")
@@ -602,12 +634,13 @@ class JellyfinRepositoryImpl @Inject constructor(
             Timber.d("Getting episode to play for series: $seriesId")
 
             try {
-                val nextUpEpisodes = mediaRepository.getNextUp(
-                    seriesId = seriesId,
-                    limit = 1,
-                    fields = FieldSets.ITEM_DETAIL,
-                    enableResumable = false
-                )
+                val nextUpEpisodes =
+                    mediaRepository.getNextUp(
+                        seriesId = seriesId,
+                        limit = 1,
+                        fields = FieldSets.ITEM_DETAIL,
+                        enableResumable = false,
+                    )
                 if (nextUpEpisodes.isNotEmpty()) {
                     Timber.d("Found next up episode: ${nextUpEpisodes.first().name}")
                     return nextUpEpisodes.first()
@@ -635,10 +668,11 @@ class JellyfinRepositoryImpl @Inject constructor(
                 return null
             }
 
-            val sortedEpisodes = allEpisodes.sortedWith(
-                compareBy<AfinityEpisode> { it.parentIndexNumber ?: 0 }
-                    .thenBy { it.indexNumber ?: 0 }
-            )
+            val sortedEpisodes =
+                allEpisodes.sortedWith(
+                    compareBy<AfinityEpisode> { it.parentIndexNumber ?: 0 }
+                        .thenBy { it.indexNumber ?: 0 }
+                )
 
             val nextEpisode = sortedEpisodes.firstOrNull { !it.played }
             if (nextEpisode != null) {
@@ -690,17 +724,21 @@ class JellyfinRepositoryImpl @Inject constructor(
         return mediaRepository.getFavoriteBoxSets()
     }
 
-    override suspend fun getEpisodeToPlayForSeason(seasonId: UUID, seriesId: UUID): AfinityEpisode? {
+    override suspend fun getEpisodeToPlayForSeason(
+        seasonId: UUID,
+        seriesId: UUID,
+    ): AfinityEpisode? {
         return try {
             Timber.d("Getting episode to play for season: $seasonId")
 
             try {
-                val nextUpEpisodes = mediaRepository.getNextUp(
-                    seriesId = seriesId,
-                    limit = 10,
-                    fields = FieldSets.ITEM_DETAIL,
-                    enableResumable = false
-                )
+                val nextUpEpisodes =
+                    mediaRepository.getNextUp(
+                        seriesId = seriesId,
+                        limit = 10,
+                        fields = FieldSets.ITEM_DETAIL,
+                        enableResumable = false,
+                    )
                 val nextUpForSeason = nextUpEpisodes.firstOrNull { it.seasonId == seasonId }
                 if (nextUpForSeason != null) {
                     Timber.d("Found next up episode for season: ${nextUpForSeason.name}")
@@ -726,7 +764,9 @@ class JellyfinRepositoryImpl @Inject constructor(
 
             val firstEpisode = sortedEpisodes.firstOrNull()
             if (firstEpisode != null) {
-                Timber.d("All episodes watched in season, returning first episode: ${firstEpisode.name}")
+                Timber.d(
+                    "All episodes watched in season, returning first episode: ${firstEpisode.name}"
+                )
                 return firstEpisode
             }
 
@@ -741,7 +781,7 @@ class JellyfinRepositoryImpl @Inject constructor(
     override suspend fun getMoviesWithPeople(
         startIndex: Int,
         limit: Int,
-        fields: List<ItemFields>?
+        fields: List<ItemFields>?,
     ): List<AfinityMovie> {
         return mediaRepository.getMoviesWithPeople(startIndex, limit, fields)
     }
@@ -749,8 +789,8 @@ class JellyfinRepositoryImpl @Inject constructor(
     override suspend fun getSimilarMovies(
         movieId: UUID,
         limit: Int,
-        fields: List<ItemFields>?
+        fields: List<ItemFields>?,
     ): List<AfinityMovie> {
         return mediaRepository.getSimilarMovies(movieId, limit, fields)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/impl/PreferencesRepositoryImpl.kt b/app/src/main/java/com/makd/afinity/data/repository/impl/PreferencesRepositoryImpl.kt
index b3e1f1df5..e084aab4f 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/impl/PreferencesRepositoryImpl.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/impl/PreferencesRepositoryImpl.kt
@@ -9,8 +9,8 @@ import androidx.datastore.preferences.core.emptyPreferences
 import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.core.longPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
-import com.makd.afinity.data.models.common.SortBy
 import com.makd.afinity.data.models.common.EpisodeLayout
+import com.makd.afinity.data.models.common.SortBy
 import com.makd.afinity.data.models.player.MpvAudioOutput
 import com.makd.afinity.data.models.player.MpvHwDec
 import com.makd.afinity.data.models.player.MpvVideoOutput
@@ -21,18 +21,18 @@ import com.makd.afinity.data.models.player.SubtitleVerticalPosition
 import com.makd.afinity.data.models.player.VideoZoomMode
 import com.makd.afinity.data.repository.PreferencesRepository
 import com.makd.afinity.di.AppPreferences
+import java.io.IOException
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
-import java.io.IOException
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @Singleton
-class PreferencesRepositoryImpl @Inject constructor(
-    @AppPreferences private val dataStore: DataStore<Preferences>
-) : PreferencesRepository {
+class PreferencesRepositoryImpl
+@Inject
+constructor(@AppPreferences private val dataStore: DataStore<Preferences>) : PreferencesRepository {
 
     private object Keys {
         val CURRENT_SERVER_ID = stringPreferencesKey("current_server_id")
@@ -95,6 +95,9 @@ class PreferencesRepositoryImpl @Inject constructor(
 
         val PREFERRED_AUDIO_LANGUAGE = stringPreferencesKey("preferred_audio_language")
         val PREFERRED_SUBTITLE_LANGUAGE = stringPreferencesKey("preferred_subtitle_language")
+
+        val NOTIFICATION_PERMISSION_DECLINED =
+            booleanPreferencesKey("notification_permission_declined")
     }
 
     override suspend fun setCurrentServerId(serverId: String?) {
@@ -112,9 +115,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override fun getCurrentServerIdFlow(): Flow<String?> {
-        return dataStore.data.map { preferences ->
-            preferences[Keys.CURRENT_SERVER_ID]
-        }
+        return dataStore.data.map { preferences -> preferences[Keys.CURRENT_SERVER_ID] }
     }
 
     override suspend fun setCurrentUserId(userId: String?) {
@@ -132,15 +133,11 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override fun getCurrentUserIdFlow(): Flow<String?> {
-        return dataStore.data.map { preferences ->
-            preferences[Keys.CURRENT_USER_ID]
-        }
+        return dataStore.data.map { preferences -> preferences[Keys.CURRENT_USER_ID] }
     }
 
     override suspend fun setRememberLogin(remember: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[Keys.REMEMBER_LOGIN] = remember
-        }
+        dataStore.edit { preferences -> preferences[Keys.REMEMBER_LOGIN] = remember }
     }
 
     override suspend fun getRememberLogin(): Boolean {
@@ -148,9 +145,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setDefaultSortBy(sortBy: SortBy) {
-        dataStore.edit { preferences ->
-            preferences[Keys.DEFAULT_SORT_BY] = sortBy.name
-        }
+        dataStore.edit { preferences -> preferences[Keys.DEFAULT_SORT_BY] = sortBy.name }
     }
 
     override suspend fun getDefaultSortBy(): SortBy {
@@ -163,9 +158,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setSortDescending(descending: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[Keys.SORT_DESCENDING] = descending
-        }
+        dataStore.edit { preferences -> preferences[Keys.SORT_DESCENDING] = descending }
     }
 
     override suspend fun getSortDescending(): Boolean {
@@ -173,9 +166,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setItemsPerPage(count: Int) {
-        dataStore.edit { preferences ->
-            preferences[Keys.ITEMS_PER_PAGE] = count
-        }
+        dataStore.edit { preferences -> preferences[Keys.ITEMS_PER_PAGE] = count }
     }
 
     override suspend fun getItemsPerPage(): Int {
@@ -183,9 +174,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setAutoPlay(autoPlay: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[Keys.AUTO_PLAY] = autoPlay
-        }
+        dataStore.edit { preferences -> preferences[Keys.AUTO_PLAY] = autoPlay }
     }
 
     override suspend fun getAutoPlay(): Boolean {
@@ -207,9 +196,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setCombineLibrarySections(combine: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[Keys.COMBINE_LIBRARY_SECTIONS] = combine
-        }
+        dataStore.edit { preferences -> preferences[Keys.COMBINE_LIBRARY_SECTIONS] = combine }
     }
 
     override suspend fun getCombineLibrarySections(): Boolean {
@@ -239,9 +226,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setSkipIntroEnabled(enabled: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[Keys.SKIP_INTRO_ENABLED] = enabled
-        }
+        dataStore.edit { preferences -> preferences[Keys.SKIP_INTRO_ENABLED] = enabled }
     }
 
     override suspend fun getSkipIntroEnabled(): Boolean {
@@ -249,9 +234,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setSkipOutroEnabled(enabled: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[Keys.SKIP_OUTRO_ENABLED] = enabled
-        }
+        dataStore.edit { preferences -> preferences[Keys.SKIP_OUTRO_ENABLED] = enabled }
     }
 
     override suspend fun getSkipOutroEnabled(): Boolean {
@@ -259,9 +242,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setThemeMode(mode: String) {
-        dataStore.edit { preferences ->
-            preferences[Keys.THEME_MODE] = mode
-        }
+        dataStore.edit { preferences -> preferences[Keys.THEME_MODE] = mode }
     }
 
     override suspend fun getThemeMode(): String {
@@ -269,9 +250,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override fun getThemeModeFlow(): Flow<String> {
-        return dataStore.data.map { preferences ->
-            preferences[Keys.THEME_MODE] ?: "SYSTEM"
-        }
+        return dataStore.data.map { preferences -> preferences[Keys.THEME_MODE] ?: "SYSTEM" }
     }
 
     override fun getDynamicColorsFlow(): Flow<Boolean> =
@@ -287,9 +266,7 @@ class PreferencesRepositoryImpl @Inject constructor(
         dataStore.data.map { it[Keys.SKIP_OUTRO_ENABLED] ?: true }
 
     override suspend fun setDynamicColors(enabled: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[Keys.DYNAMIC_COLORS] = enabled
-        }
+        dataStore.edit { preferences -> preferences[Keys.DYNAMIC_COLORS] = enabled }
     }
 
     override suspend fun getDynamicColors(): Boolean {
@@ -297,9 +274,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setGridLayout(enabled: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[Keys.GRID_LAYOUT] = enabled
-        }
+        dataStore.edit { preferences -> preferences[Keys.GRID_LAYOUT] = enabled }
     }
 
     override suspend fun getGridLayout(): Boolean {
@@ -307,9 +282,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setDownloadOverWifiOnly(wifiOnly: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[Keys.DOWNLOAD_WIFI_ONLY] = wifiOnly
-        }
+        dataStore.edit { preferences -> preferences[Keys.DOWNLOAD_WIFI_ONLY] = wifiOnly }
     }
 
     override suspend fun getDownloadOverWifiOnly(): Boolean {
@@ -317,9 +290,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setDownloadQuality(quality: String) {
-        dataStore.edit { preferences ->
-            preferences[Keys.DOWNLOAD_QUALITY] = quality
-        }
+        dataStore.edit { preferences -> preferences[Keys.DOWNLOAD_QUALITY] = quality }
     }
 
     override suspend fun getDownloadQuality(): String {
@@ -327,9 +298,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setMaxDownloads(maxDownloads: Int) {
-        dataStore.edit { preferences ->
-            preferences[Keys.MAX_DOWNLOADS] = maxDownloads
-        }
+        dataStore.edit { preferences -> preferences[Keys.MAX_DOWNLOADS] = maxDownloads }
     }
 
     override suspend fun getMaxDownloads(): Int {
@@ -337,9 +306,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setSyncEnabled(enabled: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[Keys.SYNC_ENABLED] = enabled
-        }
+        dataStore.edit { preferences -> preferences[Keys.SYNC_ENABLED] = enabled }
     }
 
     override suspend fun getSyncEnabled(): Boolean {
@@ -347,9 +314,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setSyncInterval(intervalMinutes: Int) {
-        dataStore.edit { preferences ->
-            preferences[Keys.SYNC_INTERVAL] = intervalMinutes
-        }
+        dataStore.edit { preferences -> preferences[Keys.SYNC_INTERVAL] = intervalMinutes }
     }
 
     override suspend fun getSyncInterval(): Int {
@@ -357,9 +322,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setLastSyncTime(timestamp: Long) {
-        dataStore.edit { preferences ->
-            preferences[Keys.LAST_SYNC_TIME] = timestamp
-        }
+        dataStore.edit { preferences -> preferences[Keys.LAST_SYNC_TIME] = timestamp }
     }
 
     override suspend fun getLastSyncTime(): Long {
@@ -367,9 +330,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setCrashReporting(enabled: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[Keys.CRASH_REPORTING] = enabled
-        }
+        dataStore.edit { preferences -> preferences[Keys.CRASH_REPORTING] = enabled }
     }
 
     override suspend fun getCrashReporting(): Boolean {
@@ -377,9 +338,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setUsageAnalytics(enabled: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[Keys.USAGE_ANALYTICS] = enabled
-        }
+        dataStore.edit { preferences -> preferences[Keys.USAGE_ANALYTICS] = enabled }
     }
 
     override suspend fun getUsageAnalytics(): Boolean {
@@ -387,9 +346,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setOfflineMode(enabled: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[Keys.OFFLINE_MODE] = enabled
-        }
+        dataStore.edit { preferences -> preferences[Keys.OFFLINE_MODE] = enabled }
     }
 
     override suspend fun getOfflineMode(): Boolean {
@@ -397,17 +354,23 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override fun getOfflineModeFlow(): Flow<Boolean> {
-        return dataStore.data.map { preferences ->
-            preferences[Keys.OFFLINE_MODE] ?: false
-        }
+        return dataStore.data.map { preferences -> preferences[Keys.OFFLINE_MODE] ?: false }
     }
 
-    override suspend fun clearAllPreferences() {
+    override suspend fun setNotificationPermissionDeclined(declined: Boolean) {
         dataStore.edit { preferences ->
-            preferences.clear()
+            preferences[Keys.NOTIFICATION_PERMISSION_DECLINED] = declined
         }
     }
 
+    override suspend fun getNotificationPermissionDeclined(): Boolean {
+        return dataStore.data.first()[Keys.NOTIFICATION_PERMISSION_DECLINED] ?: false
+    }
+
+    override suspend fun clearAllPreferences() {
+        dataStore.edit { preferences -> preferences.clear() }
+    }
+
     override suspend fun clearServerPreferences() {
         dataStore.edit { preferences ->
             preferences.remove(Keys.CURRENT_SERVER_ID)
@@ -423,88 +386,70 @@ class PreferencesRepositoryImpl @Inject constructor(
         }
     }
 
-    override val useExoPlayer: Flow<Boolean> = dataStore.data
-        .catch { exception ->
-            if (exception is IOException) {
-                emit(emptyPreferences())
-            } else {
-                throw exception
+    override val useExoPlayer: Flow<Boolean> =
+        dataStore.data
+            .catch { exception ->
+                if (exception is IOException) {
+                    emit(emptyPreferences())
+                } else {
+                    throw exception
+                }
             }
-        }
-        .map { preferences ->
-            preferences[Keys.USE_EXO_PLAYER] ?: false
-        }
+            .map { preferences -> preferences[Keys.USE_EXO_PLAYER] ?: false }
 
     override suspend fun setUseExoPlayer(value: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[Keys.USE_EXO_PLAYER] = value
-        }
+        dataStore.edit { preferences -> preferences[Keys.USE_EXO_PLAYER] = value }
     }
 
     override suspend fun setMpvHwDec(hwDec: MpvHwDec) {
-        dataStore.edit { preferences ->
-            preferences[Keys.MPV_HW_DEC] = hwDec.value
-        }
+        dataStore.edit { preferences -> preferences[Keys.MPV_HW_DEC] = hwDec.value }
     }
 
     override suspend fun getMpvHwDec(): MpvHwDec {
-        return dataStore.data.first()[Keys.MPV_HW_DEC]?.let {
-            MpvHwDec.fromValue(it)
-        } ?: MpvHwDec.default
+        return dataStore.data.first()[Keys.MPV_HW_DEC]?.let { MpvHwDec.fromValue(it) }
+            ?: MpvHwDec.default
     }
 
     override fun getMpvHwDecFlow(): Flow<MpvHwDec> {
         return dataStore.data.map { preferences ->
-            preferences[Keys.MPV_HW_DEC]?.let {
-                MpvHwDec.fromValue(it)
-            } ?: MpvHwDec.default
+            preferences[Keys.MPV_HW_DEC]?.let { MpvHwDec.fromValue(it) } ?: MpvHwDec.default
         }
     }
 
     override suspend fun setMpvVideoOutput(videoOutput: MpvVideoOutput) {
-        dataStore.edit { preferences ->
-            preferences[Keys.MPV_VIDEO_OUTPUT] = videoOutput.value
-        }
+        dataStore.edit { preferences -> preferences[Keys.MPV_VIDEO_OUTPUT] = videoOutput.value }
     }
 
     override suspend fun getMpvVideoOutput(): MpvVideoOutput {
-        return dataStore.data.first()[Keys.MPV_VIDEO_OUTPUT]?.let {
-            MpvVideoOutput.fromValue(it)
-        } ?: MpvVideoOutput.default
+        return dataStore.data.first()[Keys.MPV_VIDEO_OUTPUT]?.let { MpvVideoOutput.fromValue(it) }
+            ?: MpvVideoOutput.default
     }
 
     override fun getMpvVideoOutputFlow(): Flow<MpvVideoOutput> {
         return dataStore.data.map { preferences ->
-            preferences[Keys.MPV_VIDEO_OUTPUT]?.let {
-                MpvVideoOutput.fromValue(it)
-            } ?: MpvVideoOutput.default
+            preferences[Keys.MPV_VIDEO_OUTPUT]?.let { MpvVideoOutput.fromValue(it) }
+                ?: MpvVideoOutput.default
         }
     }
 
     override suspend fun setMpvAudioOutput(audioOutput: MpvAudioOutput) {
-        dataStore.edit { preferences ->
-            preferences[Keys.MPV_AUDIO_OUTPUT] = audioOutput.value
-        }
+        dataStore.edit { preferences -> preferences[Keys.MPV_AUDIO_OUTPUT] = audioOutput.value }
     }
 
     override suspend fun getMpvAudioOutput(): MpvAudioOutput {
-        return dataStore.data.first()[Keys.MPV_AUDIO_OUTPUT]?.let {
-            MpvAudioOutput.fromValue(it)
-        } ?: MpvAudioOutput.default
+        return dataStore.data.first()[Keys.MPV_AUDIO_OUTPUT]?.let { MpvAudioOutput.fromValue(it) }
+            ?: MpvAudioOutput.default
     }
 
     override fun getMpvAudioOutputFlow(): Flow<MpvAudioOutput> {
         return dataStore.data.map { preferences ->
-            preferences[Keys.MPV_AUDIO_OUTPUT]?.let {
-                MpvAudioOutput.fromValue(it)
-            } ?: MpvAudioOutput.default
+            preferences[Keys.MPV_AUDIO_OUTPUT]?.let { MpvAudioOutput.fromValue(it) }
+                ?: MpvAudioOutput.default
         }
     }
 
     override suspend fun setPreferredAudioLanguage(language: String) {
-        dataStore.edit { preferences ->
-            preferences[Keys.PREFERRED_AUDIO_LANGUAGE] = language
-        }
+        dataStore.edit { preferences -> preferences[Keys.PREFERRED_AUDIO_LANGUAGE] = language }
     }
 
     override suspend fun getPreferredAudioLanguage(): String {
@@ -518,9 +463,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setPreferredSubtitleLanguage(language: String) {
-        dataStore.edit { preferences ->
-            preferences[Keys.PREFERRED_SUBTITLE_LANGUAGE] = language
-        }
+        dataStore.edit { preferences -> preferences[Keys.PREFERRED_SUBTITLE_LANGUAGE] = language }
     }
 
     override suspend fun getPreferredSubtitleLanguage(): String {
@@ -534,9 +477,7 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun setPipGestureEnabled(enabled: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[Keys.PIP_GESTURE_ENABLED] = enabled
-        }
+        dataStore.edit { preferences -> preferences[Keys.PIP_GESTURE_ENABLED] = enabled }
     }
 
     override suspend fun getPipGestureEnabled(): Boolean {
@@ -544,15 +485,11 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override fun getPipGestureEnabledFlow(): Flow<Boolean> {
-        return dataStore.data.map { preferences ->
-            preferences[Keys.PIP_GESTURE_ENABLED] ?: false
-        }
+        return dataStore.data.map { preferences -> preferences[Keys.PIP_GESTURE_ENABLED] ?: false }
     }
 
     override suspend fun setPipBackgroundPlay(enabled: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[Keys.PIP_BACKGROUND_PLAY] = enabled
-        }
+        dataStore.edit { preferences -> preferences[Keys.PIP_BACKGROUND_PLAY] = enabled }
     }
 
     override suspend fun getPipBackgroundPlay(): Boolean {
@@ -560,15 +497,11 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override fun getPipBackgroundPlayFlow(): Flow<Boolean> {
-        return dataStore.data.map { preferences ->
-            preferences[Keys.PIP_BACKGROUND_PLAY] ?: true
-        }
+        return dataStore.data.map { preferences -> preferences[Keys.PIP_BACKGROUND_PLAY] ?: true }
     }
 
     override suspend fun setUpdateCheckFrequency(hours: Int) {
-        dataStore.edit { preferences ->
-            preferences[Keys.UPDATE_CHECK_FREQUENCY] = hours
-        }
+        dataStore.edit { preferences -> preferences[Keys.UPDATE_CHECK_FREQUENCY] = hours }
     }
 
     override suspend fun getUpdateCheckFrequency(): Int {
@@ -576,15 +509,11 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override fun getUpdateCheckFrequencyFlow(): Flow<Int> {
-        return dataStore.data.map { preferences ->
-            preferences[Keys.UPDATE_CHECK_FREQUENCY] ?: 0
-        }
+        return dataStore.data.map { preferences -> preferences[Keys.UPDATE_CHECK_FREQUENCY] ?: 0 }
     }
 
     override suspend fun setLastUpdateCheck(timestamp: Long) {
-        dataStore.edit { preferences ->
-            preferences[Keys.LAST_UPDATE_CHECK] = timestamp
-        }
+        dataStore.edit { preferences -> preferences[Keys.LAST_UPDATE_CHECK] = timestamp }
     }
 
     override suspend fun getLastUpdateCheck(): Long {
@@ -614,28 +543,21 @@ class PreferencesRepositoryImpl @Inject constructor(
             textSize = prefs[Keys.SUBTITLE_TEXT_SIZE]?.toFloatOrNull() ?: 1.0f,
             bold = prefs[Keys.SUBTITLE_BOLD] ?: false,
             italic = prefs[Keys.SUBTITLE_ITALIC] ?: false,
-            outlineStyle = prefs[Keys.SUBTITLE_OUTLINE_STYLE]?.let {
-                SubtitleOutlineStyle.fromString(
-                    it
-                )
-            }
-                ?: SubtitleOutlineStyle.NONE,
+            outlineStyle =
+                prefs[Keys.SUBTITLE_OUTLINE_STYLE]?.let { SubtitleOutlineStyle.fromString(it) }
+                    ?: SubtitleOutlineStyle.NONE,
             outlineColor = prefs[Keys.SUBTITLE_OUTLINE_COLOR] ?: Color.BLACK,
             outlineSize = prefs[Keys.SUBTITLE_OUTLINE_SIZE]?.toFloatOrNull() ?: 0f,
             backgroundColor = prefs[Keys.SUBTITLE_BACKGROUND_COLOR] ?: Color.TRANSPARENT,
             windowColor = prefs[Keys.SUBTITLE_WINDOW_COLOR] ?: Color.TRANSPARENT,
-            verticalPosition = prefs[Keys.SUBTITLE_VERTICAL_POSITION]?.let {
-                SubtitleVerticalPosition.fromString(
-                    it
-                )
-            }
-                ?: SubtitleVerticalPosition.BOTTOM,
-            horizontalAlignment = prefs[Keys.SUBTITLE_HORIZONTAL_ALIGNMENT]?.let {
-                SubtitleHorizontalAlignment.fromString(
-                    it
-                )
-            }
-                ?: SubtitleHorizontalAlignment.CENTER
+            verticalPosition =
+                prefs[Keys.SUBTITLE_VERTICAL_POSITION]?.let {
+                    SubtitleVerticalPosition.fromString(it)
+                } ?: SubtitleVerticalPosition.BOTTOM,
+            horizontalAlignment =
+                prefs[Keys.SUBTITLE_HORIZONTAL_ALIGNMENT]?.let {
+                    SubtitleHorizontalAlignment.fromString(it)
+                } ?: SubtitleHorizontalAlignment.CENTER,
         )
     }
 
@@ -646,36 +568,27 @@ class PreferencesRepositoryImpl @Inject constructor(
                 textSize = prefs[Keys.SUBTITLE_TEXT_SIZE]?.toFloatOrNull() ?: 1.0f,
                 bold = prefs[Keys.SUBTITLE_BOLD] ?: false,
                 italic = prefs[Keys.SUBTITLE_ITALIC] ?: false,
-                outlineStyle = prefs[Keys.SUBTITLE_OUTLINE_STYLE]?.let {
-                    SubtitleOutlineStyle.fromString(
-                        it
-                    )
-                }
-                    ?: SubtitleOutlineStyle.NONE,
+                outlineStyle =
+                    prefs[Keys.SUBTITLE_OUTLINE_STYLE]?.let { SubtitleOutlineStyle.fromString(it) }
+                        ?: SubtitleOutlineStyle.NONE,
                 outlineColor = prefs[Keys.SUBTITLE_OUTLINE_COLOR] ?: Color.BLACK,
                 outlineSize = prefs[Keys.SUBTITLE_OUTLINE_SIZE]?.toFloatOrNull() ?: 0f,
                 backgroundColor = prefs[Keys.SUBTITLE_BACKGROUND_COLOR] ?: Color.TRANSPARENT,
                 windowColor = prefs[Keys.SUBTITLE_WINDOW_COLOR] ?: Color.TRANSPARENT,
-                verticalPosition = prefs[Keys.SUBTITLE_VERTICAL_POSITION]?.let {
-                    SubtitleVerticalPosition.fromString(
-                        it
-                    )
-                }
-                    ?: SubtitleVerticalPosition.BOTTOM,
-                horizontalAlignment = prefs[Keys.SUBTITLE_HORIZONTAL_ALIGNMENT]?.let {
-                    SubtitleHorizontalAlignment.fromString(
-                        it
-                    )
-                }
-                    ?: SubtitleHorizontalAlignment.CENTER
+                verticalPosition =
+                    prefs[Keys.SUBTITLE_VERTICAL_POSITION]?.let {
+                        SubtitleVerticalPosition.fromString(it)
+                    } ?: SubtitleVerticalPosition.BOTTOM,
+                horizontalAlignment =
+                    prefs[Keys.SUBTITLE_HORIZONTAL_ALIGNMENT]?.let {
+                        SubtitleHorizontalAlignment.fromString(it)
+                    } ?: SubtitleHorizontalAlignment.CENTER,
             )
         }
     }
 
     override suspend fun setLogoAutoHide(enabled: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[Keys.LOGO_AUTO_HIDE] = enabled
-        }
+        dataStore.edit { preferences -> preferences[Keys.LOGO_AUTO_HIDE] = enabled }
     }
 
     override suspend fun getLogoAutoHide(): Boolean {
@@ -683,48 +596,38 @@ class PreferencesRepositoryImpl @Inject constructor(
     }
 
     override fun getLogoAutoHideFlow(): Flow<Boolean> {
-        return dataStore.data.map { preferences ->
-            preferences[Keys.LOGO_AUTO_HIDE] ?: true
-        }
+        return dataStore.data.map { preferences -> preferences[Keys.LOGO_AUTO_HIDE] ?: true }
     }
 
     override suspend fun setDefaultVideoZoomMode(mode: VideoZoomMode) {
-        dataStore.edit { preferences ->
-            preferences[Keys.VIDEO_ZOOM_MODE] = mode.value
-        }
+        dataStore.edit { preferences -> preferences[Keys.VIDEO_ZOOM_MODE] = mode.value }
     }
 
     override suspend fun getDefaultVideoZoomMode(): VideoZoomMode {
-        return dataStore.data.first()[Keys.VIDEO_ZOOM_MODE]?.let {
-            VideoZoomMode.fromInt(it)
-        } ?: VideoZoomMode.FIT
+        return dataStore.data.first()[Keys.VIDEO_ZOOM_MODE]?.let { VideoZoomMode.fromInt(it) }
+            ?: VideoZoomMode.FIT
     }
 
     override fun getDefaultVideoZoomModeFlow(): Flow<VideoZoomMode> {
         return dataStore.data.map { preferences ->
-            preferences[Keys.VIDEO_ZOOM_MODE]?.let {
-                VideoZoomMode.fromInt(it)
-            } ?: VideoZoomMode.FIT
+            preferences[Keys.VIDEO_ZOOM_MODE]?.let { VideoZoomMode.fromInt(it) }
+                ?: VideoZoomMode.FIT
         }
     }
 
     override suspend fun setEpisodeLayout(layout: EpisodeLayout) {
-        dataStore.edit { preferences ->
-            preferences[Keys.EPISODE_LAYOUT] = layout.value
-        }
+        dataStore.edit { preferences -> preferences[Keys.EPISODE_LAYOUT] = layout.value }
     }
 
     override suspend fun getEpisodeLayout(): EpisodeLayout {
-        return dataStore.data.first()[Keys.EPISODE_LAYOUT]?.let {
-            EpisodeLayout.fromValue(it)
-        } ?: EpisodeLayout.HORIZONTAL
+        return dataStore.data.first()[Keys.EPISODE_LAYOUT]?.let { EpisodeLayout.fromValue(it) }
+            ?: EpisodeLayout.HORIZONTAL
     }
 
     override fun getEpisodeLayoutFlow(): Flow<EpisodeLayout> {
         return dataStore.data.map { preferences ->
-            preferences[Keys.EPISODE_LAYOUT]?.let {
-                EpisodeLayout.fromValue(it)
-            } ?: EpisodeLayout.HORIZONTAL
+            preferences[Keys.EPISODE_LAYOUT]?.let { EpisodeLayout.fromValue(it) }
+                ?: EpisodeLayout.HORIZONTAL
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/impl/SecurePreferencesRepositoryImpl.kt b/app/src/main/java/com/makd/afinity/data/repository/impl/SecurePreferencesRepositoryImpl.kt
index 696eb5c13..741db5900 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/impl/SecurePreferencesRepositoryImpl.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/impl/SecurePreferencesRepositoryImpl.kt
@@ -12,9 +12,14 @@ import com.google.crypto.tink.RegistryConfiguration
 import com.google.crypto.tink.aead.AeadConfig
 import com.google.crypto.tink.aead.PredefinedAeadParameters
 import com.google.crypto.tink.integration.android.AndroidKeysetManager
+import com.makd.afinity.data.repository.AudiobookshelfAuthData
 import com.makd.afinity.data.repository.SecurePreferencesRepository
 import com.makd.afinity.data.repository.ServerUserToken
 import dagger.hilt.android.qualifiers.ApplicationContext
+import java.util.Base64
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -23,17 +28,14 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import timber.log.Timber
-import java.util.Base64
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Singleton
 
-private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "secure_settings")
+private val Context.dataStore: DataStore<Preferences> by
+    preferencesDataStore(name = "secure_settings")
 
 @Singleton
-class SecurePreferencesRepositoryImpl @Inject constructor(
-    @ApplicationContext private val context: Context
-) : SecurePreferencesRepository {
+class SecurePreferencesRepositoryImpl
+@Inject
+constructor(@ApplicationContext private val context: Context) : SecurePreferencesRepository {
 
     private companion object {
         private const val MASTER_KEY_URI = "android-keystore://_androidx_security_master_key_"
@@ -59,15 +61,19 @@ class SecurePreferencesRepositoryImpl @Inject constructor(
         try {
             AeadConfig.register()
 
-            AndroidKeysetManager.Builder().withSharedPref(context, TINK_KEYSET_NAME, PREF_FILE_NAME)
+            AndroidKeysetManager.Builder()
+                .withSharedPref(context, TINK_KEYSET_NAME, PREF_FILE_NAME)
                 .withKeyTemplate(KeyTemplate.createFrom(PredefinedAeadParameters.AES256_GCM))
-                .withMasterKeyUri(MASTER_KEY_URI).build().keysetHandle.getPrimitive(
-                    RegistryConfiguration.get(),
-                    Aead::class.java
-                )
+                .withMasterKeyUri(MASTER_KEY_URI)
+                .build()
+                .keysetHandle
+                .getPrimitive(RegistryConfiguration.get(), Aead::class.java)
         } catch (e: Exception) {
             Timber.e(e, "CRITICAL: Tink Init failed. Clearing broken keys.")
-            context.getSharedPreferences(PREF_FILE_NAME, Context.MODE_PRIVATE).edit().clear()
+            context
+                .getSharedPreferences(PREF_FILE_NAME, Context.MODE_PRIVATE)
+                .edit()
+                .clear()
                 .apply()
             throw RuntimeException("Crypto Init Failed", e)
         }
@@ -85,21 +91,24 @@ class SecurePreferencesRepositoryImpl @Inject constructor(
         }
     }
 
-    @Volatile
-    private var cachedJellyseerrUrl: String? = null
+    @Volatile private var cachedJellyseerrUrl: String? = null
+
+    @Volatile private var cachedJellyseerrCookie: String? = null
+
+    @Volatile private var cachedJellyseerrUsername: String? = null
 
-    @Volatile
-    private var cachedJellyseerrCookie: String? = null
+    @Volatile private var cachedAudiobookshelfUrl: String? = null
 
-    @Volatile
-    private var cachedJellyseerrUsername: String? = null
+    @Volatile private var cachedAudiobookshelfToken: String? = null
+
+    @Volatile private var cachedAudiobookshelfUserId: String? = null
+
+    @Volatile private var cachedAudiobookshelfUsername: String? = null
 
     private val _authenticationState = MutableStateFlow(false)
 
     init {
-        runBlocking(Dispatchers.IO) {
-            _authenticationState.value = hasValidAuthData()
-        }
+        runBlocking(Dispatchers.IO) { _authenticationState.value = hasValidAuthData() }
     }
 
     private fun encrypt(plainText: String): String {
@@ -113,7 +122,11 @@ class SecurePreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun saveAuthenticationData(
-        accessToken: String, userId: UUID, serverId: String, serverUrl: String, username: String
+        accessToken: String,
+        userId: UUID,
+        serverId: String,
+        serverUrl: String,
+        username: String,
     ) {
         context.dataStore.edit { prefs ->
             prefs[KEY_ACCESS_TOKEN] = encrypt(accessToken)
@@ -128,9 +141,13 @@ class SecurePreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun getAccessToken(): String? = getDecryptedString(KEY_ACCESS_TOKEN)
+
     override suspend fun getSavedUserId(): String? = getDecryptedString(KEY_USER_ID)
+
     override suspend fun getSavedServerId(): String? = getDecryptedString(KEY_SERVER_ID)
+
     override suspend fun getSavedServerUrl(): String? = getDecryptedString(KEY_SERVER_URL)
+
     override suspend fun getSavedUsername(): String? = getDecryptedString(KEY_USERNAME)
 
     override suspend fun clearAuthenticationData() {
@@ -171,12 +188,18 @@ class SecurePreferencesRepositoryImpl @Inject constructor(
         cachedJellyseerrUrl = null
         cachedJellyseerrCookie = null
         cachedJellyseerrUsername = null
+        cachedAudiobookshelfUrl = null
+        cachedAudiobookshelfToken = null
+        cachedAudiobookshelfUserId = null
+        cachedAudiobookshelfUsername = null
         _authenticationState.value = false
         Timber.d("Cleared all secure data")
     }
 
     private fun getJellyseerrKey(
-        prefix: String, serverId: String, userId: UUID
+        prefix: String,
+        serverId: String,
+        userId: UUID,
     ): Preferences.Key<String> {
         return stringPreferencesKey("${prefix}_${serverId}_$userId")
     }
@@ -186,7 +209,7 @@ class SecurePreferencesRepositoryImpl @Inject constructor(
         jellyfinUserId: UUID,
         url: String,
         cookie: String,
-        username: String
+        username: String,
     ) {
         context.dataStore.edit { prefs ->
             prefs[getJellyseerrKey("jsr_url", jellyfinServerId, jellyfinUserId)] = encrypt(url)
@@ -204,7 +227,8 @@ class SecurePreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun switchJellyseerrContext(
-        jellyfinServerId: String, jellyfinUserId: UUID
+        jellyfinServerId: String,
+        jellyfinUserId: UUID,
     ): Boolean {
         return withContext(Dispatchers.IO) {
             val prefs = context.dataStore.data.first()
@@ -221,7 +245,9 @@ class SecurePreferencesRepositoryImpl @Inject constructor(
             cachedJellyseerrCookie = cookie
             cachedJellyseerrUsername = username
 
-            Timber.d("Switched Jellyseerr context. Valid: ${!url.isNullOrBlank() && !cookie.isNullOrBlank()}")
+            Timber.d(
+                "Switched Jellyseerr context. Valid: ${!url.isNullOrBlank() && !cookie.isNullOrBlank()}"
+            )
 
             !url.isNullOrBlank() && !cookie.isNullOrBlank()
         }
@@ -234,7 +260,8 @@ class SecurePreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun getJellyseerrAuthForUser(
-        jellyfinServerId: String, jellyfinUserId: UUID
+        jellyfinServerId: String,
+        jellyfinUserId: UUID,
     ): Triple<String?, String?, String?> {
         return withContext(Dispatchers.IO) {
             val prefs = context.dataStore.data.first()
@@ -248,7 +275,8 @@ class SecurePreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun clearJellyseerrAuthForUser(
-        jellyfinServerId: String, jellyfinUserId: UUID
+        jellyfinServerId: String,
+        jellyfinUserId: UUID,
     ) {
         context.dataStore.edit { prefs ->
             prefs.remove(getJellyseerrKey("jsr_url", jellyfinServerId, jellyfinUserId))
@@ -295,7 +323,8 @@ class SecurePreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun hasValidJellyseerrAuth(): Boolean {
-        if (!cachedJellyseerrCookie.isNullOrBlank() && !cachedJellyseerrUrl.isNullOrBlank()) return true
+        if (!cachedJellyseerrCookie.isNullOrBlank() && !cachedJellyseerrUrl.isNullOrBlank())
+            return true
 
         val cookie = getJellyseerrCookie()
         val url = getJellyseerrServerUrl()
@@ -315,7 +344,11 @@ class SecurePreferencesRepositoryImpl @Inject constructor(
     }
 
     override suspend fun saveServerUserToken(
-        serverId: String, userId: UUID, accessToken: String, username: String, serverUrl: String
+        serverId: String,
+        userId: UUID,
+        accessToken: String,
+        username: String,
+        serverUrl: String,
     ) {
         context.dataStore.edit { prefs ->
             val tokenKey = stringPreferencesKey("token_${serverId}_$userId")
@@ -352,35 +385,43 @@ class SecurePreferencesRepositoryImpl @Inject constructor(
             val preferences = context.dataStore.data.first()
             val tokens = mutableListOf<ServerUserToken>()
 
-            preferences.asMap().keys.filter { it.name.startsWith("token_") }.forEach { key ->
-                try {
-                    val parts = key.name.removePrefix("token_").split("_")
-                    if (parts.size == 2) {
-                        val serverId = parts[0]
-                        val userId = UUID.fromString(parts[1])
-
-                        val token = decrypt(preferences[key] as? String)
-                        val username =
-                            getDecryptedString(stringPreferencesKey("username_${serverId}_$userId"))
-                        val serverUrl =
-                            getDecryptedString(stringPreferencesKey("serverUrl_${serverId}_$userId"))
-
-                        if (token != null && username != null && serverUrl != null) {
-                            tokens.add(
-                                ServerUserToken(
-                                    serverId = serverId,
-                                    userId = userId,
-                                    accessToken = token,
-                                    username = username,
-                                    serverUrl = serverUrl
+            preferences
+                .asMap()
+                .keys
+                .filter { it.name.startsWith("token_") }
+                .forEach { key ->
+                    try {
+                        val parts = key.name.removePrefix("token_").split("_")
+                        if (parts.size == 2) {
+                            val serverId = parts[0]
+                            val userId = UUID.fromString(parts[1])
+
+                            val token = decrypt(preferences[key] as? String)
+                            val username =
+                                getDecryptedString(
+                                    stringPreferencesKey("username_${serverId}_$userId")
+                                )
+                            val serverUrl =
+                                getDecryptedString(
+                                    stringPreferencesKey("serverUrl_${serverId}_$userId")
+                                )
+
+                            if (token != null && username != null && serverUrl != null) {
+                                tokens.add(
+                                    ServerUserToken(
+                                        serverId = serverId,
+                                        userId = userId,
+                                        accessToken = token,
+                                        username = username,
+                                        serverUrl = serverUrl,
+                                    )
                                 )
-                            )
+                            }
                         }
+                    } catch (e: Exception) {
+                        Timber.w(e, "Failed to parse token key: ${key.name}")
                     }
-                } catch (e: Exception) {
-                    Timber.w(e, "Failed to parse token key: ${key.name}")
                 }
-            }
 
             tokens
         }
@@ -401,12 +442,137 @@ class SecurePreferencesRepositoryImpl @Inject constructor(
 
     override suspend fun clearAllServerTokens(serverId: String) {
         context.dataStore.edit { prefs ->
-            val keysToRemove = prefs.asMap().keys.filter { key ->
-                key.name.contains("_${serverId}_") || key.name == "lastUser_$serverId"
-            }
+            val keysToRemove =
+                prefs.asMap().keys.filter { key ->
+                    key.name.contains("_${serverId}_") || key.name == "lastUser_$serverId"
+                }
 
             keysToRemove.forEach { prefs.remove(it) }
         }
         Timber.d("Cleared all tokens for server=$serverId")
     }
-}
\ No newline at end of file
+
+    private fun getAudiobookshelfKey(
+        prefix: String,
+        serverId: String,
+        userId: UUID,
+    ): Preferences.Key<String> {
+        return stringPreferencesKey("${prefix}_${serverId}_$userId")
+    }
+
+    override suspend fun saveAudiobookshelfAuthForUser(
+        jellyfinServerId: String,
+        jellyfinUserId: UUID,
+        serverUrl: String,
+        accessToken: String,
+        absUserId: String,
+        username: String,
+    ) {
+        context.dataStore.edit { prefs ->
+            prefs[getAudiobookshelfKey("abs_url", jellyfinServerId, jellyfinUserId)] =
+                encrypt(serverUrl)
+            prefs[getAudiobookshelfKey("abs_token", jellyfinServerId, jellyfinUserId)] =
+                encrypt(accessToken)
+            prefs[getAudiobookshelfKey("abs_userid", jellyfinServerId, jellyfinUserId)] =
+                encrypt(absUserId)
+            prefs[getAudiobookshelfKey("abs_user", jellyfinServerId, jellyfinUserId)] =
+                encrypt(username)
+        }
+
+        cachedAudiobookshelfUrl = serverUrl
+        cachedAudiobookshelfToken = accessToken
+        cachedAudiobookshelfUserId = absUserId
+        cachedAudiobookshelfUsername = username
+
+        Timber.d("Saved Audiobookshelf auth for user $jellyfinUserId on server $jellyfinServerId")
+    }
+
+    override suspend fun switchAudiobookshelfContext(
+        jellyfinServerId: String,
+        jellyfinUserId: UUID,
+    ): Boolean {
+        return withContext(Dispatchers.IO) {
+            val prefs = context.dataStore.data.first()
+
+            val urlKey = getAudiobookshelfKey("abs_url", jellyfinServerId, jellyfinUserId)
+            val tokenKey = getAudiobookshelfKey("abs_token", jellyfinServerId, jellyfinUserId)
+            val userIdKey = getAudiobookshelfKey("abs_userid", jellyfinServerId, jellyfinUserId)
+            val userKey = getAudiobookshelfKey("abs_user", jellyfinServerId, jellyfinUserId)
+
+            val url = decrypt(prefs[urlKey])
+            val token = decrypt(prefs[tokenKey])
+            val absUserId = decrypt(prefs[userIdKey])
+            val username = decrypt(prefs[userKey])
+
+            cachedAudiobookshelfUrl = url
+            cachedAudiobookshelfToken = token
+            cachedAudiobookshelfUserId = absUserId
+            cachedAudiobookshelfUsername = username
+
+            Timber.d(
+                "Switched Audiobookshelf context. Valid: ${!url.isNullOrBlank() && !token.isNullOrBlank()}"
+            )
+
+            !url.isNullOrBlank() && !token.isNullOrBlank()
+        }
+    }
+
+    override fun clearActiveAudiobookshelfCache() {
+        cachedAudiobookshelfUrl = null
+        cachedAudiobookshelfToken = null
+        cachedAudiobookshelfUserId = null
+        cachedAudiobookshelfUsername = null
+    }
+
+    override suspend fun getAudiobookshelfAuthForUser(
+        jellyfinServerId: String,
+        jellyfinUserId: UUID,
+    ): AudiobookshelfAuthData? {
+        return withContext(Dispatchers.IO) {
+            val prefs = context.dataStore.data.first()
+            val url =
+                decrypt(prefs[getAudiobookshelfKey("abs_url", jellyfinServerId, jellyfinUserId)])
+            val token =
+                decrypt(prefs[getAudiobookshelfKey("abs_token", jellyfinServerId, jellyfinUserId)])
+            val absUserId =
+                decrypt(prefs[getAudiobookshelfKey("abs_userid", jellyfinServerId, jellyfinUserId)])
+            val username =
+                decrypt(prefs[getAudiobookshelfKey("abs_user", jellyfinServerId, jellyfinUserId)])
+
+            if (url != null && token != null && absUserId != null && username != null) {
+                AudiobookshelfAuthData(
+                    serverUrl = url,
+                    accessToken = token,
+                    absUserId = absUserId,
+                    username = username,
+                )
+            } else {
+                null
+            }
+        }
+    }
+
+    override suspend fun clearAudiobookshelfAuthForUser(
+        jellyfinServerId: String,
+        jellyfinUserId: UUID,
+    ) {
+        context.dataStore.edit { prefs ->
+            prefs.remove(getAudiobookshelfKey("abs_url", jellyfinServerId, jellyfinUserId))
+            prefs.remove(getAudiobookshelfKey("abs_token", jellyfinServerId, jellyfinUserId))
+            prefs.remove(getAudiobookshelfKey("abs_userid", jellyfinServerId, jellyfinUserId))
+            prefs.remove(getAudiobookshelfKey("abs_user", jellyfinServerId, jellyfinUserId))
+        }
+        clearActiveAudiobookshelfCache()
+        Timber.d("Cleared Audiobookshelf auth for user $jellyfinUserId on server $jellyfinServerId")
+    }
+
+    override fun getCachedAudiobookshelfServerUrl(): String? = cachedAudiobookshelfUrl
+
+    override fun getCachedAudiobookshelfToken(): String? = cachedAudiobookshelfToken
+
+    override suspend fun hasValidAudiobookshelfAuth(): Boolean {
+        if (!cachedAudiobookshelfToken.isNullOrBlank() && !cachedAudiobookshelfUrl.isNullOrBlank())
+            return true
+        return false
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/jellyseerr/JellyseerrRepositoryImpl.kt b/app/src/main/java/com/makd/afinity/data/repository/jellyseerr/JellyseerrRepositoryImpl.kt
index 34fe0fc60..e2a7f90a4 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/jellyseerr/JellyseerrRepositoryImpl.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/jellyseerr/JellyseerrRepositoryImpl.kt
@@ -24,6 +24,12 @@ import com.makd.afinity.data.repository.RequestEvent
 import com.makd.afinity.data.repository.SecurePreferencesRepository
 import com.makd.afinity.util.NetworkConnectivityMonitor
 import dagger.Lazy
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -40,19 +46,15 @@ import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 import timber.log.Timber
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @Singleton
-class JellyseerrRepositoryImpl @Inject constructor(
+class JellyseerrRepositoryImpl
+@Inject
+constructor(
     private val apiService: Lazy<JellyseerrApiService>,
     private val securePreferencesRepository: SecurePreferencesRepository,
     private val database: AfinityDatabase,
-    private val networkConnectivityMonitor: NetworkConnectivityMonitor
+    private val networkConnectivityMonitor: NetworkConnectivityMonitor,
 ) : JellyseerrRepository {
 
     private val jellyseerrDao = database.jellyseerrDao()
@@ -96,24 +98,26 @@ class JellyseerrRepositoryImpl @Inject constructor(
     override suspend fun login(
         email: String,
         password: String,
-        useJellyfinAuth: Boolean
+        useJellyfinAuth: Boolean,
     ): Result<JellyseerrUser> {
         return withContext(Dispatchers.IO) {
-            val (currentServerId, currentUserId) = activeContext
-                ?: return@withContext Result.failure(Exception("No active Jellyfin session"))
+            val (currentServerId, currentUserId) =
+                activeContext
+                    ?: return@withContext Result.failure(Exception("No active Jellyfin session"))
 
             try {
                 if (!networkConnectivityMonitor.isCurrentlyConnected()) {
                     return@withContext Result.failure(Exception("No network connection"))
                 }
 
-                val response = if (useJellyfinAuth) {
-                    val jellyfinRequest = JellyfinLoginRequest(email, password)
-                    apiService.get().loginJellyfin(jellyfinRequest)
-                } else {
-                    val localRequest = LoginRequest(email, password)
-                    apiService.get().loginLocal(localRequest)
-                }
+                val response =
+                    if (useJellyfinAuth) {
+                        val jellyfinRequest = JellyfinLoginRequest(email, password)
+                        apiService.get().loginJellyfin(jellyfinRequest)
+                    } else {
+                        val localRequest = LoginRequest(email, password)
+                        apiService.get().loginLocal(localRequest)
+                    }
 
                 if (response.isSuccessful && response.body() != null) {
                     val loginResponse = response.body()!!
@@ -126,7 +130,7 @@ class JellyseerrRepositoryImpl @Inject constructor(
                             jellyfinUserId = currentUserId,
                             url = serverUrl,
                             cookie = cookies,
-                            username = loginResponse.username ?: loginResponse.email ?: "User"
+                            username = loginResponse.username ?: loginResponse.email ?: "User",
                         )
                     }
 
@@ -138,25 +142,26 @@ class JellyseerrRepositoryImpl @Inject constructor(
                             isLoggedIn = true,
                             username = loginResponse.username,
                             userId = loginResponse.id,
-                            permissions = loginResponse.permissions
+                            permissions = loginResponse.permissions,
                         )
                     )
 
                     _isAuthenticated.value = true
 
-                    val user = JellyseerrUser(
-                        id = loginResponse.id,
-                        email = loginResponse.email,
-                        username = loginResponse.username,
-                        displayName = loginResponse.displayName,
-                        permissions = loginResponse.permissions,
-                        avatar = loginResponse.avatar,
-                        requestCount = loginResponse.requestCount,
-                        movieQuotaLimit = loginResponse.movieQuotaLimit,
-                        movieQuotaDays = loginResponse.movieQuotaDays,
-                        tvQuotaLimit = loginResponse.tvQuotaLimit,
-                        tvQuotaDays = loginResponse.tvQuotaDays
-                    )
+                    val user =
+                        JellyseerrUser(
+                            id = loginResponse.id,
+                            email = loginResponse.email,
+                            username = loginResponse.username,
+                            displayName = loginResponse.displayName,
+                            permissions = loginResponse.permissions,
+                            avatar = loginResponse.avatar,
+                            requestCount = loginResponse.requestCount,
+                            movieQuotaLimit = loginResponse.movieQuotaLimit,
+                            movieQuotaDays = loginResponse.movieQuotaDays,
+                            tvQuotaLimit = loginResponse.tvQuotaLimit,
+                            tvQuotaDays = loginResponse.tvQuotaDays,
+                        )
 
                     Timber.d("Jellyseerr login successful for user: ${user.username}")
                     Result.success(user)
@@ -174,8 +179,8 @@ class JellyseerrRepositoryImpl @Inject constructor(
 
     override suspend fun logout(): Result<Unit> {
         return withContext(Dispatchers.IO) {
-            val (currentServerId, currentUserId) = activeContext
-                ?: return@withContext Result.failure(Exception("No active session"))
+            val (currentServerId, currentUserId) =
+                activeContext ?: return@withContext Result.failure(Exception("No active session"))
 
             try {
                 if (hasValidConfiguration() && networkConnectivityMonitor.isCurrentlyConnected()) {
@@ -188,7 +193,7 @@ class JellyseerrRepositoryImpl @Inject constructor(
 
                 securePreferencesRepository.clearJellyseerrAuthForUser(
                     currentServerId,
-                    currentUserId
+                    currentUserId,
                 )
                 jellyseerrDao.clearConfig(currentServerId, currentUserId.toString())
 
@@ -213,7 +218,8 @@ class JellyseerrRepositoryImpl @Inject constructor(
                     return@withContext Result.failure(Exception("No network connection"))
                 }
                 val response = apiService.get().getCurrentUser()
-                if (response.isSuccessful && response.body() != null) Result.success(response.body()!!)
+                if (response.isSuccessful && response.body() != null)
+                    Result.success(response.body()!!)
                 else Result.failure(Exception("Failed to get current user: ${response.message()}"))
             } catch (e: Exception) {
                 Timber.e(e, "Failed to get current user")
@@ -228,12 +234,14 @@ class JellyseerrRepositoryImpl @Inject constructor(
         withContext(Dispatchers.IO) {
             securePreferencesRepository.saveJellyseerrServerUrl(url)
             activeContext?.let { (serverId, userId) ->
-                val (_, cookie, username) = securePreferencesRepository.getJellyseerrAuthForUser(
-                    serverId,
-                    userId
-                )
+                val (_, cookie, username) =
+                    securePreferencesRepository.getJellyseerrAuthForUser(serverId, userId)
                 securePreferencesRepository.saveJellyseerrAuthForUser(
-                    serverId, userId, url, cookie ?: "", username ?: ""
+                    serverId,
+                    userId,
+                    url,
+                    cookie ?: "",
+                    username ?: "",
                 )
             }
         }
@@ -252,7 +260,7 @@ class JellyseerrRepositoryImpl @Inject constructor(
     override suspend fun createRequest(
         mediaId: Int,
         mediaType: MediaType,
-        seasons: List<Int>?
+        seasons: List<Int>?,
     ): Result<JellyseerrRequest> {
         return withContext(Dispatchers.IO) {
             try {
@@ -260,22 +268,26 @@ class JellyseerrRepositoryImpl @Inject constructor(
                     return@withContext Result.failure(Exception("No network connection"))
                 }
 
-                val requestBody = CreateRequestBody(
-                    tmdbId = mediaId,
-                    mediaType = mediaType.toApiString(),
-                    seasons = seasons
-                )
+                val requestBody =
+                    CreateRequestBody(
+                        tmdbId = mediaId,
+                        mediaType = mediaType.toApiString(),
+                        seasons = seasons,
+                    )
                 val response = apiService.get().createRequest(requestBody)
 
                 if (response.isSuccessful && response.body() != null) {
                     val request = response.body()!!
 
-                    val latestRequest = try {
-                        val fetchResponse = apiService.get().getRequestById(request.id)
-                        if (fetchResponse.isSuccessful && fetchResponse.body() != null) fetchResponse.body()!! else request
-                    } catch (e: Exception) {
-                        request
-                    }
+                    val latestRequest =
+                        try {
+                            val fetchResponse = apiService.get().getRequestById(request.id)
+                            if (fetchResponse.isSuccessful && fetchResponse.body() != null)
+                                fetchResponse.body()!!
+                            else request
+                        } catch (e: Exception) {
+                            request
+                        }
 
                     cacheRequest(latestRequest)
                     _requestEvents.emit(RequestEvent(latestRequest))
@@ -297,11 +309,11 @@ class JellyseerrRepositoryImpl @Inject constructor(
     override suspend fun getRequests(
         take: Int,
         skip: Int,
-        filter: String?
+        filter: String?,
     ): Result<List<JellyseerrRequest>> {
         return withContext(Dispatchers.IO) {
-            val (currentServerId, currentUserId) = activeContext
-                ?: return@withContext Result.failure(Exception("No active session"))
+            val (currentServerId, currentUserId) =
+                activeContext ?: return@withContext Result.failure(Exception("No active session"))
 
             try {
                 if (networkConnectivityMonitor.isCurrentlyConnected()) {
@@ -311,42 +323,58 @@ class JellyseerrRepositoryImpl @Inject constructor(
                             val requests = response.body()!!.results
 
                             val enrichedRequests = coroutineScope {
-                                requests.map { request ->
-                                    async {
-                                        try {
-                                            val tmdbId = request.media.tmdbId
-                                            if (tmdbId != null) {
-                                                val detailsResponse =
-                                                    when (request.media.mediaType.lowercase()) {
-                                                        "movie" -> apiService.get()
-                                                            .getMovieDetails(tmdbId)
-
-                                                        "tv" -> apiService.get()
-                                                            .getTvDetails(tmdbId)
-
-                                                        else -> null
-                                                    }
-
-                                                if (detailsResponse?.isSuccessful == true && detailsResponse.body() != null) {
-                                                    val details = detailsResponse.body()!!
-                                                    request.copy(
-                                                        media = request.media.copy(
-                                                            title = details.title,
-                                                            name = details.name,
-                                                            posterPath = details.posterPath,
-                                                            backdropPath = details.backdropPath,
-                                                            releaseDate = details.releaseDate,
-                                                            firstAirDate = details.firstAirDate
+                                requests
+                                    .map { request ->
+                                        async {
+                                            try {
+                                                val tmdbId = request.media.tmdbId
+                                                if (tmdbId != null) {
+                                                    val detailsResponse =
+                                                        when (request.media.mediaType.lowercase()) {
+                                                            "movie" ->
+                                                                apiService
+                                                                    .get()
+                                                                    .getMovieDetails(tmdbId)
+
+                                                            "tv" ->
+                                                                apiService
+                                                                    .get()
+                                                                    .getTvDetails(tmdbId)
+
+                                                            else -> null
+                                                        }
+
+                                                    if (
+                                                        detailsResponse?.isSuccessful == true &&
+                                                            detailsResponse.body() != null
+                                                    ) {
+                                                        val details = detailsResponse.body()!!
+                                                        request.copy(
+                                                            media =
+                                                                request.media.copy(
+                                                                    title = details.title,
+                                                                    name = details.name,
+                                                                    posterPath = details.posterPath,
+                                                                    backdropPath =
+                                                                        details.backdropPath,
+                                                                    releaseDate =
+                                                                        details.releaseDate,
+                                                                    firstAirDate =
+                                                                        details.firstAirDate,
+                                                                )
                                                         )
-                                                    )
+                                                    } else request
                                                 } else request
-                                            } else request
-                                        } catch (e: Exception) {
-                                            Timber.w(e, "Failed to enrich request ${request.id}")
-                                            request
+                                            } catch (e: Exception) {
+                                                Timber.w(
+                                                    e,
+                                                    "Failed to enrich request ${request.id}",
+                                                )
+                                                request
+                                            }
                                         }
                                     }
-                                }.awaitAll()
+                                    .awaitAll()
                             }
 
                             if (skip == 0 && take >= 20) {
@@ -354,7 +382,7 @@ class JellyseerrRepositoryImpl @Inject constructor(
                                 jellyseerrDao.deleteExpiredRequests(
                                     expiryTime,
                                     currentServerId,
-                                    currentUserId.toString()
+                                    currentUserId.toString(),
                                 )
                             }
 
@@ -391,7 +419,8 @@ class JellyseerrRepositoryImpl @Inject constructor(
         return withContext(Dispatchers.IO) {
             try {
                 val response = apiService.get().getRequestById(requestId)
-                if (response.isSuccessful && response.body() != null) Result.success(response.body()!!)
+                if (response.isSuccessful && response.body() != null)
+                    Result.success(response.body()!!)
                 else Result.failure(Exception("Failed"))
             } catch (e: Exception) {
                 Result.failure(e)
@@ -401,15 +430,15 @@ class JellyseerrRepositoryImpl @Inject constructor(
 
     override suspend fun deleteRequest(requestId: Int): Result<Unit> {
         return withContext(Dispatchers.IO) {
-            val (currentServerId, currentUserId) = activeContext
-                ?: return@withContext Result.failure(Exception("No active session"))
+            val (currentServerId, currentUserId) =
+                activeContext ?: return@withContext Result.failure(Exception("No active session"))
             try {
                 val response = apiService.get().deleteRequest(requestId)
                 if (response.isSuccessful) {
                     jellyseerrDao.deleteRequest(
                         requestId,
                         currentServerId,
-                        currentUserId.toString()
+                        currentUserId.toString(),
                     )
                     Result.success(Unit)
                 } else Result.failure(Exception("Failed"))
@@ -425,26 +454,35 @@ class JellyseerrRepositoryImpl @Inject constructor(
                 val response = apiService.get().approveRequest(requestId)
                 if (response.isSuccessful && response.body() != null) {
                     var req = response.body()!!
-                    val (serverId, userId) = activeContext ?: return@withContext Result.failure(
-                        Exception("No session")
-                    )
-                    val existingEntity = jellyseerrDao.getAllRequests(serverId, userId.toString())
-                        .first()
-                        .find { it.id == requestId }
-                    req = req.copy(
-                        status = RequestStatus.APPROVED.value,
-                        media = req.media.copy(
-                            status = MediaStatus.PROCESSING.value,
-                            title = if (req.media.title.isNullOrBlank()) existingEntity?.mediaTitle else req.media.title,
-                            name = if (req.media.name.isNullOrBlank()) existingEntity?.mediaName else req.media.name,
-                            posterPath = req.media.posterPath ?: existingEntity?.posterPath,
-                            backdropPath = req.media.backdropPath
-                                ?: existingEntity?.mediaBackdropPath,
-                            releaseDate = req.media.releaseDate ?: existingEntity?.mediaReleaseDate,
-                            firstAirDate = req.media.firstAirDate
-                                ?: existingEntity?.mediaFirstAirDate
+                    val (serverId, userId) =
+                        activeContext ?: return@withContext Result.failure(Exception("No session"))
+                    val existingEntity =
+                        jellyseerrDao.getAllRequests(serverId, userId.toString()).first().find {
+                            it.id == requestId
+                        }
+                    req =
+                        req.copy(
+                            status = RequestStatus.APPROVED.value,
+                            media =
+                                req.media.copy(
+                                    status = MediaStatus.PROCESSING.value,
+                                    title =
+                                        if (req.media.title.isNullOrBlank())
+                                            existingEntity?.mediaTitle
+                                        else req.media.title,
+                                    name =
+                                        if (req.media.name.isNullOrBlank())
+                                            existingEntity?.mediaName
+                                        else req.media.name,
+                                    posterPath = req.media.posterPath ?: existingEntity?.posterPath,
+                                    backdropPath =
+                                        req.media.backdropPath ?: existingEntity?.mediaBackdropPath,
+                                    releaseDate =
+                                        req.media.releaseDate ?: existingEntity?.mediaReleaseDate,
+                                    firstAirDate =
+                                        req.media.firstAirDate ?: existingEntity?.mediaFirstAirDate,
+                                ),
                         )
-                    )
 
                     cacheRequest(req)
                     Result.success(req)
@@ -461,24 +499,34 @@ class JellyseerrRepositoryImpl @Inject constructor(
                 val response = apiService.get().declineRequest(requestId)
                 if (response.isSuccessful && response.body() != null) {
                     var req = response.body()!!
-                    val (serverId, userId) = activeContext ?: return@withContext Result.failure(
-                        Exception("No session")
-                    )
-                    val existingEntity = jellyseerrDao.getAllRequests(serverId, userId.toString())
-                        .first()
-                        .find { it.id == requestId }
-                    req = req.copy(
-                        status = RequestStatus.DECLINED.value,
-
-                        media = req.media.copy(
-                            title = if (req.media.title.isNullOrBlank()) existingEntity?.mediaTitle else req.media.title,
-                            name = if (req.media.name.isNullOrBlank()) existingEntity?.mediaName else req.media.name,
-                            posterPath = req.media.posterPath ?: existingEntity?.posterPath,
-                            backdropPath = req.media.backdropPath ?: existingEntity?.mediaBackdropPath,
-                            releaseDate = req.media.releaseDate ?: existingEntity?.mediaReleaseDate,
-                            firstAirDate = req.media.firstAirDate ?: existingEntity?.mediaFirstAirDate
+                    val (serverId, userId) =
+                        activeContext ?: return@withContext Result.failure(Exception("No session"))
+                    val existingEntity =
+                        jellyseerrDao.getAllRequests(serverId, userId.toString()).first().find {
+                            it.id == requestId
+                        }
+                    req =
+                        req.copy(
+                            status = RequestStatus.DECLINED.value,
+                            media =
+                                req.media.copy(
+                                    title =
+                                        if (req.media.title.isNullOrBlank())
+                                            existingEntity?.mediaTitle
+                                        else req.media.title,
+                                    name =
+                                        if (req.media.name.isNullOrBlank())
+                                            existingEntity?.mediaName
+                                        else req.media.name,
+                                    posterPath = req.media.posterPath ?: existingEntity?.posterPath,
+                                    backdropPath =
+                                        req.media.backdropPath ?: existingEntity?.mediaBackdropPath,
+                                    releaseDate =
+                                        req.media.releaseDate ?: existingEntity?.mediaReleaseDate,
+                                    firstAirDate =
+                                        req.media.firstAirDate ?: existingEntity?.mediaFirstAirDate,
+                                ),
                         )
-                    )
 
                     cacheRequest(req)
                     Result.success(req)
@@ -493,7 +541,8 @@ class JellyseerrRepositoryImpl @Inject constructor(
         return withContext(Dispatchers.IO) {
             try {
                 val response = apiService.get().search(query, page)
-                if (response.isSuccessful && response.body() != null) Result.success(response.body()!!)
+                if (response.isSuccessful && response.body() != null)
+                    Result.success(response.body()!!)
                 else Result.failure(Exception("Failed"))
             } catch (e: Exception) {
                 Result.failure(e)
@@ -513,16 +562,18 @@ class JellyseerrRepositoryImpl @Inject constructor(
                 if (response.isSuccessful && response.body() != null) {
                     val details = response.body()!!
 
-                    val ratingsResponse = try {
-                        apiService.get().getMovieRatingsCombined(movieId)
-                    } catch (e: Exception) {
-                        Timber.w(e, "Failed to fetch ratings for movie $movieId")
-                        null
-                    }
+                    val ratingsResponse =
+                        try {
+                            apiService.get().getMovieRatingsCombined(movieId)
+                        } catch (e: Exception) {
+                            Timber.w(e, "Failed to fetch ratings for movie $movieId")
+                            null
+                        }
 
-                    val ratings = if (ratingsResponse?.isSuccessful == true) {
-                        ratingsResponse.body()
-                    } else null
+                    val ratings =
+                        if (ratingsResponse?.isSuccessful == true) {
+                            ratingsResponse.body()
+                        } else null
 
                     val enrichedDetails = details.copy(ratingsCombined = ratings)
                     Result.success(enrichedDetails)
@@ -548,15 +599,18 @@ class JellyseerrRepositoryImpl @Inject constructor(
                 if (response.isSuccessful && response.body() != null) {
                     val details = response.body()!!
 
-                    val ratingsResponse = try {
-                        apiService.get().getTvRatings(tvId)
-                    } catch (e: Exception) {
-                        Timber.w(e, "Failed to fetch ratings for TV show $tvId")
-                        null
-                    }
+                    val ratingsResponse =
+                        try {
+                            apiService.get().getTvRatings(tvId)
+                        } catch (e: Exception) {
+                            Timber.w(e, "Failed to fetch ratings for TV show $tvId")
+                            null
+                        }
 
                     val ratings =
-                        if (ratingsResponse?.isSuccessful == true && ratingsResponse.body() != null) {
+                        if (
+                            ratingsResponse?.isSuccessful == true && ratingsResponse.body() != null
+                        ) {
                             val rtRating = ratingsResponse.body()!!
                             RatingsCombined(rt = rtRating, imdb = null)
                         } else {
@@ -578,7 +632,7 @@ class JellyseerrRepositoryImpl @Inject constructor(
 
     override suspend fun findMediaByName(
         name: String,
-        mediaType: MediaType?
+        mediaType: MediaType?,
     ): Result<List<SearchResultItem>> {
         return searchMedia(name, 1).map { searchResult ->
             if (mediaType != null) searchResult.results.filter { it.getMediaType() == mediaType }
@@ -592,7 +646,9 @@ class JellyseerrRepositoryImpl @Inject constructor(
                 val response = apiService.get().getTrending(page)
                 if (response.isSuccessful && response.body() != null) {
                     val body = response.body()!!
-                    Result.success(if (limit != null) body.copy(results = body.results.take(limit)) else body)
+                    Result.success(
+                        if (limit != null) body.copy(results = body.results.take(limit)) else body
+                    )
                 } else Result.failure(Exception("Failed"))
             } catch (e: Exception) {
                 Result.failure(e)
@@ -604,15 +660,19 @@ class JellyseerrRepositoryImpl @Inject constructor(
         page: Int,
         sortBy: String,
         studio: Int?,
-        limit: Int?
+        limit: Int?,
     ): Result<JellyseerrSearchResult> {
         return withContext(Dispatchers.IO) {
             try {
-                val response = apiService.get()
-                    .getDiscoverMovies(page = page, sortBy = sortBy, studio = studio)
+                val response =
+                    apiService
+                        .get()
+                        .getDiscoverMovies(page = page, sortBy = sortBy, studio = studio)
                 if (response.isSuccessful && response.body() != null) {
                     val body = response.body()!!
-                    Result.success(if (limit != null) body.copy(results = body.results.take(limit)) else body)
+                    Result.success(
+                        if (limit != null) body.copy(results = body.results.take(limit)) else body
+                    )
                 } else Result.failure(Exception("Failed"))
             } catch (e: Exception) {
                 Result.failure(e)
@@ -624,7 +684,7 @@ class JellyseerrRepositoryImpl @Inject constructor(
         page: Int,
         sortBy: String,
         network: Int?,
-        limit: Int?
+        limit: Int?,
     ): Result<JellyseerrSearchResult> {
         return withContext(Dispatchers.IO) {
             try {
@@ -632,7 +692,9 @@ class JellyseerrRepositoryImpl @Inject constructor(
                     apiService.get().getDiscoverTv(page = page, sortBy = sortBy, network = network)
                 if (response.isSuccessful && response.body() != null) {
                     val body = response.body()!!
-                    Result.success(if (limit != null) body.copy(results = body.results.take(limit)) else body)
+                    Result.success(
+                        if (limit != null) body.copy(results = body.results.take(limit)) else body
+                    )
                 } else Result.failure(Exception("Failed"))
             } catch (e: Exception) {
                 Result.failure(e)
@@ -646,7 +708,9 @@ class JellyseerrRepositoryImpl @Inject constructor(
                 val response = apiService.get().getUpcomingMovies(page)
                 if (response.isSuccessful && response.body() != null) {
                     val body = response.body()!!
-                    Result.success(if (limit != null) body.copy(results = body.results.take(limit)) else body)
+                    Result.success(
+                        if (limit != null) body.copy(results = body.results.take(limit)) else body
+                    )
                 } else Result.failure(Exception("Failed"))
             } catch (e: Exception) {
                 Result.failure(e)
@@ -660,7 +724,9 @@ class JellyseerrRepositoryImpl @Inject constructor(
                 val response = apiService.get().getUpcomingTv(page)
                 if (response.isSuccessful && response.body() != null) {
                     val body = response.body()!!
-                    Result.success(if (limit != null) body.copy(results = body.results.take(limit)) else body)
+                    Result.success(
+                        if (limit != null) body.copy(results = body.results.take(limit)) else body
+                    )
                 } else Result.failure(Exception("Failed"))
             } catch (e: Exception) {
                 Result.failure(e)
@@ -670,7 +736,7 @@ class JellyseerrRepositoryImpl @Inject constructor(
 
     override suspend fun getMoviesByStudio(
         studioId: Int,
-        page: Int
+        page: Int,
     ): Result<JellyseerrSearchResult> = getDiscoverMovies(page, studio = studioId)
 
     override suspend fun getTvByNetwork(networkId: Int, page: Int): Result<JellyseerrSearchResult> =
@@ -680,7 +746,8 @@ class JellyseerrRepositoryImpl @Inject constructor(
         return withContext(Dispatchers.IO) {
             try {
                 val response = apiService.get().getMovieGenreSlider()
-                if (response.isSuccessful && response.body() != null) Result.success(response.body()!!)
+                if (response.isSuccessful && response.body() != null)
+                    Result.success(response.body()!!)
                 else Result.failure(Exception("Failed"))
             } catch (e: Exception) {
                 Result.failure(e)
@@ -692,7 +759,8 @@ class JellyseerrRepositoryImpl @Inject constructor(
         return withContext(Dispatchers.IO) {
             try {
                 val response = apiService.get().getTvGenreSlider()
-                if (response.isSuccessful && response.body() != null) Result.success(response.body()!!)
+                if (response.isSuccessful && response.body() != null)
+                    Result.success(response.body()!!)
                 else Result.failure(Exception("Failed"))
             } catch (e: Exception) {
                 Result.failure(e)
@@ -704,7 +772,8 @@ class JellyseerrRepositoryImpl @Inject constructor(
         return withContext(Dispatchers.IO) {
             try {
                 val response = apiService.get().getMoviesByGenre(genreId, page)
-                if (response.isSuccessful && response.body() != null) Result.success(response.body()!!)
+                if (response.isSuccessful && response.body() != null)
+                    Result.success(response.body()!!)
                 else Result.failure(Exception("Failed"))
             } catch (e: Exception) {
                 Result.failure(e)
@@ -716,7 +785,8 @@ class JellyseerrRepositoryImpl @Inject constructor(
         return withContext(Dispatchers.IO) {
             try {
                 val response = apiService.get().getTvByGenre(genreId, page)
-                if (response.isSuccessful && response.body() != null) Result.success(response.body()!!)
+                if (response.isSuccessful && response.body() != null)
+                    Result.success(response.body()!!)
                 else Result.failure(Exception("Failed"))
             } catch (e: Exception) {
                 Result.failure(e)
@@ -736,7 +806,7 @@ class JellyseerrRepositoryImpl @Inject constructor(
 
     private fun JellyseerrRequest.toEntity(
         serverId: String,
-        userId: String
+        userId: String,
     ): JellyseerrRequestEntity {
         val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US)
         return JellyseerrRequestEntity(
@@ -749,16 +819,18 @@ class JellyseerrRepositoryImpl @Inject constructor(
             tvdbId = media.tvdbId,
             title = media.title ?: media.name ?: "Unknown",
             posterPath = media.posterPath,
-            requestedAt = try {
-                dateFormat.parse(createdAt)?.time ?: System.currentTimeMillis()
-            } catch (e: Exception) {
-                System.currentTimeMillis()
-            },
-            updatedAt = try {
-                dateFormat.parse(updatedAt)?.time ?: System.currentTimeMillis()
-            } catch (e: Exception) {
-                System.currentTimeMillis()
-            },
+            requestedAt =
+                try {
+                    dateFormat.parse(createdAt)?.time ?: System.currentTimeMillis()
+                } catch (e: Exception) {
+                    System.currentTimeMillis()
+                },
+            updatedAt =
+                try {
+                    dateFormat.parse(updatedAt)?.time ?: System.currentTimeMillis()
+                } catch (e: Exception) {
+                    System.currentTimeMillis()
+                },
             requestedByName = requestedBy.displayName,
             requestedByAvatar = requestedBy.avatar,
             mediaTitle = media.title,
@@ -766,7 +838,7 @@ class JellyseerrRepositoryImpl @Inject constructor(
             mediaBackdropPath = media.backdropPath,
             mediaReleaseDate = media.releaseDate,
             mediaFirstAirDate = media.firstAirDate,
-            mediaStatus = media.status
+            mediaStatus = media.status,
         )
     }
 
@@ -775,25 +847,26 @@ class JellyseerrRepositoryImpl @Inject constructor(
         return JellyseerrRequest(
             id = id,
             status = status,
-            media = MediaInfo(
-                id = id,
-                mediaType = mediaType,
-                tmdbId = tmdbId,
-                tvdbId = tvdbId,
-                status = mediaStatus,
-                mediaAddedAt = null,
-                title = mediaTitle,
-                name = mediaName,
-                posterPath = posterPath,
-                backdropPath = mediaBackdropPath,
-                releaseDate = mediaReleaseDate,
-                firstAirDate = mediaFirstAirDate
-            ),
+            media =
+                MediaInfo(
+                    id = id,
+                    mediaType = mediaType,
+                    tmdbId = tmdbId,
+                    tvdbId = tvdbId,
+                    status = mediaStatus,
+                    mediaAddedAt = null,
+                    title = mediaTitle,
+                    name = mediaName,
+                    posterPath = posterPath,
+                    backdropPath = mediaBackdropPath,
+                    releaseDate = mediaReleaseDate,
+                    firstAirDate = mediaFirstAirDate,
+                ),
             requestedBy = RequestUser(0, requestedByName, requestedByAvatar),
             modifiedBy = null,
             createdAt = dateFormat.format(Date(requestedAt)),
             updatedAt = dateFormat.format(Date(updatedAt)),
-            seasons = null
+            seasons = null,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/livetv/JellyfinLiveTvRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/livetv/JellyfinLiveTvRepository.kt
index 7f90060fc..056cdad37 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/livetv/JellyfinLiveTvRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/livetv/JellyfinLiveTvRepository.kt
@@ -7,6 +7,10 @@ import com.makd.afinity.data.models.livetv.AfinityChannel
 import com.makd.afinity.data.models.livetv.AfinityProgram
 import com.makd.afinity.data.models.livetv.ChannelType
 import com.makd.afinity.data.repository.userdata.UserDataRepository
+import java.time.LocalDateTime
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.jellyfin.sdk.api.operations.LiveTvApi
@@ -18,15 +22,13 @@ import org.jellyfin.sdk.model.api.ItemSortBy
 import org.jellyfin.sdk.model.api.PlaybackInfoDto
 import org.jellyfin.sdk.model.api.SortOrder
 import timber.log.Timber
-import java.time.LocalDateTime
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @Singleton
-class JellyfinLiveTvRepository @Inject constructor(
+class JellyfinLiveTvRepository
+@Inject
+constructor(
     private val sessionManager: SessionManager,
-    private val userDataRepository: UserDataRepository
+    private val userDataRepository: UserDataRepository,
 ) : LiveTvRepository {
 
     private fun getBaseUrl(): String = sessionManager.getCurrentApiClient()?.baseUrl ?: ""
@@ -44,44 +46,48 @@ class JellyfinLiveTvRepository @Inject constructor(
         isNews: Boolean?,
         isKids: Boolean?,
         isSports: Boolean?,
-        limit: Int?
-    ): List<AfinityChannel> = withContext(Dispatchers.IO) {
-        try {
-            val liveTvApi = getLiveTvApi() ?: return@withContext emptyList()
-            val baseUrl = getBaseUrl()
-
-            val response = liveTvApi.getLiveTvChannels(
-                type = type?.let {
-                    when (it) {
-                        ChannelType.TV -> org.jellyfin.sdk.model.api.ChannelType.TV
-                        ChannelType.RADIO -> org.jellyfin.sdk.model.api.ChannelType.RADIO
-                    }
-                },
-                isFavorite = isFavorite,
-                isMovie = isMovie,
-                isSeries = isSeries,
-                isNews = isNews,
-                isKids = isKids,
-                isSports = isSports,
-                limit = limit,
-                sortBy = listOf(ItemSortBy.SORT_NAME),
-                sortOrder = SortOrder.ASCENDING,
-                enableImages = true,
-                imageTypeLimit = 1,
-                enableImageTypes = listOf(ImageType.PRIMARY, ImageType.THUMB),
-                fields = listOf(ItemFields.CHANNEL_INFO),
-                addCurrentProgram = true
-            )
-
-            response.content.items?.mapNotNull { channelDto ->
-                val currentProgram = channelDto.currentProgram?.toAfinityProgram(baseUrl)
-                channelDto.toAfinityChannel(baseUrl, currentProgram)
-            } ?: emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get Live TV channels")
-            emptyList()
+        limit: Int?,
+    ): List<AfinityChannel> =
+        withContext(Dispatchers.IO) {
+            try {
+                val liveTvApi = getLiveTvApi() ?: return@withContext emptyList()
+                val baseUrl = getBaseUrl()
+
+                val response =
+                    liveTvApi.getLiveTvChannels(
+                        type =
+                            type?.let {
+                                when (it) {
+                                    ChannelType.TV -> org.jellyfin.sdk.model.api.ChannelType.TV
+                                    ChannelType.RADIO ->
+                                        org.jellyfin.sdk.model.api.ChannelType.RADIO
+                                }
+                            },
+                        isFavorite = isFavorite,
+                        isMovie = isMovie,
+                        isSeries = isSeries,
+                        isNews = isNews,
+                        isKids = isKids,
+                        isSports = isSports,
+                        limit = limit,
+                        sortBy = listOf(ItemSortBy.SORT_NAME),
+                        sortOrder = SortOrder.ASCENDING,
+                        enableImages = true,
+                        imageTypeLimit = 1,
+                        enableImageTypes = listOf(ImageType.PRIMARY, ImageType.THUMB),
+                        fields = listOf(ItemFields.CHANNEL_INFO),
+                        addCurrentProgram = true,
+                    )
+
+                response.content.items?.mapNotNull { channelDto ->
+                    val currentProgram = channelDto.currentProgram?.toAfinityProgram(baseUrl)
+                    channelDto.toAfinityChannel(baseUrl, currentProgram)
+                } ?: emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get Live TV channels")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getChannel(channelId: UUID): AfinityChannel? =
         withContext(Dispatchers.IO) {
@@ -109,50 +115,54 @@ class JellyfinLiveTvRepository @Inject constructor(
         isNews: Boolean?,
         isKids: Boolean?,
         isSports: Boolean?,
-        limit: Int?
-    ): List<AfinityProgram> = withContext(Dispatchers.IO) {
-        try {
-            val liveTvApi = getLiveTvApi() ?: return@withContext emptyList()
-            val baseUrl = getBaseUrl()
-
-            val response = liveTvApi.getLiveTvPrograms(
-                channelIds = channelIds,
-                minStartDate = minStartDate,
-                maxEndDate = maxEndDate,
-                hasAired = hasAired,
-                isMovie = isMovie,
-                isSeries = isSeries,
-                isNews = isNews,
-                isKids = isKids,
-                isSports = isSports,
-                limit = limit,
-                sortBy = listOf(ItemSortBy.START_DATE),
-                sortOrder = listOf(SortOrder.ASCENDING),
-                enableImages = true,
-                imageTypeLimit = 1,
-                enableImageTypes = listOf(ImageType.PRIMARY, ImageType.THUMB, ImageType.BACKDROP),
-                fields = listOf(ItemFields.OVERVIEW, ItemFields.GENRES, ItemFields.CHANNEL_INFO)
-            )
-
-            response.content.items?.map { programDto ->
-                programDto.toAfinityProgram(baseUrl)
-            } ?: emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get programs")
-            emptyList()
+        limit: Int?,
+    ): List<AfinityProgram> =
+        withContext(Dispatchers.IO) {
+            try {
+                val liveTvApi = getLiveTvApi() ?: return@withContext emptyList()
+                val baseUrl = getBaseUrl()
+
+                val response =
+                    liveTvApi.getLiveTvPrograms(
+                        channelIds = channelIds,
+                        minStartDate = minStartDate,
+                        maxEndDate = maxEndDate,
+                        hasAired = hasAired,
+                        isMovie = isMovie,
+                        isSeries = isSeries,
+                        isNews = isNews,
+                        isKids = isKids,
+                        isSports = isSports,
+                        limit = limit,
+                        sortBy = listOf(ItemSortBy.START_DATE),
+                        sortOrder = listOf(SortOrder.ASCENDING),
+                        enableImages = true,
+                        imageTypeLimit = 1,
+                        enableImageTypes =
+                            listOf(ImageType.PRIMARY, ImageType.THUMB, ImageType.BACKDROP),
+                        fields =
+                            listOf(ItemFields.OVERVIEW, ItemFields.GENRES, ItemFields.CHANNEL_INFO),
+                    )
+
+                response.content.items?.map { programDto -> programDto.toAfinityProgram(baseUrl) }
+                    ?: emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get programs")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getCurrentProgram(channelId: UUID): AfinityProgram? =
         withContext(Dispatchers.IO) {
             try {
                 val now = LocalDateTime.now()
-                val programs = getPrograms(
-                    channelIds = listOf(channelId),
-                    minStartDate = now.minusHours(2),
-                    maxEndDate = now.plusHours(1),
-                    limit = 5
-                )
+                val programs =
+                    getPrograms(
+                        channelIds = listOf(channelId),
+                        minStartDate = now.minusHours(2),
+                        maxEndDate = now.plusHours(1),
+                        limit = 5,
+                    )
 
                 programs.find { it.isCurrentlyAiring() }
             } catch (e: Exception) {
@@ -163,29 +173,31 @@ class JellyfinLiveTvRepository @Inject constructor(
 
     override suspend fun getRecommendedPrograms(
         isAiring: Boolean,
-        limit: Int
-    ): List<AfinityProgram> = withContext(Dispatchers.IO) {
-        try {
-            val liveTvApi = getLiveTvApi() ?: return@withContext emptyList()
-            val baseUrl = getBaseUrl()
-
-            val response = liveTvApi.getRecommendedPrograms(
-                isAiring = isAiring,
-                limit = limit,
-                enableImages = true,
-                imageTypeLimit = 1,
-                enableImageTypes = listOf(ImageType.PRIMARY, ImageType.THUMB, ImageType.BACKDROP),
-                fields = listOf(ItemFields.OVERVIEW, ItemFields.GENRES)
-            )
-
-            response.content.items?.map { programDto ->
-                programDto.toAfinityProgram(baseUrl)
-            } ?: emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get recommended programs")
-            emptyList()
+        limit: Int,
+    ): List<AfinityProgram> =
+        withContext(Dispatchers.IO) {
+            try {
+                val liveTvApi = getLiveTvApi() ?: return@withContext emptyList()
+                val baseUrl = getBaseUrl()
+
+                val response =
+                    liveTvApi.getRecommendedPrograms(
+                        isAiring = isAiring,
+                        limit = limit,
+                        enableImages = true,
+                        imageTypeLimit = 1,
+                        enableImageTypes =
+                            listOf(ImageType.PRIMARY, ImageType.THUMB, ImageType.BACKDROP),
+                        fields = listOf(ItemFields.OVERVIEW, ItemFields.GENRES),
+                    )
+
+                response.content.items?.map { programDto -> programDto.toAfinityProgram(baseUrl) }
+                    ?: emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get recommended programs")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getChannelStreamUrl(channelId: UUID): String? =
         withContext(Dispatchers.IO) {
@@ -195,8 +207,7 @@ class JellyfinLiveTvRepository @Inject constructor(
                 val accessToken = apiClient.accessToken
                 val deviceId = apiClient.deviceInfo.id
 
-                val userId = sessionManager.currentSession.value?.userId
-                    ?: return@withContext null
+                val userId = sessionManager.currentSession.value?.userId ?: return@withContext null
 
                 if (baseUrl.isBlank() || accessToken.isNullOrBlank()) {
                     Timber.e("Missing baseUrl or accessToken")
@@ -207,41 +218,43 @@ class JellyfinLiveTvRepository @Inject constructor(
 
                 val maxBitrate = 140_000_000
 
-                val deviceProfile = DeviceProfile(
-                    name = "AFinity Live TV",
-                    maxStreamingBitrate = maxBitrate,
-                    maxStaticBitrate = maxBitrate,
-                    codecProfiles = emptyList(),
-                    containerProfiles = emptyList(),
-                    directPlayProfiles = emptyList(),
-                    transcodingProfiles = emptyList(),
-                    subtitleProfiles = emptyList()
-                )
-
-                val playbackInfoDto = PlaybackInfoDto(
-                    userId = userId,
-                    maxStreamingBitrate = maxBitrate,
-                    startTimeTicks = 0L,
-                    deviceProfile = deviceProfile,
-                    enableDirectPlay = true,
-                    enableDirectStream = true,
-                    enableTranscoding = true,
-                    allowVideoStreamCopy = true,
-                    allowAudioStreamCopy = true,
-                    autoOpenLiveStream = true,
-                    liveStreamId = null,
-                    mediaSourceId = null,
-                    audioStreamIndex = null,
-                    subtitleStreamIndex = null
-                )
-
-                val playbackResponse = mediaInfoApi.getPostedPlaybackInfo(
-                    itemId = channelId,
-                    data = playbackInfoDto
-                )
+                val deviceProfile =
+                    DeviceProfile(
+                        name = "AFinity Live TV",
+                        maxStreamingBitrate = maxBitrate,
+                        maxStaticBitrate = maxBitrate,
+                        codecProfiles = emptyList(),
+                        containerProfiles = emptyList(),
+                        directPlayProfiles = emptyList(),
+                        transcodingProfiles = emptyList(),
+                        subtitleProfiles = emptyList(),
+                    )
+
+                val playbackInfoDto =
+                    PlaybackInfoDto(
+                        userId = userId,
+                        maxStreamingBitrate = maxBitrate,
+                        startTimeTicks = 0L,
+                        deviceProfile = deviceProfile,
+                        enableDirectPlay = true,
+                        enableDirectStream = true,
+                        enableTranscoding = true,
+                        allowVideoStreamCopy = true,
+                        allowAudioStreamCopy = true,
+                        autoOpenLiveStream = true,
+                        liveStreamId = null,
+                        mediaSourceId = null,
+                        audioStreamIndex = null,
+                        subtitleStreamIndex = null,
+                    )
+
+                val playbackResponse =
+                    mediaInfoApi.getPostedPlaybackInfo(itemId = channelId, data = playbackInfoDto)
                 val playbackInfo = playbackResponse.content
 
-                Timber.d("PlaybackInfo: playSessionId=${playbackInfo.playSessionId}, mediaSources=${playbackInfo.mediaSources?.size ?: 0}")
+                Timber.d(
+                    "PlaybackInfo: playSessionId=${playbackInfo.playSessionId}, mediaSources=${playbackInfo.mediaSources?.size ?: 0}"
+                )
 
                 val sources = playbackInfo.mediaSources
                 if (sources.isNullOrEmpty()) {
@@ -254,27 +267,32 @@ class JellyfinLiveTvRepository @Inject constructor(
                 val mediaSourceId = source.id
                 val directStreamPath = source.path
 
-                Timber.d("Source: id=$mediaSourceId, liveStreamId=$liveStreamId, path=$directStreamPath, supportsDirectPlay=${source.supportsDirectPlay}, supportsDirectStream=${source.supportsDirectStream}, transcodingUrl=${source.transcodingUrl}")
+                Timber.d(
+                    "Source: id=$mediaSourceId, liveStreamId=$liveStreamId, path=$directStreamPath, supportsDirectPlay=${source.supportsDirectPlay}, supportsDirectStream=${source.supportsDirectStream}, transcodingUrl=${source.transcodingUrl}"
+                )
 
-                if (!directStreamPath.isNullOrBlank() &&
-                    (directStreamPath.contains(".m3u8") || directStreamPath.contains(".m3u"))
+                if (
+                    !directStreamPath.isNullOrBlank() &&
+                        (directStreamPath.contains(".m3u8") || directStreamPath.contains(".m3u"))
                 ) {
-                    val directUrl = if (directStreamPath.startsWith("http")) {
-                        directStreamPath
-                    } else {
-                        "$baseUrl$directStreamPath"
-                    }
+                    val directUrl =
+                        if (directStreamPath.startsWith("http")) {
+                            directStreamPath
+                        } else {
+                            "$baseUrl$directStreamPath"
+                        }
                     Timber.d("Using direct stream URL (IPTV): $directUrl")
                     return@withContext directUrl
                 }
 
                 if (!source.transcodingUrl.isNullOrBlank()) {
                     val transcodingUrl = source.transcodingUrl!!
-                    val fullUrl = if (transcodingUrl.startsWith("http")) {
-                        transcodingUrl
-                    } else {
-                        "$baseUrl$transcodingUrl"
-                    }
+                    val fullUrl =
+                        if (transcodingUrl.startsWith("http")) {
+                            transcodingUrl
+                        } else {
+                            "$baseUrl$transcodingUrl"
+                        }
                     Timber.d("Using server-provided transcoding URL: $fullUrl")
                     return@withContext fullUrl
                 }
@@ -317,7 +335,6 @@ class JellyfinLiveTvRepository @Inject constructor(
 
                 Timber.d("Generated stream URL: $streamUrl")
                 streamUrl
-
             } catch (e: Exception) {
                 Timber.e(e, "Failed to get stream URL for channel: $channelId")
                 null
@@ -340,19 +357,21 @@ class JellyfinLiveTvRepository @Inject constructor(
             }
         }
 
-    override suspend fun hasLiveTvAccess(): Boolean = withContext(Dispatchers.IO) {
-        try {
-            val liveTvApi = getLiveTvApi() ?: return@withContext false
-            val channelsResponse = liveTvApi.getLiveTvChannels(
-                limit = 1,
-                enableImages = false,
-                enableUserData = false,
-                addCurrentProgram = false
-            )
-            val channelCount = channelsResponse.content.items?.size ?: 0
-            return@withContext channelCount > 0
-        } catch (e: Exception) {
-            false
+    override suspend fun hasLiveTvAccess(): Boolean =
+        withContext(Dispatchers.IO) {
+            try {
+                val liveTvApi = getLiveTvApi() ?: return@withContext false
+                val channelsResponse =
+                    liveTvApi.getLiveTvChannels(
+                        limit = 1,
+                        enableImages = false,
+                        enableUserData = false,
+                        addCurrentProgram = false,
+                    )
+                val channelCount = channelsResponse.content.items?.size ?: 0
+                return@withContext channelCount > 0
+            } catch (e: Exception) {
+                false
+            }
         }
-    }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/livetv/LiveTvRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/livetv/LiveTvRepository.kt
index bac8c4d47..a6983c069 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/livetv/LiveTvRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/livetv/LiveTvRepository.kt
@@ -16,7 +16,7 @@ interface LiveTvRepository {
         isNews: Boolean? = null,
         isKids: Boolean? = null,
         isSports: Boolean? = null,
-        limit: Int? = null
+        limit: Int? = null,
     ): List<AfinityChannel>
 
     suspend fun getChannel(channelId: UUID): AfinityChannel?
@@ -31,14 +31,14 @@ interface LiveTvRepository {
         isNews: Boolean? = null,
         isKids: Boolean? = null,
         isSports: Boolean? = null,
-        limit: Int? = null
+        limit: Int? = null,
     ): List<AfinityProgram>
 
     suspend fun getCurrentProgram(channelId: UUID): AfinityProgram?
 
     suspend fun getRecommendedPrograms(
         isAiring: Boolean = true,
-        limit: Int = 20
+        limit: Int = 20,
     ): List<AfinityProgram>
 
     suspend fun getChannelStreamUrl(channelId: UUID): String?
@@ -46,4 +46,4 @@ interface LiveTvRepository {
     suspend fun toggleChannelFavorite(channelId: UUID): Boolean
 
     suspend fun hasLiveTvAccess(): Boolean
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/media/BoxSetCache.kt b/app/src/main/java/com/makd/afinity/data/repository/media/BoxSetCache.kt
index be0962da2..45444f612 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/media/BoxSetCache.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/media/BoxSetCache.kt
@@ -1,22 +1,20 @@
- package com.makd.afinity.data.repository.media
+package com.makd.afinity.data.repository.media
 
 import com.makd.afinity.data.database.dao.BoxSetCacheDao
 import com.makd.afinity.data.database.entities.BoxSetCacheEntity
 import com.makd.afinity.data.database.entities.BoxSetCacheMetadata
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
 import timber.log.Timber
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Singleton
 
- @Singleton
-class BoxSetCache @Inject constructor(
-    private val cacheDao: BoxSetCacheDao
-) {
+@Singleton
+class BoxSetCache @Inject constructor(private val cacheDao: BoxSetCacheDao) {
 
     private val mutex = Mutex()
     private val json = Json { ignoreUnknownKeys = true }
@@ -31,51 +29,64 @@ class BoxSetCache @Inject constructor(
 
     private var isInitialized = false
 
-    private suspend fun ensureInitialized() = mutex.withLock {
-        if (isInitialized) return@withLock
-
-        try {
-            Timber.d("Loading BoxSet cache from database...")
-            val startTime = System.currentTimeMillis()
-
-            val metadata = cacheDao.getMetadata()
-            if (metadata != null) {
-                lastBuiltTimestamp = metadata.lastFullBuild
-                Timber.d("Found cache metadata: lastBuild=${lastBuiltTimestamp}, version=${metadata.cacheVersion}")
-
-                if (metadata.cacheVersion != currentCacheVersion) {
-                    Timber.w("Cache version mismatch (${metadata.cacheVersion} != $currentCacheVersion), clearing cache")
-                    clearDatabase()
-                    isInitialized = true
-                    return@withLock
+    private suspend fun ensureInitialized() =
+        mutex.withLock {
+            if (isInitialized) return@withLock
+
+            try {
+                Timber.d("Loading BoxSet cache from database...")
+                val startTime = System.currentTimeMillis()
+
+                val metadata = cacheDao.getMetadata()
+                if (metadata != null) {
+                    lastBuiltTimestamp = metadata.lastFullBuild
+                    Timber.d(
+                        "Found cache metadata: lastBuild=${lastBuiltTimestamp}, version=${metadata.cacheVersion}"
+                    )
+
+                    if (metadata.cacheVersion != currentCacheVersion) {
+                        Timber.w(
+                            "Cache version mismatch (${metadata.cacheVersion} != $currentCacheVersion), clearing cache"
+                        )
+                        clearDatabase()
+                        isInitialized = true
+                        return@withLock
+                    }
                 }
-            }
 
-            val entries = cacheDao.getAllCacheEntries()
-            val loadedMap = mutableMapOf<UUID, List<UUID>>()
-
-            entries.forEach { entry ->
-                try {
-                    val itemId = UUID.fromString(entry.itemId)
-                    val boxSetIds = json.decodeFromString<List<String>>(entry.boxSetIds)
-                        .mapNotNull { try { UUID.fromString(it) } catch (e: Exception) { null } }
-                    loadedMap[itemId] = boxSetIds
-                } catch (e: Exception) {
-                    Timber.w(e, "Failed to parse cache entry for item ${entry.itemId}")
+                val entries = cacheDao.getAllCacheEntries()
+                val loadedMap = mutableMapOf<UUID, List<UUID>>()
+
+                entries.forEach { entry ->
+                    try {
+                        val itemId = UUID.fromString(entry.itemId)
+                        val boxSetIds =
+                            json.decodeFromString<List<String>>(entry.boxSetIds).mapNotNull {
+                                try {
+                                    UUID.fromString(it)
+                                } catch (e: Exception) {
+                                    null
+                                }
+                            }
+                        loadedMap[itemId] = boxSetIds
+                    } catch (e: Exception) {
+                        Timber.w(e, "Failed to parse cache entry for item ${entry.itemId}")
+                    }
                 }
-            }
 
-            itemToBoxSetsMap = loadedMap
-            val duration = System.currentTimeMillis() - startTime
-            Timber.i("Loaded BoxSet cache from database in ${duration}ms: ${loadedMap.size} items")
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to load cache from database, starting with empty cache")
-            itemToBoxSetsMap = emptyMap()
-            lastBuiltTimestamp = 0
-        } finally {
-            isInitialized = true
+                itemToBoxSetsMap = loadedMap
+                val duration = System.currentTimeMillis() - startTime
+                Timber.i(
+                    "Loaded BoxSet cache from database in ${duration}ms: ${loadedMap.size} items"
+                )
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to load cache from database, starting with empty cache")
+                itemToBoxSetsMap = emptyMap()
+                lastBuiltTimestamp = 0
+            } finally {
+                isInitialized = true
+            }
         }
-    }
 
     suspend fun isStale(): Boolean {
         ensureInitialized()
@@ -93,57 +104,58 @@ class BoxSetCache @Inject constructor(
         return itemToBoxSetsMap[itemId] ?: emptyList()
     }
 
-    suspend fun buildCache(
-        fetchAllBoxSets: suspend () -> List<BoxSetWithChildren>
-    ) = mutex.withLock {
-        try {
-            Timber.d("Building BoxSet cache...")
-            val startTime = System.currentTimeMillis()
+    suspend fun buildCache(fetchAllBoxSets: suspend () -> List<BoxSetWithChildren>) =
+        mutex.withLock {
+            try {
+                Timber.d("Building BoxSet cache...")
+                val startTime = System.currentTimeMillis()
 
-            val boxSetsWithChildren = fetchAllBoxSets()
+                val boxSetsWithChildren = fetchAllBoxSets()
 
-            val newMap = mutableMapOf<UUID, MutableList<UUID>>()
+                val newMap = mutableMapOf<UUID, MutableList<UUID>>()
 
-            boxSetsWithChildren.forEach { boxSetData ->
-                boxSetData.childItemIds.forEach { childItemId ->
-                    newMap.getOrPut(childItemId) { mutableListOf() }.add(boxSetData.boxSetId)
+                boxSetsWithChildren.forEach { boxSetData ->
+                    boxSetData.childItemIds.forEach { childItemId ->
+                        newMap.getOrPut(childItemId) { mutableListOf() }.add(boxSetData.boxSetId)
+                    }
                 }
-            }
 
-            itemToBoxSetsMap = newMap.mapValues { it.value.toList() }
-            lastBuiltTimestamp = System.currentTimeMillis()
+                itemToBoxSetsMap = newMap.mapValues { it.value.toList() }
+                lastBuiltTimestamp = System.currentTimeMillis()
 
-            withContext(Dispatchers.IO) {
-                saveToDatabase(newMap)
-            }
+                withContext(Dispatchers.IO) { saveToDatabase(newMap) }
 
-            val duration = System.currentTimeMillis() - startTime
-            Timber.i("BoxSet cache built and saved in ${duration}ms. Cached ${itemToBoxSetsMap.size} items in ${boxSetsWithChildren.size} BoxSets")
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to build BoxSet cache")
+                val duration = System.currentTimeMillis() - startTime
+                Timber.i(
+                    "BoxSet cache built and saved in ${duration}ms. Cached ${itemToBoxSetsMap.size} items in ${boxSetsWithChildren.size} BoxSets"
+                )
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to build BoxSet cache")
+            }
         }
-    }
 
     private suspend fun saveToDatabase(cacheMap: Map<UUID, List<UUID>>) {
         try {
             Timber.d("Saving BoxSet cache to database...")
 
-            val entities = cacheMap.map { (itemId, boxSetIds) ->
-                BoxSetCacheEntity(
-                    itemId = itemId.toString(),
-                    boxSetIds = json.encodeToString(boxSetIds.map { it.toString() }),
-                    lastUpdated = System.currentTimeMillis()
-                )
-            }
+            val entities =
+                cacheMap.map { (itemId, boxSetIds) ->
+                    BoxSetCacheEntity(
+                        itemId = itemId.toString(),
+                        boxSetIds = json.encodeToString(boxSetIds.map { it.toString() }),
+                        lastUpdated = System.currentTimeMillis(),
+                    )
+                }
 
             cacheDao.clearAllCacheEntries()
             cacheDao.insertCacheEntries(entities)
 
-            val metadata = BoxSetCacheMetadata(
-                id = 1,
-                lastFullBuild = lastBuiltTimestamp,
-                cacheVersion = currentCacheVersion
-            )
+            val metadata =
+                BoxSetCacheMetadata(
+                    id = 1,
+                    lastFullBuild = lastBuiltTimestamp,
+                    cacheVersion = currentCacheVersion,
+                )
             cacheDao.insertMetadata(metadata)
 
             Timber.d("Saved ${entities.size} cache entries to database")
@@ -152,12 +164,13 @@ class BoxSetCache @Inject constructor(
         }
     }
 
-    suspend fun clear() = mutex.withLock {
-        itemToBoxSetsMap = emptyMap()
-        lastBuiltTimestamp = 0
-        clearDatabase()
-        Timber.d("BoxSet cache cleared from memory and database")
-    }
+    suspend fun clear() =
+        mutex.withLock {
+            itemToBoxSetsMap = emptyMap()
+            lastBuiltTimestamp = 0
+            clearDatabase()
+            Timber.d("BoxSet cache cleared from memory and database")
+        }
 
     private suspend fun clearDatabase() {
         try {
@@ -174,19 +187,16 @@ class BoxSetCache @Inject constructor(
             itemCount = itemToBoxSetsMap.size,
             ageMs = ageMs,
             isStale = isStale(),
-            isEmpty = isEmpty()
+            isEmpty = isEmpty(),
         )
     }
 }
 
-data class BoxSetWithChildren(
-    val boxSetId: UUID,
-    val childItemIds: List<UUID>
-)
+data class BoxSetWithChildren(val boxSetId: UUID, val childItemIds: List<UUID>)
 
 data class CacheStats(
     val itemCount: Int,
     val ageMs: Long,
     val isStale: Boolean,
-    val isEmpty: Boolean
-)
\ No newline at end of file
+    val isEmpty: Boolean,
+)
diff --git a/app/src/main/java/com/makd/afinity/data/repository/media/JellyfinMediaRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/media/JellyfinMediaRepository.kt
index ba5c264ee..92485782f 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/media/JellyfinMediaRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/media/JellyfinMediaRepository.kt
@@ -25,6 +25,10 @@ import com.makd.afinity.data.models.media.AfinityStudio
 import com.makd.afinity.data.models.media.toAfinityExternalUrl
 import com.makd.afinity.data.repository.FieldSets
 import dagger.hilt.android.qualifiers.ApplicationContext
+import java.io.File
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -54,33 +58,32 @@ import org.jellyfin.sdk.model.api.ItemFilter
 import org.jellyfin.sdk.model.api.ItemSortBy
 import org.jellyfin.sdk.model.api.SortOrder
 import timber.log.Timber
-import java.io.File
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @Singleton
-class JellyfinMediaRepository @Inject constructor(
+class JellyfinMediaRepository
+@Inject
+constructor(
     private val sessionManager: SessionManager,
     @ApplicationContext private val context: Context,
-    private val boxSetCache: BoxSetCache
+    private val boxSetCache: BoxSetCache,
 ) : MediaRepository {
     override suspend fun refreshItemUserData(
         itemId: UUID,
-        fields: List<ItemFields>?
+        fields: List<ItemFields>?,
     ): AfinityItem? {
         return withContext(Dispatchers.IO) {
             try {
                 val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext null
                 val userId = getCurrentUserId() ?: return@withContext null
                 val itemsApi = ItemsApi(apiClient)
-                val response = itemsApi.getItems(
-                    userId = userId,
-                    ids = listOf(itemId),
-                    fields = fields ?: FieldSets.REFRESH_USER_DATA,
-                    enableImages = true,
-                    enableUserData = true
-                )
+                val response =
+                    itemsApi.getItems(
+                        userId = userId,
+                        ids = listOf(itemId),
+                        fields = fields ?: FieldSets.REFRESH_USER_DATA,
+                        enableImages = true,
+                        enableUserData = true,
+                    )
 
                 val freshBaseItemDto = response.content?.items?.firstOrNull()
                 val freshItem = freshBaseItemDto?.toAfinityItem(getBaseUrl())
@@ -96,15 +99,19 @@ class JellyfinMediaRepository @Inject constructor(
                                 try {
                                     kotlinx.coroutines.delay(500)
 
-                                    val seriesResponse = itemsApi.getItems(
-                                        userId = userId,
-                                        ids = listOf(seriesId),
-                                        fields = FieldSets.MEDIA_ITEM_CARDS,
-                                        enableImages = true,
-                                        enableUserData = true
-                                    )
-                                    val seriesItem = seriesResponse.content?.items?.firstOrNull()
-                                        ?.toAfinityItem(getBaseUrl())
+                                    val seriesResponse =
+                                        itemsApi.getItems(
+                                            userId = userId,
+                                            ids = listOf(seriesId),
+                                            fields = FieldSets.MEDIA_ITEM_CARDS,
+                                            enableImages = true,
+                                            enableUserData = true,
+                                        )
+                                    val seriesItem =
+                                        seriesResponse.content
+                                            ?.items
+                                            ?.firstOrNull()
+                                            ?.toAfinityItem(getBaseUrl())
 
                                     if (seriesItem != null) {
                                         updateItemInCache(_latestMedia, seriesItem)
@@ -126,7 +133,7 @@ class JellyfinMediaRepository @Inject constructor(
 
     private fun updateItemInCache(
         cache: MutableStateFlow<List<AfinityItem>>,
-        updatedItem: AfinityItem
+        updatedItem: AfinityItem,
     ) {
         cache.update { currentList ->
             val newList = currentList.toMutableList()
@@ -140,9 +147,8 @@ class JellyfinMediaRepository @Inject constructor(
                     }
                 }
 
-                (updatedItem.playbackPositionTicks.toFloat() / updatedItem.runtimeTicks * 100f) > 0f &&
-                        !updatedItem.played &&
-                        cache == _continueWatching -> {
+                (updatedItem.playbackPositionTicks.toFloat() / updatedItem.runtimeTicks * 100f) >
+                    0f && !updatedItem.played && cache == _continueWatching -> {
                     if (existingIndex != -1) {
                         newList.removeAt(existingIndex)
                     }
@@ -156,21 +162,23 @@ class JellyfinMediaRepository @Inject constructor(
                 }
             }
             if (updatedItem is AfinityEpisode && updatedItem.seriesId != null) {
-                val parentSeriesIndex = newList.indexOfFirst {
-                    it is AfinityShow && it.id == updatedItem.seriesId
-                }
+                val parentSeriesIndex =
+                    newList.indexOfFirst { it is AfinityShow && it.id == updatedItem.seriesId }
 
                 if (parentSeriesIndex != -1) {
                     val parent = newList[parentSeriesIndex] as AfinityShow
                     val currentCount = parent.unplayedItemCount ?: 0
-                    val newCount = if (updatedItem.played) {
-                        (currentCount - 1).coerceAtLeast(0)
-                    } else {
-                        currentCount + 1
-                    }
+                    val newCount =
+                        if (updatedItem.played) {
+                            (currentCount - 1).coerceAtLeast(0)
+                        } else {
+                            currentCount + 1
+                        }
                     if (currentCount != newCount) {
                         newList[parentSeriesIndex] = parent.copy(unplayedItemCount = newCount)
-                        Timber.d("Optimistic Update: Series '${parent.name}' badge $currentCount -> $newCount")
+                        Timber.d(
+                            "Optimistic Update: Series '${parent.name}' badge $currentCount -> $newCount"
+                        )
                     }
                 }
             }
@@ -206,17 +214,19 @@ class JellyfinMediaRepository @Inject constructor(
                 val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext
                 val userId = getCurrentUserId() ?: return@withContext
                 val itemsApi = ItemsApi(apiClient)
-                val response = itemsApi.getResumeItems(
-                    userId = userId,
-                    limit = 12,
-                    fields = FieldSets.CACHE_CONTINUE_WATCHING,
-                    enableImages = true,
-                    enableUserData = true
-                )
+                val response =
+                    itemsApi.getResumeItems(
+                        userId = userId,
+                        limit = 12,
+                        fields = FieldSets.CACHE_CONTINUE_WATCHING,
+                        enableImages = true,
+                        enableUserData = true,
+                    )
 
-                val continueWatchingItems = response.content?.items?.mapNotNull { baseItemDto ->
-                    baseItemDto.toAfinityItem(getBaseUrl())
-                } ?: emptyList()
+                val continueWatchingItems =
+                    response.content?.items?.mapNotNull { baseItemDto ->
+                        baseItemDto.toAfinityItem(getBaseUrl())
+                    } ?: emptyList()
 
                 _continueWatching.value = continueWatchingItems
                 Timber.d("Full refresh of continue watching cache completed")
@@ -232,19 +242,21 @@ class JellyfinMediaRepository @Inject constructor(
                 val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext
                 val userId = getCurrentUserId() ?: return@withContext
                 val userLibraryApi = UserLibraryApi(apiClient)
-                val response = userLibraryApi.getLatestMedia(
-                    userId = userId,
-                    includeItemTypes = listOf(BaseItemKind.MOVIE, BaseItemKind.SERIES),
-                    limit = 15,
-                    isPlayed = false,
-                    fields = FieldSets.CACHE_LATEST_MEDIA,
-                    enableImages = true,
-                    enableUserData = true
-                )
+                val response =
+                    userLibraryApi.getLatestMedia(
+                        userId = userId,
+                        includeItemTypes = listOf(BaseItemKind.MOVIE, BaseItemKind.SERIES),
+                        limit = 15,
+                        isPlayed = false,
+                        fields = FieldSets.CACHE_LATEST_MEDIA,
+                        enableImages = true,
+                        enableUserData = true,
+                    )
 
-                val latestItems = response.content?.mapNotNull { baseItemDto ->
-                    baseItemDto.toAfinityItem(getBaseUrl())
-                } ?: emptyList()
+                val latestItems =
+                    response.content?.mapNotNull { baseItemDto ->
+                        baseItemDto.toAfinityItem(getBaseUrl())
+                    } ?: emptyList()
 
                 _latestMedia.value = latestItems
                 Timber.d("Full refresh of latest media cache completed")
@@ -260,19 +272,21 @@ class JellyfinMediaRepository @Inject constructor(
                 val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext
                 val userId = getCurrentUserId() ?: return@withContext
                 val tvShowsApi = TvShowsApi(apiClient)
-                val response = tvShowsApi.getNextUp(
-                    userId = userId,
-                    limit = 16,
-                    fields = FieldSets.CACHE_NEXT_UP,
-                    enableImages = true,
-                    enableUserData = true,
-                    enableResumable = false,
-                    enableRewatching = false
-                )
+                val response =
+                    tvShowsApi.getNextUp(
+                        userId = userId,
+                        limit = 16,
+                        fields = FieldSets.CACHE_NEXT_UP,
+                        enableImages = true,
+                        enableUserData = true,
+                        enableResumable = false,
+                        enableRewatching = false,
+                    )
 
-                val nextUpEpisodes = response.content?.items?.mapNotNull { baseItemDto ->
-                    baseItemDto.toAfinityEpisode(getBaseUrl())
-                } ?: emptyList()
+                val nextUpEpisodes =
+                    response.content?.items?.mapNotNull { baseItemDto ->
+                        baseItemDto.toAfinityEpisode(getBaseUrl())
+                    } ?: emptyList()
 
                 _nextUp.value = nextUpEpisodes
                 Timber.d("Full refresh of next up cache completed")
@@ -305,141 +319,154 @@ class JellyfinMediaRepository @Inject constructor(
     private val _nextUp = MutableStateFlow<List<AfinityEpisode>>(emptyList())
     override val nextUp: Flow<List<AfinityEpisode>> = _nextUp.asStateFlow()
 
-    private suspend fun getCurrentUserId(): UUID? = withContext(Dispatchers.IO) {
-        return@withContext sessionManager.currentSession.value?.userId
-    }
+    private suspend fun getCurrentUserId(): UUID? =
+        withContext(Dispatchers.IO) {
+            return@withContext sessionManager.currentSession.value?.userId
+        }
 
     private fun getBaseUrl(): String {
         return sessionManager.currentSession.value?.serverUrl ?: ""
     }
 
-    override suspend fun getLibraries(): List<AfinityCollection> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            Timber.d("Attempting to get libraries via MediaFolders API")
-            try {
-                val libraryApi = LibraryApi(apiClient)
-                val response = libraryApi.getMediaFolders()
-                val libraries = response.content?.items?.mapNotNull { baseItemDto ->
-                    baseItemDto.toAfinityCollection(getBaseUrl())
-                } ?: emptyList()
-
-                if (libraries.isNotEmpty()) {
-                    _libraries.value = libraries
-                    Timber.d("Successfully retrieved ${libraries.size} libraries via MediaFolders API")
-                    return@withContext libraries
-                }
-            } catch (e: ApiClientException) {
-                val errorMessage = e.message ?: ""
-                if (errorMessage.contains("403")) {
-                    Timber.w("MediaFolders API returned 403 Forbidden. User doesn't have admin privileges. Trying Items API approach...")
-                } else {
-                    Timber.e(e, "MediaFolders API failed: ${e.message}")
+    override suspend fun getLibraries(): List<AfinityCollection> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                Timber.d("Attempting to get libraries via MediaFolders API")
+                try {
+                    val libraryApi = LibraryApi(apiClient)
+                    val response = libraryApi.getMediaFolders()
+                    val libraries =
+                        response.content?.items?.mapNotNull { baseItemDto ->
+                            baseItemDto.toAfinityCollection(getBaseUrl())
+                        } ?: emptyList()
+
+                    if (libraries.isNotEmpty()) {
+                        _libraries.value = libraries
+                        Timber.d(
+                            "Successfully retrieved ${libraries.size} libraries via MediaFolders API"
+                        )
+                        return@withContext libraries
+                    }
+                } catch (e: ApiClientException) {
+                    val errorMessage = e.message ?: ""
+                    if (errorMessage.contains("403")) {
+                        Timber.w(
+                            "MediaFolders API returned 403 Forbidden. User doesn't have admin privileges. Trying Items API approach..."
+                        )
+                    } else {
+                        Timber.e(e, "MediaFolders API failed: ${e.message}")
+                    }
                 }
-            }
 
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
 
-            val itemsApi = ItemsApi(apiClient)
-            val response = itemsApi.getItems(
-                userId = userId,
-            )
+                val itemsApi = ItemsApi(apiClient)
+                val response = itemsApi.getItems(userId = userId)
 
-            val libraries = response.content?.items?.mapNotNull { baseItemDto ->
-                try {
-                    Timber.d("Processing library: ${baseItemDto.name} (Type: ${baseItemDto.type}, CollectionType: ${baseItemDto.collectionType})")
-                    baseItemDto.toAfinityCollection(getBaseUrl())
-                } catch (e: Exception) {
-                    Timber.w(e, "Failed to convert item to collection: ${baseItemDto.name}")
-                    null
-                }
-            } ?: emptyList()
-
-            _libraries.value = libraries
-            Timber.d("Successfully retrieved ${libraries.size} libraries via Items API")
-            libraries
-
-        } catch (e: ApiClientException) {
-            Timber.e(e, "Failed to get libraries: ${e.message}")
-            emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Unexpected error getting libraries")
-            emptyList()
+                val libraries =
+                    response.content?.items?.mapNotNull { baseItemDto ->
+                        try {
+                            Timber.d(
+                                "Processing library: ${baseItemDto.name} (Type: ${baseItemDto.type}, CollectionType: ${baseItemDto.collectionType})"
+                            )
+                            baseItemDto.toAfinityCollection(getBaseUrl())
+                        } catch (e: Exception) {
+                            Timber.w(e, "Failed to convert item to collection: ${baseItemDto.name}")
+                            null
+                        }
+                    } ?: emptyList()
+
+                _libraries.value = libraries
+                Timber.d("Successfully retrieved ${libraries.size} libraries via Items API")
+                libraries
+            } catch (e: ApiClientException) {
+                Timber.e(e, "Failed to get libraries: ${e.message}")
+                emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Unexpected error getting libraries")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getLatestMedia(
         parentId: UUID?,
         limit: Int,
-        fields: List<ItemFields>?
-    ): List<AfinityItem> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
-
-            val userLibraryApi = UserLibraryApi(apiClient)
-            val response = userLibraryApi.getLatestMedia(
-                userId = userId,
-                parentId = parentId,
-                includeItemTypes = listOf(
-                    BaseItemKind.MOVIE,
-                    BaseItemKind.SERIES,
-                    BaseItemKind.EPISODE
-                ),
-                limit = limit,
-                isPlayed = false,
-                fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
-                enableImages = true,
-                enableUserData = true,
-                groupItems = true
-            )
+        fields: List<ItemFields>?,
+    ): List<AfinityItem> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
+
+                val userLibraryApi = UserLibraryApi(apiClient)
+                val response =
+                    userLibraryApi.getLatestMedia(
+                        userId = userId,
+                        parentId = parentId,
+                        includeItemTypes =
+                            listOf(BaseItemKind.MOVIE, BaseItemKind.SERIES, BaseItemKind.EPISODE),
+                        limit = limit,
+                        isPlayed = false,
+                        fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
+                        enableImages = true,
+                        enableUserData = true,
+                        groupItems = true,
+                    )
+
+                val latestItems =
+                    response.content?.mapNotNull { baseItemDto ->
+                        baseItemDto.toAfinityItem(getBaseUrl())
+                    } ?: emptyList()
 
-            val latestItems = response.content?.mapNotNull { baseItemDto ->
-                baseItemDto.toAfinityItem(getBaseUrl())
-            } ?: emptyList()
-
-            _latestMedia.value = latestItems
-            latestItems
-        } catch (e: ApiClientException) {
-            Timber.e(e, "Failed to get latest media")
-            emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Unexpected error getting latest media")
-            emptyList()
+                _latestMedia.value = latestItems
+                latestItems
+            } catch (e: ApiClientException) {
+                Timber.e(e, "Failed to get latest media")
+                emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Unexpected error getting latest media")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getContinueWatching(
         limit: Int,
-        fields: List<ItemFields>?
-    ): List<AfinityItem> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
-
-            val itemsApi = ItemsApi(apiClient)
-            val response = itemsApi.getResumeItems(
-                userId = userId,
-                limit = limit,
-                fields = fields ?: FieldSets.CONTINUE_WATCHING,
-                enableImages = true,
-                enableUserData = true
-            )
+        fields: List<ItemFields>?,
+    ): List<AfinityItem> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
+
+                val itemsApi = ItemsApi(apiClient)
+                val response =
+                    itemsApi.getResumeItems(
+                        userId = userId,
+                        limit = limit,
+                        fields = fields ?: FieldSets.CONTINUE_WATCHING,
+                        enableImages = true,
+                        enableUserData = true,
+                    )
 
-            val continueWatchingItems = response.content?.items?.mapNotNull { baseItemDto ->
-                baseItemDto.toAfinityItem(getBaseUrl())
-            } ?: emptyList()
-
-            _continueWatching.value = continueWatchingItems
-            continueWatchingItems
-        } catch (e: ApiClientException) {
-            Timber.e(e, "Failed to get continue watching")
-            emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Unexpected error getting continue watching")
-            emptyList()
+                val continueWatchingItems =
+                    response.content?.items?.mapNotNull { baseItemDto ->
+                        baseItemDto.toAfinityItem(getBaseUrl())
+                    } ?: emptyList()
+
+                _continueWatching.value = continueWatchingItems
+                continueWatchingItems
+            } catch (e: ApiClientException) {
+                Timber.e(e, "Failed to get continue watching")
+                emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Unexpected error getting continue watching")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getItems(
         parentId: UUID?,
@@ -459,145 +486,153 @@ class JellyfinMediaRepository @Inject constructor(
         fields: List<ItemFields>?,
         imageTypes: List<String>,
         hasOverview: Boolean?,
-        studios: List<String>
-    ): BaseItemDtoQueryResult = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient =
-                sessionManager.getCurrentApiClient() ?: return@withContext BaseItemDtoQueryResult(
-                    items = emptyList(),
-                    totalRecordCount = 0,
-                    startIndex = 0
-                )
-            val userId = getCurrentUserId() ?: return@withContext BaseItemDtoQueryResult(
-                items = emptyList(),
-                totalRecordCount = 0,
-                startIndex = 0
-            )
+        studios: List<String>,
+    ): BaseItemDtoQueryResult =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient()
+                        ?: return@withContext BaseItemDtoQueryResult(
+                            items = emptyList(),
+                            totalRecordCount = 0,
+                            startIndex = 0,
+                        )
+                val userId =
+                    getCurrentUserId()
+                        ?: return@withContext BaseItemDtoQueryResult(
+                            items = emptyList(),
+                            totalRecordCount = 0,
+                            startIndex = 0,
+                        )
 
-            val itemsApi = ItemsApi(apiClient)
+                val itemsApi = ItemsApi(apiClient)
 
-            val filters = buildList {
-                if (isLiked == true) add(ItemFilter.LIKES)
-            }
+                val filters = buildList { if (isLiked == true) add(ItemFilter.LIKES) }
 
-            val response = itemsApi.getItems(
-                userId = userId,
-                parentId = parentId,
-                limit = limit,
-                startIndex = startIndex,
-                searchTerm = searchTerm,
-                sortBy = listOf(sortBy.toJellyfinSortBy()),
-                sortOrder = if (sortDescending) listOf(SortOrder.DESCENDING) else listOf(SortOrder.ASCENDING),
-                includeItemTypes = includeItemTypes.mapNotNull {
-                    try {
-                        BaseItemKind.valueOf(it.uppercase())
-                    } catch (e: Exception) {
-                        null
-                    }
-                },
-                recursive = if (parentId == null) true else if (includeItemTypes.size == 1 && includeItemTypes.contains(
-                        "SERIES"
+                val response =
+                    itemsApi.getItems(
+                        userId = userId,
+                        parentId = parentId,
+                        limit = limit,
+                        startIndex = startIndex,
+                        searchTerm = searchTerm,
+                        sortBy = listOf(sortBy.toJellyfinSortBy()),
+                        sortOrder =
+                            if (sortDescending) listOf(SortOrder.DESCENDING)
+                            else listOf(SortOrder.ASCENDING),
+                        includeItemTypes =
+                            includeItemTypes.mapNotNull {
+                                try {
+                                    BaseItemKind.valueOf(it.uppercase())
+                                } catch (e: Exception) {
+                                    null
+                                }
+                            },
+                        recursive =
+                            if (parentId == null) true
+                            else if (
+                                includeItemTypes.size == 1 && includeItemTypes.contains("SERIES")
+                            )
+                                true
+                            else if (searchTerm != null) true else null,
+                        collapseBoxSetItems =
+                            if (includeItemTypes.size == 1 && includeItemTypes.contains("SERIES"))
+                                false
+                            else null,
+                        genres = genres,
+                        years = years,
+                        isFavorite = isFavorite,
+                        isPlayed = isPlayed,
+                        filters = filters.ifEmpty { null },
+                        nameStartsWith = nameStartsWith,
+                        studios = studios.ifEmpty { null },
+                        fields = fields ?: FieldSets.LIBRARY_GRID,
+                        imageTypes =
+                            if (imageTypes.isNotEmpty()) {
+                                imageTypes.mapNotNull {
+                                    try {
+                                        ImageType.valueOf(it.uppercase())
+                                    } catch (e: Exception) {
+                                        null
+                                    }
+                                }
+                            } else {
+                                null
+                            },
+                        hasOverview = hasOverview,
+                        enableImages = true,
+                        enableUserData = true,
                     )
-                ) true else if (searchTerm != null) true else null,
-                collapseBoxSetItems = if (includeItemTypes.size == 1 && includeItemTypes.contains("SERIES")) false else null,
-                genres = genres,
-                years = years,
-                isFavorite = isFavorite,
-                isPlayed = isPlayed,
-                filters = filters.ifEmpty { null },
-                nameStartsWith = nameStartsWith,
-                studios = studios.ifEmpty { null },
-                fields = fields ?: FieldSets.LIBRARY_GRID,
-                imageTypes = if (imageTypes.isNotEmpty()) {
-                    imageTypes.mapNotNull {
-                        try {
-                            ImageType.valueOf(it.uppercase())
-                        } catch (e: Exception) {
-                            null
-                        }
-                    }
-                } else {
-                    null
-                },
-                hasOverview = hasOverview,
-                enableImages = true,
-                enableUserData = true
-            )
-            response.content ?: BaseItemDtoQueryResult(
-                items = emptyList(),
-                totalRecordCount = 0,
-                startIndex = 0
-            )
-        } catch (e: ApiClientException) {
-            Timber.e(e, "Failed to get items")
-            BaseItemDtoQueryResult(
-                items = emptyList(),
-                totalRecordCount = 0,
-                startIndex = 0
-            )
-        } catch (e: Exception) {
-            Timber.e(e, "Unexpected error getting items")
-            BaseItemDtoQueryResult(
-                items = emptyList(),
-                totalRecordCount = 0,
-                startIndex = 0
-            )
+                response.content
+                    ?: BaseItemDtoQueryResult(
+                        items = emptyList(),
+                        totalRecordCount = 0,
+                        startIndex = 0,
+                    )
+            } catch (e: ApiClientException) {
+                Timber.e(e, "Failed to get items")
+                BaseItemDtoQueryResult(items = emptyList(), totalRecordCount = 0, startIndex = 0)
+            } catch (e: Exception) {
+                Timber.e(e, "Unexpected error getting items")
+                BaseItemDtoQueryResult(items = emptyList(), totalRecordCount = 0, startIndex = 0)
+            }
         }
-    }
 
-    override suspend fun getItem(
-        itemId: UUID,
-        fields: List<ItemFields>?
-    ): BaseItemDto? = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext null
-            val userId = getCurrentUserId() ?: return@withContext null
-
-            val itemsApi = ItemsApi(apiClient)
-            val response = itemsApi.getItems(
-                userId = userId,
-                ids = listOf(itemId),
-                fields = fields ?: FieldSets.ITEM_DETAIL,
-                enableImages = true,
-                enableUserData = true
-            )
-            response.content?.items?.firstOrNull()
-        } catch (e: ApiClientException) {
-            Timber.e(e, "Failed to get item with id: $itemId")
-            null
-        } catch (e: Exception) {
-            Timber.e(e, "Unexpected error getting item with id: $itemId")
-            null
+    override suspend fun getItem(itemId: UUID, fields: List<ItemFields>?): BaseItemDto? =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext null
+                val userId = getCurrentUserId() ?: return@withContext null
+
+                val itemsApi = ItemsApi(apiClient)
+                val response =
+                    itemsApi.getItems(
+                        userId = userId,
+                        ids = listOf(itemId),
+                        fields = fields ?: FieldSets.ITEM_DETAIL,
+                        enableImages = true,
+                        enableUserData = true,
+                    )
+                response.content?.items?.firstOrNull()
+            } catch (e: ApiClientException) {
+                Timber.e(e, "Failed to get item with id: $itemId")
+                null
+            } catch (e: Exception) {
+                Timber.e(e, "Unexpected error getting item with id: $itemId")
+                null
+            }
         }
-    }
 
     override suspend fun getSimilarItems(
         itemId: UUID,
         limit: Int,
-        fields: List<ItemFields>?
-    ): List<AfinityItem> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
-
-            val libraryApi = LibraryApi(apiClient)
-            val response = libraryApi.getSimilarItems(
-                itemId = itemId,
-                userId = userId,
-                limit = limit,
-                fields = fields ?: FieldSets.SIMILAR_ITEMS,
-            )
-            response.content?.items?.mapNotNull { baseItem ->
-                baseItem.toAfinityItem(getBaseUrl())
-            } ?: emptyList()
-        } catch (e: ApiClientException) {
-            Timber.e(e, "Failed to get similar items")
-            emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Unexpected error getting similar items")
-            emptyList()
+        fields: List<ItemFields>?,
+    ): List<AfinityItem> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
+
+                val libraryApi = LibraryApi(apiClient)
+                val response =
+                    libraryApi.getSimilarItems(
+                        itemId = itemId,
+                        userId = userId,
+                        limit = limit,
+                        fields = fields ?: FieldSets.SIMILAR_ITEMS,
+                    )
+                response.content?.items?.mapNotNull { baseItem ->
+                    baseItem.toAfinityItem(getBaseUrl())
+                } ?: emptyList()
+            } catch (e: ApiClientException) {
+                Timber.e(e, "Failed to get similar items")
+                emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Unexpected error getting similar items")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getMovies(
         parentId: UUID?,
@@ -609,129 +644,141 @@ class JellyfinMediaRepository @Inject constructor(
         isPlayed: Boolean?,
         isFavorite: Boolean?,
         isLiked: Boolean?,
-        fields: List<ItemFields>?
-    ): List<AfinityMovie> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
+        fields: List<ItemFields>?,
+    ): List<AfinityMovie> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
 
-            val itemsApi = ItemsApi(apiClient)
+                val itemsApi = ItemsApi(apiClient)
 
-            val filters = buildList {
-                if (isLiked == true) add(ItemFilter.LIKES)
-            }
+                val filters = buildList { if (isLiked == true) add(ItemFilter.LIKES) }
 
-            val response = itemsApi.getItems(
-                userId = userId,
-                parentId = parentId,
-                includeItemTypes = listOf(BaseItemKind.MOVIE),
-                recursive = true,
-                limit = limit,
-                startIndex = startIndex,
-                searchTerm = searchTerm,
-                sortBy = listOf(sortBy.toJellyfinSortBy()),
-                sortOrder = if (sortDescending) listOf(SortOrder.DESCENDING) else listOf(SortOrder.ASCENDING),
-                isPlayed = isPlayed,
-                isFavorite = isFavorite,
-                filters = filters.ifEmpty { null },
-                fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
-                enableImages = true,
-                enableUserData = true
-            )
+                val response =
+                    itemsApi.getItems(
+                        userId = userId,
+                        parentId = parentId,
+                        includeItemTypes = listOf(BaseItemKind.MOVIE),
+                        recursive = true,
+                        limit = limit,
+                        startIndex = startIndex,
+                        searchTerm = searchTerm,
+                        sortBy = listOf(sortBy.toJellyfinSortBy()),
+                        sortOrder =
+                            if (sortDescending) listOf(SortOrder.DESCENDING)
+                            else listOf(SortOrder.ASCENDING),
+                        isPlayed = isPlayed,
+                        isFavorite = isFavorite,
+                        filters = filters.ifEmpty { null },
+                        fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
+                        enableImages = true,
+                        enableUserData = true,
+                    )
 
-            response.content?.items
-                ?.filter { it.type == BaseItemKind.MOVIE }
-                ?.mapNotNull { baseItem ->
-                    baseItem.toAfinityMovie(getBaseUrl())
-                } ?: emptyList()
-        } catch (e: ApiClientException) {
-            Timber.e(e, "Failed to get movies")
-            emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Unexpected error getting movies")
-            emptyList()
+                response.content
+                    ?.items
+                    ?.filter { it.type == BaseItemKind.MOVIE }
+                    ?.mapNotNull { baseItem -> baseItem.toAfinityMovie(getBaseUrl()) }
+                    ?: emptyList()
+            } catch (e: ApiClientException) {
+                Timber.e(e, "Failed to get movies")
+                emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Unexpected error getting movies")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getMoviesByGenre(
         genre: String,
         parentId: UUID?,
         limit: Int,
         shuffle: Boolean,
-        fields: List<ItemFields>?
-    ): List<AfinityMovie> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
+        fields: List<ItemFields>?,
+    ): List<AfinityMovie> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
 
-            val itemsApi = ItemsApi(apiClient)
+                val itemsApi = ItemsApi(apiClient)
 
-            val response = itemsApi.getItems(
-                userId = userId,
-                parentId = parentId,
-                includeItemTypes = listOf(BaseItemKind.MOVIE),
-                recursive = true,
-                genres = listOf(genre),
-                limit = limit,
-                sortBy = if (shuffle) listOf(ItemSortBy.RANDOM) else listOf(ItemSortBy.SORT_NAME),
-                fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
-                enableImages = true,
-                enableUserData = true
-            )
+                val response =
+                    itemsApi.getItems(
+                        userId = userId,
+                        parentId = parentId,
+                        includeItemTypes = listOf(BaseItemKind.MOVIE),
+                        recursive = true,
+                        genres = listOf(genre),
+                        limit = limit,
+                        sortBy =
+                            if (shuffle) listOf(ItemSortBy.RANDOM)
+                            else listOf(ItemSortBy.SORT_NAME),
+                        fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
+                        enableImages = true,
+                        enableUserData = true,
+                    )
 
-            response.content?.items
-                ?.filter { it.type == BaseItemKind.MOVIE }
-                ?.mapNotNull { baseItem ->
-                    baseItem.toAfinityMovie(getBaseUrl())
-                } ?: emptyList()
-        } catch (e: ApiClientException) {
-            Timber.e(e, "Failed to get movies for genre: $genre")
-            emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Unexpected error getting movies for genre: $genre")
-            emptyList()
+                response.content
+                    ?.items
+                    ?.filter { it.type == BaseItemKind.MOVIE }
+                    ?.mapNotNull { baseItem -> baseItem.toAfinityMovie(getBaseUrl()) }
+                    ?: emptyList()
+            } catch (e: ApiClientException) {
+                Timber.e(e, "Failed to get movies for genre: $genre")
+                emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Unexpected error getting movies for genre: $genre")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getShowsByGenre(
         genre: String,
         parentId: UUID?,
         limit: Int,
         shuffle: Boolean,
-        fields: List<ItemFields>?
-    ): List<AfinityShow> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
+        fields: List<ItemFields>?,
+    ): List<AfinityShow> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
 
-            val itemsApi = ItemsApi(apiClient)
+                val itemsApi = ItemsApi(apiClient)
 
-            val response = itemsApi.getItems(
-                userId = userId,
-                parentId = parentId,
-                includeItemTypes = listOf(BaseItemKind.SERIES),
-                recursive = true,
-                genres = listOf(genre),
-                limit = limit,
-                sortBy = if (shuffle) listOf(ItemSortBy.RANDOM) else listOf(ItemSortBy.SORT_NAME),
-                fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
-                enableImages = true,
-                enableUserData = true
-            )
+                val response =
+                    itemsApi.getItems(
+                        userId = userId,
+                        parentId = parentId,
+                        includeItemTypes = listOf(BaseItemKind.SERIES),
+                        recursive = true,
+                        genres = listOf(genre),
+                        limit = limit,
+                        sortBy =
+                            if (shuffle) listOf(ItemSortBy.RANDOM)
+                            else listOf(ItemSortBy.SORT_NAME),
+                        fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
+                        enableImages = true,
+                        enableUserData = true,
+                    )
 
-            response.content?.items
-                ?.filter { it.type == BaseItemKind.SERIES }
-                ?.mapNotNull { baseItem ->
-                    baseItem.toAfinityShow(getBaseUrl())
-                } ?: emptyList()
-        } catch (e: ApiClientException) {
-            Timber.e(e, "Failed to get shows for genre: $genre")
-            emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Unexpected error getting shows for genre: $genre")
-            emptyList()
+                response.content
+                    ?.items
+                    ?.filter { it.type == BaseItemKind.SERIES }
+                    ?.mapNotNull { baseItem -> baseItem.toAfinityShow(getBaseUrl()) } ?: emptyList()
+            } catch (e: ApiClientException) {
+                Timber.e(e, "Failed to get shows for genre: $genre")
+                emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Unexpected error getting shows for genre: $genre")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getShows(
         parentId: UUID?,
@@ -743,280 +790,299 @@ class JellyfinMediaRepository @Inject constructor(
         isPlayed: Boolean?,
         isFavorite: Boolean?,
         isLiked: Boolean?,
-        fields: List<ItemFields>?
-    ): List<AfinityShow> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
+        fields: List<ItemFields>?,
+    ): List<AfinityShow> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
 
-            val itemsApi = ItemsApi(apiClient)
+                val itemsApi = ItemsApi(apiClient)
 
-            val filters = buildList {
-                if (isLiked == true) add(ItemFilter.LIKES)
-            }
+                val filters = buildList { if (isLiked == true) add(ItemFilter.LIKES) }
 
-            val response = itemsApi.getItems(
-                userId = userId,
-                parentId = parentId,
-                includeItemTypes = listOf(BaseItemKind.SERIES),
-                recursive = true,
-                collapseBoxSetItems = false,
-                limit = limit,
-                startIndex = startIndex,
-                searchTerm = searchTerm,
-                sortBy = listOf(sortBy.toJellyfinSortBy()),
-                sortOrder = if (sortDescending) listOf(SortOrder.DESCENDING) else listOf(SortOrder.ASCENDING),
-                isPlayed = isPlayed,
-                isFavorite = isFavorite,
-                filters = filters.ifEmpty { null },
-                fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
-                enableImages = true,
-                enableUserData = true
-            )
+                val response =
+                    itemsApi.getItems(
+                        userId = userId,
+                        parentId = parentId,
+                        includeItemTypes = listOf(BaseItemKind.SERIES),
+                        recursive = true,
+                        collapseBoxSetItems = false,
+                        limit = limit,
+                        startIndex = startIndex,
+                        searchTerm = searchTerm,
+                        sortBy = listOf(sortBy.toJellyfinSortBy()),
+                        sortOrder =
+                            if (sortDescending) listOf(SortOrder.DESCENDING)
+                            else listOf(SortOrder.ASCENDING),
+                        isPlayed = isPlayed,
+                        isFavorite = isFavorite,
+                        filters = filters.ifEmpty { null },
+                        fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
+                        enableImages = true,
+                        enableUserData = true,
+                    )
 
-            response.content?.items
-                ?.filter { it.type == BaseItemKind.SERIES }
-                ?.mapNotNull { baseItem ->
-                    baseItem.toAfinityShow(getBaseUrl())
-                } ?: emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get shows")
-            emptyList()
+                response.content
+                    ?.items
+                    ?.filter { it.type == BaseItemKind.SERIES }
+                    ?.mapNotNull { baseItem -> baseItem.toAfinityShow(getBaseUrl()) } ?: emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get shows")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getSeasons(
         seriesId: UUID,
-        fields: List<ItemFields>?
-    ): List<AfinitySeason> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
-
-            val itemsApi = ItemsApi(apiClient)
-            val response = itemsApi.getItems(
-                userId = userId,
-                parentId = seriesId,
-                includeItemTypes = listOf(BaseItemKind.SEASON),
-                fields = fields ?: FieldSets.SEASON_DETAIL,
-                enableImages = true,
-                enableUserData = true,
-                sortBy = listOf(ItemSortBy.SORT_NAME)
-            )
-            response.content?.items?.mapNotNull { baseItem ->
-                baseItem.toAfinitySeason(getBaseUrl())
-            } ?: emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get seasons")
-            emptyList()
+        fields: List<ItemFields>?,
+    ): List<AfinitySeason> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
+
+                val itemsApi = ItemsApi(apiClient)
+                val response =
+                    itemsApi.getItems(
+                        userId = userId,
+                        parentId = seriesId,
+                        includeItemTypes = listOf(BaseItemKind.SEASON),
+                        fields = fields ?: FieldSets.SEASON_DETAIL,
+                        enableImages = true,
+                        enableUserData = true,
+                        sortBy = listOf(ItemSortBy.SORT_NAME),
+                    )
+                response.content?.items?.mapNotNull { baseItem ->
+                    baseItem.toAfinitySeason(getBaseUrl())
+                } ?: emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get seasons")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getEpisodes(
         seasonId: UUID,
         seriesId: UUID?,
-        fields: List<ItemFields>?
-    ): List<AfinityEpisode> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
-
-            val actualSeriesId = seriesId ?: run {
-                val seasonItem = getItem(seasonId)
-                seasonItem?.seriesId ?: return@withContext emptyList()
-            }
+        fields: List<ItemFields>?,
+    ): List<AfinityEpisode> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
 
-            val tvShowsApi = TvShowsApi(apiClient)
-            val response = tvShowsApi.getEpisodes(
-                seriesId = actualSeriesId,
-                userId = userId,
-                seasonId = seasonId,
-                isMissing = false,
-                fields = fields ?: FieldSets.EPISODE_LIST,
-                enableImages = true,
-                enableUserData = true,
-                sortBy = ItemSortBy.SORT_NAME
-            )
-            response.content?.items?.mapNotNull { baseItem ->
-                baseItem.toAfinityEpisode(getBaseUrl())
-            } ?: emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get episodes")
-            emptyList()
+                val actualSeriesId =
+                    seriesId
+                        ?: run {
+                            val seasonItem = getItem(seasonId)
+                            seasonItem?.seriesId ?: return@withContext emptyList()
+                        }
+
+                val tvShowsApi = TvShowsApi(apiClient)
+                val response =
+                    tvShowsApi.getEpisodes(
+                        seriesId = actualSeriesId,
+                        userId = userId,
+                        seasonId = seasonId,
+                        isMissing = false,
+                        fields = fields ?: FieldSets.EPISODE_LIST,
+                        enableImages = true,
+                        enableUserData = true,
+                        sortBy = ItemSortBy.SORT_NAME,
+                    )
+                response.content?.items?.mapNotNull { baseItem ->
+                    baseItem.toAfinityEpisode(getBaseUrl())
+                } ?: emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get episodes")
+                emptyList()
+            }
         }
-    }
 
-    override suspend fun getFavoriteMovies(
-        fields: List<ItemFields>?
-    ): List<AfinityMovie> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
-            val itemsApi = ItemsApi(apiClient)
+    override suspend fun getFavoriteMovies(fields: List<ItemFields>?): List<AfinityMovie> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
+                val itemsApi = ItemsApi(apiClient)
 
-            val response = itemsApi.getItems(
-                userId = userId,
-                includeItemTypes = listOf(BaseItemKind.MOVIE),
-                isFavorite = true,
-                recursive = true,
-                fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
-                enableImages = true,
-                enableUserData = true,
-                sortBy = listOf(ItemSortBy.SORT_NAME)
-            )
-            response.content?.items?.mapNotNull { baseItem ->
-                baseItem.toAfinityMovie(getBaseUrl())
-            } ?: emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get favorite episodes")
-            emptyList()
+                val response =
+                    itemsApi.getItems(
+                        userId = userId,
+                        includeItemTypes = listOf(BaseItemKind.MOVIE),
+                        isFavorite = true,
+                        recursive = true,
+                        fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
+                        enableImages = true,
+                        enableUserData = true,
+                        sortBy = listOf(ItemSortBy.SORT_NAME),
+                    )
+                response.content?.items?.mapNotNull { baseItem ->
+                    baseItem.toAfinityMovie(getBaseUrl())
+                } ?: emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get favorite episodes")
+                emptyList()
+            }
         }
-    }
 
-    override suspend fun getFavoriteShows(
-        fields: List<ItemFields>?
-    ): List<AfinityShow> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
-            val itemsApi = ItemsApi(apiClient)
+    override suspend fun getFavoriteShows(fields: List<ItemFields>?): List<AfinityShow> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
+                val itemsApi = ItemsApi(apiClient)
 
-            val response = itemsApi.getItems(
-                userId = userId,
-                includeItemTypes = listOf(BaseItemKind.SERIES),
-                isFavorite = true,
-                recursive = true,
-                fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
-                enableImages = true,
-                enableUserData = true,
-                sortBy = listOf(ItemSortBy.SORT_NAME)
-            )
+                val response =
+                    itemsApi.getItems(
+                        userId = userId,
+                        includeItemTypes = listOf(BaseItemKind.SERIES),
+                        isFavorite = true,
+                        recursive = true,
+                        fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
+                        enableImages = true,
+                        enableUserData = true,
+                        sortBy = listOf(ItemSortBy.SORT_NAME),
+                    )
 
-            response.content?.items?.mapNotNull { baseItem ->
-                baseItem.toAfinityShow(getBaseUrl())
-            } ?: emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get favorite episodes")
-            emptyList()
+                response.content?.items?.mapNotNull { baseItem ->
+                    baseItem.toAfinityShow(getBaseUrl())
+                } ?: emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get favorite episodes")
+                emptyList()
+            }
         }
-    }
 
-    override suspend fun getFavoriteEpisodes(
-        fields: List<ItemFields>?
-    ): List<AfinityEpisode> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
-            val itemsApi = ItemsApi(apiClient)
+    override suspend fun getFavoriteEpisodes(fields: List<ItemFields>?): List<AfinityEpisode> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
+                val itemsApi = ItemsApi(apiClient)
 
-            val response = itemsApi.getItems(
-                userId = userId,
-                includeItemTypes = listOf(BaseItemKind.EPISODE),
-                isFavorite = true,
-                recursive = true,
-                fields = fields ?: FieldSets.EPISODE_LIST,
-                enableImages = true,
-                enableUserData = true,
-                sortBy = listOf(ItemSortBy.SORT_NAME)
-            )
+                val response =
+                    itemsApi.getItems(
+                        userId = userId,
+                        includeItemTypes = listOf(BaseItemKind.EPISODE),
+                        isFavorite = true,
+                        recursive = true,
+                        fields = fields ?: FieldSets.EPISODE_LIST,
+                        enableImages = true,
+                        enableUserData = true,
+                        sortBy = listOf(ItemSortBy.SORT_NAME),
+                    )
 
-            response.content?.items?.mapNotNull { baseItem ->
-                baseItem.toAfinityEpisode(getBaseUrl())
-            } ?: emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get favorite episodes")
-            emptyList()
+                response.content?.items?.mapNotNull { baseItem ->
+                    baseItem.toAfinityEpisode(getBaseUrl())
+                } ?: emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get favorite episodes")
+                emptyList()
+            }
         }
-    }
 
-    override suspend fun getFavoriteSeasons(
-        fields: List<ItemFields>?
-    ): List<AfinitySeason> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
-            val itemsApi = ItemsApi(apiClient)
+    override suspend fun getFavoriteSeasons(fields: List<ItemFields>?): List<AfinitySeason> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
+                val itemsApi = ItemsApi(apiClient)
 
-            val response = itemsApi.getItems(
-                userId = userId,
-                includeItemTypes = listOf(BaseItemKind.SEASON),
-                isFavorite = true,
-                recursive = true,
-                fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
-                enableImages = true,
-                enableUserData = true,
-                sortBy = listOf(ItemSortBy.SORT_NAME)
-            )
-            response.content?.items?.mapNotNull { baseItem ->
-                baseItem.toAfinitySeason(getBaseUrl())
-            } ?: emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get favorite seasons")
-            emptyList()
+                val response =
+                    itemsApi.getItems(
+                        userId = userId,
+                        includeItemTypes = listOf(BaseItemKind.SEASON),
+                        isFavorite = true,
+                        recursive = true,
+                        fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
+                        enableImages = true,
+                        enableUserData = true,
+                        sortBy = listOf(ItemSortBy.SORT_NAME),
+                    )
+                response.content?.items?.mapNotNull { baseItem ->
+                    baseItem.toAfinitySeason(getBaseUrl())
+                } ?: emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get favorite seasons")
+                emptyList()
+            }
         }
-    }
 
-    override suspend fun getFavoriteBoxSets(
-        fields: List<ItemFields>?
-    ): List<AfinityBoxSet> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
-            val itemsApi = ItemsApi(apiClient)
+    override suspend fun getFavoriteBoxSets(fields: List<ItemFields>?): List<AfinityBoxSet> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
+                val itemsApi = ItemsApi(apiClient)
 
-            val response = itemsApi.getItems(
-                userId = userId,
-                includeItemTypes = listOf(BaseItemKind.BOX_SET),
-                isFavorite = true,
-                recursive = true,
-                fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
-                enableImages = true,
-                enableUserData = true,
-                sortBy = listOf(ItemSortBy.SORT_NAME)
-            )
-            response.content?.items?.mapNotNull { baseItem ->
-                baseItem.toAfinityBoxSet(getBaseUrl())
-            } ?: emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get favorite box sets")
-            emptyList()
+                val response =
+                    itemsApi.getItems(
+                        userId = userId,
+                        includeItemTypes = listOf(BaseItemKind.BOX_SET),
+                        isFavorite = true,
+                        recursive = true,
+                        fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
+                        enableImages = true,
+                        enableUserData = true,
+                        sortBy = listOf(ItemSortBy.SORT_NAME),
+                    )
+                response.content?.items?.mapNotNull { baseItem ->
+                    baseItem.toAfinityBoxSet(getBaseUrl())
+                } ?: emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get favorite box sets")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getNextUp(
         seriesId: UUID?,
         limit: Int,
         fields: List<ItemFields>?,
-        enableResumable: Boolean
-    ): List<AfinityEpisode> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
-
-            val tvShowsApi = TvShowsApi(apiClient)
-            val response = tvShowsApi.getNextUp(
-                userId = userId,
-                seriesId = seriesId,
-                limit = limit,
-                fields = fields ?: FieldSets.EPISODE_LIST,
-                enableResumable = enableResumable,
-                enableImages = true,
-                enableUserData = true
-            )
-            val nextUpItems = response.content?.items?.mapNotNull { baseItem ->
-                baseItem.toAfinityEpisode(getBaseUrl())
-            } ?: emptyList()
+        enableResumable: Boolean,
+    ): List<AfinityEpisode> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
 
-            if (seriesId == null) {
-                _nextUp.value = nextUpItems
-            }
+                val tvShowsApi = TvShowsApi(apiClient)
+                val response =
+                    tvShowsApi.getNextUp(
+                        userId = userId,
+                        seriesId = seriesId,
+                        limit = limit,
+                        fields = fields ?: FieldSets.EPISODE_LIST,
+                        enableResumable = enableResumable,
+                        enableImages = true,
+                        enableUserData = true,
+                    )
+                val nextUpItems =
+                    response.content?.items?.mapNotNull { baseItem ->
+                        baseItem.toAfinityEpisode(getBaseUrl())
+                    } ?: emptyList()
 
-            nextUpItems
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get next up")
-            emptyList()
+                if (seriesId == null) {
+                    _nextUp.value = nextUpItems
+                }
+
+                nextUpItems
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get next up")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getSpecialFeatures(itemId: UUID, userId: UUID): List<AfinityItem> =
         withContext(Dispatchers.IO) {
@@ -1024,28 +1090,30 @@ class JellyfinMediaRepository @Inject constructor(
                 val apiClient =
                     sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
                 val userLibraryApi = UserLibraryApi(apiClient)
-                val response = userLibraryApi.getSpecialFeatures(
-                    itemId = itemId,
-                    userId = userId
-                )
+                val response = userLibraryApi.getSpecialFeatures(itemId = itemId, userId = userId)
 
                 Timber.d("Special features API response: ${response.content?.size ?: 0} items")
                 response.content?.forEach { item ->
-                    Timber.d("Special feature: name=${item.name}, type=${item.type}, seriesId=${item.seriesId}, seasonId=${item.seasonId}")
+                    Timber.d(
+                        "Special feature: name=${item.name}, type=${item.type}, seriesId=${item.seriesId}, seasonId=${item.seasonId}"
+                    )
                 }
 
                 response.content?.mapNotNull { baseItem ->
-                    val result = when (baseItem.type) {
-                        BaseItemKind.EPISODE -> baseItem.toAfinityEpisode(getBaseUrl())
-                        BaseItemKind.MOVIE -> baseItem.toAfinityMovie(getBaseUrl())
-                        BaseItemKind.VIDEO -> baseItem.toAfinityVideo(getBaseUrl())
-                        else -> {
-                            Timber.d("Unsupported special feature type: ${baseItem.type}")
-                            null
+                    val result =
+                        when (baseItem.type) {
+                            BaseItemKind.EPISODE -> baseItem.toAfinityEpisode(getBaseUrl())
+                            BaseItemKind.MOVIE -> baseItem.toAfinityMovie(getBaseUrl())
+                            BaseItemKind.VIDEO -> baseItem.toAfinityVideo(getBaseUrl())
+                            else -> {
+                                Timber.d("Unsupported special feature type: ${baseItem.type}")
+                                null
+                            }
                         }
-                    }
                     if (result == null) {
-                        Timber.d("Failed to convert special feature: ${baseItem.name} (${baseItem.type})")
+                        Timber.d(
+                            "Failed to convert special feature: ${baseItem.name} (${baseItem.type})"
+                        )
                     }
                     result
                 } ?: emptyList()
@@ -1059,36 +1127,40 @@ class JellyfinMediaRepository @Inject constructor(
         query: String,
         limit: Int,
         includeItemTypes: List<String>,
-        fields: List<ItemFields>?
-    ): List<AfinityItem> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
-
-            val itemsApi = ItemsApi(apiClient)
-            val response = itemsApi.getItems(
-                userId = userId,
-                searchTerm = query,
-                limit = limit,
-                includeItemTypes = includeItemTypes.mapNotNull {
-                    try {
-                        BaseItemKind.valueOf(it.uppercase())
-                    } catch (e: Exception) {
-                        null
-                    }
-                },
-                fields = fields ?: FieldSets.SEARCH_RESULTS,
-                enableImages = true,
-                enableUserData = true
-            )
-            response.content?.items?.mapNotNull { baseItem ->
-                baseItem.toAfinityItem(getBaseUrl())
-            } ?: emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to search items")
-            emptyList()
+        fields: List<ItemFields>?,
+    ): List<AfinityItem> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
+
+                val itemsApi = ItemsApi(apiClient)
+                val response =
+                    itemsApi.getItems(
+                        userId = userId,
+                        searchTerm = query,
+                        limit = limit,
+                        includeItemTypes =
+                            includeItemTypes.mapNotNull {
+                                try {
+                                    BaseItemKind.valueOf(it.uppercase())
+                                } catch (e: Exception) {
+                                    null
+                                }
+                            },
+                        fields = fields ?: FieldSets.SEARCH_RESULTS,
+                        enableImages = true,
+                        enableUserData = true,
+                    )
+                response.content?.items?.mapNotNull { baseItem ->
+                    baseItem.toAfinityItem(getBaseUrl())
+                } ?: emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to search items")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getPerson(personId: UUID): AfinityPersonDetail? =
         withContext(Dispatchers.IO) {
@@ -1097,10 +1169,7 @@ class JellyfinMediaRepository @Inject constructor(
                 val userId = getCurrentUserId() ?: return@withContext null
 
                 val userLibraryApi = UserLibraryApi(apiClient)
-                val response = userLibraryApi.getItem(
-                    itemId = personId,
-                    userId = userId
-                )
+                val response = userLibraryApi.getItem(itemId = personId, userId = userId)
 
                 response.content?.let { baseItemDto ->
                     AfinityPersonDetail(
@@ -1110,7 +1179,7 @@ class JellyfinMediaRepository @Inject constructor(
                         images = baseItemDto.toAfinityImages(getBaseUrl()),
                         premiereDate = baseItemDto.premiereDate,
                         productionLocations = baseItemDto.productionLocations ?: emptyList(),
-                        externalUrls = baseItemDto.externalUrls?.map { it.toAfinityExternalUrl() }
+                        externalUrls = baseItemDto.externalUrls?.map { it.toAfinityExternalUrl() },
                     )
                 }
             } catch (e: Exception) {
@@ -1122,109 +1191,121 @@ class JellyfinMediaRepository @Inject constructor(
     override suspend fun getPersonItems(
         personId: UUID,
         includeItemTypes: List<String>,
-        fields: List<ItemFields>?
-    ): List<AfinityItem> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
-
-            val itemsApi = ItemsApi(apiClient)
-            val response = itemsApi.getItems(
-                userId = userId,
-                personIds = listOf(personId),
-                includeItemTypes = includeItemTypes.mapNotNull {
-                    try {
-                        BaseItemKind.valueOf(it.uppercase())
-                    } catch (e: Exception) {
-                        null
-                    }
-                },
-                fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
-                enableImages = true,
-                imageTypeLimit = 1,
-                enableImageTypes = listOf(ImageType.PRIMARY),
-                enableUserData = true,
-                recursive = true,
-                limit = 150
-            )
-            response.content?.items?.mapNotNull { baseItem ->
-                baseItem.toAfinityItem(getBaseUrl())
-            } ?: emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get person items for ID: $personId")
-            emptyList()
+        fields: List<ItemFields>?,
+    ): List<AfinityItem> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
+
+                val itemsApi = ItemsApi(apiClient)
+                val response =
+                    itemsApi.getItems(
+                        userId = userId,
+                        personIds = listOf(personId),
+                        includeItemTypes =
+                            includeItemTypes.mapNotNull {
+                                try {
+                                    BaseItemKind.valueOf(it.uppercase())
+                                } catch (e: Exception) {
+                                    null
+                                }
+                            },
+                        fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
+                        enableImages = true,
+                        imageTypeLimit = 1,
+                        enableImageTypes = listOf(ImageType.PRIMARY),
+                        enableUserData = true,
+                        recursive = true,
+                        limit = 150,
+                    )
+                response.content?.items?.mapNotNull { baseItem ->
+                    baseItem.toAfinityItem(getBaseUrl())
+                } ?: emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get person items for ID: $personId")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getMoviesWithPeople(
         startIndex: Int,
         limit: Int,
-        fields: List<ItemFields>?
-    ): List<AfinityMovie> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
-
-            val itemsApi = ItemsApi(apiClient)
-            val response = itemsApi.getItems(
-                userId = userId,
-                includeItemTypes = listOf(BaseItemKind.MOVIE),
-                fields = fields ?: listOf(
-                    ItemFields.PEOPLE,
-                    ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
-                    ItemFields.DATE_CREATED,
-                    ItemFields.OVERVIEW
-                ),
-                startIndex = startIndex,
-                limit = limit,
-                enableImages = true,
-                recursive = true
-            )
+        fields: List<ItemFields>?,
+    ): List<AfinityMovie> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
+
+                val itemsApi = ItemsApi(apiClient)
+                val response =
+                    itemsApi.getItems(
+                        userId = userId,
+                        includeItemTypes = listOf(BaseItemKind.MOVIE),
+                        fields =
+                            fields
+                                ?: listOf(
+                                    ItemFields.PEOPLE,
+                                    ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
+                                    ItemFields.DATE_CREATED,
+                                    ItemFields.OVERVIEW,
+                                ),
+                        startIndex = startIndex,
+                        limit = limit,
+                        enableImages = true,
+                        recursive = true,
+                    )
 
-            response.content?.items?.mapNotNull { baseItem ->
-                baseItem.toAfinityMovie(getBaseUrl())
-            } ?: emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get movies with people at index: $startIndex")
-            emptyList()
+                response.content?.items?.mapNotNull { baseItem ->
+                    baseItem.toAfinityMovie(getBaseUrl())
+                } ?: emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get movies with people at index: $startIndex")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getSimilarMovies(
         movieId: UUID,
         limit: Int,
-        fields: List<ItemFields>?
-    ): List<AfinityMovie> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
-
-            val libraryApi = LibraryApi(apiClient)
-            val response = libraryApi.getSimilarItems(
-                itemId = movieId,
-                userId = userId,
-                limit = limit,
-                fields = fields ?: FieldSets.MEDIA_ITEM_CARDS
-            )
+        fields: List<ItemFields>?,
+    ): List<AfinityMovie> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
 
-            response.content?.items
-                ?.filter { it.id != movieId }
-                ?.mapNotNull { baseItem ->
-                    baseItem.toAfinityMovie(getBaseUrl())
-                }
-                ?.shuffled()
-                ?: emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get similar movies for ID: $movieId")
-            emptyList()
+                val libraryApi = LibraryApi(apiClient)
+                val response =
+                    libraryApi.getSimilarItems(
+                        itemId = movieId,
+                        userId = userId,
+                        limit = limit,
+                        fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
+                    )
+
+                response.content
+                    ?.items
+                    ?.filter { it.id != movieId }
+                    ?.mapNotNull { baseItem -> baseItem.toAfinityMovie(getBaseUrl()) }
+                    ?.shuffled() ?: emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get similar movies for ID: $movieId")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getTrickplayData(itemId: UUID, width: Int, index: Int): ByteArray? =
         withContext(Dispatchers.IO) {
             try {
                 val externalFilesDir = context.getExternalFilesDir(null)
-                Timber.d("Attempting to load trickplay tile: itemId=$itemId, width=$width, index=$index")
+                Timber.d(
+                    "Attempting to load trickplay tile: itemId=$itemId, width=$width, index=$index"
+                )
 
                 if (externalFilesDir != null) {
                     val downloadDir = File(externalFilesDir, "AFinity/Downloads")
@@ -1235,7 +1316,9 @@ class JellyfinMediaRepository @Inject constructor(
                     Timber.d("File exists: ${trickplayFile.exists()}")
 
                     if (trickplayFile.exists()) {
-                        Timber.i("Loading trickplay tile from local storage: $width/$index.jpg (${trickplayFile.length()} bytes)")
+                        Timber.i(
+                            "Loading trickplay tile from local storage: $width/$index.jpg (${trickplayFile.length()} bytes)"
+                        )
                         return@withContext trickplayFile.readBytes()
                     } else {
                         Timber.d("Trickplay file not found locally, trying API")
@@ -1263,171 +1346,184 @@ class JellyfinMediaRepository @Inject constructor(
     override suspend fun getGenres(
         parentId: UUID?,
         limit: Int?,
-        includeItemTypes: List<String>
-    ): List<String> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
-            val genresApi = GenresApi(apiClient)
-
-            val response = genresApi.getGenres(
-                userId = userId,
-                parentId = parentId,
-                limit = limit,
-                sortBy = listOf(ItemSortBy.SORT_NAME),
-                sortOrder = listOf(SortOrder.ASCENDING),
-                enableImages = false,
-                enableTotalRecordCount = false,
-                includeItemTypes = includeItemTypes.mapNotNull {
-                    try {
-                        BaseItemKind.valueOf(it.uppercase())
-                    } catch (e: Exception) {
-                        null
-                    }
-                }
-            )
+        includeItemTypes: List<String>,
+    ): List<String> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
+                val genresApi = GenresApi(apiClient)
 
-            response.content?.items?.mapNotNull { genreDto ->
-                genreDto.name?.takeIf { it.isNotBlank() }
-            } ?: emptyList()
+                val response =
+                    genresApi.getGenres(
+                        userId = userId,
+                        parentId = parentId,
+                        limit = limit,
+                        sortBy = listOf(ItemSortBy.SORT_NAME),
+                        sortOrder = listOf(SortOrder.ASCENDING),
+                        enableImages = false,
+                        enableTotalRecordCount = false,
+                        includeItemTypes =
+                            includeItemTypes.mapNotNull {
+                                try {
+                                    BaseItemKind.valueOf(it.uppercase())
+                                } catch (e: Exception) {
+                                    null
+                                }
+                            },
+                    )
 
-        } catch (e: ApiClientException) {
-            Timber.e(e, "API error getting genres: ${e.message}")
-            emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Unexpected error getting genres")
-            emptyList()
+                response.content?.items?.mapNotNull { genreDto ->
+                    genreDto.name?.takeIf { it.isNotBlank() }
+                } ?: emptyList()
+            } catch (e: ApiClientException) {
+                Timber.e(e, "API error getting genres: ${e.message}")
+                emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Unexpected error getting genres")
+                emptyList()
+            }
         }
-    }
 
     override suspend fun getStudios(
         parentId: UUID?,
         limit: Int?,
-        includeItemTypes: List<String>
-    ): List<AfinityStudio> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
-
-            val librariesResponse = getLibraries()
-            val tvLibraries = librariesResponse.filter { it.type == CollectionType.TvShows }
-
-            if (tvLibraries.isEmpty()) {
-                Timber.d("No TV libraries found")
-                return@withContext emptyList()
-            }
+        includeItemTypes: List<String>,
+    ): List<AfinityStudio> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
 
-            Timber.d("Found ${tvLibraries.size} TV libraries")
+                val librariesResponse = getLibraries()
+                val tvLibraries = librariesResponse.filter { it.type == CollectionType.TvShows }
 
-            val studiosApi = StudiosApi(apiClient)
-            val allStudios = mutableListOf<Triple<UUID, String, Pair<String?, Int>>>()
+                if (tvLibraries.isEmpty()) {
+                    Timber.d("No TV libraries found")
+                    return@withContext emptyList()
+                }
 
-            for (library in tvLibraries) {
-                try {
-                    val response = studiosApi.getStudios(
-                        userId = userId,
-                        parentId = library.id,
-                        includeItemTypes = listOf(BaseItemKind.SERIES),
-                        enableImages = true
-                    )
+                Timber.d("Found ${tvLibraries.size} TV libraries")
 
-                    response.content?.items?.forEach { studioDto ->
-                        val id: UUID = studioDto.id ?: return@forEach
-                        val name: String =
-                            studioDto.name?.takeIf { it.isNotBlank() } ?: return@forEach
-                        val childCount: Int = studioDto.childCount ?: 0
+                val studiosApi = StudiosApi(apiClient)
+                val allStudios = mutableListOf<Triple<UUID, String, Pair<String?, Int>>>()
 
-                        val imageTags: Map<ImageType, String>? = studioDto.imageTags
-                        val thumbImageUrl: String? =
-                            imageTags?.get(ImageType.THUMB)?.let { tag: String ->
-                                "${getBaseUrl()}/Items/$id/Images/Thumb?tag=$tag"
-                            }
+                for (library in tvLibraries) {
+                    try {
+                        val response =
+                            studiosApi.getStudios(
+                                userId = userId,
+                                parentId = library.id,
+                                includeItemTypes = listOf(BaseItemKind.SERIES),
+                                enableImages = true,
+                            )
 
-                        allStudios.add(Triple(id, name, Pair(thumbImageUrl, childCount)))
-                    }
+                        response.content?.items?.forEach { studioDto ->
+                            val id: UUID = studioDto.id ?: return@forEach
+                            val name: String =
+                                studioDto.name?.takeIf { it.isNotBlank() } ?: return@forEach
+                            val childCount: Int = studioDto.childCount ?: 0
+
+                            val imageTags: Map<ImageType, String>? = studioDto.imageTags
+                            val thumbImageUrl: String? =
+                                imageTags?.get(ImageType.THUMB)?.let { tag: String ->
+                                    "${getBaseUrl()}/Items/$id/Images/Thumb?tag=$tag"
+                                }
+
+                            allStudios.add(Triple(id, name, Pair(thumbImageUrl, childCount)))
+                        }
 
-                    Timber.d("Fetched ${response.content?.items?.size ?: 0} studios from library: ${library.name}")
-                } catch (e: Exception) {
-                    Timber.e(e, "Failed to fetch studios from library: ${library.name}")
+                        Timber.d(
+                            "Fetched ${response.content?.items?.size ?: 0} studios from library: ${library.name}"
+                        )
+                    } catch (e: Exception) {
+                        Timber.e(e, "Failed to fetch studios from library: ${library.name}")
+                    }
                 }
-            }
 
-            val uniqueStudios = mutableMapOf<UUID, Triple<String, String?, Int>>()
-            for ((id, name, imageData) in allStudios) {
-                val (thumbUrl, childCount) = imageData
+                val uniqueStudios = mutableMapOf<UUID, Triple<String, String?, Int>>()
+                for ((id, name, imageData) in allStudios) {
+                    val (thumbUrl, childCount) = imageData
 
-                if (uniqueStudios.containsKey(id)) {
-                    val existing = uniqueStudios[id]!!
-                    if (childCount > existing.third) {
+                    if (uniqueStudios.containsKey(id)) {
+                        val existing = uniqueStudios[id]!!
+                        if (childCount > existing.third) {
+                            uniqueStudios[id] = Triple(name, thumbUrl, childCount)
+                        }
+                    } else {
                         uniqueStudios[id] = Triple(name, thumbUrl, childCount)
                     }
-                } else {
-                    uniqueStudios[id] = Triple(name, thumbUrl, childCount)
                 }
-            }
 
-            Timber.d("Deduplicated to ${uniqueStudios.size} unique studios")
+                Timber.d("Deduplicated to ${uniqueStudios.size} unique studios")
 
-            val filteredStudios = uniqueStudios
-                .filter { (_, data) -> data.third >= 5 }
-                .filter { (_, data) -> data.second != null }
+                val filteredStudios =
+                    uniqueStudios
+                        .filter { (_, data) -> data.third >= 5 }
+                        .filter { (_, data) -> data.second != null }
 
-            Timber.d("Filtered to ${filteredStudios.size} studios (min 5 shows, has Thumb)")
-
-            val sortedStudios = filteredStudios
-                .map { (id, data) ->
-                    AfinityStudio(
-                        id = id,
-                        name = data.first,
-                        primaryImageUrl = data.second,
-                        itemCount = data.third
-                    )
-                }
-                .sortedByDescending { it.itemCount }
+                Timber.d("Filtered to ${filteredStudios.size} studios (min 5 shows, has Thumb)")
 
-            sortedStudios.take(limit ?: 15)
+                val sortedStudios =
+                    filteredStudios
+                        .map { (id, data) ->
+                            AfinityStudio(
+                                id = id,
+                                name = data.first,
+                                primaryImageUrl = data.second,
+                                itemCount = data.third,
+                            )
+                        }
+                        .sortedByDescending { it.itemCount }
 
-        } catch (e: ApiClientException) {
-            Timber.e(e, "API error getting studios: ${e.message}")
-            emptyList()
-        } catch (e: Exception) {
-            Timber.e(e, "Unexpected error getting studios")
-            emptyList()
+                sortedStudios.take(limit ?: 15)
+            } catch (e: ApiClientException) {
+                Timber.e(e, "API error getting studios: ${e.message}")
+                emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Unexpected error getting studios")
+                emptyList()
+            }
         }
-    }
 
-    override suspend fun ensureBoxSetCacheBuilt() = withContext(Dispatchers.IO) {
-        try {
-            if (boxSetCache.isEmpty() || boxSetCache.isStale()) {
-                val stats = boxSetCache.getStats()
-                Timber.d("BoxSet cache needs rebuild - Empty: ${stats.isEmpty}, Stale: ${stats.isStale}, Age: ${stats.ageMs}ms")
+    override suspend fun ensureBoxSetCacheBuilt() =
+        withContext(Dispatchers.IO) {
+            try {
+                if (boxSetCache.isEmpty() || boxSetCache.isStale()) {
+                    val stats = boxSetCache.getStats()
+                    Timber.d(
+                        "BoxSet cache needs rebuild - Empty: ${stats.isEmpty}, Stale: ${stats.isStale}, Age: ${stats.ageMs}ms"
+                    )
 
-                boxSetCache.buildCache {
-                    fetchAllBoxSetsWithChildren()
+                    boxSetCache.buildCache { fetchAllBoxSetsWithChildren() }
+                } else {
+                    val stats = boxSetCache.getStats()
+                    Timber.d(
+                        "BoxSet cache is fresh - ${stats.itemCount} items cached, Age: ${stats.ageMs}ms"
+                    )
                 }
-            } else {
-                val stats = boxSetCache.getStats()
-                Timber.d("BoxSet cache is fresh - ${stats.itemCount} items cached, Age: ${stats.ageMs}ms")
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to ensure BoxSet cache is built")
             }
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to ensure BoxSet cache is built")
         }
-    }
 
     private suspend fun fetchAllBoxSetsWithChildren(): List<BoxSetWithChildren> {
         val apiClient = sessionManager.getCurrentApiClient() ?: return emptyList()
         val userId = getCurrentUserId() ?: return emptyList()
         val itemsApi = ItemsApi(apiClient)
 
-        val boxSetsResponse = itemsApi.getItems(
-            userId = userId,
-            includeItemTypes = listOf(BaseItemKind.BOX_SET),
-            recursive = true,
-            fields = listOf(ItemFields.CHILD_COUNT),
-            enableImages = false,
-            enableUserData = false,
-            limit = null
-        )
+        val boxSetsResponse =
+            itemsApi.getItems(
+                userId = userId,
+                includeItemTypes = listOf(BaseItemKind.BOX_SET),
+                recursive = true,
+                fields = listOf(ItemFields.CHILD_COUNT),
+                enableImages = false,
+                enableUserData = false,
+                limit = null,
+            )
 
         val allBoxSets = boxSetsResponse.content?.items ?: emptyList()
         Timber.d("Fetching children for ${allBoxSets.size} BoxSets")
@@ -1436,77 +1532,88 @@ class JellyfinMediaRepository @Inject constructor(
 
         val semaphore = Semaphore(10)
         return coroutineScope {
-            nonEmptyBoxSets.map { boxSetDto ->
-                async {
-                    semaphore.withPermit {
-                        try {
-                            val childrenResponse = itemsApi.getItems(
-                                userId = userId,
-                                parentId = boxSetDto.id,
-                                recursive = false,
-                                fields = emptyList(),
-                                enableImages = false,
-                                enableUserData = false
-                            )
-
-                            val childItemIds =
-                                childrenResponse.content?.items?.mapNotNull { it.id } ?: emptyList()
+            nonEmptyBoxSets
+                .map { boxSetDto ->
+                    async {
+                        semaphore.withPermit {
+                            try {
+                                val childrenResponse =
+                                    itemsApi.getItems(
+                                        userId = userId,
+                                        parentId = boxSetDto.id,
+                                        recursive = false,
+                                        fields = emptyList(),
+                                        enableImages = false,
+                                        enableUserData = false,
+                                    )
 
-                            BoxSetWithChildren(
-                                boxSetId = boxSetDto.id,
-                                childItemIds = childItemIds
-                            )
-                        } catch (e: Exception) {
-                            Timber.w(e, "Failed to fetch children for BoxSet ${boxSetDto.name}")
-                            BoxSetWithChildren(boxSetDto.id, emptyList())
+                                val childItemIds =
+                                    childrenResponse.content?.items?.mapNotNull { it.id }
+                                        ?: emptyList()
+
+                                BoxSetWithChildren(
+                                    boxSetId = boxSetDto.id,
+                                    childItemIds = childItemIds,
+                                )
+                            } catch (e: Exception) {
+                                Timber.w(e, "Failed to fetch children for BoxSet ${boxSetDto.name}")
+                                BoxSetWithChildren(boxSetDto.id, emptyList())
+                            }
                         }
                     }
                 }
-            }.awaitAll()
+                .awaitAll()
         }
     }
 
     override suspend fun getBoxSetsContaining(
         itemId: UUID,
-        fields: List<ItemFields>?
-    ): List<AfinityBoxSet> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            ensureBoxSetCacheBuilt()
+        fields: List<ItemFields>?,
+    ): List<AfinityBoxSet> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                ensureBoxSetCacheBuilt()
 
-            val boxSetIds = boxSetCache.getBoxSetIdsForItem(itemId)
+                val boxSetIds = boxSetCache.getBoxSetIdsForItem(itemId)
 
-            if (boxSetIds.isEmpty()) {
-                Timber.d("Item $itemId is not in any BoxSets (cache lookup)")
-                return@withContext emptyList()
-            }
+                if (boxSetIds.isEmpty()) {
+                    Timber.d("Item $itemId is not in any BoxSets (cache lookup)")
+                    return@withContext emptyList()
+                }
 
-            val userId = getCurrentUserId() ?: return@withContext emptyList()
-            val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-            val itemsApi = ItemsApi(apiClient)
+                val userId = getCurrentUserId() ?: return@withContext emptyList()
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val itemsApi = ItemsApi(apiClient)
 
-            val boxSetsResponse = itemsApi.getItems(
-                userId = userId,
-                ids = boxSetIds,
-                fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
-                enableImages = true,
-                enableUserData = true
-            )
+                val boxSetsResponse =
+                    itemsApi.getItems(
+                        userId = userId,
+                        ids = boxSetIds,
+                        fields = fields ?: FieldSets.MEDIA_ITEM_CARDS,
+                        enableImages = true,
+                        enableUserData = true,
+                    )
 
-            val boxSets = boxSetsResponse.content?.items?.mapNotNull { boxSetDto ->
-                boxSetDto.toAfinityBoxSet(getBaseUrl())
-            } ?: emptyList()
+                val boxSets =
+                    boxSetsResponse.content?.items?.mapNotNull { boxSetDto ->
+                        boxSetDto.toAfinityBoxSet(getBaseUrl())
+                    } ?: emptyList()
 
-            Timber.d("Item $itemId is in ${boxSets.size} BoxSets (cache lookup)")
-            boxSets
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get BoxSets containing item $itemId")
-            emptyList()
+                Timber.d("Item $itemId is in ${boxSets.size} BoxSets (cache lookup)")
+                boxSets
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get BoxSets containing item $itemId")
+                emptyList()
+            }
         }
-    }
 
     override fun getLibrariesFlow(): Flow<List<AfinityCollection>> = libraries
+
     override fun getLatestMediaFlow(parentId: UUID?): Flow<List<AfinityItem>> = latestMedia
+
     override fun getContinueWatchingFlow(): Flow<List<AfinityItem>> = continueWatching
+
     override fun getNextUpFlow(): Flow<List<AfinityEpisode>> = nextUp
 
     private fun SortBy.toJellyfinSortBy(): ItemSortBy {
@@ -1522,4 +1629,4 @@ class JellyfinMediaRepository @Inject constructor(
             SortBy.RANDOM -> ItemSortBy.RANDOM
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/media/MediaRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/media/MediaRepository.kt
index 1b27d116b..93f6007a1 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/media/MediaRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/media/MediaRepository.kt
@@ -11,11 +11,11 @@ import com.makd.afinity.data.models.media.AfinityPersonDetail
 import com.makd.afinity.data.models.media.AfinitySeason
 import com.makd.afinity.data.models.media.AfinityShow
 import com.makd.afinity.data.models.media.AfinityStudio
+import java.util.UUID
 import kotlinx.coroutines.flow.Flow
 import org.jellyfin.sdk.model.api.BaseItemDto
 import org.jellyfin.sdk.model.api.BaseItemDtoQueryResult
 import org.jellyfin.sdk.model.api.ItemFields
-import java.util.UUID
 
 interface MediaRepository {
 
@@ -27,27 +27,28 @@ interface MediaRepository {
     fun getNextUpFlow(): Flow<List<AfinityEpisode>>
 
     suspend fun invalidateContinueWatchingCache()
+
     suspend fun invalidateLatestMediaCache()
+
     suspend fun invalidateNextUpCache()
+
     suspend fun invalidateAllCaches()
+
     suspend fun invalidateItemCache(itemId: UUID)
 
-    suspend fun refreshItemUserData(
-        itemId: UUID,
-        fields: List<ItemFields>? = null
-    ): AfinityItem?
+    suspend fun refreshItemUserData(itemId: UUID, fields: List<ItemFields>? = null): AfinityItem?
 
     suspend fun getLibraries(): List<AfinityCollection>
 
     suspend fun getLatestMedia(
         parentId: UUID? = null,
         limit: Int = 16,
-        fields: List<ItemFields>? = null
+        fields: List<ItemFields>? = null,
     ): List<AfinityItem>
 
     suspend fun getContinueWatching(
         limit: Int = 16,
-        fields: List<ItemFields>? = null
+        fields: List<ItemFields>? = null,
     ): List<AfinityItem>
 
     suspend fun getItems(
@@ -68,18 +69,16 @@ interface MediaRepository {
         fields: List<ItemFields>? = null,
         imageTypes: List<String> = emptyList(),
         hasOverview: Boolean? = null,
-        studios: List<String> = emptyList()
+        studios: List<String> = emptyList(),
     ): BaseItemDtoQueryResult
 
-    suspend fun getItem(
-        itemId: UUID,
-        fields: List<ItemFields>? = null
-    ): BaseItemDto?
+    suspend fun getItem(itemId: UUID, fields: List<ItemFields>? = null): BaseItemDto?
 
     suspend fun getSimilarItems(
         itemId: UUID,
         limit: Int = 12,
-        fields: List<ItemFields>? = null): List<AfinityItem>
+        fields: List<ItemFields>? = null,
+    ): List<AfinityItem>
 
     suspend fun getMovies(
         parentId: UUID? = null,
@@ -91,7 +90,7 @@ interface MediaRepository {
         isPlayed: Boolean? = null,
         isFavorite: Boolean? = null,
         isLiked: Boolean? = null,
-        fields: List<ItemFields>? = null
+        fields: List<ItemFields>? = null,
     ): List<AfinityMovie>
 
     suspend fun getMoviesByGenre(
@@ -99,7 +98,7 @@ interface MediaRepository {
         parentId: UUID? = null,
         limit: Int = 20,
         shuffle: Boolean = true,
-        fields: List<ItemFields>? = null
+        fields: List<ItemFields>? = null,
     ): List<AfinityMovie>
 
     suspend fun getShowsByGenre(
@@ -107,7 +106,7 @@ interface MediaRepository {
         parentId: UUID? = null,
         limit: Int = 20,
         shuffle: Boolean = true,
-        fields: List<ItemFields>? = null
+        fields: List<ItemFields>? = null,
     ): List<AfinityShow>
 
     suspend fun getShows(
@@ -120,39 +119,26 @@ interface MediaRepository {
         isPlayed: Boolean? = null,
         isFavorite: Boolean? = null,
         isLiked: Boolean? = null,
-        fields: List<ItemFields>? = null
+        fields: List<ItemFields>? = null,
     ): List<AfinityShow>
 
-    suspend fun getSeasons(
-        seriesId: UUID,
-        fields: List<ItemFields>? = null
-    ): List<AfinitySeason>
+    suspend fun getSeasons(seriesId: UUID, fields: List<ItemFields>? = null): List<AfinitySeason>
 
     suspend fun getEpisodes(
         seasonId: UUID,
         seriesId: UUID? = null,
-        fields: List<ItemFields>? = null
+        fields: List<ItemFields>? = null,
     ): List<AfinityEpisode>
 
-    suspend fun getFavoriteShows(
-        fields: List<ItemFields>? = null
-    ): List<AfinityShow>
+    suspend fun getFavoriteShows(fields: List<ItemFields>? = null): List<AfinityShow>
 
-    suspend fun getFavoriteMovies(
-        fields: List<ItemFields>? = null
-    ): List<AfinityMovie>
+    suspend fun getFavoriteMovies(fields: List<ItemFields>? = null): List<AfinityMovie>
 
-    suspend fun getFavoriteEpisodes(
-        fields: List<ItemFields>? = null
-    ): List<AfinityEpisode>
+    suspend fun getFavoriteEpisodes(fields: List<ItemFields>? = null): List<AfinityEpisode>
 
-    suspend fun getFavoriteSeasons(
-        fields: List<ItemFields>? = null
-    ): List<AfinitySeason>
+    suspend fun getFavoriteSeasons(fields: List<ItemFields>? = null): List<AfinitySeason>
 
-    suspend fun getFavoriteBoxSets(
-        fields: List<ItemFields>? = null
-    ): List<AfinityBoxSet>
+    suspend fun getFavoriteBoxSets(fields: List<ItemFields>? = null): List<AfinityBoxSet>
 
     suspend fun getGenres(
         parentId: UUID? = null,
@@ -170,45 +156,50 @@ interface MediaRepository {
         seriesId: UUID? = null,
         limit: Int = 16,
         fields: List<ItemFields>? = null,
-        enableResumable: Boolean = true
+        enableResumable: Boolean = true,
     ): List<AfinityEpisode>
 
     suspend fun getSpecialFeatures(itemId: UUID, userId: UUID): List<AfinityItem>
+
     suspend fun getTrickplayData(itemId: UUID, width: Int, index: Int): ByteArray?
+
     suspend fun searchItems(
         query: String,
         limit: Int = 50,
         includeItemTypes: List<String> = emptyList(),
-        fields: List<ItemFields>? = null
+        fields: List<ItemFields>? = null,
     ): List<AfinityItem>
 
     suspend fun getPerson(personId: UUID): AfinityPersonDetail?
+
     suspend fun getPersonItems(
         personId: UUID,
         includeItemTypes: List<String> = emptyList(),
-        fields: List<ItemFields>? = null
+        fields: List<ItemFields>? = null,
     ): List<AfinityItem>
 
     suspend fun getMoviesWithPeople(
         startIndex: Int = 0,
         limit: Int = 500,
-        fields: List<ItemFields>? = null
+        fields: List<ItemFields>? = null,
     ): List<AfinityMovie>
 
     suspend fun getSimilarMovies(
         movieId: UUID,
         limit: Int = 32,
-        fields: List<ItemFields>? = null
+        fields: List<ItemFields>? = null,
     ): List<AfinityMovie>
 
     suspend fun getBoxSetsContaining(
         itemId: UUID,
-        fields: List<ItemFields>? = null
+        fields: List<ItemFields>? = null,
     ): List<AfinityBoxSet>
 
     suspend fun ensureBoxSetCacheBuilt()
 
     fun getLibrariesFlow(): Flow<List<AfinityCollection>>
+
     fun getLatestMediaFlow(parentId: UUID? = null): Flow<List<AfinityItem>>
+
     fun getContinueWatchingFlow(): Flow<List<AfinityItem>>
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/playback/JellyfinPlaybackRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/playback/JellyfinPlaybackRepository.kt
index 3ccb9ca34..9322ffb13 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/playback/JellyfinPlaybackRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/playback/JellyfinPlaybackRepository.kt
@@ -4,6 +4,9 @@ import com.makd.afinity.data.manager.SessionManager
 import com.makd.afinity.data.models.user.AfinityUserDataDto
 import com.makd.afinity.data.repository.DatabaseRepository
 import com.makd.afinity.data.repository.PreferencesRepository
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.jellyfin.sdk.api.client.exception.ApiClientException
@@ -19,15 +22,14 @@ import org.jellyfin.sdk.model.api.RepeatMode
 import org.jellyfin.sdk.model.api.SubtitleDeliveryMethod
 import org.jellyfin.sdk.model.api.SubtitleProfile
 import timber.log.Timber
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @Singleton
-class JellyfinPlaybackRepository @Inject constructor(
+class JellyfinPlaybackRepository
+@Inject
+constructor(
     private val sessionManager: SessionManager,
     private val databaseRepository: DatabaseRepository,
-    private val preferencesRepository: PreferencesRepository
+    private val preferencesRepository: PreferencesRepository,
 ) : PlaybackRepository {
 
     private suspend fun getCurrentUserId(): UUID? {
@@ -40,7 +42,7 @@ class JellyfinPlaybackRepository @Inject constructor(
         maxAudioChannels: Int?,
         audioStreamIndex: Int?,
         subtitleStreamIndex: Int?,
-        mediaSourceId: String?
+        mediaSourceId: String?,
     ): PlaybackInfoDto? {
         return withContext(Dispatchers.IO) {
             try {
@@ -48,46 +50,49 @@ class JellyfinPlaybackRepository @Inject constructor(
                 val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext null
                 val mediaInfoApi = MediaInfoApi(apiClient)
 
-                val deviceProfile = DeviceProfile(
-                    name = "Direct play all",
-                    maxStaticBitrate = maxStreamingBitrate ?: 1_000_000_000,
-                    maxStreamingBitrate = maxStreamingBitrate ?: 1_000_000_000,
-                    codecProfiles = emptyList(),
-                    containerProfiles = emptyList(),
-                    directPlayProfiles = emptyList(),
-                    transcodingProfiles = emptyList(),
-                    subtitleProfiles = listOf(
-                        SubtitleProfile("srt", SubtitleDeliveryMethod.EXTERNAL),
-                        SubtitleProfile("ass", SubtitleDeliveryMethod.EXTERNAL),
-                        SubtitleProfile("vtt", SubtitleDeliveryMethod.EXTERNAL),
-                        SubtitleProfile("sub", SubtitleDeliveryMethod.EXTERNAL),
-                        SubtitleProfile("idx", SubtitleDeliveryMethod.EXTERNAL)
-                    ),
+                val deviceProfile =
+                    DeviceProfile(
+                        name = "Direct play all",
+                        maxStaticBitrate = maxStreamingBitrate ?: 1_000_000_000,
+                        maxStreamingBitrate = maxStreamingBitrate ?: 1_000_000_000,
+                        codecProfiles = emptyList(),
+                        containerProfiles = emptyList(),
+                        directPlayProfiles = emptyList(),
+                        transcodingProfiles = emptyList(),
+                        subtitleProfiles =
+                            listOf(
+                                SubtitleProfile("srt", SubtitleDeliveryMethod.EXTERNAL),
+                                SubtitleProfile("ass", SubtitleDeliveryMethod.EXTERNAL),
+                                SubtitleProfile("vtt", SubtitleDeliveryMethod.EXTERNAL),
+                                SubtitleProfile("sub", SubtitleDeliveryMethod.EXTERNAL),
+                                SubtitleProfile("idx", SubtitleDeliveryMethod.EXTERNAL),
+                            ),
+                    )
+
+                val playbackInfoDto =
+                    PlaybackInfoDto(
+                        userId = userId,
+                        maxStreamingBitrate = maxStreamingBitrate,
+                        startTimeTicks = 0L,
+                        audioStreamIndex = audioStreamIndex,
+                        subtitleStreamIndex = subtitleStreamIndex,
+                        maxAudioChannels = maxAudioChannels,
+                        mediaSourceId = mediaSourceId,
+                        deviceProfile = deviceProfile,
+                        enableDirectPlay = true,
+                        enableDirectStream = true,
+                        enableTranscoding = true,
+                        allowVideoStreamCopy = true,
+                        allowAudioStreamCopy = true,
+                    )
+
+                val response =
+                    mediaInfoApi.getPostedPlaybackInfo(itemId = itemId, data = playbackInfoDto)
+
+                Timber.d(
+                    "Got playback info response with ${response.content.mediaSources?.size ?: 0} media sources"
                 )
 
-                val playbackInfoDto = PlaybackInfoDto(
-                    userId = userId,
-                    maxStreamingBitrate = maxStreamingBitrate,
-                    startTimeTicks = 0L,
-                    audioStreamIndex = audioStreamIndex,
-                    subtitleStreamIndex = subtitleStreamIndex,
-                    maxAudioChannels = maxAudioChannels,
-                    mediaSourceId = mediaSourceId,
-                    deviceProfile = deviceProfile,
-                    enableDirectPlay = true,
-                    enableDirectStream = true,
-                    enableTranscoding = true,
-                    allowVideoStreamCopy = true,
-                    allowAudioStreamCopy = true
-                )
-
-                val response = mediaInfoApi.getPostedPlaybackInfo(
-                    itemId = itemId,
-                    data = playbackInfoDto
-                )
-
-                Timber.d("Got playback info response with ${response.content.mediaSources?.size ?: 0} media sources")
-
                 playbackInfoDto
             } catch (e: ApiClientException) {
                 Timber.e(e, "Failed to get playback info for item: $itemId")
@@ -99,60 +104,63 @@ class JellyfinPlaybackRepository @Inject constructor(
         }
     }
 
-
     override suspend fun getMediaSources(
         itemId: UUID,
         maxStreamingBitrate: Int?,
         maxAudioChannels: Int?,
         audioStreamIndex: Int?,
         subtitleStreamIndex: Int?,
-        mediaSourceId: String?
+        mediaSourceId: String?,
     ): List<MediaSourceInfo> {
         return withContext(Dispatchers.IO) {
             try {
                 val userId = getCurrentUserId() ?: return@withContext emptyList()
-                val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
                 val mediaInfoApi = MediaInfoApi(apiClient)
 
-                val deviceProfile = DeviceProfile(
-                    name = "Direct play all",
-                    maxStaticBitrate = maxStreamingBitrate ?: 1_000_000_000,
-                    maxStreamingBitrate = maxStreamingBitrate ?: 1_000_000_000,
-                    codecProfiles = emptyList(),
-                    containerProfiles = emptyList(),
-                    directPlayProfiles = emptyList(),
-                    transcodingProfiles = emptyList(),
-                    subtitleProfiles = listOf(
-                        SubtitleProfile("srt", SubtitleDeliveryMethod.EXTERNAL),
-                        SubtitleProfile("ass", SubtitleDeliveryMethod.EXTERNAL),
-                        SubtitleProfile("vtt", SubtitleDeliveryMethod.EXTERNAL),
-                        SubtitleProfile("sub", SubtitleDeliveryMethod.EXTERNAL),
-                        SubtitleProfile("idx", SubtitleDeliveryMethod.EXTERNAL)
-                    ),
-                )
-
-                val playbackInfoDto = PlaybackInfoDto(
-                    userId = userId,
-                    maxStreamingBitrate = maxStreamingBitrate,
-                    startTimeTicks = 0L,
-                    audioStreamIndex = audioStreamIndex,
-                    subtitleStreamIndex = subtitleStreamIndex,
-                    maxAudioChannels = maxAudioChannels,
-                    mediaSourceId = mediaSourceId,
-                    deviceProfile = deviceProfile,
-                    enableDirectPlay = true,
-                    enableDirectStream = true,
-                    enableTranscoding = true,
-                    allowVideoStreamCopy = true,
-                    allowAudioStreamCopy = true
+                val deviceProfile =
+                    DeviceProfile(
+                        name = "Direct play all",
+                        maxStaticBitrate = maxStreamingBitrate ?: 1_000_000_000,
+                        maxStreamingBitrate = maxStreamingBitrate ?: 1_000_000_000,
+                        codecProfiles = emptyList(),
+                        containerProfiles = emptyList(),
+                        directPlayProfiles = emptyList(),
+                        transcodingProfiles = emptyList(),
+                        subtitleProfiles =
+                            listOf(
+                                SubtitleProfile("srt", SubtitleDeliveryMethod.EXTERNAL),
+                                SubtitleProfile("ass", SubtitleDeliveryMethod.EXTERNAL),
+                                SubtitleProfile("vtt", SubtitleDeliveryMethod.EXTERNAL),
+                                SubtitleProfile("sub", SubtitleDeliveryMethod.EXTERNAL),
+                                SubtitleProfile("idx", SubtitleDeliveryMethod.EXTERNAL),
+                            ),
+                    )
+
+                val playbackInfoDto =
+                    PlaybackInfoDto(
+                        userId = userId,
+                        maxStreamingBitrate = maxStreamingBitrate,
+                        startTimeTicks = 0L,
+                        audioStreamIndex = audioStreamIndex,
+                        subtitleStreamIndex = subtitleStreamIndex,
+                        maxAudioChannels = maxAudioChannels,
+                        mediaSourceId = mediaSourceId,
+                        deviceProfile = deviceProfile,
+                        enableDirectPlay = true,
+                        enableDirectStream = true,
+                        enableTranscoding = true,
+                        allowVideoStreamCopy = true,
+                        allowAudioStreamCopy = true,
+                    )
+
+                val response =
+                    mediaInfoApi.getPostedPlaybackInfo(itemId = itemId, data = playbackInfoDto)
+
+                Timber.d(
+                    "Got ${response.content.mediaSources?.size ?: 0} media sources for item: $itemId"
                 )
-
-                val response = mediaInfoApi.getPostedPlaybackInfo(
-                    itemId = itemId,
-                    data = playbackInfoDto
-                )
-
-                Timber.d("Got ${response.content.mediaSources?.size ?: 0} media sources for item: $itemId")
                 response.content.mediaSources ?: emptyList()
             } catch (e: Exception) {
                 Timber.e(e, "Failed to get media sources for item: $itemId")
@@ -168,28 +176,31 @@ class JellyfinPlaybackRepository @Inject constructor(
         subtitleStreamIndex: Int?,
         videoStreamIndex: Int?,
         maxStreamingBitrate: Int?,
-        startTimeTicks: Long?
+        startTimeTicks: Long?,
     ): String? {
         return withContext(Dispatchers.IO) {
             try {
                 val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext null
                 val videosApi = VideosApi(apiClient)
 
-                val streamUrl = videosApi.getVideoStreamUrl(
-                    itemId = itemId,
-                    static = true,
-                    mediaSourceId = mediaSourceId,
-                    audioStreamIndex = audioStreamIndex,
-                    subtitleStreamIndex = subtitleStreamIndex,
-                    videoStreamIndex = videoStreamIndex,
-                    startTimeTicks = null
-                )
+                val streamUrl =
+                    videosApi.getVideoStreamUrl(
+                        itemId = itemId,
+                        static = true,
+                        mediaSourceId = mediaSourceId,
+                        audioStreamIndex = audioStreamIndex,
+                        subtitleStreamIndex = subtitleStreamIndex,
+                        videoStreamIndex = videoStreamIndex,
+                        startTimeTicks = null,
+                    )
 
                 Timber.d("Generated stream URL: $streamUrl")
                 streamUrl
-
             } catch (e: ApiClientException) {
-                Timber.e(e, "Failed to get stream URL for item: $itemId, mediaSource: $mediaSourceId")
+                Timber.e(
+                    e,
+                    "Failed to get stream URL for item: $itemId, mediaSource: $mediaSourceId",
+                )
                 null
             } catch (e: Exception) {
                 Timber.e(e, "Unexpected error getting stream URL for item: $itemId")
@@ -205,7 +216,7 @@ class JellyfinPlaybackRepository @Inject constructor(
         audioStreamIndex: Int?,
         subtitleStreamIndex: Int?,
         playMethod: String,
-        canSeek: Boolean
+        canSeek: Boolean,
     ): Boolean {
         return withContext(Dispatchers.IO) {
             try {
@@ -219,7 +230,7 @@ class JellyfinPlaybackRepository @Inject constructor(
                     subtitleStreamIndex = subtitleStreamIndex,
                     PlayMethod.fromName(playMethod),
                     playSessionId = sessionId,
-                    canSeek = canSeek
+                    canSeek = canSeek,
                 )
                 true
             } catch (e: ApiClientException) {
@@ -242,7 +253,7 @@ class JellyfinPlaybackRepository @Inject constructor(
         audioStreamIndex: Int?,
         subtitleStreamIndex: Int?,
         playMethod: String,
-        repeatMode: String
+        repeatMode: String,
     ): Boolean {
         return withContext(Dispatchers.IO) {
             try {
@@ -259,7 +270,7 @@ class JellyfinPlaybackRepository @Inject constructor(
                     playSessionId = sessionId,
                     repeatMode = RepeatMode.fromName(repeatMode),
                     isPaused = isPaused,
-                    isMuted = isMuted
+                    isMuted = isMuted,
                 )
                 true
             } catch (e: ApiClientException) {
@@ -267,7 +278,10 @@ class JellyfinPlaybackRepository @Inject constructor(
                 savePlaybackProgressLocally(itemId, positionTicks)
                 false
             } catch (e: Exception) {
-                Timber.e(e, "Unexpected error reporting playback progress for item: $itemId, saving locally")
+                Timber.e(
+                    e,
+                    "Unexpected error reporting playback progress for item: $itemId, saving locally",
+                )
                 savePlaybackProgressLocally(itemId, positionTicks)
                 false
             }
@@ -280,7 +294,7 @@ class JellyfinPlaybackRepository @Inject constructor(
         positionTicks: Long,
         mediaSourceId: String,
         nextMediaType: String?,
-        playlistItemId: String?
+        playlistItemId: String?,
     ): Boolean {
         return withContext(Dispatchers.IO) {
             try {
@@ -292,7 +306,7 @@ class JellyfinPlaybackRepository @Inject constructor(
                     mediaSourceId = mediaSourceId,
                     nextMediaType = nextMediaType,
                     positionTicks = positionTicks,
-                    playSessionId = sessionId
+                    playSessionId = sessionId,
                 )
                 true
             } catch (e: ApiClientException) {
@@ -300,7 +314,10 @@ class JellyfinPlaybackRepository @Inject constructor(
                 savePlaybackProgressLocally(itemId, positionTicks)
                 false
             } catch (e: Exception) {
-                Timber.e(e, "Unexpected error reporting playback stop for item: $itemId, saving locally")
+                Timber.e(
+                    e,
+                    "Unexpected error reporting playback stop for item: $itemId, saving locally",
+                )
                 savePlaybackProgressLocally(itemId, positionTicks)
                 false
             }
@@ -309,17 +326,22 @@ class JellyfinPlaybackRepository @Inject constructor(
 
     private suspend fun savePlaybackProgressLocally(itemId: UUID, positionTicks: Long) {
         try {
-            val userIdString = preferencesRepository.getCurrentUserId() ?: run {
-                Timber.w("Cannot save playback progress locally: no current user ID in preferences")
-                return
-            }
+            val userIdString =
+                preferencesRepository.getCurrentUserId()
+                    ?: run {
+                        Timber.w(
+                            "Cannot save playback progress locally: no current user ID in preferences"
+                        )
+                        return
+                    }
 
-            val userId = try {
-                UUID.fromString(userIdString)
-            } catch (e: IllegalArgumentException) {
-                Timber.w("Cannot save playback progress locally: invalid user ID format")
-                return
-            }
+            val userId =
+                try {
+                    UUID.fromString(userIdString)
+                } catch (e: IllegalArgumentException) {
+                    Timber.w("Cannot save playback progress locally: invalid user ID format")
+                    return
+                }
 
             val serverId = sessionManager.currentSession.value?.serverId
             if (serverId == null) {
@@ -329,18 +351,21 @@ class JellyfinPlaybackRepository @Inject constructor(
 
             val existingData = databaseRepository.getUserData(userId, itemId)
 
-            val updatedData = AfinityUserDataDto(
-                userId = userId,
-                itemId = itemId,
-                serverId = serverId,
-                played = existingData?.played ?: false,
-                favorite = existingData?.favorite ?: false,
-                playbackPositionTicks = positionTicks,
-                toBeSynced = true
-            )
+            val updatedData =
+                AfinityUserDataDto(
+                    userId = userId,
+                    itemId = itemId,
+                    serverId = serverId,
+                    played = existingData?.played ?: false,
+                    favorite = existingData?.favorite ?: false,
+                    playbackPositionTicks = positionTicks,
+                    toBeSynced = true,
+                )
 
             databaseRepository.insertUserData(updatedData)
-            Timber.i("Saved playback progress locally for item $itemId: ${positionTicks / 10000}ms (will sync when online)")
+            Timber.i(
+                "Saved playback progress locally for item $itemId: ${positionTicks / 10000}ms (will sync when online)"
+            )
         } catch (e: Exception) {
             Timber.e(e, "Failed to save playback progress locally for item: $itemId")
         }
@@ -369,9 +394,9 @@ class JellyfinPlaybackRepository @Inject constructor(
                 val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext null
                 val sessionApi = SessionApi(apiClient)
                 val response = sessionApi.getSessions()
-                response.content?.firstOrNull { session ->
-                    session.deviceId == apiClient.deviceInfo?.id
-                }?.id
+                response.content
+                    ?.firstOrNull { session -> session.deviceId == apiClient.deviceInfo?.id }
+                    ?.id
             } catch (e: ApiClientException) {
                 Timber.e(e, "Failed to get active session")
                 null
@@ -471,4 +496,4 @@ class JellyfinPlaybackRepository @Inject constructor(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/playback/PlaybackRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/playback/PlaybackRepository.kt
index 56145adaf..d9989fff1 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/playback/PlaybackRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/playback/PlaybackRepository.kt
@@ -1,7 +1,7 @@
 package com.makd.afinity.data.repository.playback
 
-import org.jellyfin.sdk.model.api.PlaybackInfoDto
 import java.util.UUID
+import org.jellyfin.sdk.model.api.PlaybackInfoDto
 
 interface PlaybackRepository {
 
@@ -11,7 +11,7 @@ interface PlaybackRepository {
         maxAudioChannels: Int? = null,
         audioStreamIndex: Int? = null,
         subtitleStreamIndex: Int? = null,
-        mediaSourceId: String? = null
+        mediaSourceId: String? = null,
     ): PlaybackInfoDto?
 
     suspend fun getStreamUrl(
@@ -21,7 +21,7 @@ interface PlaybackRepository {
         subtitleStreamIndex: Int? = null,
         videoStreamIndex: Int? = null,
         maxStreamingBitrate: Int? = null,
-        startTimeTicks: Long? = null
+        startTimeTicks: Long? = null,
     ): String?
 
     suspend fun getMediaSources(
@@ -30,7 +30,7 @@ interface PlaybackRepository {
         maxAudioChannels: Int? = null,
         audioStreamIndex: Int? = null,
         subtitleStreamIndex: Int? = null,
-        mediaSourceId: String? = null
+        mediaSourceId: String? = null,
     ): List<org.jellyfin.sdk.model.api.MediaSourceInfo>
 
     suspend fun reportPlaybackStart(
@@ -40,7 +40,7 @@ interface PlaybackRepository {
         audioStreamIndex: Int? = null,
         subtitleStreamIndex: Int? = null,
         playMethod: String = "DirectPlay",
-        canSeek: Boolean = true
+        canSeek: Boolean = true,
     ): Boolean
 
     suspend fun reportPlaybackProgress(
@@ -53,7 +53,7 @@ interface PlaybackRepository {
         audioStreamIndex: Int? = null,
         subtitleStreamIndex: Int? = null,
         playMethod: String = "DirectPlay",
-        repeatMode: String = "RepeatNone"
+        repeatMode: String = "RepeatNone",
     ): Boolean
 
     suspend fun reportPlaybackStop(
@@ -62,16 +62,20 @@ interface PlaybackRepository {
         positionTicks: Long,
         mediaSourceId: String,
         nextMediaType: String? = null,
-        playlistItemId: String? = null
+        playlistItemId: String? = null,
     ): Boolean
 
     suspend fun pingSession(sessionId: String): Boolean
+
     suspend fun getActiveSession(): String?
+
     suspend fun endSession(sessionId: String): Boolean
 
     suspend fun stopTranscoding(deviceId: String): Boolean
+
     suspend fun getTranscodingJob(deviceId: String): Any?
 
     suspend fun getBitrateTestBytes(size: Int): ByteArray?
+
     suspend fun detectMaxBitrate(): Int?
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/segments/JellyfinSegmentsRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/segments/JellyfinSegmentsRepository.kt
index ac26025d9..c23745116 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/segments/JellyfinSegmentsRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/segments/JellyfinSegmentsRepository.kt
@@ -4,68 +4,82 @@ import com.makd.afinity.data.manager.SessionManager
 import com.makd.afinity.data.models.media.AfinitySegment
 import com.makd.afinity.data.models.media.toAfinitySegment
 import com.makd.afinity.data.repository.DatabaseRepository
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.jellyfin.sdk.api.operations.MediaSegmentsApi
 import timber.log.Timber
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @Singleton
-class JellyfinSegmentsRepository @Inject constructor(
+class JellyfinSegmentsRepository
+@Inject
+constructor(
     private val sessionManager: SessionManager,
-    private val databaseRepository: DatabaseRepository
+    private val databaseRepository: DatabaseRepository,
 ) : SegmentsRepository {
 
-    override suspend fun getSegments(itemId: UUID): List<AfinitySegment> = withContext(Dispatchers.IO) {
-        return@withContext try {
-            Timber.d("Checking database for cached segments for item $itemId")
-            val cachedSegments = databaseRepository.getSegmentsForItem(itemId)
-            if (cachedSegments.isNotEmpty()) {
-                Timber.i("Loaded ${cachedSegments.size} segments from database for item $itemId")
-                return@withContext cachedSegments
-            }
+    override suspend fun getSegments(itemId: UUID): List<AfinitySegment> =
+        withContext(Dispatchers.IO) {
+            return@withContext try {
+                Timber.d("Checking database for cached segments for item $itemId")
+                val cachedSegments = databaseRepository.getSegmentsForItem(itemId)
+                if (cachedSegments.isNotEmpty()) {
+                    Timber.i(
+                        "Loaded ${cachedSegments.size} segments from database for item $itemId"
+                    )
+                    return@withContext cachedSegments
+                }
 
-            Timber.d("No cached segments found in database, fetching from API")
+                Timber.d("No cached segments found in database, fetching from API")
 
-            try {
-                val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
-                val mediaSegmentsApi = MediaSegmentsApi(apiClient)
-                val response = mediaSegmentsApi.getItemSegments(itemId)
+                try {
+                    val apiClient =
+                        sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                    val mediaSegmentsApi = MediaSegmentsApi(apiClient)
+                    val response = mediaSegmentsApi.getItemSegments(itemId)
 
-                val segments = response.content?.items?.map { mediaSegmentDto ->
-                    mediaSegmentDto.toAfinitySegment()
-                } ?: emptyList()
+                    val segments =
+                        response.content?.items?.map { mediaSegmentDto ->
+                            mediaSegmentDto.toAfinitySegment()
+                        } ?: emptyList()
 
-                Timber.d("Fetched ${segments.size} segments from API for item $itemId")
+                    Timber.d("Fetched ${segments.size} segments from API for item $itemId")
 
-                if (segments.isNotEmpty()) {
-                    segments.forEach { segment ->
-                        try {
-                            Timber.d("Caching segment ${segment.type} (${segment.startTicks}-${segment.endTicks}) for item $itemId")
-                            databaseRepository.insertSegment(segment, itemId)
-                            Timber.d("Successfully cached segment ${segment.type}")
-                        } catch (e: Exception) {
-                            Timber.w(e, "Failed to cache segment ${segment.type} in database")
+                    if (segments.isNotEmpty()) {
+                        segments.forEach { segment ->
+                            try {
+                                Timber.d(
+                                    "Caching segment ${segment.type} (${segment.startTicks}-${segment.endTicks}) for item $itemId"
+                                )
+                                databaseRepository.insertSegment(segment, itemId)
+                                Timber.d("Successfully cached segment ${segment.type}")
+                            } catch (e: Exception) {
+                                Timber.w(e, "Failed to cache segment ${segment.type} in database")
+                            }
                         }
                     }
-                }
 
-                segments
-            } catch (e: Exception) {
-                Timber.w(e, "API fetch failed, checking database again in case segments were cached")
-                val fallbackSegments = databaseRepository.getSegmentsForItem(itemId)
-                if (fallbackSegments.isNotEmpty()) {
-                    Timber.i("Loaded ${fallbackSegments.size} segments from database after API failure")
-                } else {
-                    Timber.d("No segments available offline for item $itemId")
+                    segments
+                } catch (e: Exception) {
+                    Timber.w(
+                        e,
+                        "API fetch failed, checking database again in case segments were cached",
+                    )
+                    val fallbackSegments = databaseRepository.getSegmentsForItem(itemId)
+                    if (fallbackSegments.isNotEmpty()) {
+                        Timber.i(
+                            "Loaded ${fallbackSegments.size} segments from database after API failure"
+                        )
+                    } else {
+                        Timber.d("No segments available offline for item $itemId")
+                    }
+                    fallbackSegments
                 }
-                fallbackSegments
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to get segments for item $itemId")
+                emptyList()
             }
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get segments for item $itemId")
-            emptyList()
         }
-    }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/segments/SegmentsRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/segments/SegmentsRepository.kt
index adcd8fc5e..3b63ac826 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/segments/SegmentsRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/segments/SegmentsRepository.kt
@@ -5,4 +5,4 @@ import java.util.UUID
 
 interface SegmentsRepository {
     suspend fun getSegments(itemId: UUID): List<AfinitySegment>
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/server/JellyfinServerRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/server/JellyfinServerRepository.kt
index 140b9a5fa..1520d9077 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/server/JellyfinServerRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/server/JellyfinServerRepository.kt
@@ -3,6 +3,10 @@ package com.makd.afinity.data.repository.server
 import com.makd.afinity.data.manager.SessionManager
 import com.makd.afinity.data.models.server.Server
 import com.makd.afinity.data.repository.DatabaseRepository
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Provider
+import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -19,17 +23,15 @@ import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.exception.ApiClientException
 import org.jellyfin.sdk.api.operations.SystemApi
 import timber.log.Timber
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Provider
-import javax.inject.Singleton
 
 @Singleton
-class JellyfinServerRepository @Inject constructor(
+class JellyfinServerRepository
+@Inject
+constructor(
     private val jellyfin: Jellyfin,
     private val apiClient: ApiClient,
     private val sessionManagerProvider: Provider<SessionManager>,
-    private val databaseRepository: DatabaseRepository
+    private val databaseRepository: DatabaseRepository,
 ) : ServerRepository {
 
     private val sessionManager: SessionManager
@@ -56,9 +58,13 @@ class JellyfinServerRepository @Inject constructor(
                             _currentServer.value = server
                             _currentBaseUrl.value = server.address
                             _isConnected.value = true
-                            Timber.d("JellyfinServerRepository: Updated current server to ${server.name} (${server.id})")
+                            Timber.d(
+                                "JellyfinServerRepository: Updated current server to ${server.name} (${server.id})"
+                            )
                         } else {
-                            Timber.w("JellyfinServerRepository: Session changed but server ${session.serverId} not found in database")
+                            Timber.w(
+                                "JellyfinServerRepository: Session changed but server ${session.serverId} not found in database"
+                            )
                         }
                     } catch (e: Exception) {
                         Timber.e(e, "JellyfinServerRepository: Failed to load server for session")
@@ -96,23 +102,20 @@ class JellyfinServerRepository @Inject constructor(
             val discoveredServers = mutableListOf<Server>()
 
             withTimeoutOrNull(5000) {
-                jellyfin.discovery.discoverLocalServers(
-                    timeout = 3000,
-                    maxServers = 10
-                ).collect { serverInfo ->
+                jellyfin.discovery.discoverLocalServers(timeout = 3000, maxServers = 10).collect {
+                    serverInfo ->
                     Timber.d("Discovered server: ${serverInfo.name} at ${serverInfo.address}")
 
-                    val server = Server(
-                        id = serverInfo.id ?: UUID.randomUUID().toString(),
-                        name = serverInfo.name ?: "Jellyfin Server",
-                        version = null,
-                        address = serverInfo.address ?: ""
-                    )
+                    val server =
+                        Server(
+                            id = serverInfo.id ?: UUID.randomUUID().toString(),
+                            name = serverInfo.name ?: "Jellyfin Server",
+                            version = null,
+                            address = serverInfo.address ?: "",
+                        )
                     discoveredServers.add(server)
                 }
-            } ?: run {
-                Timber.w("Server discovery timed out after 5 seconds")
-            }
+            } ?: run { Timber.w("Server discovery timed out after 5 seconds") }
 
             Timber.d("Discovered ${discoveredServers.size} local servers")
             discoveredServers
@@ -127,18 +130,17 @@ class JellyfinServerRepository @Inject constructor(
             val discoveredServers = mutableListOf<Server>()
             emit(emptyList())
 
-            jellyfin.discovery.discoverLocalServers(
-                timeout = 5000,
-                maxServers = 10
-            ).collect { serverInfo ->
+            jellyfin.discovery.discoverLocalServers(timeout = 5000, maxServers = 10).collect {
+                serverInfo ->
                 Timber.d("Discovered server: ${serverInfo.name} at ${serverInfo.address}")
 
-                val server = Server(
-                    id = serverInfo.id ?: UUID.randomUUID().toString(),
-                    name = serverInfo.name ?: "Jellyfin Server",
-                    version = null,
-                    address = serverInfo.address ?: ""
-                )
+                val server =
+                    Server(
+                        id = serverInfo.id ?: UUID.randomUUID().toString(),
+                        name = serverInfo.name ?: "Jellyfin Server",
+                        version = null,
+                        address = serverInfo.address ?: "",
+                    )
                 discoveredServers.add(server)
                 emit(discoveredServers.toList())
             }
@@ -166,12 +168,13 @@ class JellyfinServerRepository @Inject constructor(
                     val systemInfo = response.content
 
                     if (systemInfo != null) {
-                        val server = Server(
-                            id = systemInfo.id ?: UUID.randomUUID().toString(),
-                            name = systemInfo.serverName ?: "Jellyfin Server",
-                            version = systemInfo.version,
-                            address = serverAddress
-                        )
+                        val server =
+                            Server(
+                                id = systemInfo.id ?: UUID.randomUUID().toString(),
+                                name = systemInfo.serverName ?: "Jellyfin Server",
+                                version = systemInfo.version,
+                                address = serverAddress,
+                            )
 
                         apiClient.update(baseUrl = originalUrl)
                         _currentBaseUrl.value = originalUrl
@@ -182,7 +185,7 @@ class JellyfinServerRepository @Inject constructor(
                             server = server,
                             serverAddress = serverAddress,
                             version = systemInfo.version ?: "Unknown",
-                            isQuickConnectEnabled = systemInfo.startupWizardCompleted == true
+                            isQuickConnectEnabled = systemInfo.startupWizardCompleted == true,
                         )
                     } else {
                         apiClient.update(baseUrl = originalUrl)
@@ -204,7 +207,9 @@ class JellyfinServerRepository @Inject constructor(
                 ServerConnectionResult.Error("Server error: ${e.message ?: "Unknown API error"}")
             } catch (e: Exception) {
                 Timber.e(e, "Network error testing server connection")
-                ServerConnectionResult.Error("Failed to connect: ${e.message ?: "Check server address and network connection"}")
+                ServerConnectionResult.Error(
+                    "Failed to connect: ${e.message ?: "Check server address and network connection"}"
+                )
             }
         }
     }
@@ -221,7 +226,7 @@ class JellyfinServerRepository @Inject constructor(
                         id = it.id ?: UUID.randomUUID().toString(),
                         name = it.serverName ?: "Jellyfin Server",
                         version = it.version,
-                        address = _currentBaseUrl.value
+                        address = _currentBaseUrl.value,
                     )
                 }
             } catch (e: Exception) {
@@ -239,12 +244,13 @@ class JellyfinServerRepository @Inject constructor(
                 val systemInfo = response.content
 
                 if (systemInfo != null) {
-                    val server = Server(
-                        id = systemInfo.id ?: UUID.randomUUID().toString(),
-                        name = systemInfo.serverName ?: "Jellyfin Server",
-                        version = systemInfo.version,
-                        address = _currentBaseUrl.value
-                    )
+                    val server =
+                        Server(
+                            id = systemInfo.id ?: UUID.randomUUID().toString(),
+                            name = systemInfo.serverName ?: "Jellyfin Server",
+                            version = systemInfo.version,
+                            address = _currentBaseUrl.value,
+                        )
                     _currentServer.value = server
                     _isConnected.value = true
                     Timber.d("Server info refreshed: ${server.name}")
@@ -274,7 +280,7 @@ class JellyfinServerRepository @Inject constructor(
         tag: String?,
         maxWidth: Int?,
         maxHeight: Int?,
-        quality: Int?
+        quality: Int?,
     ): String {
         val baseUrl = _currentBaseUrl.value
         if (baseUrl.isBlank()) return ""
@@ -298,7 +304,7 @@ class JellyfinServerRepository @Inject constructor(
         audioStreamIndex: Int?,
         subtitleStreamIndex: Int?,
         videoStreamIndex: Int?,
-        accessToken: String?
+        accessToken: String?,
     ): String {
         val baseUrl = _currentBaseUrl.value
         if (baseUrl.isBlank()) return ""
@@ -321,9 +327,9 @@ class JellyfinServerRepository @Inject constructor(
             val server: Server,
             val serverAddress: String,
             val version: String,
-            val isQuickConnectEnabled: Boolean
+            val isQuickConnectEnabled: Boolean,
         ) : ServerConnectionResult()
 
         data class Error(val message: String) : ServerConnectionResult()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/server/ServerRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/server/ServerRepository.kt
index 1a2873787..347145c4b 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/server/ServerRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/server/ServerRepository.kt
@@ -9,19 +9,27 @@ interface ServerRepository {
     val currentBaseUrl: StateFlow<String>
     val isConnected: StateFlow<Boolean>
     val currentServer: StateFlow<Server?>
+
     suspend fun refreshServerInfo()
 
     fun getBaseUrl(): String
+
     suspend fun setBaseUrl(baseUrl: String)
 
     suspend fun discoverServers(): List<Server>
+
     fun discoverServersFlow(): Flow<List<Server>>
 
-    suspend fun testServerConnection(serverAddress: String): JellyfinServerRepository.ServerConnectionResult
+    suspend fun testServerConnection(
+        serverAddress: String
+    ): JellyfinServerRepository.ServerConnectionResult
+
     suspend fun getServerInfo(): Server?
 
     fun isConnectedToServer(): Boolean
+
     fun getCurrentServer(): Server?
+
     fun disconnect()
 
     fun buildImageUrl(
@@ -31,7 +39,7 @@ interface ServerRepository {
         tag: String? = null,
         maxWidth: Int? = null,
         maxHeight: Int? = null,
-        quality: Int? = null
+        quality: Int? = null,
     ): String
 
     fun buildStreamUrl(
@@ -41,6 +49,6 @@ interface ServerRepository {
         audioStreamIndex: Int? = null,
         subtitleStreamIndex: Int? = null,
         videoStreamIndex: Int? = null,
-        accessToken: String? = null
+        accessToken: String? = null,
     ): String
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/userdata/JellyfinUserDataRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/userdata/JellyfinUserDataRepository.kt
index 05209689a..2f455b17d 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/userdata/JellyfinUserDataRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/userdata/JellyfinUserDataRepository.kt
@@ -1,6 +1,9 @@
 package com.makd.afinity.data.repository.userdata
 
 import com.makd.afinity.data.manager.SessionManager
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.jellyfin.sdk.api.client.exception.ApiClientException
@@ -12,14 +15,10 @@ import org.jellyfin.sdk.model.api.ItemFields
 import org.jellyfin.sdk.model.api.UpdateUserItemDataDto
 import org.jellyfin.sdk.model.api.UserItemDataDto
 import timber.log.Timber
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @Singleton
-class JellyfinUserDataRepository @Inject constructor(
-    private val sessionManager: SessionManager
-) : UserDataRepository {
+class JellyfinUserDataRepository @Inject constructor(private val sessionManager: SessionManager) :
+    UserDataRepository {
 
     private suspend fun getCurrentUserId(): UUID? {
         return sessionManager.currentSession.value?.userId
@@ -35,7 +34,7 @@ class JellyfinUserDataRepository @Inject constructor(
                 playStateApi.markPlayedItem(
                     itemId = itemId,
                     userId = userId,
-                    datePlayed = org.jellyfin.sdk.model.DateTime.now()
+                    datePlayed = org.jellyfin.sdk.model.DateTime.now(),
                 )
                 true
             } catch (e: ApiClientException) {
@@ -55,10 +54,7 @@ class JellyfinUserDataRepository @Inject constructor(
                 val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext false
                 val playStateApi = PlayStateApi(apiClient)
 
-                playStateApi.markUnplayedItem(
-                    itemId = itemId,
-                    userId = userId
-                )
+                playStateApi.markUnplayedItem(itemId = itemId, userId = userId)
                 true
             } catch (e: ApiClientException) {
                 Timber.e(e, "Failed to mark item as unwatched: $itemId")
@@ -79,7 +75,7 @@ class JellyfinUserDataRepository @Inject constructor(
                 playStateApi.onPlaybackProgress(
                     itemId = itemId,
                     positionTicks = positionTicks,
-                    isPaused = true
+                    isPaused = true,
                 )
                 true
             } catch (e: ApiClientException) {
@@ -99,10 +95,7 @@ class JellyfinUserDataRepository @Inject constructor(
                 val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext null
                 val itemsApi = ItemsApi(apiClient)
 
-                val response = itemsApi.getItemUserData(
-                    itemId = itemId,
-                    userId = userId
-                )
+                val response = itemsApi.getItemUserData(itemId = itemId, userId = userId)
                 response.content
             } catch (e: ApiClientException) {
                 Timber.e(e, "Failed to get user data for item: $itemId")
@@ -121,10 +114,7 @@ class JellyfinUserDataRepository @Inject constructor(
                 val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext false
                 val userLibraryApi = UserLibraryApi(apiClient)
 
-                userLibraryApi.markFavoriteItem(
-                    itemId = itemId,
-                    userId = userId
-                )
+                userLibraryApi.markFavoriteItem(itemId = itemId, userId = userId)
                 true
             } catch (e: ApiClientException) {
                 Timber.e(e, "Failed to add item to favorites: $itemId")
@@ -143,10 +133,7 @@ class JellyfinUserDataRepository @Inject constructor(
                 val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext false
                 val userLibraryApi = UserLibraryApi(apiClient)
 
-                userLibraryApi.unmarkFavoriteItem(
-                    itemId = itemId,
-                    userId = userId
-                )
+                userLibraryApi.unmarkFavoriteItem(itemId = itemId, userId = userId)
                 true
             } catch (e: ApiClientException) {
                 Timber.e(e, "Failed to remove item from favorites: $itemId")
@@ -161,25 +148,32 @@ class JellyfinUserDataRepository @Inject constructor(
     override suspend fun getFavoriteItems(
         includeItemTypes: List<String>,
         limit: Int?,
-        startIndex: Int
+        startIndex: Int,
     ): List<UUID> {
         return withContext(Dispatchers.IO) {
             try {
                 val userId = getCurrentUserId() ?: return@withContext emptyList()
-                val apiClient = sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
+                val apiClient =
+                    sessionManager.getCurrentApiClient() ?: return@withContext emptyList()
                 val itemsApi = ItemsApi(apiClient)
 
-                val response = itemsApi.getItems(
-                    userId = userId,
-                    isFavorite = true,
-                    includeItemTypes = includeItemTypes.mapNotNull {
-                        try { BaseItemKind.valueOf(it.uppercase()) } catch (e: Exception) { null }
-                    },
-                    limit = limit,
-                    startIndex = startIndex,
-                    fields = listOf(ItemFields.OVERVIEW),
-                    enableUserData = true
-                )
+                val response =
+                    itemsApi.getItems(
+                        userId = userId,
+                        isFavorite = true,
+                        includeItemTypes =
+                            includeItemTypes.mapNotNull {
+                                try {
+                                    BaseItemKind.valueOf(it.uppercase())
+                                } catch (e: Exception) {
+                                    null
+                                }
+                            },
+                        limit = limit,
+                        startIndex = startIndex,
+                        fields = listOf(ItemFields.OVERVIEW),
+                        enableUserData = true,
+                    )
 
                 response.content?.items?.mapNotNull { it.id } ?: emptyList()
             } catch (e: ApiClientException) {
@@ -204,9 +198,7 @@ class JellyfinUserDataRepository @Inject constructor(
                 itemsApi.updateItemUserData(
                     itemId = itemId,
                     userId = userId,
-                    data = UpdateUserItemDataDto(
-                        rating = jellyfinRating.toDouble()
-                    )
+                    data = UpdateUserItemDataDto(rating = jellyfinRating.toDouble()),
                 )
                 true
             } catch (e: ApiClientException) {
@@ -229,9 +221,7 @@ class JellyfinUserDataRepository @Inject constructor(
                 itemsApi.updateItemUserData(
                     itemId = itemId,
                     userId = userId,
-                    data = UpdateUserItemDataDto(
-                        rating = null
-                    )
+                    data = UpdateUserItemDataDto(rating = null),
                 )
                 true
             } catch (e: ApiClientException) {
@@ -254,9 +244,7 @@ class JellyfinUserDataRepository @Inject constructor(
                 itemsApi.updateItemUserData(
                     itemId = itemId,
                     userId = userId,
-                    data = UpdateUserItemDataDto(
-                        likes = isLiked
-                    )
+                    data = UpdateUserItemDataDto(likes = isLiked),
                 )
                 true
             } catch (e: ApiClientException) {
@@ -283,15 +271,16 @@ class JellyfinUserDataRepository @Inject constructor(
                             itemsApi.updateItemUserData(
                                 itemId = itemId,
                                 userId = userId,
-                                data = UpdateUserItemDataDto(
-                                    rating = userDataDto.rating,
-                                    played = userDataDto.played,
-                                    playbackPositionTicks = userDataDto.playbackPositionTicks,
-                                    playCount = userDataDto.playCount,
-                                    isFavorite = userDataDto.isFavorite,
-                                    likes = userDataDto.likes,
-                                    lastPlayedDate = userDataDto.lastPlayedDate
-                                )
+                                data =
+                                    UpdateUserItemDataDto(
+                                        rating = userDataDto.rating,
+                                        played = userDataDto.played,
+                                        playbackPositionTicks = userDataDto.playbackPositionTicks,
+                                        playCount = userDataDto.playCount,
+                                        isFavorite = userDataDto.isFavorite,
+                                        likes = userDataDto.likes,
+                                        lastPlayedDate = userDataDto.lastPlayedDate,
+                                    ),
                             )
                             successCount++
                         }
@@ -315,9 +304,7 @@ class JellyfinUserDataRepository @Inject constructor(
                 val result = mutableMapOf<UUID, UserItemDataDto>()
 
                 itemIds.forEach { itemId ->
-                    getUserData(itemId)?.let { userData ->
-                        result[itemId] = userData
-                    }
+                    getUserData(itemId)?.let { userData -> result[itemId] = userData }
                 }
 
                 result
@@ -327,4 +314,4 @@ class JellyfinUserDataRepository @Inject constructor(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/userdata/UserDataRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/userdata/UserDataRepository.kt
index e87c9f83f..806878659 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/userdata/UserDataRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/userdata/UserDataRepository.kt
@@ -1,27 +1,35 @@
 package com.makd.afinity.data.repository.userdata
 
-import org.jellyfin.sdk.model.api.UserItemDataDto
 import java.util.UUID
+import org.jellyfin.sdk.model.api.UserItemDataDto
 
 interface UserDataRepository {
 
     suspend fun markWatched(itemId: UUID): Boolean
+
     suspend fun markUnwatched(itemId: UUID): Boolean
+
     suspend fun updatePlaybackPosition(itemId: UUID, positionTicks: Long): Boolean
+
     suspend fun getUserData(itemId: UUID): UserItemDataDto?
 
     suspend fun addToFavorites(itemId: UUID): Boolean
+
     suspend fun removeFromFavorites(itemId: UUID): Boolean
+
     suspend fun getFavoriteItems(
         includeItemTypes: List<String> = emptyList(),
         limit: Int? = null,
-        startIndex: Int = 0
+        startIndex: Int = 0,
     ): List<UUID>
 
     suspend fun setRating(itemId: UUID, rating: Int): Boolean
+
     suspend fun removeRating(itemId: UUID): Boolean
+
     suspend fun setLike(itemId: UUID, isLiked: Boolean): Boolean
 
     suspend fun syncUserData(items: List<UserItemDataDto>): Boolean
+
     suspend fun getUserDataBatch(itemIds: List<UUID>): Map<UUID, UserItemDataDto>
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/watchlist/WatchlistRepository.kt b/app/src/main/java/com/makd/afinity/data/repository/watchlist/WatchlistRepository.kt
index 75fb0e82d..dd87dc63f 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/watchlist/WatchlistRepository.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/watchlist/WatchlistRepository.kt
@@ -4,8 +4,8 @@ import com.makd.afinity.data.models.media.AfinityEpisode
 import com.makd.afinity.data.models.media.AfinityMovie
 import com.makd.afinity.data.models.media.AfinitySeason
 import com.makd.afinity.data.models.media.AfinityShow
-import kotlinx.coroutines.flow.Flow
 import java.util.UUID
+import kotlinx.coroutines.flow.Flow
 
 interface WatchlistRepository {
 
@@ -30,4 +30,4 @@ interface WatchlistRepository {
     fun getWatchlistCountFlow(): Flow<Int>
 
     suspend fun clearWatchlist()
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/repository/watchlist/WatchlistRepositoryImpl.kt b/app/src/main/java/com/makd/afinity/data/repository/watchlist/WatchlistRepositoryImpl.kt
index d8a56f8c5..f098968d4 100644
--- a/app/src/main/java/com/makd/afinity/data/repository/watchlist/WatchlistRepositoryImpl.kt
+++ b/app/src/main/java/com/makd/afinity/data/repository/watchlist/WatchlistRepositoryImpl.kt
@@ -11,21 +11,23 @@ import com.makd.afinity.data.repository.FieldSets
 import com.makd.afinity.data.repository.JellyfinRepository
 import com.makd.afinity.data.repository.media.MediaRepository
 import com.makd.afinity.data.repository.userdata.UserDataRepository
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.withContext
 import timber.log.Timber
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @Singleton
-class WatchlistRepositoryImpl @Inject constructor(
+class WatchlistRepositoryImpl
+@Inject
+constructor(
     private val userDataRepository: UserDataRepository,
     private val mediaRepository: MediaRepository,
-    private val jellyfinRepository: JellyfinRepository
+    private val jellyfinRepository: JellyfinRepository,
 ) : WatchlistRepository {
 
     override suspend fun addToWatchlist(itemId: UUID, itemType: String): Boolean {
@@ -49,9 +51,7 @@ class WatchlistRepositoryImpl @Inject constructor(
     }
 
     override fun isInWatchlistFlow(itemId: UUID): Flow<Boolean> {
-        return flow {
-            emit(isInWatchlist(itemId))
-        }.flowOn(Dispatchers.IO)
+        return flow { emit(isInWatchlist(itemId)) }.flowOn(Dispatchers.IO)
     }
 
     override suspend fun getWatchlistMovies(): List<AfinityMovie> {
@@ -61,7 +61,7 @@ class WatchlistRepositoryImpl @Inject constructor(
                     isLiked = true,
                     sortBy = SortBy.DATE_ADDED,
                     sortDescending = true,
-                    fields = FieldSets.MEDIA_ITEM_CARDS
+                    fields = FieldSets.MEDIA_ITEM_CARDS,
                 )
             } catch (e: Exception) {
                 Timber.e(e, "Failed to load liked movies")
@@ -77,7 +77,7 @@ class WatchlistRepositoryImpl @Inject constructor(
                     isLiked = true,
                     sortBy = SortBy.DATE_ADDED,
                     sortDescending = true,
-                    fields = FieldSets.MEDIA_ITEM_CARDS
+                    fields = FieldSets.MEDIA_ITEM_CARDS,
                 )
             } catch (e: Exception) {
                 Timber.e(e, "Failed to load liked shows")
@@ -89,18 +89,17 @@ class WatchlistRepositoryImpl @Inject constructor(
     override suspend fun getWatchlistSeasons(): List<AfinitySeason> {
         return withContext(Dispatchers.IO) {
             try {
-                val response = mediaRepository.getItems(
-                    isLiked = true,
-                    includeItemTypes = listOf("SEASON"),
-                    sortBy = SortBy.DATE_ADDED,
-                    sortDescending = true,
-                    fields = FieldSets.MEDIA_ITEM_CARDS
-                )
+                val response =
+                    mediaRepository.getItems(
+                        isLiked = true,
+                        includeItemTypes = listOf("SEASON"),
+                        sortBy = SortBy.DATE_ADDED,
+                        sortDescending = true,
+                        fields = FieldSets.MEDIA_ITEM_CARDS,
+                    )
                 response.items
                     ?.filter { it.type?.name == "SEASON" }
-                    ?.mapNotNull {
-                        it.toAfinitySeason(jellyfinRepository)
-                    } ?: emptyList()
+                    ?.mapNotNull { it.toAfinitySeason(jellyfinRepository) } ?: emptyList()
             } catch (e: Exception) {
                 Timber.e(e, "Failed to load liked seasons")
                 emptyList()
@@ -111,18 +110,17 @@ class WatchlistRepositoryImpl @Inject constructor(
     override suspend fun getWatchlistEpisodes(): List<AfinityEpisode> {
         return withContext(Dispatchers.IO) {
             try {
-                val response = mediaRepository.getItems(
-                    isLiked = true,
-                    includeItemTypes = listOf("EPISODE"),
-                    sortBy = SortBy.DATE_ADDED,
-                    sortDescending = true,
-                    fields = FieldSets.MEDIA_ITEM_CARDS
-                )
+                val response =
+                    mediaRepository.getItems(
+                        isLiked = true,
+                        includeItemTypes = listOf("EPISODE"),
+                        sortBy = SortBy.DATE_ADDED,
+                        sortDescending = true,
+                        fields = FieldSets.MEDIA_ITEM_CARDS,
+                    )
                 response.items
                     ?.filter { it.type?.name == "EPISODE" }
-                    ?.mapNotNull {
-                        it.toAfinityEpisode(jellyfinRepository)
-                    } ?: emptyList()
+                    ?.mapNotNull { it.toAfinityEpisode(jellyfinRepository) } ?: emptyList()
             } catch (e: Exception) {
                 Timber.e(e, "Failed to load liked episodes")
                 emptyList()
@@ -133,10 +131,7 @@ class WatchlistRepositoryImpl @Inject constructor(
     override suspend fun getWatchlistCount(): Int {
         return withContext(Dispatchers.IO) {
             try {
-                val response = mediaRepository.getItems(
-                    isLiked = true,
-                    limit = 0
-                )
+                val response = mediaRepository.getItems(isLiked = true, limit = 0)
                 response.totalRecordCount ?: 0
             } catch (e: Exception) {
                 Timber.e(e, "Failed to get watchlist count")
@@ -146,18 +141,13 @@ class WatchlistRepositoryImpl @Inject constructor(
     }
 
     override fun getWatchlistCountFlow(): Flow<Int> {
-        return flow {
-            emit(getWatchlistCount())
-        }.flowOn(Dispatchers.IO)
+        return flow { emit(getWatchlistCount()) }.flowOn(Dispatchers.IO)
     }
 
     override suspend fun clearWatchlist() {
         return withContext(Dispatchers.IO) {
             try {
-                val allLikedResponse = mediaRepository.getItems(
-                    isLiked = true,
-                    limit = 1000
-                )
+                val allLikedResponse = mediaRepository.getItems(isLiked = true, limit = 1000)
                 val likedItemIds = allLikedResponse.items?.mapNotNull { it.id } ?: emptyList()
 
                 likedItemIds.forEach { itemId ->
@@ -173,4 +163,4 @@ class WatchlistRepositoryImpl @Inject constructor(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/serialization/Serializers.kt b/app/src/main/java/com/makd/afinity/data/serialization/Serializers.kt
index b272e62c0..e83b2e6b2 100644
--- a/app/src/main/java/com/makd/afinity/data/serialization/Serializers.kt
+++ b/app/src/main/java/com/makd/afinity/data/serialization/Serializers.kt
@@ -1,14 +1,14 @@
 package com.makd.afinity.data.serialization
 
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+import java.util.UUID
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.PrimitiveKind
 import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
-import java.util.UUID
 
 object UUIDSerializer : KSerializer<UUID> {
     override val descriptor: SerialDescriptor =
@@ -56,4 +56,4 @@ object NullableLocalDateTimeSerializer : KSerializer<LocalDateTime?> {
         val string = decoder.decodeString()
         return if (string.isEmpty()) null else LocalDateTime.parse(string, formatter)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/sync/UserDataSyncScheduler.kt b/app/src/main/java/com/makd/afinity/data/sync/UserDataSyncScheduler.kt
index 3daade232..182a98ab0 100644
--- a/app/src/main/java/com/makd/afinity/data/sync/UserDataSyncScheduler.kt
+++ b/app/src/main/java/com/makd/afinity/data/sync/UserDataSyncScheduler.kt
@@ -8,31 +8,26 @@ import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import com.makd.afinity.data.workers.UserDataSyncWorker
 import dagger.hilt.android.qualifiers.ApplicationContext
-import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
+import timber.log.Timber
 
 @Singleton
-class UserDataSyncScheduler @Inject constructor(
-    @ApplicationContext private val context: Context
-) {
+class UserDataSyncScheduler @Inject constructor(@ApplicationContext private val context: Context) {
 
     fun scheduleSyncNow() {
         try {
-            val constraints = Constraints.Builder()
-                .setRequiredNetworkType(NetworkType.CONNECTED)
-                .build()
-
-            val syncRequest = OneTimeWorkRequestBuilder<UserDataSyncWorker>()
-                .setConstraints(constraints)
-                .addTag(SYNC_WORK_TAG)
-                .build()
-
-            WorkManager.getInstance(context).enqueueUniqueWork(
-                SYNC_WORK_NAME,
-                ExistingWorkPolicy.REPLACE,
-                syncRequest
-            )
+            val constraints =
+                Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build()
+
+            val syncRequest =
+                OneTimeWorkRequestBuilder<UserDataSyncWorker>()
+                    .setConstraints(constraints)
+                    .addTag(SYNC_WORK_TAG)
+                    .build()
+
+            WorkManager.getInstance(context)
+                .enqueueUniqueWork(SYNC_WORK_NAME, ExistingWorkPolicy.REPLACE, syncRequest)
 
             Timber.d("User data sync scheduled (will run when network is available)")
         } catch (e: Exception) {
diff --git a/app/src/main/java/com/makd/afinity/data/updater/GitHubApiService.kt b/app/src/main/java/com/makd/afinity/data/updater/GitHubApiService.kt
index ba6fd02bf..22c226dad 100644
--- a/app/src/main/java/com/makd/afinity/data/updater/GitHubApiService.kt
+++ b/app/src/main/java/com/makd/afinity/data/updater/GitHubApiService.kt
@@ -1,19 +1,17 @@
 package com.makd.afinity.data.updater
 
 import com.makd.afinity.data.updater.models.GitHubRelease
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @Singleton
-class GitHubApiService @Inject constructor(
-    private val okHttpClient: OkHttpClient
-) {
+class GitHubApiService @Inject constructor(private val okHttpClient: OkHttpClient) {
     private val json = Json {
         ignoreUnknownKeys = true
         coerceInputValues = true
@@ -25,34 +23,36 @@ class GitHubApiService @Inject constructor(
         private const val USER_AGENT = "AFinity-Android-App"
     }
 
-    suspend fun getLatestRelease(): Result<GitHubRelease> = withContext(Dispatchers.IO) {
-        try {
-            val request = Request.Builder()
-                .url(GITHUB_API_URL)
-                .addHeader("Accept", "application/vnd.github.v3+json")
-                .addHeader("User-Agent", USER_AGENT)
-                .build()
-
-            val response = okHttpClient.newCall(request).execute()
-
-            if (!response.isSuccessful) {
-                Timber.e("GitHub API request failed: ${response.code}")
-                return@withContext Result.failure(
-                    Exception("Failed to fetch release: HTTP ${response.code}")
-                )
+    suspend fun getLatestRelease(): Result<GitHubRelease> =
+        withContext(Dispatchers.IO) {
+            try {
+                val request =
+                    Request.Builder()
+                        .url(GITHUB_API_URL)
+                        .addHeader("Accept", "application/vnd.github.v3+json")
+                        .addHeader("User-Agent", USER_AGENT)
+                        .build()
+
+                val response = okHttpClient.newCall(request).execute()
+
+                if (!response.isSuccessful) {
+                    Timber.e("GitHub API request failed: ${response.code}")
+                    return@withContext Result.failure(
+                        Exception("Failed to fetch release: HTTP ${response.code}")
+                    )
+                }
+
+                val body =
+                    response.body?.string()
+                        ?: return@withContext Result.failure(Exception("Empty response body"))
+
+                val release = json.decodeFromString<GitHubRelease>(body)
+
+                Timber.d("Fetched latest release: ${release.tagName}")
+                Result.success(release)
+            } catch (e: Exception) {
+                Timber.e(e, "Error fetching latest release")
+                Result.failure(e)
             }
-
-            val body = response.body?.string() ?: return@withContext Result.failure(
-                Exception("Empty response body")
-            )
-
-            val release = json.decodeFromString<GitHubRelease>(body)
-
-            Timber.d("Fetched latest release: ${release.tagName}")
-            Result.success(release)
-        } catch (e: Exception) {
-            Timber.e(e, "Error fetching latest release")
-            Result.failure(e)
         }
-    }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/updater/UpdateCheckWorker.kt b/app/src/main/java/com/makd/afinity/data/updater/UpdateCheckWorker.kt
index 5ada9fd53..de8653561 100644
--- a/app/src/main/java/com/makd/afinity/data/updater/UpdateCheckWorker.kt
+++ b/app/src/main/java/com/makd/afinity/data/updater/UpdateCheckWorker.kt
@@ -10,11 +10,13 @@ import dagger.assisted.AssistedInject
 import timber.log.Timber
 
 @HiltWorker
-class UpdateCheckWorker @AssistedInject constructor(
+class UpdateCheckWorker
+@AssistedInject
+constructor(
     @Assisted appContext: Context,
     @Assisted workerParams: WorkerParameters,
     private val updateManager: UpdateManager,
-    private val notificationManager: UpdateNotificationManager
+    private val notificationManager: UpdateNotificationManager,
 ) : CoroutineWorker(appContext, workerParams) {
 
     override suspend fun doWork(): Result {
@@ -40,4 +42,4 @@ class UpdateCheckWorker @AssistedInject constructor(
     companion object {
         const val WORK_NAME = "update_check_worker"
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/updater/UpdateManager.kt b/app/src/main/java/com/makd/afinity/data/updater/UpdateManager.kt
index b0fe8d802..09722d5b2 100644
--- a/app/src/main/java/com/makd/afinity/data/updater/UpdateManager.kt
+++ b/app/src/main/java/com/makd/afinity/data/updater/UpdateManager.kt
@@ -14,6 +14,9 @@ import com.makd.afinity.data.repository.PreferencesRepository
 import com.makd.afinity.data.updater.models.GitHubRelease
 import com.makd.afinity.data.updater.models.UpdateState
 import dagger.hilt.android.qualifiers.ApplicationContext
+import java.io.File
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -24,15 +27,14 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import java.io.File
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @Singleton
-class UpdateManager @Inject constructor(
+class UpdateManager
+@Inject
+constructor(
     @ApplicationContext private val context: Context,
     private val gitHubApiService: GitHubApiService,
-    private val preferencesRepository: PreferencesRepository
+    private val preferencesRepository: PreferencesRepository,
 ) {
     private val _updateState = MutableStateFlow<UpdateState>(UpdateState.Idle)
     val updateState: StateFlow<UpdateState> = _updateState.asStateFlow()
@@ -44,24 +46,29 @@ class UpdateManager @Inject constructor(
     private var progressJob: Job? = null
     private val coroutineScope = CoroutineScope(Dispatchers.Main)
 
-    private val downloadReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            val id = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
-            Timber.d("BroadcastReceiver.onReceive called! Download ID: $id, currentDownloadId: $currentDownloadId")
-            if (id == currentDownloadId) {
-                Timber.d("IDs match, calling handleDownloadComplete")
-                handleDownloadComplete(id)
-            } else {
-                Timber.w("Received download complete for different ID: $id vs $currentDownloadId")
+    private val downloadReceiver =
+        object : BroadcastReceiver() {
+            override fun onReceive(context: Context, intent: Intent) {
+                val id = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
+                Timber.d(
+                    "BroadcastReceiver.onReceive called! Download ID: $id, currentDownloadId: $currentDownloadId"
+                )
+                if (id == currentDownloadId) {
+                    Timber.d("IDs match, calling handleDownloadComplete")
+                    handleDownloadComplete(id)
+                } else {
+                    Timber.w(
+                        "Received download complete for different ID: $id vs $currentDownloadId"
+                    )
+                }
             }
         }
-    }
 
     init {
         context.registerReceiver(
             downloadReceiver,
             IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE),
-            Context.RECEIVER_NOT_EXPORTED
+            Context.RECEIVER_NOT_EXPORTED,
         )
         Timber.d("UpdateManager initialized, download receiver registered")
     }
@@ -94,7 +101,7 @@ class UpdateManager @Inject constructor(
                 Timber.e(error, "Failed to check for updates")
                 _updateState.value = UpdateState.Error(error.message ?: "Unknown error")
                 null
-            }
+            },
         )
     }
 
@@ -107,11 +114,14 @@ class UpdateManager @Inject constructor(
         }
 
         val currentAbi = getCurrentAbi()
-        val apkAsset = release.assets.firstOrNull { asset ->
-            asset.name.endsWith(".apk") && asset.name.contains(currentAbi)
-        } ?: release.assets.firstOrNull { asset ->
-            asset.name.endsWith(".apk") && asset.name.contains("arm64-v8a")
-        } ?: release.assets.firstOrNull { it.name.endsWith(".apk") }
+        val apkAsset =
+            release.assets.firstOrNull { asset ->
+                asset.name.endsWith(".apk") && asset.name.contains(currentAbi)
+            }
+                ?: release.assets.firstOrNull { asset ->
+                    asset.name.endsWith(".apk") && asset.name.contains("arm64-v8a")
+                }
+                ?: release.assets.firstOrNull { it.name.endsWith(".apk") }
 
         if (apkAsset == null) {
             _updateState.value = UpdateState.Error("No compatible APK found")
@@ -119,15 +129,18 @@ class UpdateManager @Inject constructor(
         }
 
         try {
-            val request = DownloadManager.Request(Uri.parse(apkAsset.downloadUrl))
-                .setTitle("AFinity Update")
-                .setDescription("Downloading version ${release.tagName}")
-                .setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-                .setDestinationInExternalPublicDir(
-                    Environment.DIRECTORY_DOWNLOADS,
-                    apkAsset.name
-                )
-                .setMimeType("application/vnd.android.package-archive")
+            val request =
+                DownloadManager.Request(Uri.parse(apkAsset.downloadUrl))
+                    .setTitle("AFinity Update")
+                    .setDescription("Downloading version ${release.tagName}")
+                    .setNotificationVisibility(
+                        DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED
+                    )
+                    .setDestinationInExternalPublicDir(
+                        Environment.DIRECTORY_DOWNLOADS,
+                        apkAsset.name,
+                    )
+                    .setMimeType("application/vnd.android.package-archive")
 
             currentDownloadId = downloadManager.enqueue(request)
             _updateState.value = UpdateState.Downloading(0)
@@ -143,81 +156,92 @@ class UpdateManager @Inject constructor(
 
     private fun trackDownloadProgress() {
         progressJob?.cancel()
-        progressJob = coroutineScope.launch {
-            while (isActive && currentDownloadId != null) {
-                val query = DownloadManager.Query().setFilterById(currentDownloadId!!)
-                val cursor = downloadManager.query(query)
-
-                if (cursor.moveToFirst()) {
-                    val statusIndex = cursor.getColumnIndex(DownloadManager.COLUMN_STATUS)
-                    val status = cursor.getInt(statusIndex)
-
-                    val bytesDownloadedIndex =
-                        cursor.getColumnIndex(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR)
-                    val totalBytesIndex =
-                        cursor.getColumnIndex(DownloadManager.COLUMN_TOTAL_SIZE_BYTES)
-                    val bytesDownloaded = cursor.getLong(bytesDownloadedIndex)
-                    val totalBytes = cursor.getLong(totalBytesIndex)
-
-                    Timber.d("Download status: $status, bytes: $bytesDownloaded / $totalBytes")
-
-                    when (status) {
-                        DownloadManager.STATUS_RUNNING -> {
-                            if (totalBytes > 0) {
-                                val progress =
-                                    ((bytesDownloaded * 100) / totalBytes).toInt().coerceIn(0, 99)
-                                _updateState.value = UpdateState.Downloading(progress)
-                                Timber.d("Download progress: $progress%")
+        progressJob =
+            coroutineScope.launch {
+                while (isActive && currentDownloadId != null) {
+                    val query = DownloadManager.Query().setFilterById(currentDownloadId!!)
+                    val cursor = downloadManager.query(query)
+
+                    if (cursor.moveToFirst()) {
+                        val statusIndex = cursor.getColumnIndex(DownloadManager.COLUMN_STATUS)
+                        val status = cursor.getInt(statusIndex)
+
+                        val bytesDownloadedIndex =
+                            cursor.getColumnIndex(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR)
+                        val totalBytesIndex =
+                            cursor.getColumnIndex(DownloadManager.COLUMN_TOTAL_SIZE_BYTES)
+                        val bytesDownloaded = cursor.getLong(bytesDownloadedIndex)
+                        val totalBytes = cursor.getLong(totalBytesIndex)
+
+                        Timber.d("Download status: $status, bytes: $bytesDownloaded / $totalBytes")
+
+                        when (status) {
+                            DownloadManager.STATUS_RUNNING -> {
+                                if (totalBytes > 0) {
+                                    val progress =
+                                        ((bytesDownloaded * 100) / totalBytes)
+                                            .toInt()
+                                            .coerceIn(0, 99)
+                                    _updateState.value = UpdateState.Downloading(progress)
+                                    Timber.d("Download progress: $progress%")
+                                }
                             }
-                        }
 
-                        DownloadManager.STATUS_SUCCESSFUL -> {
-                            Timber.d("Download successful, stopping progress tracking")
-                            cursor.close()
-                            delay(1000)
-                            if (_updateState.value is UpdateState.Downloading) {
-                                Timber.w("Broadcast receiver didn't fire, handling completion manually")
-                                handleDownloadComplete(currentDownloadId!!)
+                            DownloadManager.STATUS_SUCCESSFUL -> {
+                                Timber.d("Download successful, stopping progress tracking")
+                                cursor.close()
+                                delay(1000)
+                                if (_updateState.value is UpdateState.Downloading) {
+                                    Timber.w(
+                                        "Broadcast receiver didn't fire, handling completion manually"
+                                    )
+                                    handleDownloadComplete(currentDownloadId!!)
+                                }
+                                return@launch
                             }
-                            return@launch
-                        }
 
-                        DownloadManager.STATUS_FAILED -> {
-                            val reasonIndex = cursor.getColumnIndex(DownloadManager.COLUMN_REASON)
-                            val reason = cursor.getInt(reasonIndex)
-                            Timber.e("Download failed with reason: $reason")
-                            _updateState.value = UpdateState.Error("Download failed: $reason")
-                            cursor.close()
-                            return@launch
+                            DownloadManager.STATUS_FAILED -> {
+                                val reasonIndex =
+                                    cursor.getColumnIndex(DownloadManager.COLUMN_REASON)
+                                val reason = cursor.getInt(reasonIndex)
+                                Timber.e("Download failed with reason: $reason")
+                                _updateState.value = UpdateState.Error("Download failed: $reason")
+                                cursor.close()
+                                return@launch
+                            }
                         }
+                    } else {
+                        cursor.close()
+                        return@launch
                     }
-                } else {
                     cursor.close()
-                    return@launch
+                    delay(500)
                 }
-                cursor.close()
-                delay(500)
             }
-        }
     }
 
     fun installUpdate(file: File) {
         try {
-            val intent = Intent(Intent.ACTION_VIEW).apply {
-                flags = Intent.FLAG_ACTIVITY_NEW_TASK
-
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    val uri = FileProvider.getUriForFile(
-                        context,
-                        "${context.packageName}.fileprovider",
-                        file
-                    )
-                    setDataAndType(uri, "application/vnd.android.package-archive")
-                    addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                } else {
-                    setDataAndType(Uri.fromFile(file), "application/vnd.android.package-archive")
+            val intent =
+                Intent(Intent.ACTION_VIEW).apply {
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK
+
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                        val uri =
+                            FileProvider.getUriForFile(
+                                context,
+                                "${context.packageName}.fileprovider",
+                                file,
+                            )
+                        setDataAndType(uri, "application/vnd.android.package-archive")
+                        addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                    } else {
+                        setDataAndType(
+                            Uri.fromFile(file),
+                            "application/vnd.android.package-archive",
+                        )
+                    }
                 }
-            }
 
             context.startActivity(intent)
         } catch (e: Exception) {
@@ -245,18 +269,19 @@ class UpdateManager @Inject constructor(
                     Timber.d("Download URI: $uriString")
 
                     if (uriString != null) {
-                        val file = if (uriString.startsWith("file://")) {
-                            File(Uri.parse(uriString).path ?: "")
-                        } else {
-                            val localFileIndex =
-                                cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_FILENAME)
-                            if (localFileIndex >= 0) {
-                                val localFile = cursor.getString(localFileIndex)
-                                if (localFile != null) File(localFile) else null
+                        val file =
+                            if (uriString.startsWith("file://")) {
+                                File(Uri.parse(uriString).path ?: "")
                             } else {
-                                null
+                                val localFileIndex =
+                                    cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_FILENAME)
+                                if (localFileIndex >= 0) {
+                                    val localFile = cursor.getString(localFileIndex)
+                                    if (localFile != null) File(localFile) else null
+                                } else {
+                                    null
+                                }
                             }
-                        }
 
                         if (file?.exists() == true) {
                             _updateState.value = UpdateState.Downloaded(file, currentRelease!!)
@@ -287,11 +312,14 @@ class UpdateManager @Inject constructor(
 
     private fun getDownloadedApkFile(release: GitHubRelease): File? {
         val currentAbi = getCurrentAbi()
-        val apkAsset = release.assets.firstOrNull { asset ->
-            asset.name.endsWith(".apk") && asset.name.contains(currentAbi)
-        } ?: release.assets.firstOrNull { asset ->
-            asset.name.endsWith(".apk") && asset.name.contains("arm64-v8a")
-        } ?: release.assets.firstOrNull { it.name.endsWith(".apk") }
+        val apkAsset =
+            release.assets.firstOrNull { asset ->
+                asset.name.endsWith(".apk") && asset.name.contains(currentAbi)
+            }
+                ?: release.assets.firstOrNull { asset ->
+                    asset.name.endsWith(".apk") && asset.name.contains("arm64-v8a")
+                }
+                ?: release.assets.firstOrNull { it.name.endsWith(".apk") }
 
         if (apkAsset == null) return null
 
@@ -301,14 +329,15 @@ class UpdateManager @Inject constructor(
 
         val allFiles = downloadDir.listFiles() ?: return null
 
-        val matchingFiles = allFiles.filter { file ->
-            file.name == apkAsset.name ||
-                    file.name.matches(Regex("$baseFileName(-\\d+)?\\.apk"))
-        }.sortedByDescending { it.lastModified() }
+        val matchingFiles =
+            allFiles
+                .filter { file ->
+                    file.name == apkAsset.name ||
+                        file.name.matches(Regex("$baseFileName(-\\d+)?\\.apk"))
+                }
+                .sortedByDescending { it.lastModified() }
 
-        return matchingFiles.firstOrNull()?.also {
-            Timber.d("Found existing download: ${it.name}")
-        }
+        return matchingFiles.firstOrNull()?.also { Timber.d("Found existing download: ${it.name}") }
     }
 
     private fun isNewerVersion(remoteVersion: String): Boolean {
@@ -325,7 +354,8 @@ class UpdateManager @Inject constructor(
 
     private fun parseVersion(version: String): Int {
         val cleanVersion = version.removePrefix("v").split("-")[0]
-        return cleanVersion.split(".")
+        return cleanVersion
+            .split(".")
             .take(3)
             .map { it.toIntOrNull() ?: 0 }
             .fold(0) { acc, num -> acc * 1000 + num }
@@ -348,4 +378,4 @@ class UpdateManager @Inject constructor(
             Timber.e(e, "Failed to unregister download receiver")
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/updater/UpdateScheduler.kt b/app/src/main/java/com/makd/afinity/data/updater/UpdateScheduler.kt
index 5466c4091..ab09c2bd6 100644
--- a/app/src/main/java/com/makd/afinity/data/updater/UpdateScheduler.kt
+++ b/app/src/main/java/com/makd/afinity/data/updater/UpdateScheduler.kt
@@ -8,15 +8,13 @@ import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import com.makd.afinity.data.updater.models.UpdateCheckFrequency
 import dagger.hilt.android.qualifiers.ApplicationContext
-import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Singleton
+import timber.log.Timber
 
 @Singleton
-class UpdateScheduler @Inject constructor(
-    @ApplicationContext private val context: Context
-) {
+class UpdateScheduler @Inject constructor(@ApplicationContext private val context: Context) {
     private val workManager = WorkManager.getInstance(context)
 
     fun scheduleUpdateChecks(frequency: UpdateCheckFrequency) {
@@ -26,21 +24,18 @@ class UpdateScheduler @Inject constructor(
             return
         }
 
-        val constraints = Constraints.Builder()
-            .setRequiredNetworkType(NetworkType.CONNECTED)
-            .build()
+        val constraints =
+            Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build()
 
-        val workRequest = PeriodicWorkRequestBuilder<UpdateCheckWorker>(
-            frequency.hours.toLong(),
-            TimeUnit.HOURS
-        )
-            .setConstraints(constraints)
-            .build()
+        val workRequest =
+            PeriodicWorkRequestBuilder<UpdateCheckWorker>(frequency.hours.toLong(), TimeUnit.HOURS)
+                .setConstraints(constraints)
+                .build()
 
         workManager.enqueueUniquePeriodicWork(
             UpdateCheckWorker.WORK_NAME,
             ExistingPeriodicWorkPolicy.REPLACE,
-            workRequest
+            workRequest,
         )
 
         Timber.d("Scheduled update checks every ${frequency.hours} hours")
@@ -50,4 +45,4 @@ class UpdateScheduler @Inject constructor(
         workManager.cancelUniqueWork(UpdateCheckWorker.WORK_NAME)
         Timber.d("Cancelled scheduled update checks")
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/updater/models/GitHubRelease.kt b/app/src/main/java/com/makd/afinity/data/updater/models/GitHubRelease.kt
index 79006bc6b..70900043c 100644
--- a/app/src/main/java/com/makd/afinity/data/updater/models/GitHubRelease.kt
+++ b/app/src/main/java/com/makd/afinity/data/updater/models/GitHubRelease.kt
@@ -12,7 +12,7 @@ data class GitHubRelease(
     @SerialName("published_at") val publishedAt: String,
     @SerialName("assets") val assets: List<GitHubAsset>,
     @SerialName("prerelease") val prerelease: Boolean = false,
-    @SerialName("draft") val draft: Boolean = false
+    @SerialName("draft") val draft: Boolean = false,
 )
 
 @Serializable
@@ -20,16 +20,22 @@ data class GitHubAsset(
     @SerialName("name") val name: String,
     @SerialName("browser_download_url") val downloadUrl: String,
     @SerialName("size") val size: Long,
-    @SerialName("content_type") val contentType: String
+    @SerialName("content_type") val contentType: String,
 )
 
 sealed class UpdateState {
     object Idle : UpdateState()
+
     object Checking : UpdateState()
+
     data class Available(val release: GitHubRelease) : UpdateState()
+
     object UpToDate : UpdateState()
+
     data class Downloading(val progress: Int) : UpdateState()
+
     data class Downloaded(val file: java.io.File, val release: GitHubRelease) : UpdateState()
+
     data class Error(val message: String) : UpdateState()
 }
 
@@ -44,4 +50,4 @@ enum class UpdateCheckFrequency(val hours: Int, val displayName: String) {
             return entries.find { it.hours == hours } ?: ON_APP_OPEN
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/updater/notification/UpdateNotificationManager.kt b/app/src/main/java/com/makd/afinity/data/updater/notification/UpdateNotificationManager.kt
index 8b4097b5d..c3b28695a 100644
--- a/app/src/main/java/com/makd/afinity/data/updater/notification/UpdateNotificationManager.kt
+++ b/app/src/main/java/com/makd/afinity/data/updater/notification/UpdateNotificationManager.kt
@@ -15,9 +15,9 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class UpdateNotificationManager @Inject constructor(
-    @ApplicationContext private val context: Context
-) {
+class UpdateNotificationManager
+@Inject
+constructor(@ApplicationContext private val context: Context) {
     private val notificationManager =
         context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
@@ -33,52 +33,60 @@ class UpdateNotificationManager @Inject constructor(
 
     private fun createNotificationChannel() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel = NotificationChannel(
-                CHANNEL_ID,
-                CHANNEL_NAME,
-                NotificationManager.IMPORTANCE_DEFAULT
-            ).apply {
-                description = "Notifications for app updates"
-                enableLights(true)
-                enableVibration(true)
-            }
+            val channel =
+                NotificationChannel(
+                        CHANNEL_ID,
+                        CHANNEL_NAME,
+                        NotificationManager.IMPORTANCE_DEFAULT,
+                    )
+                    .apply {
+                        description = "Notifications for app updates"
+                        enableLights(true)
+                        enableVibration(true)
+                    }
             notificationManager.createNotificationChannel(channel)
         }
     }
 
     fun showUpdateAvailableNotification(release: GitHubRelease) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            if (context.checkSelfPermission(android.Manifest.permission.POST_NOTIFICATIONS)
-                != android.content.pm.PackageManager.PERMISSION_GRANTED
+            if (
+                context.checkSelfPermission(android.Manifest.permission.POST_NOTIFICATIONS) !=
+                    android.content.pm.PackageManager.PERMISSION_GRANTED
             ) {
                 return
             }
         }
 
-        val intent = Intent(context, MainActivity::class.java).apply {
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
-            putExtra("navigate_to_updates", true)
-        }
-
-        val pendingIntent = PendingIntent.getActivity(
-            context,
-            0,
-            intent,
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-        )
+        val intent =
+            Intent(context, MainActivity::class.java).apply {
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+                putExtra("navigate_to_updates", true)
+            }
 
-        val notification = NotificationCompat.Builder(context, CHANNEL_ID)
-            .setSmallIcon(R.drawable.ic_launcher_foreground)
-            .setContentTitle("Update Available")
-            .setContentText("Version ${release.tagName} is now available")
-            .setStyle(
-                NotificationCompat.BigTextStyle()
-                    .bigText("Version ${release.tagName} is now available. Tap to view details and download.")
+        val pendingIntent =
+            PendingIntent.getActivity(
+                context,
+                0,
+                intent,
+                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
             )
-            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-            .setContentIntent(pendingIntent)
-            .setAutoCancel(true)
-            .build()
+
+        val notification =
+            NotificationCompat.Builder(context, CHANNEL_ID)
+                .setSmallIcon(R.drawable.ic_launcher_foreground)
+                .setContentTitle("Update Available")
+                .setContentText("Version ${release.tagName} is now available")
+                .setStyle(
+                    NotificationCompat.BigTextStyle()
+                        .bigText(
+                            "Version ${release.tagName} is now available. Tap to view details and download."
+                        )
+                )
+                .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+                .setContentIntent(pendingIntent)
+                .setAutoCancel(true)
+                .build()
 
         notificationManager.notify(NOTIFICATION_ID, notification)
     }
@@ -86,4 +94,4 @@ class UpdateNotificationManager @Inject constructor(
     fun cancelUpdateNotification() {
         notificationManager.cancel(NOTIFICATION_ID)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/websocket/JellyfinWebSocketManager.kt b/app/src/main/java/com/makd/afinity/data/websocket/JellyfinWebSocketManager.kt
index ce907ade5..4c8baf2f8 100644
--- a/app/src/main/java/com/makd/afinity/data/websocket/JellyfinWebSocketManager.kt
+++ b/app/src/main/java/com/makd/afinity/data/websocket/JellyfinWebSocketManager.kt
@@ -2,6 +2,8 @@ package com.makd.afinity.data.websocket
 
 import com.makd.afinity.data.repository.media.MediaRepository
 import com.makd.afinity.data.repository.userdata.UserDataRepository
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -19,14 +21,14 @@ import org.jellyfin.sdk.model.api.ServerShuttingDownMessage
 import org.jellyfin.sdk.model.api.SessionsMessage
 import org.jellyfin.sdk.model.api.UserDataChangedMessage
 import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @Singleton
-class JellyfinWebSocketManager @Inject constructor(
+class JellyfinWebSocketManager
+@Inject
+constructor(
     private val apiClient: ApiClient,
     private val mediaRepository: MediaRepository,
-    private val userDataRepository: UserDataRepository
+    private val userDataRepository: UserDataRepository,
 ) {
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
 
@@ -39,12 +41,13 @@ class JellyfinWebSocketManager @Inject constructor(
                 _connectionState.value = WebSocketState.CONNECTING
 
                 apiClient.webSocket.state.collect { socketState ->
-                    _connectionState.value = when (socketState) {
-                        is SocketApiState.Connected -> WebSocketState.CONNECTED
-                        is SocketApiState.Connecting -> WebSocketState.CONNECTING
-                        is SocketApiState.Disconnected -> WebSocketState.DISCONNECTED
-                        else -> WebSocketState.DISCONNECTED
-                    }
+                    _connectionState.value =
+                        when (socketState) {
+                            is SocketApiState.Connected -> WebSocketState.CONNECTED
+                            is SocketApiState.Connecting -> WebSocketState.CONNECTING
+                            is SocketApiState.Disconnected -> WebSocketState.DISCONNECTED
+                            else -> WebSocketState.DISCONNECTED
+                        }
                 }
             } catch (e: Exception) {
                 Timber.e(e, "Failed to monitor WebSocket state")
@@ -183,4 +186,4 @@ class JellyfinWebSocketManager @Inject constructor(
         Timber.w("Server is shutting down")
         _connectionState.value = WebSocketState.SERVER_SHUTDOWN
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/websocket/WebSocketState.kt b/app/src/main/java/com/makd/afinity/data/websocket/WebSocketState.kt
index 001b31c21..610da1c92 100644
--- a/app/src/main/java/com/makd/afinity/data/websocket/WebSocketState.kt
+++ b/app/src/main/java/com/makd/afinity/data/websocket/WebSocketState.kt
@@ -7,5 +7,5 @@ enum class WebSocketState {
     DISCONNECTING,
     ERROR,
     SERVER_RESTARTING,
-    SERVER_SHUTDOWN
-}
\ No newline at end of file
+    SERVER_SHUTDOWN,
+}
diff --git a/app/src/main/java/com/makd/afinity/data/workers/ImageDownloadWorker.kt b/app/src/main/java/com/makd/afinity/data/workers/ImageDownloadWorker.kt
index 9f7f3c3f7..20e9f0986 100644
--- a/app/src/main/java/com/makd/afinity/data/workers/ImageDownloadWorker.kt
+++ b/app/src/main/java/com/makd/afinity/data/workers/ImageDownloadWorker.kt
@@ -16,6 +16,9 @@ import com.makd.afinity.data.repository.download.JellyfinDownloadRepository
 import com.makd.afinity.di.DownloadClient
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
+import java.io.File
+import java.io.FileOutputStream
+import java.util.UUID
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
@@ -23,12 +26,11 @@ import okhttp3.Request
 import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.extensions.userApi
 import timber.log.Timber
-import java.io.File
-import java.io.FileOutputStream
-import java.util.UUID
 
 @HiltWorker
-class ImageDownloadWorker @AssistedInject constructor(
+class ImageDownloadWorker
+@AssistedInject
+constructor(
     @Assisted appContext: Context,
     @Assisted workerParams: WorkerParameters,
     private val sessionManager: SessionManager,
@@ -44,179 +46,201 @@ class ImageDownloadWorker @AssistedInject constructor(
         const val BUFFER_SIZE = 8192
     }
 
-    override suspend fun doWork(): Result = withContext(Dispatchers.IO) {
-        val downloadIdString = inputData.getString(KEY_DOWNLOAD_ID)
-            ?: return@withContext Result.failure(workDataOf("error" to "Missing download ID"))
-
-        val itemIdString = inputData.getString(KEY_ITEM_ID)
-            ?: return@withContext Result.failure(workDataOf("error" to "Missing item ID"))
-
-        val itemId = try {
-            UUID.fromString(itemIdString)
-        } catch (e: IllegalArgumentException) {
-            return@withContext Result.failure(workDataOf("error" to "Invalid item ID"))
-        }
-
-        val sourceId = inputData.getString(KEY_SOURCE_ID)
-            ?: return@withContext Result.failure(workDataOf("error" to "Missing source ID"))
-
-        try {
-            Timber.d("Starting image download for item: $itemId")
+    override suspend fun doWork(): Result =
+        withContext(Dispatchers.IO) {
+            val downloadIdString =
+                inputData.getString(KEY_DOWNLOAD_ID)
+                    ?: return@withContext Result.failure(
+                        workDataOf("error" to "Missing download ID")
+                    )
 
-            val download: DownloadDto = databaseRepository.getDownloadByItemId(itemId)
-                ?: return@withContext Result.failure(workDataOf("error" to "Download not found"))
+            val itemIdString =
+                inputData.getString(KEY_ITEM_ID)
+                    ?: return@withContext Result.failure(workDataOf("error" to "Missing item ID"))
 
-            val apiClient = sessionManager.getOrRestoreApiClient(download.serverId)
-                ?: return@withContext Result.failure(workDataOf("error" to "Could not restore session for server ${download.serverId}"))
-
-            val userId = try {
-                apiClient.userApi.getCurrentUser().content?.id
-            } catch (e: Exception) {
-                null
-            } ?: return@withContext Result.failure(workDataOf("error" to "User not authenticated"))
-
-            val item = databaseRepository.getMovie(itemId, userId)
-                ?: databaseRepository.getEpisode(itemId, userId)
-                ?: return@withContext Result.failure(workDataOf("error" to "Item not found in database"))
-
-            Timber.d("Loaded item from database: ${item.name}, has images: ${item.images.primary != null}")
+            val itemId =
+                try {
+                    UUID.fromString(itemIdString)
+                } catch (e: IllegalArgumentException) {
+                    return@withContext Result.failure(workDataOf("error" to "Invalid item ID"))
+                }
 
-            val itemDir = downloadRepository.getItemDownloadDirectory(itemId)
-            val imagesDir = File(itemDir, "images").also { it.mkdirs() }
+            val sourceId =
+                inputData.getString(KEY_SOURCE_ID)
+                    ?: return@withContext Result.failure(workDataOf("error" to "Missing source ID"))
+
+            try {
+                Timber.d("Starting image download for item: $itemId")
+
+                val download: DownloadDto =
+                    databaseRepository.getDownloadByItemId(itemId)
+                        ?: return@withContext Result.failure(
+                            workDataOf("error" to "Download not found")
+                        )
+
+                val apiClient =
+                    sessionManager.getOrRestoreApiClient(download.serverId)
+                        ?: return@withContext Result.failure(
+                            workDataOf(
+                                "error" to
+                                    "Could not restore session for server ${download.serverId}"
+                            )
+                        )
+
+                val userId =
+                    try {
+                        apiClient.userApi.getCurrentUser().content?.id
+                    } catch (e: Exception) {
+                        null
+                    }
+                        ?: return@withContext Result.failure(
+                            workDataOf("error" to "User not authenticated")
+                        )
+
+                val item =
+                    databaseRepository.getMovie(itemId, userId)
+                        ?: databaseRepository.getEpisode(itemId, userId)
+                        ?: return@withContext Result.failure(
+                            workDataOf("error" to "Item not found in database")
+                        )
+
+                Timber.d(
+                    "Loaded item from database: ${item.name}, has images: ${item.images.primary != null}"
+                )
 
-            val images = item.images
-            val downloadedImages = mutableMapOf<String, android.net.Uri>()
+                val itemDir = downloadRepository.getItemDownloadDirectory(itemId)
+                val imagesDir = File(itemDir, "images").also { it.mkdirs() }
 
-            fun downloadWithClient(url: String, baseName: String): android.net.Uri? {
-                return downloadImage(apiClient, url, imagesDir, baseName)
-            }
+                val images = item.images
+                val downloadedImages = mutableMapOf<String, android.net.Uri>()
 
-            if (images.primary != null) {
-                try {
-                    val url = images.primary.toString()
-                    if (url.startsWith("file://")) {
-                        Timber.d("Primary image already local, skipping download: $url")
-                    } else {
-                        Timber.d("Downloading primary image from: $url")
-                        val localUri = downloadWithClient(url, "primary")
-                        if (localUri != null) {
-                            downloadedImages["primary"] = localUri
-                            Timber.i("Primary image downloaded successfully")
-                        }
-                    }
-                } catch (e: Exception) {
-                    Timber.w(e, "Failed to download primary image")
+                fun downloadWithClient(url: String, baseName: String): android.net.Uri? {
+                    return downloadImage(apiClient, url, imagesDir, baseName)
                 }
-            }
 
-            if (images.backdrop != null) {
-                try {
-                    val url = images.backdrop.toString()
-                    if (url.startsWith("file://")) {
-                        Timber.d("Backdrop image already local, skipping download: $url")
-                    } else {
-                        Timber.d("Downloading backdrop image from: $url")
-                        val localUri = downloadWithClient(url, "backdrop")
-                        if (localUri != null) {
-                            downloadedImages["backdrop"] = localUri
-                            Timber.i("Backdrop image downloaded successfully")
+                if (images.primary != null) {
+                    try {
+                        val url = images.primary.toString()
+                        if (url.startsWith("file://")) {
+                            Timber.d("Primary image already local, skipping download: $url")
+                        } else {
+                            Timber.d("Downloading primary image from: $url")
+                            val localUri = downloadWithClient(url, "primary")
+                            if (localUri != null) {
+                                downloadedImages["primary"] = localUri
+                                Timber.i("Primary image downloaded successfully")
+                            }
                         }
+                    } catch (e: Exception) {
+                        Timber.w(e, "Failed to download primary image")
                     }
-                } catch (e: Exception) {
-                    Timber.w(e, "Failed to download backdrop image")
                 }
-            }
 
-            if (images.logo != null) {
-                try {
-                    val url = images.logo.toString()
-                    if (url.startsWith("file://")) {
-                        Timber.d("Logo image already local, skipping download: $url")
-                    } else {
-                        Timber.d("Downloading logo image from: $url")
-                        val localUri = downloadWithClient(url, "logo")
-                        if (localUri != null) {
-                            downloadedImages["logo"] = localUri
-                            Timber.i("Logo image downloaded successfully")
+                if (images.backdrop != null) {
+                    try {
+                        val url = images.backdrop.toString()
+                        if (url.startsWith("file://")) {
+                            Timber.d("Backdrop image already local, skipping download: $url")
+                        } else {
+                            Timber.d("Downloading backdrop image from: $url")
+                            val localUri = downloadWithClient(url, "backdrop")
+                            if (localUri != null) {
+                                downloadedImages["backdrop"] = localUri
+                                Timber.i("Backdrop image downloaded successfully")
+                            }
                         }
+                    } catch (e: Exception) {
+                        Timber.w(e, "Failed to download backdrop image")
                     }
-                } catch (e: Exception) {
-                    Timber.w(e, "Failed to download logo image")
                 }
-            }
 
-            if (images.thumb != null) {
-                try {
-                    val url = images.thumb.toString()
-                    if (url.startsWith("file://")) {
-                        Timber.d("Thumb image already local, skipping download: $url")
-                    } else {
-                        Timber.d("Downloading thumb image from: $url")
-                        val localUri = downloadWithClient(url, "thumb")
-                        if (localUri != null) {
-                            downloadedImages["thumb"] = localUri
-                            Timber.i("Thumb image downloaded successfully")
+                if (images.logo != null) {
+                    try {
+                        val url = images.logo.toString()
+                        if (url.startsWith("file://")) {
+                            Timber.d("Logo image already local, skipping download: $url")
+                        } else {
+                            Timber.d("Downloading logo image from: $url")
+                            val localUri = downloadWithClient(url, "logo")
+                            if (localUri != null) {
+                                downloadedImages["logo"] = localUri
+                                Timber.i("Logo image downloaded successfully")
+                            }
                         }
+                    } catch (e: Exception) {
+                        Timber.w(e, "Failed to download logo image")
                     }
-                } catch (e: Exception) {
-                    Timber.w(e, "Failed to download thumb image")
                 }
-            }
 
-            if (item is AfinityEpisode) {
-                if (item.seriesLogo != null) {
+                if (images.thumb != null) {
                     try {
-                        val url = item.seriesLogo.toString()
+                        val url = images.thumb.toString()
                         if (url.startsWith("file://")) {
-                            Timber.d("Series logo already local, skipping download: $url")
+                            Timber.d("Thumb image already local, skipping download: $url")
                         } else {
-                            Timber.d("Downloading series logo image from: $url")
-                            val localUri = downloadWithClient(url, "series_logo")
+                            Timber.d("Downloading thumb image from: $url")
+                            val localUri = downloadWithClient(url, "thumb")
                             if (localUri != null) {
-                                downloadedImages["series_logo"] = localUri
-                                Timber.i("Series logo image downloaded successfully")
+                                downloadedImages["thumb"] = localUri
+                                Timber.i("Thumb image downloaded successfully")
                             }
                         }
                     } catch (e: Exception) {
-                        Timber.w(e, "Failed to download series logo")
+                        Timber.w(e, "Failed to download thumb image")
                     }
                 }
-            }
-
-            Timber.i("Image download completed for item: $itemId - ${downloadedImages.size} images downloaded")
 
-            if (downloadedImages.isNotEmpty()) {
-                updateItemWithLocalImages(item, downloadedImages, download.serverId)
-            }
+                if (item is AfinityEpisode) {
+                    if (item.seriesLogo != null) {
+                        try {
+                            val url = item.seriesLogo.toString()
+                            if (url.startsWith("file://")) {
+                                Timber.d("Series logo already local, skipping download: $url")
+                            } else {
+                                Timber.d("Downloading series logo image from: $url")
+                                val localUri = downloadWithClient(url, "series_logo")
+                                if (localUri != null) {
+                                    downloadedImages["series_logo"] = localUri
+                                    Timber.i("Series logo image downloaded successfully")
+                                }
+                            }
+                        } catch (e: Exception) {
+                            Timber.w(e, "Failed to download series logo")
+                        }
+                    }
+                }
 
-            return@withContext Result.success(
-                workDataOf(
-                    KEY_DOWNLOAD_ID to downloadIdString,
-                    KEY_ITEM_ID to itemIdString,
-                    KEY_SOURCE_ID to sourceId
+                Timber.i(
+                    "Image download completed for item: $itemId - ${downloadedImages.size} images downloaded"
                 )
-            )
 
-        } catch (e: Exception) {
-            Timber.e(e, "Image download failed")
-            return@withContext Result.failure(
-                workDataOf(
-                    "error" to (e.message ?: "Unknown error")
+                if (downloadedImages.isNotEmpty()) {
+                    updateItemWithLocalImages(item, downloadedImages, download.serverId)
+                }
+
+                return@withContext Result.success(
+                    workDataOf(
+                        KEY_DOWNLOAD_ID to downloadIdString,
+                        KEY_ITEM_ID to itemIdString,
+                        KEY_SOURCE_ID to sourceId,
+                    )
+                )
+            } catch (e: Exception) {
+                Timber.e(e, "Image download failed")
+                return@withContext Result.failure(
+                    workDataOf("error" to (e.message ?: "Unknown error"))
                 )
-            )
+            }
         }
-    }
 
     private fun downloadImage(
         apiClient: ApiClient,
         url: String,
         outputDir: File,
-        baseName: String
+        baseName: String,
     ): android.net.Uri? {
-        val request = Request.Builder()
-            .url(url)
-            .header("X-Emby-Token", apiClient.accessToken ?: "")
-            .build()
+        val request =
+            Request.Builder().url(url).header("X-Emby-Token", apiClient.accessToken ?: "").build()
 
         okHttpClient.newCall(request).execute().use { response ->
             if (!response.isSuccessful) {
@@ -224,13 +248,14 @@ class ImageDownloadWorker @AssistedInject constructor(
             }
 
             val contentType = response.header("Content-Type") ?: "image/jpeg"
-            val extension = when {
-                contentType.contains("png") -> "png"
-                contentType.contains("webp") -> "webp"
-                contentType.contains("gif") -> "gif"
-                contentType.contains("jpeg") || contentType.contains("jpg") -> "jpg"
-                else -> "jpg"
-            }
+            val extension =
+                when {
+                    contentType.contains("png") -> "png"
+                    contentType.contains("webp") -> "webp"
+                    contentType.contains("gif") -> "gif"
+                    contentType.contains("jpeg") || contentType.contains("jpg") -> "jpg"
+                    else -> "jpg"
+                }
 
             val outputFile = File(outputDir, "$baseName.$extension")
 
@@ -262,36 +287,41 @@ class ImageDownloadWorker @AssistedInject constructor(
     private suspend fun updateItemWithLocalImages(
         item: AfinityItem,
         downloadedImages: Map<String, android.net.Uri>,
-        serverId: String
+        serverId: String,
     ) {
         try {
             val images = item.images
-            val updatedImages = AfinityImages(
-                primary = downloadedImages["primary"] ?: images.primary,
-                backdrop = downloadedImages["backdrop"] ?: images.backdrop,
-                thumb = downloadedImages["thumb"] ?: images.thumb,
-                logo = downloadedImages["logo"] ?: images.logo,
-                showPrimary = images.showPrimary,
-                showBackdrop = images.showBackdrop,
-                showLogo = downloadedImages["series_logo"] ?: images.showLogo,
-                primaryImageBlurHash = images.primaryImageBlurHash,
-                backdropImageBlurHash = images.backdropImageBlurHash,
-                thumbImageBlurHash = images.thumbImageBlurHash,
-                logoImageBlurHash = images.logoImageBlurHash,
-                showPrimaryImageBlurHash = images.showPrimaryImageBlurHash,
-                showBackdropImageBlurHash = images.showBackdropImageBlurHash,
-                showLogoImageBlurHash = images.showLogoImageBlurHash
-            )
+            val updatedImages =
+                AfinityImages(
+                    primary = downloadedImages["primary"] ?: images.primary,
+                    backdrop = downloadedImages["backdrop"] ?: images.backdrop,
+                    thumb = downloadedImages["thumb"] ?: images.thumb,
+                    logo = downloadedImages["logo"] ?: images.logo,
+                    showPrimary = images.showPrimary,
+                    showBackdrop = images.showBackdrop,
+                    showLogo = downloadedImages["series_logo"] ?: images.showLogo,
+                    primaryImageBlurHash = images.primaryImageBlurHash,
+                    backdropImageBlurHash = images.backdropImageBlurHash,
+                    thumbImageBlurHash = images.thumbImageBlurHash,
+                    logoImageBlurHash = images.logoImageBlurHash,
+                    showPrimaryImageBlurHash = images.showPrimaryImageBlurHash,
+                    showBackdropImageBlurHash = images.showBackdropImageBlurHash,
+                    showLogoImageBlurHash = images.showLogoImageBlurHash,
+                )
 
             when (item) {
                 is AfinityMovie -> {
                     databaseRepository.insertMovie(item.copy(images = updatedImages), serverId)
-                    Timber.i("Updated movie in database with ${downloadedImages.size} local image paths")
+                    Timber.i(
+                        "Updated movie in database with ${downloadedImages.size} local image paths"
+                    )
                 }
 
                 is AfinityEpisode -> {
                     databaseRepository.insertEpisode(item.copy(images = updatedImages), serverId)
-                    Timber.i("Updated episode in database with ${downloadedImages.size} local image paths")
+                    Timber.i(
+                        "Updated episode in database with ${downloadedImages.size} local image paths"
+                    )
                 }
 
                 else -> {
@@ -302,4 +332,4 @@ class ImageDownloadWorker @AssistedInject constructor(
             Timber.e(e, "Failed to update item with local images")
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/workers/MediaDownloadWorker.kt b/app/src/main/java/com/makd/afinity/data/workers/MediaDownloadWorker.kt
index ceda1e6b1..a5535adbc 100644
--- a/app/src/main/java/com/makd/afinity/data/workers/MediaDownloadWorker.kt
+++ b/app/src/main/java/com/makd/afinity/data/workers/MediaDownloadWorker.kt
@@ -1,9 +1,9 @@
 package com.makd.afinity.data.workers
 
 import android.app.NotificationChannel
-import android.content.pm.ServiceInfo
 import android.app.NotificationManager
 import android.content.Context
+import android.content.pm.ServiceInfo
 import android.net.Uri
 import android.os.Build
 import androidx.core.app.NotificationCompat
@@ -34,6 +34,9 @@ import com.makd.afinity.data.repository.segments.SegmentsRepository
 import com.makd.afinity.di.DownloadClient
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
+import java.io.File
+import java.io.FileOutputStream
+import java.util.UUID
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
@@ -45,12 +48,11 @@ import org.jellyfin.sdk.api.operations.ItemsApi
 import org.jellyfin.sdk.model.api.BaseItemKind
 import org.jellyfin.sdk.model.api.ItemFields
 import timber.log.Timber
-import java.io.File
-import java.io.FileOutputStream
-import java.util.UUID
 
 @HiltWorker
-class MediaDownloadWorker @AssistedInject constructor(
+class MediaDownloadWorker
+@AssistedInject
+constructor(
     @Assisted appContext: Context,
     @Assisted workerParams: WorkerParameters,
     private val sessionManager: SessionManager,
@@ -71,248 +73,303 @@ class MediaDownloadWorker @AssistedInject constructor(
         const val BUFFER_SIZE = 8192
     }
 
-    override suspend fun doWork(): Result = withContext(Dispatchers.IO) {
-        val downloadIdString = inputData.getString(KEY_DOWNLOAD_ID)
-            ?: return@withContext Result.failure(workDataOf("error" to "Missing download ID"))
-
-        val downloadId = try {
-            UUID.fromString(downloadIdString)
-        } catch (e: IllegalArgumentException) {
-            return@withContext Result.failure(workDataOf("error" to "Invalid download ID"))
-        }
-
-        val itemIdString = inputData.getString(KEY_ITEM_ID)
-            ?: return@withContext Result.failure(workDataOf("error" to "Missing item ID"))
-
-        val itemId = try {
-            UUID.fromString(itemIdString)
-        } catch (e: IllegalArgumentException) {
-            return@withContext Result.failure(workDataOf("error" to "Invalid item ID"))
-        }
-
-        val sourceId = inputData.getString(KEY_SOURCE_ID)
-            ?: return@withContext Result.failure(workDataOf("error" to "Missing source ID"))
-
-        val itemName = inputData.getString(KEY_ITEM_NAME) ?: "Unknown"
-        val itemType = inputData.getString(KEY_ITEM_TYPE) ?: "Unknown"
+    override suspend fun doWork(): Result =
+        withContext(Dispatchers.IO) {
+            val downloadIdString =
+                inputData.getString(KEY_DOWNLOAD_ID)
+                    ?: return@withContext Result.failure(
+                        workDataOf("error" to "Missing download ID")
+                    )
 
-        try {
-            val foregroundInfo = createForegroundInfo(downloadId.hashCode(), itemName, 0, 0)
-            setForeground(foregroundInfo)
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to promote to foreground service")
-        }
+            val downloadId =
+                try {
+                    UUID.fromString(downloadIdString)
+                } catch (e: IllegalArgumentException) {
+                    return@withContext Result.failure(workDataOf("error" to "Invalid download ID"))
+                }
 
-        try {
-            Timber.d("Starting media download for item: $itemName ($itemType)")
+            val itemIdString =
+                inputData.getString(KEY_ITEM_ID)
+                    ?: return@withContext Result.failure(workDataOf("error" to "Missing item ID"))
 
-            val download: DownloadDto = databaseRepository.getDownload(downloadId)
-                ?: return@withContext Result.failure(workDataOf("error" to "Download not found"))
+            val itemId =
+                try {
+                    UUID.fromString(itemIdString)
+                } catch (e: IllegalArgumentException) {
+                    return@withContext Result.failure(workDataOf("error" to "Invalid item ID"))
+                }
 
-            val apiClient = sessionManager.getOrRestoreApiClient(download.serverId)
-                ?: return@withContext Result.failure(workDataOf("error" to "Could not restore session for server ${download.serverId}"))
+            val sourceId =
+                inputData.getString(KEY_SOURCE_ID)
+                    ?: return@withContext Result.failure(workDataOf("error" to "Missing source ID"))
 
-            databaseRepository.insertDownload(
-                download.copy(
-                    status = DownloadStatus.DOWNLOADING,
-                    updatedAt = System.currentTimeMillis()
-                )
-            )
+            val itemName = inputData.getString(KEY_ITEM_NAME) ?: "Unknown"
+            val itemType = inputData.getString(KEY_ITEM_TYPE) ?: "Unknown"
 
-            val userId = try {
-                apiClient.userApi.getCurrentUser().content?.id
+            try {
+                val foregroundInfo = createForegroundInfo(downloadId.hashCode(), itemName, 0, 0)
+                setForeground(foregroundInfo)
             } catch (e: Exception) {
-                null
-            } ?: return@withContext Result.failure(workDataOf("error" to "User not authenticated"))
-
-            if (userId != download.userId) {
-                Timber.w("User ID mismatch. Download started by ${download.userId}, active token is for $userId")
+                Timber.e(e, "Failed to promote to foreground service")
             }
 
-            val baseUrl = apiClient.baseUrl ?: ""
+            try {
+                Timber.d("Starting media download for item: $itemName ($itemType)")
 
-            val itemsApi = ItemsApi(apiClient)
-            val baseItemDto = try {
-                itemsApi.getItems(
-                    userId = userId,
-                    ids = listOf(itemId),
-                    fields = listOf(
-                        ItemFields.MEDIA_SOURCES,
-                        ItemFields.MEDIA_STREAMS,
-                        ItemFields.OVERVIEW
-                    ),
-                    enableImages = true,
-                    enableUserData = true
-                ).content?.items?.firstOrNull()
-            } catch (e: Exception) {
-                Timber.e(e, "Failed to fetch item details")
-                null
-            } ?: return@withContext Result.failure(workDataOf("error" to "Item not found"))
+                val download: DownloadDto =
+                    databaseRepository.getDownload(downloadId)
+                        ?: return@withContext Result.failure(
+                            workDataOf("error" to "Download not found")
+                        )
 
-            val item = when (baseItemDto.type) {
-                BaseItemKind.MOVIE -> baseItemDto.toAfinityMovie(baseUrl)
-                BaseItemKind.EPISODE -> baseItemDto.toAfinityEpisode(baseUrl)
-                    ?: return@withContext Result.failure(workDataOf("error" to "Failed to convert episode"))
+                val apiClient =
+                    sessionManager.getOrRestoreApiClient(download.serverId)
+                        ?: return@withContext Result.failure(
+                            workDataOf(
+                                "error" to
+                                    "Could not restore session for server ${download.serverId}"
+                            )
+                        )
 
-                else -> return@withContext Result.failure(
-                    workDataOf("error" to "Unsupported item type: ${baseItemDto.type}")
+                databaseRepository.insertDownload(
+                    download.copy(
+                        status = DownloadStatus.DOWNLOADING,
+                        updatedAt = System.currentTimeMillis(),
+                    )
                 )
-            }
 
-            val source = item.sources.find { it.id == sourceId }
-                ?: return@withContext Result.failure(workDataOf("error" to "Source not found"))
+                val userId =
+                    try {
+                        apiClient.userApi.getCurrentUser().content?.id
+                    } catch (e: Exception) {
+                        null
+                    }
+                        ?: return@withContext Result.failure(
+                            workDataOf("error" to "User not authenticated")
+                        )
 
-            val itemDir = downloadRepository.getItemDownloadDirectory(itemId)
-            val mediaDir = File(itemDir, "media").also { it.mkdirs() }
+                if (userId != download.userId) {
+                    Timber.w(
+                        "User ID mismatch. Download started by ${download.userId}, active token is for $userId"
+                    )
+                }
 
-            val extension = when {
-                source.path.contains(".mkv") -> "mkv"
-                source.path.contains(".mp4") -> "mp4"
-                source.path.contains(".avi") -> "avi"
-                else -> "mkv"
-            }
+                val baseUrl = apiClient.baseUrl ?: ""
 
-            val outputFile = File(mediaDir, "$sourceId.$extension.download")
-            val finalFile = File(mediaDir, "$sourceId.$extension")
+                val itemsApi = ItemsApi(apiClient)
+                val baseItemDto =
+                    try {
+                        itemsApi
+                            .getItems(
+                                userId = userId,
+                                ids = listOf(itemId),
+                                fields =
+                                    listOf(
+                                        ItemFields.MEDIA_SOURCES,
+                                        ItemFields.MEDIA_STREAMS,
+                                        ItemFields.OVERVIEW,
+                                    ),
+                                enableImages = true,
+                                enableUserData = true,
+                            )
+                            .content
+                            ?.items
+                            ?.firstOrNull()
+                    } catch (e: Exception) {
+                        Timber.e(e, "Failed to fetch item details")
+                        null
+                    } ?: return@withContext Result.failure(workDataOf("error" to "Item not found"))
+
+                val item =
+                    when (baseItemDto.type) {
+                        BaseItemKind.MOVIE -> baseItemDto.toAfinityMovie(baseUrl)
+                        BaseItemKind.EPISODE ->
+                            baseItemDto.toAfinityEpisode(baseUrl)
+                                ?: return@withContext Result.failure(
+                                    workDataOf("error" to "Failed to convert episode")
+                                )
+
+                        else ->
+                            return@withContext Result.failure(
+                                workDataOf("error" to "Unsupported item type: ${baseItemDto.type}")
+                            )
+                    }
 
-            val downloadUrl = apiClient.libraryApi.getDownloadUrl(itemId = itemId)
+                val source =
+                    item.sources.find { it.id == sourceId }
+                        ?: return@withContext Result.failure(
+                            workDataOf("error" to "Source not found")
+                        )
 
-            val existingFileSize = if (outputFile.exists()) outputFile.length() else 0L
+                val itemDir = downloadRepository.getItemDownloadDirectory(itemId)
+                val mediaDir = File(itemDir, "media").also { it.mkdirs() }
 
-            Timber.d("Downloading from: $downloadUrl")
-            Timber.d("Saving to: ${outputFile.absolutePath}")
-            Timber.d("Resuming from byte: $existingFileSize")
+                val extension =
+                    when {
+                        source.path.contains(".mkv") -> "mkv"
+                        source.path.contains(".mp4") -> "mp4"
+                        source.path.contains(".avi") -> "avi"
+                        else -> "mkv"
+                    }
 
-            val requestBuilder = Request.Builder()
-                .url(downloadUrl)
-                .header("X-Emby-Token", apiClient.accessToken ?: "")
+                val outputFile = File(mediaDir, "$sourceId.$extension.download")
+                val finalFile = File(mediaDir, "$sourceId.$extension")
 
-            if (existingFileSize > 0) {
-                requestBuilder.header("Range", "bytes=$existingFileSize-")
-            }
+                val downloadUrl = apiClient.libraryApi.getDownloadUrl(itemId = itemId)
 
-            val request = requestBuilder.build()
+                val existingFileSize = if (outputFile.exists()) outputFile.length() else 0L
 
-            okHttpClient.newCall(request).execute().use { response ->
-                if (!response.isSuccessful) {
-                    if (response.code == 416) {
-                        Timber.w("File already fully downloaded (416). Proceeding to completion.")
-                    } else {
-                        throw Exception("Download failed: ${response.code} ${response.message}")
-                    }
-                }
+                Timber.d("Downloading from: $downloadUrl")
+                Timber.d("Saving to: ${outputFile.absolutePath}")
+                Timber.d("Resuming from byte: $existingFileSize")
 
-                val remainingBytes = response.body?.contentLength() ?: -1L
-                val totalBytes = if (remainingBytes != -1L) existingFileSize + remainingBytes else -1L
+                val requestBuilder =
+                    Request.Builder()
+                        .url(downloadUrl)
+                        .header("X-Emby-Token", apiClient.accessToken ?: "")
 
-                var downloadedBytes = existingFileSize
-                var lastUpdateTime = 0L
+                if (existingFileSize > 0) {
+                    requestBuilder.header("Range", "bytes=$existingFileSize-")
+                }
 
-                response.body?.byteStream()?.use { input ->
-                    FileOutputStream(outputFile, true).use { output ->
-                        val buffer = ByteArray(BUFFER_SIZE)
-                        var bytes: Int
+                val request = requestBuilder.build()
 
-                        while (input.read(buffer).also { bytes = it } != -1) {
-                            if (isStopped) {
-                                Timber.d("Download paused/stopped by user")
-                                try {
-                                    output.close()
-                                } catch (_: Exception) {}
+                okHttpClient.newCall(request).execute().use { response ->
+                    if (!response.isSuccessful) {
+                        if (response.code == 416) {
+                            Timber.w(
+                                "File already fully downloaded (416). Proceeding to completion."
+                            )
+                        } else {
+                            throw Exception("Download failed: ${response.code} ${response.message}")
+                        }
+                    }
 
-                                return@withContext Result.failure(workDataOf("error" to "Paused"))
-                            }
+                    val remainingBytes = response.body?.contentLength() ?: -1L
+                    val totalBytes =
+                        if (remainingBytes != -1L) existingFileSize + remainingBytes else -1L
 
-                            output.write(buffer, 0, bytes)
-                            downloadedBytes += bytes
+                    var downloadedBytes = existingFileSize
+                    var lastUpdateTime = 0L
 
-                            if (totalBytes > 0) {
-                                val progress = (downloadedBytes.toFloat() / totalBytes.toFloat())
+                    response.body?.byteStream()?.use { input ->
+                        FileOutputStream(outputFile, true).use { output ->
+                            val buffer = ByteArray(BUFFER_SIZE)
+                            var bytes: Int
+
+                            while (input.read(buffer).also { bytes = it } != -1) {
+                                if (isStopped) {
+                                    Timber.d("Download paused/stopped by user")
+                                    try {
+                                        output.close()
+                                    } catch (_: Exception) {}
+
+                                    return@withContext Result.failure(
+                                        workDataOf("error" to "Paused")
+                                    )
+                                }
 
-                                val currentTime = System.currentTimeMillis()
-                                if (currentTime - lastUpdateTime > 500 || downloadedBytes == totalBytes) {
-                                    lastUpdateTime = currentTime
-                                    updateProgress(downloadId, progress, downloadedBytes, totalBytes)
+                                output.write(buffer, 0, bytes)
+                                downloadedBytes += bytes
+
+                                if (totalBytes > 0) {
+                                    val progress =
+                                        (downloadedBytes.toFloat() / totalBytes.toFloat())
+
+                                    val currentTime = System.currentTimeMillis()
+                                    if (
+                                        currentTime - lastUpdateTime > 500 ||
+                                            downloadedBytes == totalBytes
+                                    ) {
+                                        lastUpdateTime = currentTime
+                                        updateProgress(
+                                            downloadId,
+                                            progress,
+                                            downloadedBytes,
+                                            totalBytes,
+                                        )
 
-                                    setProgressAsync(
-                                        workDataOf(
-                                            PROGRESS_KEY to progress,
-                                            "downloadedBytes" to downloadedBytes,
-                                            "totalBytes" to totalBytes
+                                        setProgressAsync(
+                                            workDataOf(
+                                                PROGRESS_KEY to progress,
+                                                "downloadedBytes" to downloadedBytes,
+                                                "totalBytes" to totalBytes,
+                                            )
                                         )
-                                    )
 
-                                    setForeground(
-                                        createForegroundInfo(
-                                            downloadId.hashCode(),
-                                            itemName,
-                                            downloadedBytes,
-                                            totalBytes
+                                        setForeground(
+                                            createForegroundInfo(
+                                                downloadId.hashCode(),
+                                                itemName,
+                                                downloadedBytes,
+                                                totalBytes,
+                                            )
                                         )
-                                    )
+                                    }
                                 }
                             }
                         }
                     }
                 }
-            }
 
-            if (outputFile.exists()) {
-                outputFile.renameTo(finalFile)
-                Timber.d("Download completed: ${finalFile.absolutePath}")
-            }
+                if (outputFile.exists()) {
+                    outputFile.renameTo(finalFile)
+                    Timber.d("Download completed: ${finalFile.absolutePath}")
+                }
 
-            val updatedDownload = download.copy(
-                status = DownloadStatus.COMPLETED,
-                progress = 1.0f,
-                bytesDownloaded = finalFile.length(),
-                totalBytes = finalFile.length(),
-                filePath = finalFile.absolutePath,
-                updatedAt = System.currentTimeMillis()
-            )
-            databaseRepository.insertDownload(updatedDownload)
+                val updatedDownload =
+                    download.copy(
+                        status = DownloadStatus.COMPLETED,
+                        progress = 1.0f,
+                        bytesDownloaded = finalFile.length(),
+                        totalBytes = finalFile.length(),
+                        filePath = finalFile.absolutePath,
+                        updatedAt = System.currentTimeMillis(),
+                    )
+                databaseRepository.insertDownload(updatedDownload)
 
-            ensureItemInDatabase(apiClient, download.serverId, itemId, itemType, userId)
-            downloadImages(apiClient, download.serverId, itemId, itemType, userId)
-            downloadSegments(itemId)
-            createLocalSource(itemId, sourceId, source.name, finalFile, source.mediaStreams)
+                ensureItemInDatabase(apiClient, download.serverId, itemId, itemType, userId)
+                downloadImages(apiClient, download.serverId, itemId, itemType, userId)
+                downloadSegments(itemId)
+                createLocalSource(itemId, sourceId, source.name, finalFile, source.mediaStreams)
 
-            Timber.i("Media download completed successfully for: $itemName")
+                Timber.i("Media download completed successfully for: $itemName")
 
-            return@withContext Result.success(
-                workDataOf(
-                    KEY_DOWNLOAD_ID to downloadIdString,
-                    KEY_ITEM_ID to itemIdString,
-                    KEY_SOURCE_ID to sourceId,
-                    KEY_FILE_PATH to finalFile.absolutePath
+                return@withContext Result.success(
+                    workDataOf(
+                        KEY_DOWNLOAD_ID to downloadIdString,
+                        KEY_ITEM_ID to itemIdString,
+                        KEY_SOURCE_ID to sourceId,
+                        KEY_FILE_PATH to finalFile.absolutePath,
+                    )
                 )
-            )
-
-        } catch (e: Exception) {
-            Timber.e(e, "Media download failed")
-            try {
-                val download = databaseRepository.getDownload(downloadId)
-                if (download != null) {
-                    databaseRepository.insertDownload(
-                        download.copy(
-                            status = DownloadStatus.FAILED,
-                            error = e.message ?: "Unknown error",
-                            updatedAt = System.currentTimeMillis()
+            } catch (e: Exception) {
+                Timber.e(e, "Media download failed")
+                try {
+                    val download = databaseRepository.getDownload(downloadId)
+                    if (download != null) {
+                        databaseRepository.insertDownload(
+                            download.copy(
+                                status = DownloadStatus.FAILED,
+                                error = e.message ?: "Unknown error",
+                                updatedAt = System.currentTimeMillis(),
+                            )
                         )
-                    )
+                    }
+                } catch (dbEx: Exception) {
+                    Timber.e(dbEx, "Failed to update download status to FAILED")
                 }
-            } catch (dbEx: Exception) {
-                Timber.e(dbEx, "Failed to update download status to FAILED")
+                return@withContext Result.failure(
+                    workDataOf("error" to (e.message ?: "Unknown error"))
+                )
             }
-            return@withContext Result.failure(workDataOf("error" to (e.message ?: "Unknown error")))
         }
-    }
 
     private suspend fun updateProgress(
         downloadId: UUID,
         progress: Float,
         downloadedBytes: Long,
-        totalBytes: Long
+        totalBytes: Long,
     ) {
         try {
             val download = databaseRepository.getDownload(downloadId)
@@ -322,7 +379,7 @@ class MediaDownloadWorker @AssistedInject constructor(
                         progress = progress,
                         bytesDownloaded = downloadedBytes,
                         totalBytes = totalBytes,
-                        updatedAt = System.currentTimeMillis()
+                        updatedAt = System.currentTimeMillis(),
                     )
                 )
             }
@@ -336,33 +393,39 @@ class MediaDownloadWorker @AssistedInject constructor(
         serverId: String,
         itemId: UUID,
         itemType: String,
-        userId: UUID
+        userId: UUID,
     ) {
         try {
             Timber.d("Ensuring item $itemId is saved to database")
             val baseUrl = apiClient.baseUrl ?: ""
             val itemsApi = ItemsApi(apiClient)
 
-            val baseItemDto = try {
-                itemsApi.getItems(
-                    userId = userId,
-                    ids = listOf(itemId),
-                    fields = listOf(
-                        ItemFields.MEDIA_SOURCES,
-                        ItemFields.MEDIA_STREAMS,
-                        ItemFields.OVERVIEW,
-                        ItemFields.GENRES,
-                        ItemFields.PEOPLE,
-                        ItemFields.TAGLINES,
-                        ItemFields.CHAPTERS,
-                        ItemFields.TRICKPLAY
-                    ),
-                    enableImages = true,
-                    enableUserData = true
-                ).content?.items?.firstOrNull()
-            } catch (e: Exception) {
-                null
-            }
+            val baseItemDto =
+                try {
+                    itemsApi
+                        .getItems(
+                            userId = userId,
+                            ids = listOf(itemId),
+                            fields =
+                                listOf(
+                                    ItemFields.MEDIA_SOURCES,
+                                    ItemFields.MEDIA_STREAMS,
+                                    ItemFields.OVERVIEW,
+                                    ItemFields.GENRES,
+                                    ItemFields.PEOPLE,
+                                    ItemFields.TAGLINES,
+                                    ItemFields.CHAPTERS,
+                                    ItemFields.TRICKPLAY,
+                                ),
+                            enableImages = true,
+                            enableUserData = true,
+                        )
+                        .content
+                        ?.items
+                        ?.firstOrNull()
+                } catch (e: Exception) {
+                    null
+                }
 
             if (baseItemDto == null) return
 
@@ -377,21 +440,27 @@ class MediaDownloadWorker @AssistedInject constructor(
                     if (episode != null) {
                         episode.seriesId?.let { seriesId ->
                             if (databaseRepository.getShow(seriesId, userId) == null) {
-                                val showDto = try {
-                                    itemsApi.getItems(
-                                        userId = userId,
-                                        ids = listOf(seriesId),
-                                        fields = listOf(
-                                            ItemFields.OVERVIEW,
-                                            ItemFields.GENRES,
-                                            ItemFields.PEOPLE
-                                        ),
-                                        enableImages = true,
-                                        enableUserData = true
-                                    ).content?.items?.firstOrNull()
-                                } catch (e: Exception) {
-                                    null
-                                }
+                                val showDto =
+                                    try {
+                                        itemsApi
+                                            .getItems(
+                                                userId = userId,
+                                                ids = listOf(seriesId),
+                                                fields =
+                                                    listOf(
+                                                        ItemFields.OVERVIEW,
+                                                        ItemFields.GENRES,
+                                                        ItemFields.PEOPLE,
+                                                    ),
+                                                enableImages = true,
+                                                enableUserData = true,
+                                            )
+                                            .content
+                                            ?.items
+                                            ?.firstOrNull()
+                                    } catch (e: Exception) {
+                                        null
+                                    }
 
                                 showDto?.toAfinityShow(baseUrl)?.let { show ->
                                     databaseRepository.insertShow(show, serverId)
@@ -402,17 +471,22 @@ class MediaDownloadWorker @AssistedInject constructor(
 
                         episode.seasonId.let { seasonId ->
                             if (databaseRepository.getSeason(seasonId, userId) == null) {
-                                val seasonDto = try {
-                                    itemsApi.getItems(
-                                        userId = userId,
-                                        ids = listOf(seasonId),
-                                        fields = listOf(ItemFields.OVERVIEW),
-                                        enableImages = true,
-                                        enableUserData = true
-                                    ).content?.items?.firstOrNull()
-                                } catch (e: Exception) {
-                                    null
-                                }
+                                val seasonDto =
+                                    try {
+                                        itemsApi
+                                            .getItems(
+                                                userId = userId,
+                                                ids = listOf(seasonId),
+                                                fields = listOf(ItemFields.OVERVIEW),
+                                                enableImages = true,
+                                                enableUserData = true,
+                                            )
+                                            .content
+                                            ?.items
+                                            ?.firstOrNull()
+                                    } catch (e: Exception) {
+                                        null
+                                    }
 
                                 seasonDto?.toAfinitySeason(baseUrl)?.let { season ->
                                     databaseRepository.insertSeason(season, serverId)
@@ -437,14 +511,15 @@ class MediaDownloadWorker @AssistedInject constructor(
         serverId: String,
         itemId: UUID,
         itemType: String,
-        userId: UUID
+        userId: UUID,
     ) {
         try {
-            val item = when (itemType.uppercase()) {
-                "MOVIE" -> databaseRepository.getMovie(itemId, userId)
-                "EPISODE" -> databaseRepository.getEpisode(itemId, userId)
-                else -> null
-            } ?: return
+            val item =
+                when (itemType.uppercase()) {
+                    "MOVIE" -> databaseRepository.getMovie(itemId, userId)
+                    "EPISODE" -> databaseRepository.getEpisode(itemId, userId)
+                    else -> null
+                } ?: return
 
             val itemDir = downloadRepository.getItemDownloadDirectory(itemId)
             val imagesDir = File(itemDir, "images").also { it.mkdirs() }
@@ -470,22 +545,23 @@ class MediaDownloadWorker @AssistedInject constructor(
                 saveImage(images.showLogo, "showLogo")
             }
 
-            val updatedImages = AfinityImages(
-                primary = downloadedImages["primary"] ?: images.primary,
-                backdrop = downloadedImages["backdrop"] ?: images.backdrop,
-                thumb = downloadedImages["thumb"] ?: images.thumb,
-                logo = downloadedImages["logo"] ?: images.logo,
-                showPrimary = downloadedImages["showPrimary"] ?: images.showPrimary,
-                showBackdrop = downloadedImages["showBackdrop"] ?: images.showBackdrop,
-                showLogo = downloadedImages["showLogo"] ?: images.showLogo,
-                primaryImageBlurHash = images.primaryImageBlurHash,
-                backdropImageBlurHash = images.backdropImageBlurHash,
-                thumbImageBlurHash = images.thumbImageBlurHash,
-                logoImageBlurHash = images.logoImageBlurHash,
-                showPrimaryImageBlurHash = images.showPrimaryImageBlurHash,
-                showBackdropImageBlurHash = images.showBackdropImageBlurHash,
-                showLogoImageBlurHash = images.showLogoImageBlurHash
-            )
+            val updatedImages =
+                AfinityImages(
+                    primary = downloadedImages["primary"] ?: images.primary,
+                    backdrop = downloadedImages["backdrop"] ?: images.backdrop,
+                    thumb = downloadedImages["thumb"] ?: images.thumb,
+                    logo = downloadedImages["logo"] ?: images.logo,
+                    showPrimary = downloadedImages["showPrimary"] ?: images.showPrimary,
+                    showBackdrop = downloadedImages["showBackdrop"] ?: images.showBackdrop,
+                    showLogo = downloadedImages["showLogo"] ?: images.showLogo,
+                    primaryImageBlurHash = images.primaryImageBlurHash,
+                    backdropImageBlurHash = images.backdropImageBlurHash,
+                    thumbImageBlurHash = images.thumbImageBlurHash,
+                    logoImageBlurHash = images.logoImageBlurHash,
+                    showPrimaryImageBlurHash = images.showPrimaryImageBlurHash,
+                    showBackdropImageBlurHash = images.showBackdropImageBlurHash,
+                    showLogoImageBlurHash = images.showLogoImageBlurHash,
+                )
 
             when (item) {
                 is AfinityMovie -> {
@@ -506,7 +582,7 @@ class MediaDownloadWorker @AssistedInject constructor(
         apiClient: ApiClient,
         serverId: String,
         showId: UUID,
-        userId: UUID
+        userId: UUID,
     ) {
         try {
             val show = databaseRepository.getShow(showId, userId) ?: return
@@ -525,16 +601,17 @@ class MediaDownloadWorker @AssistedInject constructor(
             saveImage(images.backdrop, "backdrop")
             saveImage(images.logo, "logo")
 
-            val updatedImages = AfinityImages(
-                primary = downloadedImages["primary"] ?: images.primary,
-                backdrop = downloadedImages["backdrop"] ?: images.backdrop,
-                thumb = downloadedImages["thumb"] ?: images.thumb,
-                logo = downloadedImages["logo"] ?: images.logo,
-                primaryImageBlurHash = images.primaryImageBlurHash,
-                backdropImageBlurHash = images.backdropImageBlurHash,
-                thumbImageBlurHash = images.thumbImageBlurHash,
-                logoImageBlurHash = images.logoImageBlurHash
-            )
+            val updatedImages =
+                AfinityImages(
+                    primary = downloadedImages["primary"] ?: images.primary,
+                    backdrop = downloadedImages["backdrop"] ?: images.backdrop,
+                    thumb = downloadedImages["thumb"] ?: images.thumb,
+                    logo = downloadedImages["logo"] ?: images.logo,
+                    primaryImageBlurHash = images.primaryImageBlurHash,
+                    backdropImageBlurHash = images.backdropImageBlurHash,
+                    thumbImageBlurHash = images.thumbImageBlurHash,
+                    logoImageBlurHash = images.logoImageBlurHash,
+                )
             databaseRepository.insertShow(show.copy(images = updatedImages), serverId)
         } catch (e: Exception) {
             Timber.e(e, "Failed to download show images")
@@ -545,7 +622,7 @@ class MediaDownloadWorker @AssistedInject constructor(
         apiClient: ApiClient,
         serverId: String,
         seasonId: UUID,
-        userId: UUID
+        userId: UUID,
     ) {
         try {
             val season = databaseRepository.getSeason(seasonId, userId) ?: return
@@ -563,16 +640,17 @@ class MediaDownloadWorker @AssistedInject constructor(
             saveImage(images.primary, "primary")
             saveImage(images.backdrop, "backdrop")
 
-            val updatedImages = AfinityImages(
-                primary = downloadedImages["primary"] ?: images.primary,
-                backdrop = downloadedImages["backdrop"] ?: images.backdrop,
-                thumb = downloadedImages["thumb"] ?: images.thumb,
-                logo = downloadedImages["logo"] ?: images.logo,
-                primaryImageBlurHash = images.primaryImageBlurHash,
-                backdropImageBlurHash = images.backdropImageBlurHash,
-                thumbImageBlurHash = images.thumbImageBlurHash,
-                logoImageBlurHash = images.logoImageBlurHash
-            )
+            val updatedImages =
+                AfinityImages(
+                    primary = downloadedImages["primary"] ?: images.primary,
+                    backdrop = downloadedImages["backdrop"] ?: images.backdrop,
+                    thumb = downloadedImages["thumb"] ?: images.thumb,
+                    logo = downloadedImages["logo"] ?: images.logo,
+                    primaryImageBlurHash = images.primaryImageBlurHash,
+                    backdropImageBlurHash = images.backdropImageBlurHash,
+                    thumbImageBlurHash = images.thumbImageBlurHash,
+                    logoImageBlurHash = images.logoImageBlurHash,
+                )
             databaseRepository.insertSeason(season.copy(images = updatedImages), serverId)
         } catch (e: Exception) {
             Timber.e(e, "Failed to download season images")
@@ -583,7 +661,7 @@ class MediaDownloadWorker @AssistedInject constructor(
         apiClient: ApiClient,
         serverId: String,
         itemId: UUID,
-        userId: UUID
+        userId: UUID,
     ) {
         try {
             val movie = databaseRepository.getMovie(itemId, userId) ?: return
@@ -592,24 +670,27 @@ class MediaDownloadWorker @AssistedInject constructor(
             val movieDir = downloadRepository.getItemDownloadDirectory(itemId)
             val peopleImagesDir = File(movieDir, "people").also { it.mkdirs() }
 
-            val updatedPeople = movie.people.map { person ->
-                person.image.uri?.let { uri ->
-                    val localPath = downloadImage(
-                        apiClient,
-                        uri.toString(),
-                        peopleImagesDir,
-                        person.id.toString()
-                    )
-                    if (localPath != null) {
-                        person.copy(
-                            image = AfinityPersonImage(
-                                uri = localPath,
-                                blurHash = person.image.blurHash
+            val updatedPeople =
+                movie.people.map { person ->
+                    person.image.uri?.let { uri ->
+                        val localPath =
+                            downloadImage(
+                                apiClient,
+                                uri.toString(),
+                                peopleImagesDir,
+                                person.id.toString(),
                             )
-                        )
-                    } else person
-                } ?: person
-            }
+                        if (localPath != null) {
+                            person.copy(
+                                image =
+                                    AfinityPersonImage(
+                                        uri = localPath,
+                                        blurHash = person.image.blurHash,
+                                    )
+                            )
+                        } else person
+                    } ?: person
+                }
             databaseRepository.insertMovie(movie.copy(people = updatedPeople), serverId)
         } catch (e: Exception) {
             Timber.e(e, "Failed to download person images")
@@ -620,30 +701,30 @@ class MediaDownloadWorker @AssistedInject constructor(
         apiClient: ApiClient,
         imageUrl: String,
         outputDir: File,
-        baseName: String
+        baseName: String,
     ): Uri? {
         var resultUri: Uri? = null
         try {
-            val request = Request.Builder()
-                .url(imageUrl)
-                .header("X-Emby-Token", apiClient.accessToken ?: "")
-                .build()
+            val request =
+                Request.Builder()
+                    .url(imageUrl)
+                    .header("X-Emby-Token", apiClient.accessToken ?: "")
+                    .build()
 
             okHttpClient.newCall(request).execute().use { response ->
                 if (response.isSuccessful) {
                     val contentType = response.header("Content-Type") ?: "image/jpeg"
-                    val extension = when {
-                        contentType.contains("png") -> "png"
-                        contentType.contains("webp") -> "webp"
-                        contentType.contains("gif") -> "gif"
-                        else -> "jpg"
-                    }
+                    val extension =
+                        when {
+                            contentType.contains("png") -> "png"
+                            contentType.contains("webp") -> "webp"
+                            contentType.contains("gif") -> "gif"
+                            else -> "jpg"
+                        }
                     val outputFile = File(outputDir, "$baseName.$extension")
 
                     response.body?.byteStream()?.use { input ->
-                        FileOutputStream(outputFile).use { output ->
-                            input.copyTo(output)
-                        }
+                        FileOutputStream(outputFile).use { output -> input.copyTo(output) }
                     }
 
                     if (outputFile.exists() && outputFile.length() > 0) {
@@ -670,18 +751,19 @@ class MediaDownloadWorker @AssistedInject constructor(
         sourceId: String,
         sourceName: String,
         file: File,
-        originalStreams: List<AfinityMediaStream>
+        originalStreams: List<AfinityMediaStream>,
     ) {
         try {
             val localSourceId = "${sourceId}_local"
-            val localSource = AfinitySourceDto(
-                id = localSourceId,
-                itemId = itemId,
-                name = "$sourceName (Downloaded)",
-                type = AfinitySourceType.LOCAL,
-                path = file.absolutePath,
-                downloadId = null
-            )
+            val localSource =
+                AfinitySourceDto(
+                    id = localSourceId,
+                    itemId = itemId,
+                    name = "$sourceName (Downloaded)",
+                    type = AfinitySourceType.LOCAL,
+                    path = file.absolutePath,
+                    downloadId = null,
+                )
             databaseRepository.insertSource(
                 AfinitySource(
                     id = localSource.id,
@@ -690,18 +772,16 @@ class MediaDownloadWorker @AssistedInject constructor(
                     path = localSource.path,
                     size = file.length(),
                     mediaStreams = emptyList(),
-                    downloadId = null
+                    downloadId = null,
                 ),
-                itemId
+                itemId,
             )
             originalStreams.forEach { stream ->
                 if (!stream.isExternal) {
                     try {
                         databaseRepository.insertMediaStream(
-                            stream = stream.copy(
-                                path = file.absolutePath
-                            ),
-                            sourceId = localSourceId
+                            stream = stream.copy(path = file.absolutePath),
+                            sourceId = localSourceId,
                         )
                     } catch (e: Exception) {
                         Timber.w("Failed to copy stream ${stream.type} to local source")
@@ -717,51 +797,49 @@ class MediaDownloadWorker @AssistedInject constructor(
         notificationId: Int,
         itemName: String,
         downloadedBytes: Long,
-        totalBytes: Long
+        totalBytes: Long,
     ): ForegroundInfo {
         val context: Context = applicationContext
         val channelId = "download_channel"
         val title = "Downloading $itemName"
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel = NotificationChannel(
-                channelId,
-                "Downloads",
-                NotificationManager.IMPORTANCE_LOW
-            ).apply {
-                description = "Background download tasks"
-            }
+            val channel =
+                NotificationChannel(channelId, "Downloads", NotificationManager.IMPORTANCE_LOW)
+                    .apply { description = "Background download tasks" }
             val notificationManager =
                 context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
             notificationManager.createNotificationChannel(channel)
         }
 
-        val progressText = if (totalBytes > 0) {
-            "${(downloadedBytes * 100 / totalBytes)}%"
-        } else {
-            "Starting..."
-        }
+        val progressText =
+            if (totalBytes > 0) {
+                "${(downloadedBytes * 100 / totalBytes)}%"
+            } else {
+                "Starting..."
+            }
 
-        val notification = NotificationCompat.Builder(context, channelId)
-            .setContentTitle(title)
-            .setContentText(progressText)
-            .setSmallIcon(R.drawable.ic_download)
-            .setOngoing(true)
-            .setProgress(
-                if (totalBytes > 0) totalBytes.toInt() else 0,
-                if (totalBytes > 0) downloadedBytes.toInt() else 0,
-                totalBytes <= 0
-            )
-            .setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
-            .build()
+        val notification =
+            NotificationCompat.Builder(context, channelId)
+                .setContentTitle(title)
+                .setContentText(progressText)
+                .setSmallIcon(R.drawable.ic_download)
+                .setOngoing(true)
+                .setProgress(
+                    if (totalBytes > 0) totalBytes.toInt() else 0,
+                    if (totalBytes > 0) downloadedBytes.toInt() else 0,
+                    totalBytes <= 0,
+                )
+                .setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
+                .build()
 
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             ForegroundInfo(
                 notificationId,
                 notification,
-                ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+                ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC,
             )
         } else {
             ForegroundInfo(notificationId, notification)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/workers/SubtitleDownloadWorker.kt b/app/src/main/java/com/makd/afinity/data/workers/SubtitleDownloadWorker.kt
index 85621eb2f..c3cceb5d4 100644
--- a/app/src/main/java/com/makd/afinity/data/workers/SubtitleDownloadWorker.kt
+++ b/app/src/main/java/com/makd/afinity/data/workers/SubtitleDownloadWorker.kt
@@ -15,6 +15,9 @@ import com.makd.afinity.data.repository.download.JellyfinDownloadRepository
 import com.makd.afinity.di.DownloadClient
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
+import java.io.File
+import java.io.FileOutputStream
+import java.util.UUID
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
@@ -26,12 +29,11 @@ import org.jellyfin.sdk.model.api.BaseItemKind
 import org.jellyfin.sdk.model.api.ItemFields
 import org.jellyfin.sdk.model.api.MediaStreamType
 import timber.log.Timber
-import java.io.File
-import java.io.FileOutputStream
-import java.util.UUID
 
 @HiltWorker
-class SubtitleDownloadWorker @AssistedInject constructor(
+class SubtitleDownloadWorker
+@AssistedInject
+constructor(
     @Assisted appContext: Context,
     @Assisted workerParams: WorkerParameters,
     private val sessionManager: SessionManager,
@@ -47,113 +49,143 @@ class SubtitleDownloadWorker @AssistedInject constructor(
         const val BUFFER_SIZE = 8192
     }
 
-    override suspend fun doWork(): Result = withContext(Dispatchers.IO) {
-        val downloadIdString = inputData.getString(KEY_DOWNLOAD_ID)
-            ?: return@withContext Result.failure(workDataOf("error" to "Missing download ID"))
+    override suspend fun doWork(): Result =
+        withContext(Dispatchers.IO) {
+            val downloadIdString =
+                inputData.getString(KEY_DOWNLOAD_ID)
+                    ?: return@withContext Result.failure(
+                        workDataOf("error" to "Missing download ID")
+                    )
 
-        val itemIdString = inputData.getString(KEY_ITEM_ID)
-            ?: return@withContext Result.failure(workDataOf("error" to "Missing item ID"))
+            val itemIdString =
+                inputData.getString(KEY_ITEM_ID)
+                    ?: return@withContext Result.failure(workDataOf("error" to "Missing item ID"))
 
-        val itemId = try {
-            UUID.fromString(itemIdString)
-        } catch (e: IllegalArgumentException) {
-            return@withContext Result.failure(workDataOf("error" to "Invalid item ID"))
-        }
+            val itemId =
+                try {
+                    UUID.fromString(itemIdString)
+                } catch (e: IllegalArgumentException) {
+                    return@withContext Result.failure(workDataOf("error" to "Invalid item ID"))
+                }
 
-        val sourceId = inputData.getString(KEY_SOURCE_ID)
-            ?: return@withContext Result.failure(workDataOf("error" to "Missing source ID"))
+            val sourceId =
+                inputData.getString(KEY_SOURCE_ID)
+                    ?: return@withContext Result.failure(workDataOf("error" to "Missing source ID"))
 
-        try {
-            Timber.d("Starting subtitle download for item: $itemId")
+            try {
+                Timber.d("Starting subtitle download for item: $itemId")
 
-            val download: DownloadDto = databaseRepository.getDownloadByItemId(itemId)
-                ?: return@withContext Result.failure(workDataOf("error" to "Download not found"))
+                val download: DownloadDto =
+                    databaseRepository.getDownloadByItemId(itemId)
+                        ?: return@withContext Result.failure(
+                            workDataOf("error" to "Download not found")
+                        )
 
-            val apiClient = sessionManager.getOrRestoreApiClient(download.serverId)
-                ?: return@withContext Result.failure(workDataOf("error" to "Could not restore session for server ${download.serverId}"))
+                val apiClient =
+                    sessionManager.getOrRestoreApiClient(download.serverId)
+                        ?: return@withContext Result.failure(
+                            workDataOf(
+                                "error" to
+                                    "Could not restore session for server ${download.serverId}"
+                            )
+                        )
 
-            val userId = try {
-                apiClient.userApi.getCurrentUser().content?.id
-            } catch (e: Exception) {
-                null
-            } ?: return@withContext Result.failure(workDataOf("error" to "User not authenticated"))
-
-            val baseUrl = apiClient.baseUrl ?: ""
-
-            val itemsApi = ItemsApi(apiClient)
-            val baseItemDto = try {
-                itemsApi.getItems(
-                    userId = userId,
-                    ids = listOf(itemId),
-                    fields = listOf(ItemFields.MEDIA_SOURCES, ItemFields.MEDIA_STREAMS),
-                    enableImages = false,
-                    enableUserData = false
-                ).content?.items?.firstOrNull()
-            } catch (e: Exception) {
-                Timber.e(e, "Failed to fetch item details for subtitles")
-                null
-            } ?: return@withContext Result.failure(workDataOf("error" to "Item not found"))
+                val userId =
+                    try {
+                        apiClient.userApi.getCurrentUser().content?.id
+                    } catch (e: Exception) {
+                        null
+                    }
+                        ?: return@withContext Result.failure(
+                            workDataOf("error" to "User not authenticated")
+                        )
 
-            val item = when (baseItemDto.type) {
-                BaseItemKind.MOVIE -> baseItemDto.toAfinityMovie(baseUrl)
-                BaseItemKind.EPISODE -> baseItemDto.toAfinityEpisode(baseUrl)
-                    ?: return@withContext Result.failure(workDataOf("error" to "Failed to convert episode"))
+                val baseUrl = apiClient.baseUrl ?: ""
 
-                else -> return@withContext Result.failure(
-                    workDataOf("error" to "Unsupported item type: ${baseItemDto.type}")
-                )
-            }
+                val itemsApi = ItemsApi(apiClient)
+                val baseItemDto =
+                    try {
+                        itemsApi
+                            .getItems(
+                                userId = userId,
+                                ids = listOf(itemId),
+                                fields = listOf(ItemFields.MEDIA_SOURCES, ItemFields.MEDIA_STREAMS),
+                                enableImages = false,
+                                enableUserData = false,
+                            )
+                            .content
+                            ?.items
+                            ?.firstOrNull()
+                    } catch (e: Exception) {
+                        Timber.e(e, "Failed to fetch item details for subtitles")
+                        null
+                    } ?: return@withContext Result.failure(workDataOf("error" to "Item not found"))
 
-            val source = item.sources.find { it.id == sourceId }
-                ?: return@withContext Result.failure(workDataOf("error" to "Source not found"))
+                val item =
+                    when (baseItemDto.type) {
+                        BaseItemKind.MOVIE -> baseItemDto.toAfinityMovie(baseUrl)
+                        BaseItemKind.EPISODE ->
+                            baseItemDto.toAfinityEpisode(baseUrl)
+                                ?: return@withContext Result.failure(
+                                    workDataOf("error" to "Failed to convert episode")
+                                )
 
-            val subtitleStreams = source.mediaStreams.filter { stream ->
-                stream.type == MediaStreamType.SUBTITLE &&
-                        stream.isExternal == true
-            }
+                        else ->
+                            return@withContext Result.failure(
+                                workDataOf("error" to "Unsupported item type: ${baseItemDto.type}")
+                            )
+                    }
 
-            if (subtitleStreams.isEmpty()) {
-                Timber.d("No external subtitles found for item: $itemId")
-                return@withContext Result.success()
-            }
+                val source =
+                    item.sources.find { it.id == sourceId }
+                        ?: return@withContext Result.failure(
+                            workDataOf("error" to "Source not found")
+                        )
 
-            val itemDir = downloadRepository.getItemDownloadDirectory(itemId)
-            val subtitlesDir = File(itemDir, "subtitles").also { it.mkdirs() }
+                val subtitleStreams =
+                    source.mediaStreams.filter { stream ->
+                        stream.type == MediaStreamType.SUBTITLE && stream.isExternal == true
+                    }
 
-            subtitleStreams.forEach { stream ->
-                try {
-                    downloadSubtitle(
-                        apiClient = apiClient,
-                        itemId = itemId,
-                        stream = stream,
-                        baseUrl = baseUrl,
-                        outputDir = subtitlesDir,
-                        mediaSourceId = sourceId
-                    )
-                } catch (e: Exception) {
-                    Timber.w(e, "Failed to download subtitle: ${stream.language}")
+                if (subtitleStreams.isEmpty()) {
+                    Timber.d("No external subtitles found for item: $itemId")
+                    return@withContext Result.success()
                 }
-            }
 
-            Timber.i("Subtitle download completed for item: $itemId")
+                val itemDir = downloadRepository.getItemDownloadDirectory(itemId)
+                val subtitlesDir = File(itemDir, "subtitles").also { it.mkdirs() }
 
-            return@withContext Result.success(
-                workDataOf(
-                    KEY_DOWNLOAD_ID to downloadIdString,
-                    KEY_ITEM_ID to itemIdString,
-                    KEY_SOURCE_ID to sourceId
-                )
-            )
+                subtitleStreams.forEach { stream ->
+                    try {
+                        downloadSubtitle(
+                            apiClient = apiClient,
+                            itemId = itemId,
+                            stream = stream,
+                            baseUrl = baseUrl,
+                            outputDir = subtitlesDir,
+                            mediaSourceId = sourceId,
+                        )
+                    } catch (e: Exception) {
+                        Timber.w(e, "Failed to download subtitle: ${stream.language}")
+                    }
+                }
+
+                Timber.i("Subtitle download completed for item: $itemId")
 
-        } catch (e: Exception) {
-            Timber.e(e, "Subtitle download failed")
-            return@withContext Result.failure(
-                workDataOf(
-                    "error" to (e.message ?: "Unknown error")
+                return@withContext Result.success(
+                    workDataOf(
+                        KEY_DOWNLOAD_ID to downloadIdString,
+                        KEY_ITEM_ID to itemIdString,
+                        KEY_SOURCE_ID to sourceId,
+                    )
+                )
+            } catch (e: Exception) {
+                Timber.e(e, "Subtitle download failed")
+                return@withContext Result.failure(
+                    workDataOf("error" to (e.message ?: "Unknown error"))
                 )
-            )
+            }
         }
-    }
 
     private suspend fun downloadSubtitle(
         apiClient: ApiClient,
@@ -161,17 +193,20 @@ class SubtitleDownloadWorker @AssistedInject constructor(
         stream: AfinityMediaStream,
         baseUrl: String,
         outputDir: File,
-        mediaSourceId: String
+        mediaSourceId: String,
     ) {
         val language = stream.language ?: "unknown"
         val codec = stream.codec ?: "srt"
-        val extension = when (codec.lowercase()) {
-            "subrip", "srt" -> "srt"
-            "ass" -> "ass"
-            "ssa" -> "ssa"
-            "vtt", "webvtt" -> "vtt"
-            else -> "srt"
-        }
+        val extension =
+            when (codec.lowercase()) {
+                "subrip",
+                "srt" -> "srt"
+                "ass" -> "ass"
+                "ssa" -> "ssa"
+                "vtt",
+                "webvtt" -> "vtt"
+                else -> "srt"
+            }
 
         val outputFile = File(outputDir, "${language}_${stream.index}.$extension")
 
@@ -179,10 +214,11 @@ class SubtitleDownloadWorker @AssistedInject constructor(
             val subtitleUrl =
                 "$baseUrl/Videos/$itemId/$mediaSourceId/Subtitles/${stream.index}/Stream.$extension?api_key=${apiClient.accessToken}"
 
-            val request = Request.Builder()
-                .url(subtitleUrl)
-                .header("X-Emby-Token", apiClient.accessToken ?: "")
-                .build()
+            val request =
+                Request.Builder()
+                    .url(subtitleUrl)
+                    .header("X-Emby-Token", apiClient.accessToken ?: "")
+                    .build()
 
             try {
                 okHttpClient.newCall(request).execute().use { response ->
@@ -210,10 +246,7 @@ class SubtitleDownloadWorker @AssistedInject constructor(
         if (outputFile.exists() && outputFile.length() > 0) {
             val localSourceId = "${mediaSourceId}_local"
             try {
-                val localStream = stream.copy(
-                    path = outputFile.absolutePath,
-                    isExternal = true,
-                )
+                val localStream = stream.copy(path = outputFile.absolutePath, isExternal = true)
                 databaseRepository.insertMediaStream(localStream, localSourceId)
                 Timber.d("Registered local subtitle in DB: ${outputFile.name}")
             } catch (e: Exception) {
@@ -223,4 +256,4 @@ class SubtitleDownloadWorker @AssistedInject constructor(
 
         Timber.d("Processed subtitle: $language.$extension")
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/workers/TrickplayDownloadWorker.kt b/app/src/main/java/com/makd/afinity/data/workers/TrickplayDownloadWorker.kt
index 9c0cc7799..328cb56f0 100644
--- a/app/src/main/java/com/makd/afinity/data/workers/TrickplayDownloadWorker.kt
+++ b/app/src/main/java/com/makd/afinity/data/workers/TrickplayDownloadWorker.kt
@@ -15,6 +15,9 @@ import com.makd.afinity.data.repository.download.JellyfinDownloadRepository
 import com.makd.afinity.di.DownloadClient
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
+import java.io.File
+import java.io.FileOutputStream
+import java.util.UUID
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
@@ -25,12 +28,11 @@ import org.jellyfin.sdk.api.operations.ItemsApi
 import org.jellyfin.sdk.model.api.BaseItemKind
 import org.jellyfin.sdk.model.api.ItemFields
 import timber.log.Timber
-import java.io.File
-import java.io.FileOutputStream
-import java.util.UUID
 
 @HiltWorker
-class TrickplayDownloadWorker @AssistedInject constructor(
+class TrickplayDownloadWorker
+@AssistedInject
+constructor(
     @Assisted appContext: Context,
     @Assisted workerParams: WorkerParameters,
     private val sessionManager: SessionManager,
@@ -46,118 +48,147 @@ class TrickplayDownloadWorker @AssistedInject constructor(
         const val BUFFER_SIZE = 8192
     }
 
-    override suspend fun doWork(): Result = withContext(Dispatchers.IO) {
-        val downloadIdString = inputData.getString(KEY_DOWNLOAD_ID)
-            ?: return@withContext Result.failure(workDataOf("error" to "Missing download ID"))
-
-        val itemIdString = inputData.getString(KEY_ITEM_ID)
-            ?: return@withContext Result.failure(workDataOf("error" to "Missing item ID"))
-
-        val itemId = try {
-            UUID.fromString(itemIdString)
-        } catch (e: IllegalArgumentException) {
-            return@withContext Result.failure(workDataOf("error" to "Invalid item ID"))
-        }
-
-        val sourceId = inputData.getString(KEY_SOURCE_ID)
-            ?: return@withContext Result.failure(workDataOf("error" to "Missing source ID"))
-
-        try {
-            Timber.d("Starting trickplay download for item: $itemId")
-
-            val download: DownloadDto = databaseRepository.getDownloadByItemId(itemId)
-                ?: return@withContext Result.failure(workDataOf("error" to "Download not found"))
+    override suspend fun doWork(): Result =
+        withContext(Dispatchers.IO) {
+            val downloadIdString =
+                inputData.getString(KEY_DOWNLOAD_ID)
+                    ?: return@withContext Result.failure(
+                        workDataOf("error" to "Missing download ID")
+                    )
 
-            val apiClient = sessionManager.getOrRestoreApiClient(download.serverId)
-                ?: return@withContext Result.failure(workDataOf("error" to "Could not restore session for server ${download.serverId}"))
+            val itemIdString =
+                inputData.getString(KEY_ITEM_ID)
+                    ?: return@withContext Result.failure(workDataOf("error" to "Missing item ID"))
 
-            val userId = try {
-                apiClient.userApi.getCurrentUser().content?.id
-            } catch (e: Exception) {
-                null
-            } ?: return@withContext Result.failure(workDataOf("error" to "User not authenticated"))
-
-            val baseUrl = apiClient.baseUrl ?: ""
-
-            val itemsApi = ItemsApi(apiClient)
-            val baseItemDto = try {
-                itemsApi.getItems(
-                    userId = userId,
-                    ids = listOf(itemId),
-                    fields = listOf(ItemFields.TRICKPLAY, ItemFields.OVERVIEW),
-                    enableImages = false,
-                    enableUserData = false
-                ).content?.items?.firstOrNull()
-            } catch (e: Exception) {
-                Timber.e(e, "Failed to fetch item details for trickplay")
-                null
-            } ?: return@withContext Result.failure(workDataOf("error" to "Item not found"))
+            val itemId =
+                try {
+                    UUID.fromString(itemIdString)
+                } catch (e: IllegalArgumentException) {
+                    return@withContext Result.failure(workDataOf("error" to "Invalid item ID"))
+                }
 
-            val item = when (baseItemDto.type) {
-                BaseItemKind.MOVIE -> baseItemDto.toAfinityMovie(baseUrl)
-                BaseItemKind.EPISODE -> baseItemDto.toAfinityEpisode(baseUrl)
-                    ?: return@withContext Result.failure(workDataOf("error" to "Failed to convert episode"))
+            val sourceId =
+                inputData.getString(KEY_SOURCE_ID)
+                    ?: return@withContext Result.failure(workDataOf("error" to "Missing source ID"))
 
-                else -> return@withContext Result.failure(
-                    workDataOf("error" to "Unsupported item type: ${baseItemDto.type}")
-                )
-            }
+            try {
+                Timber.d("Starting trickplay download for item: $itemId")
+
+                val download: DownloadDto =
+                    databaseRepository.getDownloadByItemId(itemId)
+                        ?: return@withContext Result.failure(
+                            workDataOf("error" to "Download not found")
+                        )
+
+                val apiClient =
+                    sessionManager.getOrRestoreApiClient(download.serverId)
+                        ?: return@withContext Result.failure(
+                            workDataOf(
+                                "error" to
+                                    "Could not restore session for server ${download.serverId}"
+                            )
+                        )
+
+                val userId =
+                    try {
+                        apiClient.userApi.getCurrentUser().content?.id
+                    } catch (e: Exception) {
+                        null
+                    }
+                        ?: return@withContext Result.failure(
+                            workDataOf("error" to "User not authenticated")
+                        )
+
+                val baseUrl = apiClient.baseUrl ?: ""
+
+                val itemsApi = ItemsApi(apiClient)
+                val baseItemDto =
+                    try {
+                        itemsApi
+                            .getItems(
+                                userId = userId,
+                                ids = listOf(itemId),
+                                fields = listOf(ItemFields.TRICKPLAY, ItemFields.OVERVIEW),
+                                enableImages = false,
+                                enableUserData = false,
+                            )
+                            .content
+                            ?.items
+                            ?.firstOrNull()
+                    } catch (e: Exception) {
+                        Timber.e(e, "Failed to fetch item details for trickplay")
+                        null
+                    } ?: return@withContext Result.failure(workDataOf("error" to "Item not found"))
+
+                val item =
+                    when (baseItemDto.type) {
+                        BaseItemKind.MOVIE -> baseItemDto.toAfinityMovie(baseUrl)
+                        BaseItemKind.EPISODE ->
+                            baseItemDto.toAfinityEpisode(baseUrl)
+                                ?: return@withContext Result.failure(
+                                    workDataOf("error" to "Failed to convert episode")
+                                )
+
+                        else ->
+                            return@withContext Result.failure(
+                                workDataOf("error" to "Unsupported item type: ${baseItemDto.type}")
+                            )
+                    }
 
-            val trickplayInfo = item.trickplayInfo
-            if (trickplayInfo.isNullOrEmpty()) {
-                Timber.d("No trickplay info available for item: $itemId")
-                return@withContext Result.success()
-            }
+                val trickplayInfo = item.trickplayInfo
+                if (trickplayInfo.isNullOrEmpty()) {
+                    Timber.d("No trickplay info available for item: $itemId")
+                    return@withContext Result.success()
+                }
 
-            val itemDir = downloadRepository.getItemDownloadDirectory(itemId)
-            val trickplayDir = File(itemDir, "trickplay").also { it.mkdirs() }
-            Timber.d("Trickplay download base directory: ${trickplayDir.absolutePath}")
-            Timber.d("Trickplay resolutions available: ${trickplayInfo.keys.joinToString()}")
+                val itemDir = downloadRepository.getItemDownloadDirectory(itemId)
+                val trickplayDir = File(itemDir, "trickplay").also { it.mkdirs() }
+                Timber.d("Trickplay download base directory: ${trickplayDir.absolutePath}")
+                Timber.d("Trickplay resolutions available: ${trickplayInfo.keys.joinToString()}")
 
-            trickplayInfo.forEach { (resolution, info) ->
-                Timber.d("Processing trickplay resolution: key='$resolution', info.width=${info.width}")
-                try {
-                    downloadTrickplayTiles(
-                        apiClient = apiClient,
-                        itemId = itemId,
-                        resolution = resolution,
-                        info = info,
-                        baseUrl = baseUrl,
-                        outputDir = trickplayDir
+                trickplayInfo.forEach { (resolution, info) ->
+                    Timber.d(
+                        "Processing trickplay resolution: key='$resolution', info.width=${info.width}"
                     )
-                } catch (e: Exception) {
-                    Timber.w(e, "Failed to download trickplay for resolution: $resolution")
+                    try {
+                        downloadTrickplayTiles(
+                            apiClient = apiClient,
+                            itemId = itemId,
+                            resolution = resolution,
+                            info = info,
+                            baseUrl = baseUrl,
+                            outputDir = trickplayDir,
+                        )
+                    } catch (e: Exception) {
+                        Timber.w(e, "Failed to download trickplay for resolution: $resolution")
+                    }
                 }
-            }
 
-            val localSourceId = "${sourceId}_local"
-            trickplayInfo.forEach { (_, info) ->
-                try {
-                    databaseRepository.insertTrickplayInfo(info, localSourceId)
-                } catch (e: Exception) {
-                    Timber.w(e, "Failed to save trickplay info to database")
+                val localSourceId = "${sourceId}_local"
+                trickplayInfo.forEach { (_, info) ->
+                    try {
+                        databaseRepository.insertTrickplayInfo(info, localSourceId)
+                    } catch (e: Exception) {
+                        Timber.w(e, "Failed to save trickplay info to database")
+                    }
                 }
-            }
 
-            Timber.i("Trickplay download completed for item: $itemId")
+                Timber.i("Trickplay download completed for item: $itemId")
 
-            return@withContext Result.success(
-                workDataOf(
-                    KEY_DOWNLOAD_ID to downloadIdString,
-                    KEY_ITEM_ID to itemIdString,
-                    KEY_SOURCE_ID to sourceId
+                return@withContext Result.success(
+                    workDataOf(
+                        KEY_DOWNLOAD_ID to downloadIdString,
+                        KEY_ITEM_ID to itemIdString,
+                        KEY_SOURCE_ID to sourceId,
+                    )
                 )
-            )
-
-        } catch (e: Exception) {
-            Timber.e(e, "Trickplay download failed")
-            return@withContext Result.failure(
-                workDataOf(
-                    "error" to (e.message ?: "Unknown error")
+            } catch (e: Exception) {
+                Timber.e(e, "Trickplay download failed")
+                return@withContext Result.failure(
+                    workDataOf("error" to (e.message ?: "Unknown error"))
                 )
-            )
+            }
         }
-    }
 
     private suspend fun downloadTrickplayTiles(
         apiClient: ApiClient,
@@ -165,7 +196,7 @@ class TrickplayDownloadWorker @AssistedInject constructor(
         resolution: String,
         info: AfinityTrickplayInfo,
         baseUrl: String,
-        outputDir: File
+        outputDir: File,
     ) {
         val resolutionDir = File(outputDir, resolution).also { it.mkdirs() }
 
@@ -175,7 +206,9 @@ class TrickplayDownloadWorker @AssistedInject constructor(
         val totalTiles =
             kotlin.math.ceil(info.thumbnailCount.toDouble() / thumbnailsPerTile).toInt()
 
-        Timber.d("Downloading trickplay: ${info.thumbnailCount} thumbnails across $totalTiles tiled images (${info.tileWidth}x${info.tileHeight} grid per tile)")
+        Timber.d(
+            "Downloading trickplay: ${info.thumbnailCount} thumbnails across $totalTiles tiled images (${info.tileWidth}x${info.tileHeight} grid per tile)"
+        )
 
         for (tileIndex in 0 until totalTiles) {
             try {
@@ -190,10 +223,11 @@ class TrickplayDownloadWorker @AssistedInject constructor(
                     continue
                 }
 
-                val request = Request.Builder()
-                    .url(tileUrl)
-                    .header("X-Emby-Token", apiClient.accessToken ?: "")
-                    .build()
+                val request =
+                    Request.Builder()
+                        .url(tileUrl)
+                        .header("X-Emby-Token", apiClient.accessToken ?: "")
+                        .build()
 
                 okHttpClient.newCall(request).execute().use { response ->
                     if (!response.isSuccessful) {
@@ -212,11 +246,12 @@ class TrickplayDownloadWorker @AssistedInject constructor(
                     }
                 }
 
-                Timber.i("Downloaded trickplay tiled image: $resolution/$tileIndex.jpg (${outputFile.length()} bytes)")
-
+                Timber.i(
+                    "Downloaded trickplay tiled image: $resolution/$tileIndex.jpg (${outputFile.length()} bytes)"
+                )
             } catch (e: Exception) {
                 Timber.w(e, "Failed to download trickplay tile $tileIndex")
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/data/workers/UserDataSyncWorker.kt b/app/src/main/java/com/makd/afinity/data/workers/UserDataSyncWorker.kt
index d00abd868..3b0b3ef68 100644
--- a/app/src/main/java/com/makd/afinity/data/workers/UserDataSyncWorker.kt
+++ b/app/src/main/java/com/makd/afinity/data/workers/UserDataSyncWorker.kt
@@ -17,97 +17,117 @@ import org.jellyfin.sdk.model.api.UpdateUserItemDataDto
 import timber.log.Timber
 
 @HiltWorker
-class UserDataSyncWorker @AssistedInject constructor(
+class UserDataSyncWorker
+@AssistedInject
+constructor(
     @Assisted appContext: Context,
     @Assisted workerParams: WorkerParameters,
     private val sessionManager: SessionManager,
     private val databaseRepository: DatabaseRepository,
 ) : CoroutineWorker(appContext, workerParams) {
 
-    override suspend fun doWork(): Result = withContext(Dispatchers.IO) {
-        try {
-            Timber.d("Starting user data sync")
+    override suspend fun doWork(): Result =
+        withContext(Dispatchers.IO) {
+            try {
+                Timber.d("Starting user data sync")
 
-            val servers = databaseRepository.getAllServers()
+                val servers = databaseRepository.getAllServers()
 
-            if (servers.isEmpty()) {
-                Timber.d("No servers found, skipping sync")
-                return@withContext Result.success()
-            }
+                if (servers.isEmpty()) {
+                    Timber.d("No servers found, skipping sync")
+                    return@withContext Result.success()
+                }
 
-            var totalSuccess = 0
-            var totalFailure = 0
+                var totalSuccess = 0
+                var totalFailure = 0
 
-            servers.forEach { server ->
-                try {
-                    val apiClient = sessionManager.getOrRestoreApiClient(server.id)
+                servers.forEach { server ->
+                    try {
+                        val apiClient = sessionManager.getOrRestoreApiClient(server.id)
 
-                    if (apiClient == null) {
-                        Timber.d("Skipping sync for server ${server.name}: No valid session found")
-                        return@forEach
-                    }
+                        if (apiClient == null) {
+                            Timber.d(
+                                "Skipping sync for server ${server.name}: No valid session found"
+                            )
+                            return@forEach
+                        }
 
-                    val userId = try {
-                        apiClient.userApi.getCurrentUser().content?.id
-                    } catch (e: Exception) {
-                        Timber.w("Could not validate user token for server ${server.name}: ${e.message}")
-                        null
-                    }
+                        val userId =
+                            try {
+                                apiClient.userApi.getCurrentUser().content?.id
+                            } catch (e: Exception) {
+                                Timber.w(
+                                    "Could not validate user token for server ${server.name}: ${e.message}"
+                                )
+                                null
+                            }
 
-                    if (userId == null) {
-                        return@forEach
-                    }
+                        if (userId == null) {
+                            return@forEach
+                        }
 
-                    val unsyncedData = databaseRepository.getAllUserDataToSync(userId, server.id)
+                        val unsyncedData =
+                            databaseRepository.getAllUserDataToSync(userId, server.id)
 
-                    if (unsyncedData.isNotEmpty()) {
-                        Timber.i("Found ${unsyncedData.size} items to sync for user $userId on server ${server.name}")
+                        if (unsyncedData.isNotEmpty()) {
+                            Timber.i(
+                                "Found ${unsyncedData.size} items to sync for user $userId on server ${server.name}"
+                            )
 
-                        val itemsApi = ItemsApi(apiClient)
+                            val itemsApi = ItemsApi(apiClient)
 
-                        unsyncedData.forEach { userData ->
-                            try {
-                                Timber.d("Syncing item ${userData.itemId} -> Server: ${server.name}")
-
-                                itemsApi.updateItemUserData(
-                                    itemId = userData.itemId,
-                                    userId = userId,
-                                    data = UpdateUserItemDataDto(
-                                        playbackPositionTicks = userData.playbackPositionTicks,
-                                        played = userData.played,
-                                        isFavorite = userData.favorite
+                            unsyncedData.forEach { userData ->
+                                try {
+                                    Timber.d(
+                                        "Syncing item ${userData.itemId} -> Server: ${server.name}"
                                     )
-                                )
 
-                                databaseRepository.markUserDataSynced(userId, userData.itemId, server.id)
-                                totalSuccess++
-                            } catch (e: Exception) {
-                                totalFailure++
-                                Timber.w(e, "Failed to sync item ${userData.itemId} on server ${server.name}")
+                                    itemsApi.updateItemUserData(
+                                        itemId = userData.itemId,
+                                        userId = userId,
+                                        data =
+                                            UpdateUserItemDataDto(
+                                                playbackPositionTicks =
+                                                    userData.playbackPositionTicks,
+                                                played = userData.played,
+                                                isFavorite = userData.favorite,
+                                            ),
+                                    )
+
+                                    databaseRepository.markUserDataSynced(
+                                        userId,
+                                        userData.itemId,
+                                        server.id,
+                                    )
+                                    totalSuccess++
+                                } catch (e: Exception) {
+                                    totalFailure++
+                                    Timber.w(
+                                        e,
+                                        "Failed to sync item ${userData.itemId} on server ${server.name}",
+                                    )
+                                }
                             }
                         }
+                    } catch (e: Exception) {
+                        Timber.e(e, "Error processing sync for server ${server.name}")
                     }
-                } catch (e: Exception) {
-                    Timber.e(e, "Error processing sync for server ${server.name}")
                 }
-            }
 
-            Timber.i("Global user data sync completed. Success: $totalSuccess, Failures: $totalFailure")
+                Timber.i(
+                    "Global user data sync completed. Success: $totalSuccess, Failures: $totalFailure"
+                )
 
-            return@withContext if (totalSuccess > 0 || totalFailure == 0) {
-                Result.success(
-                    workDataOf(
-                        "synced_count" to totalSuccess,
-                        "failed_count" to totalFailure
+                return@withContext if (totalSuccess > 0 || totalFailure == 0) {
+                    Result.success(
+                        workDataOf("synced_count" to totalSuccess, "failed_count" to totalFailure)
                     )
-                )
-            } else {
-                Result.retry()
+                } else {
+                    Result.retry()
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "User data sync failed with critical error")
+                return@withContext Result.retry()
             }
-
-        } catch (e: Exception) {
-            Timber.e(e, "User data sync failed with critical error")
-            return@withContext Result.retry()
         }
-    }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/di/AudiobookshelfModule.kt b/app/src/main/java/com/makd/afinity/di/AudiobookshelfModule.kt
new file mode 100644
index 000000000..1bb7fe69b
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/di/AudiobookshelfModule.kt
@@ -0,0 +1,31 @@
+package com.makd.afinity.di
+
+import com.makd.afinity.data.database.AfinityDatabase
+import com.makd.afinity.data.database.dao.AudiobookshelfDao
+import com.makd.afinity.data.repository.AudiobookshelfRepository
+import com.makd.afinity.data.repository.audiobookshelf.AudiobookshelfRepositoryImpl
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class AudiobookshelfModule {
+
+    @Binds
+    @Singleton
+    abstract fun bindAudiobookshelfRepository(
+        impl: AudiobookshelfRepositoryImpl
+    ): AudiobookshelfRepository
+
+    companion object {
+        @Provides
+        @Singleton
+        fun provideAudiobookshelfDao(database: AfinityDatabase): AudiobookshelfDao {
+            return database.audiobookshelfDao()
+        }
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/di/DatabaseModule.kt b/app/src/main/java/com/makd/afinity/di/DatabaseModule.kt
index ab84ae342..2b79c9f82 100644
--- a/app/src/main/java/com/makd/afinity/di/DatabaseModule.kt
+++ b/app/src/main/java/com/makd/afinity/di/DatabaseModule.kt
@@ -30,14 +30,12 @@ object DatabaseModule {
 
     @Provides
     @Singleton
-    fun provideAfinityDatabase(
-        @ApplicationContext context: Context
-    ): AfinityDatabase {
+    fun provideAfinityDatabase(@ApplicationContext context: Context): AfinityDatabase {
         return Room.databaseBuilder(
-            context.applicationContext,
-            AfinityDatabase::class.java,
-            "afinity_database"
-        )
+                context.applicationContext,
+                AfinityDatabase::class.java,
+                "afinity_database",
+            )
             .addMigrations(*DatabaseMigrations.ALL_MIGRATIONS)
             .build()
     }
@@ -106,5 +104,4 @@ object DatabaseModule {
     fun provideBoxSetCacheDao(database: AfinityDatabase): BoxSetCacheDao {
         return database.boxSetCacheDao()
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/di/HiltQualifiers.kt b/app/src/main/java/com/makd/afinity/di/HiltQualifiers.kt
index d81d0825b..9675e6ef8 100644
--- a/app/src/main/java/com/makd/afinity/di/HiltQualifiers.kt
+++ b/app/src/main/java/com/makd/afinity/di/HiltQualifiers.kt
@@ -2,34 +2,20 @@ package com.makd.afinity.di
 
 import javax.inject.Qualifier
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class JellyfinApiClient
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class JellyfinApiClient
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class BackgroundApiClient
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class BackgroundApiClient
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class CurrentServerUrl
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class CurrentServerUrl
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class CurrentUserToken
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class CurrentUserToken
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class ApplicationScope
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class ApplicationScope
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class IoDispatcher
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class IoDispatcher
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class MainDispatcher
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class MainDispatcher
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class DefaultDispatcher
\ No newline at end of file
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class DefaultDispatcher
+
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class AudiobookshelfClient
diff --git a/app/src/main/java/com/makd/afinity/di/JellyseerrModule.kt b/app/src/main/java/com/makd/afinity/di/JellyseerrModule.kt
index cf8dbc0ee..7503f35a1 100644
--- a/app/src/main/java/com/makd/afinity/di/JellyseerrModule.kt
+++ b/app/src/main/java/com/makd/afinity/di/JellyseerrModule.kt
@@ -17,9 +17,7 @@ abstract class JellyseerrModule {
 
     @Binds
     @Singleton
-    abstract fun bindJellyseerrRepository(
-        impl: JellyseerrRepositoryImpl
-    ): JellyseerrRepository
+    abstract fun bindJellyseerrRepository(impl: JellyseerrRepositoryImpl): JellyseerrRepository
 
     companion object {
         @Provides
diff --git a/app/src/main/java/com/makd/afinity/di/LiveTvModule.kt b/app/src/main/java/com/makd/afinity/di/LiveTvModule.kt
index f4f5bf9e0..ab88641ae 100644
--- a/app/src/main/java/com/makd/afinity/di/LiveTvModule.kt
+++ b/app/src/main/java/com/makd/afinity/di/LiveTvModule.kt
@@ -17,4 +17,4 @@ abstract class LiveTvModule {
     abstract fun bindLiveTvRepository(
         jellyfinLiveTvRepository: JellyfinLiveTvRepository
     ): LiveTvRepository
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/di/NetworkModule.kt b/app/src/main/java/com/makd/afinity/di/NetworkModule.kt
index c90a898ce..1f7543e07 100644
--- a/app/src/main/java/com/makd/afinity/di/NetworkModule.kt
+++ b/app/src/main/java/com/makd/afinity/di/NetworkModule.kt
@@ -3,6 +3,7 @@ package com.makd.afinity.di
 import android.content.Context
 import com.makd.afinity.BuildConfig
 import com.makd.afinity.core.AppConstants
+import com.makd.afinity.data.network.AudiobookshelfApiService
 import com.makd.afinity.data.network.JellyseerrApiService
 import com.makd.afinity.data.repository.SecurePreferencesRepository
 import dagger.Module
@@ -10,6 +11,12 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import java.io.File
+import java.io.IOException
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+import javax.inject.Qualifier
+import javax.inject.Singleton
 import okhttp3.Cache
 import okhttp3.ConnectionPool
 import okhttp3.Dispatcher
@@ -27,20 +34,12 @@ import org.jellyfin.sdk.model.DeviceInfo
 import retrofit2.Retrofit
 import retrofit2.converter.kotlinx.serialization.asConverterFactory
 import timber.log.Timber
-import java.io.File
-import java.io.IOException
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
-import javax.inject.Qualifier
-import javax.inject.Singleton
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class DownloadClient
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class DownloadClient
+
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class JellyseerrClient
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class JellyseerrClient
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class AudiobookshelfRetrofit
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -48,10 +47,8 @@ object NetworkModule {
 
     @Provides
     @Singleton
-    fun provideClientInfo(): ClientInfo = ClientInfo(
-        name = AppConstants.APP_NAME,
-        version = AppConstants.VERSION_NAME
-    )
+    fun provideClientInfo(): ClientInfo =
+        ClientInfo(name = AppConstants.APP_NAME, version = AppConstants.VERSION_NAME)
 
     @Provides
     @Singleton
@@ -60,49 +57,55 @@ object NetworkModule {
     @Provides
     @Singleton
     fun provideBaseOkHttpClient(@ApplicationContext context: Context): OkHttpClient {
-        val dispatcher = Dispatcher(Executors.newCachedThreadPool { runnable ->
-            Thread(runnable, "Jellyfin-OkHttp").apply {
-                isDaemon = false
-            }
-        }).apply {
-            maxRequests = 45
-            maxRequestsPerHost = 10
-        }
-
-        val connectionPool = ConnectionPool(
-            maxIdleConnections = 10,
-            keepAliveDuration = 30,
-            timeUnit = TimeUnit.SECONDS
-        )
-
-        val builder = OkHttpClient.Builder()
-            .dispatcher(dispatcher)
-            .connectionPool(connectionPool)
-            .cache(
-                Cache(
-                    directory = File(context.cacheDir, "http_cache"),
-                    maxSize = 50L * 1024L * 1024L
+        val dispatcher =
+            Dispatcher(
+                    Executors.newCachedThreadPool { runnable ->
+                        Thread(runnable, "Jellyfin-OkHttp").apply { isDaemon = false }
+                    }
                 )
+                .apply {
+                    maxRequests = 45
+                    maxRequestsPerHost = 10
+                }
+
+        val connectionPool =
+            ConnectionPool(
+                maxIdleConnections = 10,
+                keepAliveDuration = 30,
+                timeUnit = TimeUnit.SECONDS,
             )
-            .connectTimeout(15, TimeUnit.SECONDS)
-            .readTimeout(30, TimeUnit.SECONDS)
-            .writeTimeout(30, TimeUnit.SECONDS)
-            .callTimeout(45, TimeUnit.SECONDS)
-            .retryOnConnectionFailure(true)
-            .followRedirects(true)
-            .followSslRedirects(true)
 
-        if (BuildConfig.DEBUG) {
-            val loggingInterceptor = HttpLoggingInterceptor { message ->
-                if (message.contains("ERROR") || message.contains("FAILED") || message.contains("-->") || message.contains(
-                        "<--"
+        val builder =
+            OkHttpClient.Builder()
+                .dispatcher(dispatcher)
+                .connectionPool(connectionPool)
+                .cache(
+                    Cache(
+                        directory = File(context.cacheDir, "http_cache"),
+                        maxSize = 50L * 1024L * 1024L,
                     )
-                ) {
-                    Timber.tag("Jellyfin-HTTP").d(message)
-                }
-            }.apply {
-                level = HttpLoggingInterceptor.Level.BASIC
-            }
+                )
+                .connectTimeout(15, TimeUnit.SECONDS)
+                .readTimeout(30, TimeUnit.SECONDS)
+                .writeTimeout(30, TimeUnit.SECONDS)
+                .callTimeout(45, TimeUnit.SECONDS)
+                .retryOnConnectionFailure(true)
+                .followRedirects(true)
+                .followSslRedirects(true)
+
+        if (BuildConfig.DEBUG) {
+            val loggingInterceptor =
+                HttpLoggingInterceptor { message ->
+                        if (
+                            message.contains("ERROR") ||
+                                message.contains("FAILED") ||
+                                message.contains("-->") ||
+                                message.contains("<--")
+                        ) {
+                            Timber.tag("Jellyfin-HTTP").d(message)
+                        }
+                    }
+                    .apply { level = HttpLoggingInterceptor.Level.BASIC }
             builder.addInterceptor(loggingInterceptor)
         }
 
@@ -113,43 +116,49 @@ object NetworkModule {
     @Singleton
     @DownloadClient
     fun provideDownloadOkHttpClient(@ApplicationContext context: Context): OkHttpClient {
-        val dispatcher = Dispatcher(Executors.newCachedThreadPool { runnable ->
-            Thread(runnable, "Download-OkHttp").apply {
-                isDaemon = false
-            }
-        }).apply {
-            maxRequests = 5
-            maxRequestsPerHost = 2
-        }
+        val dispatcher =
+            Dispatcher(
+                    Executors.newCachedThreadPool { runnable ->
+                        Thread(runnable, "Download-OkHttp").apply { isDaemon = false }
+                    }
+                )
+                .apply {
+                    maxRequests = 5
+                    maxRequestsPerHost = 2
+                }
 
-        val connectionPool = ConnectionPool(
-            maxIdleConnections = 5,
-            keepAliveDuration = 5,
-            timeUnit = TimeUnit.MINUTES
-        )
-
-        val builder = OkHttpClient.Builder()
-            .dispatcher(dispatcher)
-            .connectionPool(connectionPool)
-            .connectTimeout(30, TimeUnit.SECONDS)
-            .readTimeout(5, TimeUnit.MINUTES)
-            .writeTimeout(5, TimeUnit.MINUTES)
-            .callTimeout(0, TimeUnit.SECONDS)
-            .retryOnConnectionFailure(true)
-            .followRedirects(true)
-            .followSslRedirects(true)
+        val connectionPool =
+            ConnectionPool(
+                maxIdleConnections = 5,
+                keepAliveDuration = 5,
+                timeUnit = TimeUnit.MINUTES,
+            )
+
+        val builder =
+            OkHttpClient.Builder()
+                .dispatcher(dispatcher)
+                .connectionPool(connectionPool)
+                .connectTimeout(30, TimeUnit.SECONDS)
+                .readTimeout(5, TimeUnit.MINUTES)
+                .writeTimeout(5, TimeUnit.MINUTES)
+                .callTimeout(0, TimeUnit.SECONDS)
+                .retryOnConnectionFailure(true)
+                .followRedirects(true)
+                .followSslRedirects(true)
 
         if (BuildConfig.DEBUG) {
-            val loggingInterceptor = HttpLoggingInterceptor { message ->
-                if (message.contains("ERROR") || message.contains("FAILED") || message.contains("-->") || message.contains(
-                        "<--"
-                    )
-                ) {
-                    Timber.tag("Download-HTTP").d(message)
-                }
-            }.apply {
-                level = HttpLoggingInterceptor.Level.BASIC
-            }
+            val loggingInterceptor =
+                HttpLoggingInterceptor { message ->
+                        if (
+                            message.contains("ERROR") ||
+                                message.contains("FAILED") ||
+                                message.contains("-->") ||
+                                message.contains("<--")
+                        ) {
+                            Timber.tag("Download-HTTP").d(message)
+                        }
+                    }
+                    .apply { level = HttpLoggingInterceptor.Level.BASIC }
             builder.addInterceptor(loggingInterceptor)
         }
 
@@ -168,7 +177,7 @@ object NetworkModule {
         @ApplicationContext context: Context,
         clientInfo: ClientInfo,
         deviceInfo: DeviceInfo,
-        okHttpFactory: OkHttpFactory
+        okHttpFactory: OkHttpFactory,
     ): Jellyfin {
         return createJellyfin {
             this.context = context
@@ -208,67 +217,72 @@ object NetworkModule {
     @JellyseerrClient
     fun provideJellyseerrOkHttpClient(
         baseOkHttpClient: OkHttpClient,
-        securePreferencesRepository: SecurePreferencesRepository
+        securePreferencesRepository: SecurePreferencesRepository,
     ): OkHttpClient {
-        return baseOkHttpClient.newBuilder()
+        return baseOkHttpClient
+            .newBuilder()
             .addInterceptor { chain ->
                 val originalRequest = chain.request()
 
                 val savedUrl = securePreferencesRepository.getCachedJellyseerrServerUrl()
-                val currentBaseUrl = try {
-                    if (!savedUrl.isNullOrBlank()) {
-                        normalizeJellyseerrUrl(savedUrl)
-                    } else {
+                val currentBaseUrl =
+                    try {
+                        if (!savedUrl.isNullOrBlank()) {
+                            normalizeJellyseerrUrl(savedUrl)
+                        } else {
+                            null
+                        }
+                    } catch (e: Exception) {
                         null
                     }
-                } catch (e: Exception) {
-                    null
-                }
 
                 if (currentBaseUrl == null) {
-                    throw IOException("Jellyseerr server URL not configured. Please configure the server URL first.")
+                    throw IOException(
+                        "Jellyseerr server URL not configured. Please configure the server URL first."
+                    )
                 }
 
-                val newUrl = currentBaseUrl.toHttpUrlOrNull()?.newBuilder()
-                    ?.addPathSegments(originalRequest.url.encodedPath.removePrefix("/"))
-                    ?.apply {
-                        for (i in 0 until originalRequest.url.querySize) {
-                            addQueryParameter(
-                                originalRequest.url.queryParameterName(i),
-                                originalRequest.url.queryParameterValue(i)
-                            )
+                val newUrl =
+                    currentBaseUrl
+                        .toHttpUrlOrNull()
+                        ?.newBuilder()
+                        ?.addPathSegments(originalRequest.url.encodedPath.removePrefix("/"))
+                        ?.apply {
+                            for (i in 0 until originalRequest.url.querySize) {
+                                addQueryParameter(
+                                    originalRequest.url.queryParameterName(i),
+                                    originalRequest.url.queryParameterValue(i),
+                                )
+                            }
                         }
-                    }
-                    ?.build()
-                    ?: throw IOException("Failed to build Jellyseerr URL")
-
-                val newRequest = originalRequest.newBuilder()
-                    .url(newUrl)
-                    .apply {
-                        val cookie = securePreferencesRepository.getCachedJellyseerrCookie()
-                        cookie?.let {
-                            addHeader("Cookie", it)
+                        ?.build() ?: throw IOException("Failed to build Jellyseerr URL")
+
+                val newRequest =
+                    originalRequest
+                        .newBuilder()
+                        .url(newUrl)
+                        .apply {
+                            val cookie = securePreferencesRepository.getCachedJellyseerrCookie()
+                            cookie?.let { addHeader("Cookie", it) }
+                            addHeader("Content-Type", "application/json")
                         }
-                        addHeader("Content-Type", "application/json")
-                    }
-                    .build()
+                        .build()
 
                 chain.proceed(newRequest)
             }
             .build()
     }
 
-    private val jellyseerrJson = kotlinx.serialization.json.Json {
-        ignoreUnknownKeys = true
-        isLenient = true
-        encodeDefaults = true
-    }
+    private val jellyseerrJson =
+        kotlinx.serialization.json.Json {
+            ignoreUnknownKeys = true
+            isLenient = true
+            encodeDefaults = true
+        }
 
     @Provides
     @Singleton
-    fun provideJellyseerrRetrofit(
-        @JellyseerrClient okHttpClient: OkHttpClient
-    ): Retrofit {
+    fun provideJellyseerrRetrofit(@JellyseerrClient okHttpClient: OkHttpClient): Retrofit {
         val contentType = "application/json".toMediaType()
         val baseUrl = "http://placeholder.jellyseerr/"
 
@@ -284,4 +298,122 @@ object NetworkModule {
     fun provideJellyseerrApiService(retrofit: Retrofit): JellyseerrApiService {
         return retrofit.create(JellyseerrApiService::class.java)
     }
-}
\ No newline at end of file
+
+    private fun normalizeAudiobookshelfUrl(raw: String?): String {
+        if (raw.isNullOrBlank()) {
+            throw IOException("Audiobookshelf server URL not configured")
+        }
+
+        var base = raw.trim()
+
+        if (!base.startsWith("http://") && !base.startsWith("https://")) {
+            base = "http://$base"
+        }
+
+        if (!base.endsWith("/")) {
+            base += "/"
+        }
+
+        return base
+    }
+
+    @Provides
+    @Singleton
+    @AudiobookshelfClient
+    fun provideAudiobookshelfOkHttpClient(
+        baseOkHttpClient: OkHttpClient,
+        securePreferencesRepository: SecurePreferencesRepository,
+    ): OkHttpClient {
+        return baseOkHttpClient
+            .newBuilder()
+            .addInterceptor { chain ->
+                val originalRequest = chain.request()
+
+                val savedUrl = securePreferencesRepository.getCachedAudiobookshelfServerUrl()
+                val currentBaseUrl =
+                    try {
+                        if (!savedUrl.isNullOrBlank()) {
+                            normalizeAudiobookshelfUrl(savedUrl)
+                        } else {
+                            null
+                        }
+                    } catch (e: Exception) {
+                        null
+                    }
+
+                if (currentBaseUrl == null) {
+                    throw IOException(
+                        "Audiobookshelf server URL not configured. Please configure the server URL first."
+                    )
+                }
+
+                val newUrl =
+                    currentBaseUrl
+                        .toHttpUrlOrNull()
+                        ?.newBuilder()
+                        ?.addPathSegments(originalRequest.url.encodedPath.removePrefix("/"))
+                        ?.apply {
+                            for (i in 0 until originalRequest.url.querySize) {
+                                addQueryParameter(
+                                    originalRequest.url.queryParameterName(i),
+                                    originalRequest.url.queryParameterValue(i),
+                                )
+                            }
+                        }
+                        ?.build() ?: throw IOException("Failed to build Audiobookshelf URL")
+
+                val newRequest =
+                    originalRequest
+                        .newBuilder()
+                        .url(newUrl)
+                        .apply {
+                            val token = securePreferencesRepository.getCachedAudiobookshelfToken()
+                            token?.let { addHeader("Authorization", "Bearer $it") }
+                            addHeader("Content-Type", "application/json")
+                        }
+                        .build()
+
+                val response = chain.proceed(newRequest)
+                if (newUrl.encodedPath.contains("/play")) {
+                    val responseBody = response.body
+                    val source = responseBody?.source()
+                    source?.request(Long.MAX_VALUE)
+                    val buffer = source?.buffer?.clone()
+                    val responseString = buffer?.readUtf8()
+                    timber.log.Timber.d("ABS Play Response [${response.code}]: $responseString")
+                }
+
+                response
+            }
+            .build()
+    }
+
+    private val audiobookshelfJson =
+        kotlinx.serialization.json.Json {
+            ignoreUnknownKeys = true
+            isLenient = true
+            encodeDefaults = true
+        }
+
+    @Provides
+    @Singleton
+    @AudiobookshelfRetrofit
+    fun provideAudiobookshelfRetrofit(@AudiobookshelfClient okHttpClient: OkHttpClient): Retrofit {
+        val contentType = "application/json".toMediaType()
+        val baseUrl = "http://placeholder.audiobookshelf/"
+
+        return Retrofit.Builder()
+            .baseUrl(baseUrl)
+            .client(okHttpClient)
+            .addConverterFactory(audiobookshelfJson.asConverterFactory(contentType))
+            .build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideAudiobookshelfApiService(
+        @AudiobookshelfRetrofit retrofit: Retrofit
+    ): AudiobookshelfApiService {
+        return retrofit.create(AudiobookshelfApiService::class.java)
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/di/PlayerModule.kt b/app/src/main/java/com/makd/afinity/di/PlayerModule.kt
index bcb67745b..37053cbcc 100644
--- a/app/src/main/java/com/makd/afinity/di/PlayerModule.kt
+++ b/app/src/main/java/com/makd/afinity/di/PlayerModule.kt
@@ -19,8 +19,8 @@ object PlayerModule {
     fun providePlaybackStateManager(
         mediaRepository: MediaRepository,
         playbackRepository: PlaybackRepository,
-        syncScheduler: UserDataSyncScheduler
+        syncScheduler: UserDataSyncScheduler,
     ): PlaybackStateManager {
         return PlaybackStateManager(mediaRepository, playbackRepository, syncScheduler)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/di/PreferencesEntryPoint.kt b/app/src/main/java/com/makd/afinity/di/PreferencesEntryPoint.kt
index a4139454b..537b9423f 100644
--- a/app/src/main/java/com/makd/afinity/di/PreferencesEntryPoint.kt
+++ b/app/src/main/java/com/makd/afinity/di/PreferencesEntryPoint.kt
@@ -9,4 +9,4 @@ import dagger.hilt.components.SingletonComponent
 @InstallIn(SingletonComponent::class)
 interface PreferencesEntryPoint {
     fun preferencesRepository(): PreferencesRepository
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/di/PreferencesModule.kt b/app/src/main/java/com/makd/afinity/di/PreferencesModule.kt
index e65e6225c..6bea5cff7 100644
--- a/app/src/main/java/com/makd/afinity/di/PreferencesModule.kt
+++ b/app/src/main/java/com/makd/afinity/di/PreferencesModule.kt
@@ -12,21 +12,18 @@ import dagger.hilt.components.SingletonComponent
 import javax.inject.Qualifier
 import javax.inject.Singleton
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class AppPreferences
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class AppPreferences
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class UserPreferences
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class UserPreferences
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class ServerPreferences
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class ServerPreferences
 
-private val Context.appPreferencesDataStore: DataStore<Preferences> by preferencesDataStore(name = "app_preferences")
-private val Context.userPreferencesDataStore: DataStore<Preferences> by preferencesDataStore(name = "user_preferences")
-private val Context.serverPreferencesDataStore: DataStore<Preferences> by preferencesDataStore(name = "server_preferences")
+private val Context.appPreferencesDataStore: DataStore<Preferences> by
+    preferencesDataStore(name = "app_preferences")
+private val Context.userPreferencesDataStore: DataStore<Preferences> by
+    preferencesDataStore(name = "user_preferences")
+private val Context.serverPreferencesDataStore: DataStore<Preferences> by
+    preferencesDataStore(name = "server_preferences")
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -58,4 +55,4 @@ object PreferencesModule {
     ): DataStore<Preferences> {
         return context.serverPreferencesDataStore
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/di/RepositoryModule.kt b/app/src/main/java/com/makd/afinity/di/RepositoryModule.kt
index a82e908f8..6688a1ae8 100644
--- a/app/src/main/java/com/makd/afinity/di/RepositoryModule.kt
+++ b/app/src/main/java/com/makd/afinity/di/RepositoryModule.kt
@@ -30,10 +30,11 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import org.jellyfin.sdk.api.client.ApiClient
 import javax.inject.Singleton
+import org.jellyfin.sdk.api.client.ApiClient
 
-private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "afinity_preferences")
+private val Context.dataStore: DataStore<Preferences> by
+    preferencesDataStore(name = "afinity_preferences")
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -41,9 +42,7 @@ abstract class RepositoryModule {
 
     @Binds
     @Singleton
-    abstract fun bindAuthRepository(
-        jellyfinAuthRepository: JellyfinAuthRepository
-    ): AuthRepository
+    abstract fun bindAuthRepository(jellyfinAuthRepository: JellyfinAuthRepository): AuthRepository
 
     @Binds
     @Singleton
@@ -111,9 +110,9 @@ abstract class RepositoryModule {
         fun provideWebSocketManager(
             apiClient: ApiClient,
             mediaRepository: MediaRepository,
-            userDataRepository: UserDataRepository
+            userDataRepository: UserDataRepository,
         ): JellyfinWebSocketManager {
             return JellyfinWebSocketManager(apiClient, mediaRepository, userDataRepository)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/di/SecurityModule.kt b/app/src/main/java/com/makd/afinity/di/SecurityModule.kt
index b1e850d0d..ff46c7900 100644
--- a/app/src/main/java/com/makd/afinity/di/SecurityModule.kt
+++ b/app/src/main/java/com/makd/afinity/di/SecurityModule.kt
@@ -17,4 +17,4 @@ abstract class SecurityModule {
     abstract fun bindSecurePreferencesRepository(
         securePreferencesRepositoryImpl: SecurePreferencesRepositoryImpl
     ): SecurePreferencesRepository
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/di/SegmentsModule.kt b/app/src/main/java/com/makd/afinity/di/SegmentsModule.kt
index 2902bc040..8ae3815e2 100644
--- a/app/src/main/java/com/makd/afinity/di/SegmentsModule.kt
+++ b/app/src/main/java/com/makd/afinity/di/SegmentsModule.kt
@@ -17,4 +17,4 @@ abstract class SegmentsModule {
     abstract fun bindSegmentsRepository(
         jellyfinSegmentsRepository: JellyfinSegmentsRepository
     ): SegmentsRepository
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/di/WatchlistModule.kt b/app/src/main/java/com/makd/afinity/di/WatchlistModule.kt
index d36fc5b6a..3c97ccaec 100644
--- a/app/src/main/java/com/makd/afinity/di/WatchlistModule.kt
+++ b/app/src/main/java/com/makd/afinity/di/WatchlistModule.kt
@@ -20,12 +20,12 @@ object WatchlistModule {
     fun provideWatchlistRepository(
         userDataRepository: UserDataRepository,
         mediaRepository: MediaRepository,
-        jellyfinRepository: JellyfinRepository
+        jellyfinRepository: JellyfinRepository,
     ): WatchlistRepository {
         return WatchlistRepositoryImpl(
             userDataRepository = userDataRepository,
             mediaRepository = mediaRepository,
-            jellyfinRepository = jellyfinRepository
+            jellyfinRepository = jellyfinRepository,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/navigation/Destination.kt b/app/src/main/java/com/makd/afinity/navigation/Destination.kt
index 227f9d076..5575e3841 100644
--- a/app/src/main/java/com/makd/afinity/navigation/Destination.kt
+++ b/app/src/main/java/com/makd/afinity/navigation/Destination.kt
@@ -6,43 +6,49 @@ enum class Destination(
     val route: String,
     val title: String,
     val selectedIconRes: Int,
-    val unselectedIconRes: Int
+    val unselectedIconRes: Int,
 ) {
     HOME(
         route = "home",
         title = "Home",
         selectedIconRes = R.drawable.ic_home_filled,
-        unselectedIconRes = R.drawable.ic_home
+        unselectedIconRes = R.drawable.ic_home,
     ),
     LIBRARIES(
         route = "libraries",
         title = "Libraries",
         selectedIconRes = R.drawable.ic_video_library_filled,
-        unselectedIconRes = R.drawable.ic_video_library
+        unselectedIconRes = R.drawable.ic_video_library,
     ),
     FAVORITES(
         route = "favorites",
         title = "Favorites",
         selectedIconRes = R.drawable.ic_favorite_filled,
-        unselectedIconRes = R.drawable.ic_favorite
+        unselectedIconRes = R.drawable.ic_favorite,
     ),
     WATCHLIST(
         route = "watchlist",
         title = "Watchlist",
         selectedIconRes = R.drawable.ic_bookmarks_filled,
-        unselectedIconRes = R.drawable.ic_bookmarks
+        unselectedIconRes = R.drawable.ic_bookmarks,
     ),
     REQUESTS(
         route = "requests",
         title = "Requests",
         selectedIconRes = R.drawable.ic_plus_filled,
-        unselectedIconRes = R.drawable.ic_plus
+        unselectedIconRes = R.drawable.ic_plus,
+    ),
+    AUDIOBOOKS(
+        route = "audiobookshelf/libraries",
+        title = "Audiobooks",
+        selectedIconRes = R.drawable.ic_books_filled,
+        unselectedIconRes = R.drawable.ic_books,
     ),
     LIVE_TV(
         route = "live_tv",
         title = "Live TV",
         selectedIconRes = R.drawable.ic_live_tv_filled_nav,
-        unselectedIconRes = R.drawable.ic_live_tv_nav
+        unselectedIconRes = R.drawable.ic_live_tv_nav,
     );
 
     companion object {
@@ -64,6 +70,60 @@ enum class Destination(
 
         const val LOGIN_ROUTE = "login?serverUrl={serverUrl}"
 
+        const val AUDIOBOOKSHELF_LOGIN_ROUTE = "audiobookshelf/login"
+        const val AUDIOBOOKSHELF_LIBRARIES_ROUTE = "audiobookshelf/libraries"
+        const val AUDIOBOOKSHELF_LIBRARY_ROUTE = "audiobookshelf/library/{libraryId}"
+        const val AUDIOBOOKSHELF_ITEM_ROUTE = "audiobookshelf/item/{itemId}"
+        const val AUDIOBOOKSHELF_SERIES_ROUTE =
+            "audiobookshelf/series/{seriesId}/{libraryId}/{seriesName}"
+        const val AUDIOBOOKSHELF_GENRE_RESULTS_ROUTE = "audiobookshelf/genre/{genre}"
+        const val AUDIOBOOKSHELF_PLAYER_ROUTE =
+            "audiobookshelf/player/{itemId}?episodeId={episodeId}&startPosition={startPosition}"
+
+        fun createAudiobookshelfLoginRoute(): String {
+            return AUDIOBOOKSHELF_LOGIN_ROUTE
+        }
+
+        fun createAudiobookshelfLibrariesRoute(): String {
+            return AUDIOBOOKSHELF_LIBRARIES_ROUTE
+        }
+
+        fun createAudiobookshelfLibraryRoute(libraryId: String): String {
+            return "audiobookshelf/library/$libraryId"
+        }
+
+        fun createAudiobookshelfItemRoute(itemId: String): String {
+            return "audiobookshelf/item/$itemId"
+        }
+
+        fun createAudiobookshelfSeriesRoute(
+            seriesId: String,
+            libraryId: String,
+            seriesName: String,
+        ): String {
+            return "audiobookshelf/series/$seriesId/$libraryId/${seriesName.replace("/", "%2F")}"
+        }
+
+        fun createAudiobookshelfGenreResultsRoute(genre: String): String {
+            return "audiobookshelf/genre/${genre.replace("/", "%2F")}"
+        }
+
+        fun createAudiobookshelfPlayerRoute(
+            itemId: String,
+            episodeId: String? = null,
+            startPosition: Double? = null,
+        ): String {
+            val params = buildList {
+                if (episodeId != null) add("episodeId=$episodeId")
+                if (startPosition != null) add("startPosition=$startPosition")
+            }
+            return if (params.isNotEmpty()) {
+                "audiobookshelf/player/$itemId?${params.joinToString("&")}"
+            } else {
+                "audiobookshelf/player/$itemId"
+            }
+        }
+
         fun createPersonRoute(personId: String): String {
             return "person/$personId"
         }
@@ -73,7 +133,7 @@ enum class Destination(
             mediaSourceId: String,
             audioStreamIndex: Int? = null,
             subtitleStreamIndex: Int? = null,
-            startPositionMs: Long = 0L
+            startPositionMs: Long = 0L,
         ): String {
             var route = "player/$itemId/$mediaSourceId"
             val params = mutableListOf<String>()
@@ -133,7 +193,11 @@ enum class Destination(
             return LICENSES_ROUTE
         }
 
-        fun createFilteredMediaRoute(filterType: String, filterId: Int, filterName: String): String {
+        fun createFilteredMediaRoute(
+            filterType: String,
+            filterId: Int,
+            filterName: String,
+        ): String {
             return "filtered_media/$filterType/$filterId/${filterName.replace("/", "%2F")}"
         }
 
@@ -157,4 +221,4 @@ enum class Destination(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/navigation/MainNavigation.kt b/app/src/main/java/com/makd/afinity/navigation/MainNavigation.kt
index 3e1ddb877..67ba2cdeb 100644
--- a/app/src/main/java/com/makd/afinity/navigation/MainNavigation.kt
+++ b/app/src/main/java/com/makd/afinity/navigation/MainNavigation.kt
@@ -2,6 +2,10 @@
 
 package com.makd.afinity.navigation
 
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@@ -9,12 +13,12 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold
 import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteType
-import androidx.compose.material3.adaptive.navigationsuite.rememberNavigationSuiteScaffoldState
 import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
@@ -29,9 +33,17 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
 import com.makd.afinity.data.manager.OfflineModeManager
+import com.makd.afinity.data.repository.AudiobookshelfRepository
 import com.makd.afinity.data.repository.JellyseerrRepository
 import com.makd.afinity.data.repository.watchlist.WatchlistRepository
 import com.makd.afinity.data.updater.UpdateManager
+import com.makd.afinity.ui.audiobookshelf.genre.AudiobookshelfGenreResultsScreen
+import com.makd.afinity.ui.audiobookshelf.item.AudiobookshelfItemScreen
+import com.makd.afinity.ui.audiobookshelf.item.series.AudiobookshelfSeriesScreen
+import com.makd.afinity.ui.audiobookshelf.libraries.AudiobookshelfLibrariesScreen
+import com.makd.afinity.ui.audiobookshelf.library.AudiobookshelfLibraryScreen
+import com.makd.afinity.ui.audiobookshelf.player.AudiobookshelfPlayerScreen
+import com.makd.afinity.ui.audiobookshelf.player.components.MiniPlayer
 import com.makd.afinity.ui.components.AfinitySplashScreen
 import com.makd.afinity.ui.favorites.FavoritesScreen
 import com.makd.afinity.ui.home.HomeScreen
@@ -68,20 +80,26 @@ fun MainNavigation(
     viewModel: MainNavigationViewModel = hiltViewModel(),
     updateManager: UpdateManager,
     offlineModeManager: OfflineModeManager,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val mainUiState by mainViewModel.uiState.collectAsStateWithLifecycle()
     val watchlistRepository: WatchlistRepository =
         hiltViewModel<MainNavigationViewModel>().watchlistRepository
-    val watchlistCount by watchlistRepository.getWatchlistCountFlow()
-        .collectAsStateWithLifecycle(initialValue = 0)
+    val watchlistCount by
+        watchlistRepository.getWatchlistCountFlow().collectAsStateWithLifecycle(initialValue = 0)
     val jellyseerrRepository: JellyseerrRepository =
         hiltViewModel<MainNavigationViewModel>().jellyseerrRepository
-    val isJellyseerrAuthenticated by jellyseerrRepository.isAuthenticated
-        .collectAsStateWithLifecycle()
+    val isJellyseerrAuthenticated by
+        jellyseerrRepository.isAuthenticated.collectAsStateWithLifecycle()
+    val audiobookshelfRepository: AudiobookshelfRepository =
+        hiltViewModel<MainNavigationViewModel>().audiobookshelfRepository
+    val isAudiobookshelfAuthenticated by
+        audiobookshelfRepository.isAuthenticated.collectAsStateWithLifecycle()
     val hasLiveTvAccess by viewModel.hasLiveTvAccess.collectAsStateWithLifecycle()
     val appLoadingState by viewModel.appLoadingState.collectAsStateWithLifecycle()
     val isOffline by offlineModeManager.isOffline.collectAsStateWithLifecycle(initialValue = false)
+    val audiobookshelfPlaybackState by
+        viewModel.audiobookshelfPlaybackManager.playbackState.collectAsStateWithLifecycle()
     val navController = rememberNavController()
     val navBackStackEntry by navController.currentBackStackEntryAsState()
     val currentDestination = navBackStackEntry?.destination
@@ -91,13 +109,14 @@ fun MainNavigation(
         AfinitySplashScreen(
             statusText = appLoadingState.loadingPhase.ifEmpty { "Loading..." },
             progress = appLoadingState.loadingProgress,
-            modifier = modifier
+            modifier = modifier,
         )
         return
     }
 
-    val shouldShowNavigation = currentDestination?.route?.let { route ->
-        !route.startsWith("library_content/") &&
+    val shouldShowNavigation =
+        currentDestination?.route?.let { route ->
+            !route.startsWith("library_content/") &&
                 !route.startsWith("studio_content/") &&
                 !route.startsWith("item_detail/") &&
                 !route.startsWith("episodes/") &&
@@ -113,18 +132,13 @@ fun MainNavigation(
                 route != "licenses" &&
                 route != "server_management" &&
                 !route.startsWith("add_edit_server") &&
-                !route.startsWith("login")
-    } ?: true
-
-    val navigationSuiteScaffoldState = rememberNavigationSuiteScaffoldState()
-
-    LaunchedEffect(shouldShowNavigation) {
-        if (shouldShowNavigation) {
-            navigationSuiteScaffoldState.show()
-        } else {
-            navigationSuiteScaffoldState.hide()
-        }
-    }
+                !route.startsWith("login") &&
+                !route.startsWith("audiobookshelf/library/") &&
+                !route.startsWith("audiobookshelf/item/") &&
+                !route.startsWith("audiobookshelf/series/") &&
+                !route.startsWith("audiobookshelf/genre/") &&
+                !route.startsWith("audiobookshelf/player/")
+        } ?: true
 
     val useNavRail = widthSizeClass != WindowWidthSizeClass.Compact
 
@@ -134,9 +148,7 @@ fun MainNavigation(
             if (currentRoute != Destination.HOME.route) {
                 Timber.d("Switching to offline mode, navigating to HOME")
                 navController.navigate(Destination.HOME.route) {
-                    popUpTo(navController.graph.findStartDestination().id) {
-                        saveState = true
-                    }
+                    popUpTo(navController.graph.findStartDestination().id) { saveState = true }
                     launchSingleTop = true
                     restoreState = true
                 }
@@ -145,7 +157,12 @@ fun MainNavigation(
     }
 
     NavigationSuiteScaffold(
-        layoutType = if (useNavRail) NavigationSuiteType.NavigationRail else NavigationSuiteType.NavigationBar,
+        layoutType =
+            when {
+                !shouldShowNavigation -> NavigationSuiteType.None
+                useNavRail -> NavigationSuiteType.NavigationRail
+                else -> NavigationSuiteType.NavigationBar
+            },
         navigationSuiteItems = {
             Destination.entries.forEach { destination ->
                 if (isOffline && destination != Destination.HOME) {
@@ -160,13 +177,16 @@ fun MainNavigation(
                     return@forEach
                 }
 
+                if (destination == Destination.AUDIOBOOKS && !isAudiobookshelfAuthenticated) {
+                    return@forEach
+                }
+
                 if (destination == Destination.LIVE_TV && !hasLiveTvAccess) {
                     return@forEach
                 }
 
-                val selected = currentDestination?.hierarchy?.any {
-                    it.route == destination.route
-                } == true
+                val selected =
+                    currentDestination?.hierarchy?.any { it.route == destination.route } == true
 
                 item(
                     selected = selected,
@@ -181,468 +201,611 @@ fun MainNavigation(
                     },
                     icon = {
                         Icon(
-                            painter = painterResource(
-                                id = if (selected) {
-                                    destination.selectedIconRes
-                                } else {
-                                    destination.unselectedIconRes
-                                }
-                            ),
-                            contentDescription = destination.title
+                            painter =
+                                painterResource(
+                                    id =
+                                        if (selected) {
+                                            destination.selectedIconRes
+                                        } else {
+                                            destination.unselectedIconRes
+                                        }
+                                ),
+                            contentDescription = destination.title,
                         )
-
                     },
                     label = {
                         if (selected) {
                             Text(
                                 text = destination.title,
-                                style = MaterialTheme.typography.labelSmall
+                                style = MaterialTheme.typography.labelSmall,
                             )
                         }
-                    }
+                    },
                 )
             }
         },
-        state = navigationSuiteScaffoldState,
         modifier = modifier,
         containerColor = MaterialTheme.colorScheme.surface,
         contentColor = MaterialTheme.colorScheme.onSurface,
-        navigationSuiteColors = androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaults.colors(
-            navigationBarContainerColor = MaterialTheme.colorScheme.surface,
-            navigationRailContainerColor = MaterialTheme.colorScheme.surface
-        )
+        navigationSuiteColors =
+            androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaults.colors(
+                navigationBarContainerColor = MaterialTheme.colorScheme.surface,
+                navigationRailContainerColor = MaterialTheme.colorScheme.surface,
+            ),
     ) {
-        NavHost(
-            navController = navController,
-            startDestination = Destination.HOME.route,
-            modifier = Modifier.fillMaxSize()
-        ) {
-            composable(Destination.HOME.route) {
-                HomeScreen(
-                    onItemClick = { item ->
-                        val route = Destination.createItemDetailRoute(item.id.toString())
-                        navController.navigate(route)
-                    },
-                    onPlayClick = { item ->
-                        coroutineScope.launch {
-                            try {
-                                val playableItem = viewModel.resolvePlayableItem(item)
-
-                                if (playableItem == null) {
-                                    Timber.w("Could not resolve playable item for: ${item.name}")
-                                    return@launch
+        val isOnAudiobookshelfPlayer =
+            currentDestination?.route?.startsWith("audiobookshelf/player/") == true
+        val showMiniPlayer =
+            audiobookshelfPlaybackState.sessionId != null && !isOnAudiobookshelfPlayer
+
+        Box(modifier = Modifier.fillMaxSize()) {
+            NavHost(
+                navController = navController,
+                startDestination = Destination.HOME.route,
+                modifier = Modifier.fillMaxSize(),
+            ) {
+                composable(Destination.HOME.route) {
+                    HomeScreen(
+                        onItemClick = { item ->
+                            val route = Destination.createItemDetailRoute(item.id.toString())
+                            navController.navigate(route)
+                        },
+                        onPlayClick = { item ->
+                            coroutineScope.launch {
+                                try {
+                                    val playableItem = viewModel.resolvePlayableItem(item)
+
+                                    if (playableItem == null) {
+                                        Timber.w(
+                                            "Could not resolve playable item for: ${item.name}"
+                                        )
+                                        return@launch
+                                    }
+
+                                    PlayerLauncher.launch(
+                                        context = navController.context,
+                                        itemId = playableItem.id,
+                                        mediaSourceId =
+                                            playableItem.sources.firstOrNull()?.id ?: "",
+                                        audioStreamIndex = null,
+                                        subtitleStreamIndex = null,
+                                        startPositionMs = 0L,
+                                    )
+                                } catch (e: Exception) {
+                                    Timber.e(e, "Failed to handle play click for: ${item.name}")
                                 }
+                            }
+                        },
+                        onProfileClick = {
+                            val route = Destination.createSettingsRoute()
+                            navController.navigate(route)
+                        },
+                        navController = navController,
+                        mainUiState = mainUiState,
+                        modifier = Modifier.fillMaxSize(),
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
+
+                composable(Destination.LIBRARIES.route) {
+                    LibrariesScreen(
+                        onLibraryClick = { library ->
+                            val route =
+                                Destination.createLibraryContentRoute(
+                                    libraryId = library.id.toString(),
+                                    libraryName = library.name,
+                                )
+                            navController.navigate(route)
+                        },
+                        onProfileClick = {
+                            val route = Destination.createSettingsRoute()
+                            navController.navigate(route)
+                        },
+                        navController = navController,
+                        mainUiState = mainUiState,
+                        modifier = Modifier.fillMaxSize(),
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
+
+                composable(
+                    route = Destination.LIBRARY_CONTENT_ROUTE,
+                    arguments =
+                        listOf(
+                            navArgument("libraryId") { type = NavType.StringType },
+                            navArgument("libraryName") { type = NavType.StringType },
+                        ),
+                ) {
+                    LibraryContentScreen(
+                        onItemClick = { item ->
+                            val route = Destination.createItemDetailRoute(item.id.toString())
+                            navController.navigate(route)
+                        },
+                        onProfileClick = {
+                            val route = Destination.createSettingsRoute()
+                            navController.navigate(route)
+                        },
+                        navController = navController,
+                        modifier = Modifier.fillMaxSize(),
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
+
+                composable(
+                    route = Destination.STUDIO_CONTENT_ROUTE,
+                    arguments = listOf(navArgument("studioName") { type = NavType.StringType }),
+                ) {
+                    LibraryContentScreen(
+                        onItemClick = { item ->
+                            val route = Destination.createItemDetailRoute(item.id.toString())
+                            navController.navigate(route)
+                        },
+                        onProfileClick = {
+                            val route = Destination.createSettingsRoute()
+                            navController.navigate(route)
+                        },
+                        navController = navController,
+                        modifier = Modifier.fillMaxSize(),
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
 
+                composable(
+                    route = Destination.ITEM_DETAIL_ROUTE,
+                    arguments = listOf(navArgument("itemId") { type = NavType.StringType }),
+                ) {
+                    ItemDetailScreen(
+                        navController = navController,
+                        onPlayClick = { item, selection ->
+                            PlayerLauncher.launch(
+                                context = navController.context,
+                                itemId = item.id,
+                                mediaSourceId =
+                                    selection?.mediaSourceId
+                                        ?: item.sources.firstOrNull()?.id
+                                        ?: "",
+                                audioStreamIndex = selection?.audioStreamIndex,
+                                subtitleStreamIndex = selection?.subtitleStreamIndex,
+                                startPositionMs = selection?.startPositionMs ?: 0L,
+                            )
+                        },
+                        modifier = Modifier.fillMaxSize(),
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
+
+                composable(
+                    route = Destination.EPISODE_LIST_ROUTE,
+                    arguments =
+                        listOf(
+                            navArgument("seasonId") { type = NavType.StringType },
+                            navArgument("seasonName") { type = NavType.StringType },
+                        ),
+                ) { backStackEntry ->
+                    ItemDetailScreen(
+                        onPlayClick = { item, selection ->
+                            if (selection != null) {
                                 PlayerLauncher.launch(
                                     context = navController.context,
-                                    itemId = playableItem.id,
-                                    mediaSourceId = playableItem.sources.firstOrNull()?.id ?: "",
-                                    audioStreamIndex = null,
-                                    subtitleStreamIndex = null,
-                                    startPositionMs = 0L
+                                    itemId = item.id,
+                                    mediaSourceId = selection.mediaSourceId,
+                                    audioStreamIndex = selection.audioStreamIndex,
+                                    subtitleStreamIndex = selection.subtitleStreamIndex,
+                                    startPositionMs = selection.startPositionMs,
                                 )
-                            } catch (e: Exception) {
-                                Timber.e(e, "Failed to handle play click for: ${item.name}")
                             }
-                        }
-                    },
-                    onProfileClick = {
-                        val route = Destination.createSettingsRoute()
-                        navController.navigate(route)
-                    },
-                    navController = navController,
-                    mainUiState = mainUiState,
-                    modifier = Modifier.fillMaxSize(),
-                    widthSizeClass = widthSizeClass
-                )
-            }
+                        },
+                        navController = navController,
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
 
-            composable(Destination.LIBRARIES.route) {
-                LibrariesScreen(
-                    onLibraryClick = { library ->
-                        val route = Destination.createLibraryContentRoute(
-                            libraryId = library.id.toString(),
-                            libraryName = library.name
-                        )
-                        navController.navigate(route)
-                    },
-                    onProfileClick = {
-                        val route = Destination.createSettingsRoute()
-                        navController.navigate(route)
-                    },
-                    navController = navController,
-                    mainUiState = mainUiState,
-                    modifier = Modifier.fillMaxSize(),
-                    widthSizeClass = widthSizeClass
-                )
-            }
+                composable(
+                    route = Destination.PERSON_ROUTE,
+                    arguments = listOf(navArgument("personId") { type = NavType.StringType }),
+                ) {
+                    PersonScreen(
+                        navController = navController,
+                        modifier = Modifier.fillMaxSize(),
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
 
-            composable(
-                route = Destination.LIBRARY_CONTENT_ROUTE,
-                arguments = listOf(
-                    navArgument("libraryId") { type = NavType.StringType },
-                    navArgument("libraryName") { type = NavType.StringType }
-                )
-            ) {
-                LibraryContentScreen(
-                    onItemClick = { item ->
-                        val route = Destination.createItemDetailRoute(item.id.toString())
-                        navController.navigate(route)
-                    },
-                    onProfileClick = {
-                        val route = Destination.createSettingsRoute()
-                        navController.navigate(route)
-                    },
-                    navController = navController,
-                    modifier = Modifier.fillMaxSize(),
-                    widthSizeClass = widthSizeClass
-                )
-            }
+                composable(Destination.FAVORITES.route) {
+                    FavoritesScreen(
+                        onItemClick = { item ->
+                            val route = Destination.createItemDetailRoute(item.id.toString())
+                            navController.navigate(route)
+                        },
+                        onPersonClick = { personId ->
+                            val route = Destination.createPersonRoute(personId)
+                            navController.navigate(route)
+                        },
+                        modifier = Modifier.fillMaxSize(),
+                        mainUiState = mainUiState,
+                        navController = navController,
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
 
-            composable(
-                route = Destination.STUDIO_CONTENT_ROUTE,
-                arguments = listOf(
-                    navArgument("studioName") { type = NavType.StringType }
-                )
-            ) {
-                LibraryContentScreen(
-                    onItemClick = { item ->
-                        val route = Destination.createItemDetailRoute(item.id.toString())
-                        navController.navigate(route)
-                    },
-                    onProfileClick = {
-                        val route = Destination.createSettingsRoute()
-                        navController.navigate(route)
-                    },
-                    navController = navController,
-                    modifier = Modifier.fillMaxSize(),
-                    widthSizeClass = widthSizeClass
-                )
-            }
+                composable(Destination.WATCHLIST.route) {
+                    WatchlistScreen(
+                        onItemClick = { item ->
+                            val route = Destination.createItemDetailRoute(item.id.toString())
+                            navController.navigate(route)
+                        },
+                        modifier = Modifier.fillMaxSize(),
+                        mainUiState = mainUiState,
+                        navController = navController,
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
 
-            composable(
-                route = Destination.ITEM_DETAIL_ROUTE,
-                arguments = listOf(
-                    navArgument("itemId") { type = NavType.StringType }
-                )
-            ) {
-                ItemDetailScreen(
-                    navController = navController,
-                    onPlayClick = { item, selection ->
-                        PlayerLauncher.launch(
-                            context = navController.context,
-                            itemId = item.id,
-                            mediaSourceId = selection?.mediaSourceId
-                                ?: item.sources.firstOrNull()?.id ?: "",
-                            audioStreamIndex = selection?.audioStreamIndex,
-                            subtitleStreamIndex = selection?.subtitleStreamIndex,
-                            startPositionMs = selection?.startPositionMs ?: 0L
-                        )
-                    },
-                    modifier = Modifier.fillMaxSize(),
-                    widthSizeClass = widthSizeClass
-                )
-            }
+                composable(Destination.REQUESTS.route) {
+                    RequestsScreen(
+                        onSearchClick = { navController.navigate(Destination.SEARCH_ROUTE) },
+                        onProfileClick = {
+                            val route = Destination.createSettingsRoute()
+                            navController.navigate(route)
+                        },
+                        mainUiState = mainUiState,
+                        onNavigateToFilteredMedia = { filterParams ->
+                            val route =
+                                Destination.createFilteredMediaRoute(
+                                    filterType = filterParams.type.name,
+                                    filterId = filterParams.id,
+                                    filterName = filterParams.name,
+                                )
+                            navController.navigate(route)
+                        },
+                        onItemClick = { jellyfinItemId ->
+                            val route = Destination.createItemDetailRoute(jellyfinItemId)
+                            navController.navigate(route)
+                        },
+                        modifier = Modifier.fillMaxSize(),
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
 
-            composable(
-                route = Destination.EPISODE_LIST_ROUTE,
-                arguments = listOf(
-                    navArgument("seasonId") { type = NavType.StringType },
-                    navArgument("seasonName") { type = NavType.StringType }
-                )
-            ) { backStackEntry ->
-                ItemDetailScreen(
-                    onPlayClick = { item, selection ->
-                        if (selection != null) {
-                            PlayerLauncher.launch(
-                                context = navController.context,
-                                itemId = item.id,
-                                mediaSourceId = selection.mediaSourceId,
-                                audioStreamIndex = selection.audioStreamIndex,
-                                subtitleStreamIndex = selection.subtitleStreamIndex,
-                                startPositionMs = selection.startPositionMs
+                composable(Destination.LIVE_TV.route) {
+                    com.makd.afinity.ui.livetv.LiveTvScreen(
+                        navController = navController,
+                        mainUiState = mainUiState,
+                        modifier = Modifier.fillMaxSize(),
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
+
+                composable(
+                    route = Destination.FILTERED_MEDIA_ROUTE,
+                    arguments =
+                        listOf(
+                            navArgument("filterType") { type = NavType.StringType },
+                            navArgument("filterId") { type = NavType.IntType },
+                            navArgument("filterName") { type = NavType.StringType },
+                        ),
+                ) { backStackEntry ->
+                    val filterTypeString =
+                        backStackEntry.arguments?.getString("filterType") ?: return@composable
+                    val filterId = backStackEntry.arguments?.getInt("filterId") ?: return@composable
+                    val filterName =
+                        backStackEntry.arguments?.getString("filterName") ?: return@composable
+
+                    val filterType = FilterType.valueOf(filterTypeString)
+                    val filterParams = FilterParams(filterType, filterId, filterName)
+
+                    FilteredMediaScreen(
+                        filterParams = filterParams,
+                        onSearchClick = { navController.navigate(Destination.SEARCH_ROUTE) },
+                        onProfileClick = {
+                            val route = Destination.createSettingsRoute()
+                            navController.navigate(route)
+                        },
+                        mainUiState = mainUiState,
+                        onItemClick = { jellyfinItemId ->
+                            val route = Destination.createItemDetailRoute(jellyfinItemId)
+                            navController.navigate(route)
+                        },
+                        modifier = Modifier.fillMaxSize(),
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
+
+                composable(Destination.SEARCH_ROUTE) {
+                    SearchScreen(
+                        onBackClick = { navController.popBackStack() },
+                        onItemClick = { item ->
+                            val route = Destination.createItemDetailRoute(item.id.toString())
+                            navController.navigate(route)
+                        },
+                        onGenreClick = { genre ->
+                            val route = Destination.createGenreResultsRoute(genre)
+                            navController.navigate(route)
+                        },
+                        onAudiobookshelfItemClick = { itemId ->
+                            navController.navigate(
+                                Destination.createAudiobookshelfItemRoute(itemId)
                             )
-                        }
-                    },
-                    navController = navController,
-                    widthSizeClass = widthSizeClass
-                )
-            }
+                        },
+                        onAudiobookshelfGenreClick = { genre ->
+                            navController.navigate(
+                                Destination.createAudiobookshelfGenreResultsRoute(genre)
+                            )
+                        },
+                        modifier = Modifier.fillMaxSize(),
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
 
-            composable(
-                route = Destination.PERSON_ROUTE,
-                arguments = listOf(
-                    navArgument("personId") { type = NavType.StringType }
-                )
-            ) {
-                PersonScreen(
-                    navController = navController,
-                    modifier = Modifier.fillMaxSize(),
-                    widthSizeClass = widthSizeClass
-                )
-            }
+                composable(
+                    route = Destination.GENRE_RESULTS_ROUTE,
+                    arguments = listOf(navArgument("genre") { type = NavType.StringType }),
+                ) {
+                    GenreResultsScreen(
+                        genre = it.arguments?.getString("genre") ?: "",
+                        onBackClick = { navController.popBackStack() },
+                        onItemClick = { item ->
+                            val route = Destination.createItemDetailRoute(item.id.toString())
+                            navController.navigate(route)
+                        },
+                        modifier = Modifier.fillMaxSize(),
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
 
-            composable(Destination.FAVORITES.route) {
-                FavoritesScreen(
-                    onItemClick = { item ->
-                        val route = Destination.createItemDetailRoute(item.id.toString())
-                        navController.navigate(route)
-                    },
-                    onPersonClick = { personId ->
-                        val route = Destination.createPersonRoute(personId)
-                        navController.navigate(route)
-                    },
-                    modifier = Modifier.fillMaxSize(),
-                    mainUiState = mainUiState,
-                    navController = navController,
-                    widthSizeClass = widthSizeClass
-                )
-            }
+                composable(
+                    route = Destination.AUDIOBOOKSHELF_GENRE_RESULTS_ROUTE,
+                    arguments = listOf(navArgument("genre") { type = NavType.StringType }),
+                ) {
+                    AudiobookshelfGenreResultsScreen(
+                        genre = it.arguments?.getString("genre") ?: "",
+                        onBackClick = { navController.popBackStack() },
+                        onItemClick = { itemId ->
+                            navController.navigate(
+                                Destination.createAudiobookshelfItemRoute(itemId)
+                            )
+                        },
+                        modifier = Modifier.fillMaxSize(),
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
 
-            composable(Destination.WATCHLIST.route) {
-                WatchlistScreen(
-                    onItemClick = { item ->
-                        val route = Destination.createItemDetailRoute(item.id.toString())
-                        navController.navigate(route)
-                    },
-                    modifier = Modifier.fillMaxSize(),
-                    mainUiState = mainUiState,
-                    navController = navController,
-                    widthSizeClass = widthSizeClass
-                )
-            }
+                composable(Destination.SETTINGS_ROUTE) {
+                    SettingsScreen(
+                        navController = navController,
+                        onBackClick = { navController.popBackStack() },
+                        onLogoutComplete = {
+                            // Logout handled by MainActivity observing auth state
+                        },
+                        onLicensesClick = {
+                            val route = Destination.createLicensesRoute()
+                            navController.navigate(route)
+                        },
+                        onDownloadClick = {
+                            val route = Destination.createDownloadSettingsRoute()
+                            navController.navigate(route)
+                        },
+                        onPlayerOptionsClick = {
+                            val route = Destination.createPlayerOptionsRoute()
+                            navController.navigate(route)
+                        },
+                        onAppearanceOptionsClick = {
+                            val route = Destination.createAppearanceOptionsRoute()
+                            navController.navigate(route)
+                        },
+                        onServerManagementClick = {
+                            val route = Destination.createServerManagementRoute()
+                            navController.navigate(route)
+                        },
+                    )
+                }
 
-            composable(Destination.REQUESTS.route) {
-                RequestsScreen(
-                    onSearchClick = {
-                        navController.navigate(Destination.SEARCH_ROUTE)
-                    },
-                    onProfileClick = {
-                        val route = Destination.createSettingsRoute()
-                        navController.navigate(route)
-                    },
-                    mainUiState = mainUiState,
-                    onNavigateToFilteredMedia = { filterParams ->
-                        val route = Destination.createFilteredMediaRoute(
-                            filterType = filterParams.type.name,
-                            filterId = filterParams.id,
-                            filterName = filterParams.name
-                        )
-                        navController.navigate(route)
-                    },
-                    onItemClick = { jellyfinItemId ->
-                        val route = Destination.createItemDetailRoute(jellyfinItemId)
-                        navController.navigate(route)
-                    },
-                    modifier = Modifier.fillMaxSize(),
-                    widthSizeClass = widthSizeClass
-                )
-            }
+                composable(Destination.DOWNLOAD_SETTINGS_ROUTE) {
+                    DownloadSettingsScreen(
+                        onBackClick = { navController.popBackStack() },
+                        offlineModeManager = offlineModeManager,
+                        modifier = Modifier.fillMaxSize(),
+                    )
+                }
 
-            composable(Destination.LIVE_TV.route) {
-                com.makd.afinity.ui.livetv.LiveTvScreen(
-                    navController = navController,
-                    mainUiState = mainUiState,
-                    modifier = Modifier.fillMaxSize(),
-                    widthSizeClass = widthSizeClass
-                )
-            }
+                composable(Destination.PLAYER_OPTIONS_ROUTE) {
+                    PlayerOptionsScreen(
+                        onBackClick = { navController.popBackStack() },
+                        modifier = Modifier.fillMaxSize(),
+                    )
+                }
 
-            composable(
-                route = Destination.FILTERED_MEDIA_ROUTE,
-                arguments = listOf(
-                    navArgument("filterType") { type = NavType.StringType },
-                    navArgument("filterId") { type = NavType.IntType },
-                    navArgument("filterName") { type = NavType.StringType }
-                )
-            ) { backStackEntry ->
-                val filterTypeString =
-                    backStackEntry.arguments?.getString("filterType") ?: return@composable
-                val filterId = backStackEntry.arguments?.getInt("filterId") ?: return@composable
-                val filterName =
-                    backStackEntry.arguments?.getString("filterName") ?: return@composable
-
-                val filterType = FilterType.valueOf(filterTypeString)
-                val filterParams = FilterParams(filterType, filterId, filterName)
-
-                FilteredMediaScreen(
-                    filterParams = filterParams,
-                    onSearchClick = {
-                        navController.navigate(Destination.SEARCH_ROUTE)
-                    },
-                    onProfileClick = {
-                        val route = Destination.createSettingsRoute()
-                        navController.navigate(route)
-                    },
-                    mainUiState = mainUiState,
-                    onItemClick = { jellyfinItemId ->
-                        val route = Destination.createItemDetailRoute(jellyfinItemId)
-                        navController.navigate(route)
-                    },
-                    modifier = Modifier.fillMaxSize(),
-                    widthSizeClass = widthSizeClass
-                )
-            }
+                composable(Destination.APPEARANCE_OPTIONS_ROUTE) {
+                    AppearanceOptionsScreen(onBackClick = { navController.popBackStack() })
+                }
 
-            composable(Destination.SEARCH_ROUTE) {
-                SearchScreen(
-                    onBackClick = {
-                        navController.popBackStack()
-                    },
-                    onItemClick = { item ->
-                        val route = Destination.createItemDetailRoute(item.id.toString())
-                        navController.navigate(route)
-                    },
-                    onGenreClick = { genre ->
-                        val route = Destination.createGenreResultsRoute(genre)
-                        navController.navigate(route)
-                    },
-                    modifier = Modifier.fillMaxSize(),
-                    widthSizeClass = widthSizeClass
-                )
-            }
+                composable(Destination.LICENSES_ROUTE) {
+                    LicensesScreen(onBackClick = { navController.popBackStack() })
+                }
 
-            composable(
-                route = Destination.GENRE_RESULTS_ROUTE,
-                arguments = listOf(
-                    navArgument("genre") { type = NavType.StringType }
-                )
-            ) {
-                GenreResultsScreen(
-                    genre = it.arguments?.getString("genre") ?: "",
-                    onBackClick = {
-                        navController.popBackStack()
-                    },
-                    onItemClick = { item ->
-                        val route = Destination.createItemDetailRoute(item.id.toString())
-                        navController.navigate(route)
-                    },
-                    modifier = Modifier.fillMaxSize(),
-                    widthSizeClass = widthSizeClass
-                )
-            }
+                composable(Destination.SERVER_MANAGEMENT_ROUTE) {
+                    ServerManagementScreen(
+                        onBackClick = { navController.popBackStack() },
+                        onAddServerClick = {
+                            val route = Destination.createAddEditServerRoute(serverId = null)
+                            navController.navigate(route)
+                        },
+                        onEditServerClick = { serverId ->
+                            val route = Destination.createAddEditServerRoute(serverId = serverId)
+                            navController.navigate(route)
+                        },
+                    )
+                }
 
-            composable(Destination.SETTINGS_ROUTE) {
-                SettingsScreen(
-                    navController = navController,
-                    onBackClick = {
-                        navController.popBackStack()
-                    },
-                    onLogoutComplete = {
-                        // Logout handled by MainActivity observing auth state
-                    },
-                    onLicensesClick = {
-                        val route = Destination.createLicensesRoute()
-                        navController.navigate(route)
-                    },
-                    onDownloadClick = {
-                        val route = Destination.createDownloadSettingsRoute()
-                        navController.navigate(route)
-                    },
-                    onPlayerOptionsClick = {
-                        val route = Destination.createPlayerOptionsRoute()
-                        navController.navigate(route)
-                    },
-                    onAppearanceOptionsClick = {
-                        val route = Destination.createAppearanceOptionsRoute()
-                        navController.navigate(route)
-                    },
-                    onServerManagementClick = {
-                        val route = Destination.createServerManagementRoute()
-                        navController.navigate(route)
-                    }
-                )
-            }
+                composable(
+                    route = Destination.ADD_EDIT_SERVER_ROUTE,
+                    arguments =
+                        listOf(
+                            navArgument("serverId") {
+                                type = NavType.StringType
+                                nullable = true
+                                defaultValue = null
+                            }
+                        ),
+                ) {
+                    AddEditServerScreen(onBackClick = { navController.popBackStack() })
+                }
 
-            composable(Destination.DOWNLOAD_SETTINGS_ROUTE) {
-                DownloadSettingsScreen(
-                    onBackClick = {
-                        navController.popBackStack()
-                    },
-                    offlineModeManager = offlineModeManager,
-                    modifier = Modifier.fillMaxSize()
-                )
-            }
+                composable(
+                    route = Destination.LOGIN_ROUTE,
+                    arguments =
+                        listOf(
+                            navArgument("serverUrl") {
+                                type = NavType.StringType
+                                nullable = true
+                                defaultValue = null
+                            }
+                        ),
+                ) {
+                    LoginScreen(
+                        onLoginSuccess = {
+                            navController.navigate(Destination.HOME.route) {
+                                popUpTo(0) { inclusive = true }
+                            }
+                        },
+                        modifier = Modifier.fillMaxSize(),
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
 
-            composable(Destination.PLAYER_OPTIONS_ROUTE) {
-                PlayerOptionsScreen(
-                    onBackClick = {
-                        navController.popBackStack()
-                    },
-                    modifier = Modifier.fillMaxSize()
-                )
-            }
+                composable(Destination.AUDIOBOOKSHELF_LIBRARIES_ROUTE) {
+                    AudiobookshelfLibrariesScreen(
+                        onNavigateToItem = { itemId ->
+                            navController.navigate(
+                                Destination.createAudiobookshelfItemRoute(itemId)
+                            )
+                        },
+                        navController = navController,
+                        mainUiState = mainUiState,
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
 
-            composable(Destination.APPEARANCE_OPTIONS_ROUTE) {
-                AppearanceOptionsScreen(
-                    onBackClick = {
-                        navController.popBackStack()
-                    }
-                )
-            }
+                composable(
+                    route = Destination.AUDIOBOOKSHELF_LIBRARY_ROUTE,
+                    arguments = listOf(navArgument("libraryId") { type = NavType.StringType }),
+                ) {
+                    AudiobookshelfLibraryScreen(
+                        onNavigateBack = { navController.popBackStack() },
+                        onNavigateToItem = { itemId ->
+                            navController.navigate(
+                                Destination.createAudiobookshelfItemRoute(itemId)
+                            )
+                        },
+                    )
+                }
 
-            composable(Destination.LICENSES_ROUTE) {
-                LicensesScreen(
-                    onBackClick = {
-                        navController.popBackStack()
-                    }
-                )
-            }
+                composable(
+                    route = Destination.AUDIOBOOKSHELF_ITEM_ROUTE,
+                    arguments = listOf(navArgument("itemId") { type = NavType.StringType }),
+                ) {
+                    AudiobookshelfItemScreen(
+                        onNavigateToPlayer = { itemId, episodeId, startPosition ->
+                            navController.navigate(
+                                Destination.createAudiobookshelfPlayerRoute(
+                                    itemId,
+                                    episodeId,
+                                    startPosition,
+                                )
+                            )
+                        },
+                        onNavigateToSeries = { seriesId, libraryId, seriesName ->
+                            navController.navigate(
+                                Destination.createAudiobookshelfSeriesRoute(
+                                    seriesId,
+                                    libraryId,
+                                    seriesName,
+                                )
+                            )
+                        },
+                    )
+                }
 
-            composable(Destination.SERVER_MANAGEMENT_ROUTE) {
-                ServerManagementScreen(
-                    onBackClick = {
-                        navController.popBackStack()
-                    },
-                    onAddServerClick = {
-                        val route = Destination.createAddEditServerRoute(serverId = null)
-                        navController.navigate(route)
-                    },
-                    onEditServerClick = { serverId ->
-                        val route = Destination.createAddEditServerRoute(serverId = serverId)
-                        navController.navigate(route)
-                    }
-                )
-            }
+                composable(
+                    route = Destination.AUDIOBOOKSHELF_SERIES_ROUTE,
+                    arguments =
+                        listOf(
+                            navArgument("seriesId") { type = NavType.StringType },
+                            navArgument("libraryId") { type = NavType.StringType },
+                            navArgument("seriesName") { type = NavType.StringType },
+                        ),
+                ) {
+                    AudiobookshelfSeriesScreen(
+                        onNavigateToPlayer = { itemId, episodeId, startPosition ->
+                            navController.navigate(
+                                Destination.createAudiobookshelfPlayerRoute(
+                                    itemId,
+                                    episodeId,
+                                    startPosition,
+                                )
+                            )
+                        },
+                    )
+                }
 
-            composable(
-                route = Destination.ADD_EDIT_SERVER_ROUTE,
-                arguments = listOf(
-                    navArgument("serverId") {
-                        type = NavType.StringType
-                        nullable = true
-                        defaultValue = null
-                    }
-                )
-            ) {
-                AddEditServerScreen(
-                    onBackClick = {
-                        navController.popBackStack()
-                    }
-                )
+                composable(
+                    route = Destination.AUDIOBOOKSHELF_PLAYER_ROUTE,
+                    arguments =
+                        listOf(
+                            navArgument("itemId") { type = NavType.StringType },
+                            navArgument("episodeId") {
+                                type = NavType.StringType
+                                nullable = true
+                                defaultValue = null
+                            },
+                            navArgument("startPosition") {
+                                type = NavType.StringType
+                                nullable = true
+                                defaultValue = null
+                            },
+                        ),
+                ) {
+                    AudiobookshelfPlayerScreen(onNavigateBack = { navController.popBackStack() })
+                }
             }
 
-            composable(
-                route = Destination.LOGIN_ROUTE,
-                arguments = listOf(
-                    navArgument("serverUrl") {
-                        type = NavType.StringType
-                        nullable = true
-                        defaultValue = null
-                    }
-                )
+            AnimatedVisibility(
+                visible = showMiniPlayer,
+                enter = slideInVertically { it },
+                exit = slideOutVertically { it },
+                modifier = Modifier.align(Alignment.BottomCenter),
             ) {
-                LoginScreen(
-                    onLoginSuccess = {
-                        navController.navigate(Destination.HOME.route) {
-                            popUpTo(0) { inclusive = true }
+                MiniPlayer(
+                    title = audiobookshelfPlaybackState.displayTitle,
+                    author = audiobookshelfPlaybackState.displayAuthor,
+                    coverUrl = audiobookshelfPlaybackState.coverUrl,
+                    currentTime = audiobookshelfPlaybackState.currentTime,
+                    duration = audiobookshelfPlaybackState.duration,
+                    isPlaying = audiobookshelfPlaybackState.isPlaying,
+                    isBuffering = audiobookshelfPlaybackState.isBuffering,
+                    onPlayPauseClick = {
+                        if (viewModel.audiobookshelfPlayer.isPlaying()) {
+                            viewModel.audiobookshelfPlayer.pause()
+                        } else {
+                            viewModel.audiobookshelfPlayer.play()
+                        }
+                    },
+                    onCloseClick = {
+                        viewModel.audiobookshelfPlayer.pause()
+                        coroutineScope.launch { viewModel.audiobookshelfPlayer.closeSession() }
+                    },
+                    onClick = {
+                        val itemId = audiobookshelfPlaybackState.itemId
+                        val episodeId = audiobookshelfPlaybackState.episodeId
+                        if (itemId != null) {
+                            navController.navigate(
+                                Destination.createAudiobookshelfPlayerRoute(itemId, episodeId)
+                            )
                         }
                     },
-                    modifier = Modifier.fillMaxSize(),
-                    widthSizeClass = widthSizeClass
                 )
             }
         }
     }
     GlobalUpdateDialog(updateManager = updateManager)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/navigation/MainNavigationViewModel.kt b/app/src/main/java/com/makd/afinity/navigation/MainNavigationViewModel.kt
index a0f2a1436..6289b29f6 100644
--- a/app/src/main/java/com/makd/afinity/navigation/MainNavigationViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/navigation/MainNavigationViewModel.kt
@@ -6,12 +6,16 @@ import com.makd.afinity.data.manager.OfflineModeManager
 import com.makd.afinity.data.models.media.AfinityItem
 import com.makd.afinity.data.models.media.AfinityShow
 import com.makd.afinity.data.repository.AppDataRepository
+import com.makd.afinity.data.repository.AudiobookshelfRepository
 import com.makd.afinity.data.repository.JellyfinRepository
 import com.makd.afinity.data.repository.JellyseerrRepository
 import com.makd.afinity.data.repository.auth.AuthRepository
 import com.makd.afinity.data.repository.livetv.LiveTvRepository
 import com.makd.afinity.data.repository.watchlist.WatchlistRepository
+import com.makd.afinity.player.audiobookshelf.AudiobookshelfPlaybackManager
+import com.makd.afinity.player.audiobookshelf.AudiobookshelfPlayer
 import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.asStateFlow
@@ -19,36 +23,42 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltViewModel
-class MainNavigationViewModel @Inject constructor(
+class MainNavigationViewModel
+@Inject
+constructor(
     private val appDataRepository: AppDataRepository,
     private val authRepository: AuthRepository,
     private val jellyfinRepository: JellyfinRepository,
     val watchlistRepository: WatchlistRepository,
     val jellyseerrRepository: JellyseerrRepository,
+    val audiobookshelfRepository: AudiobookshelfRepository,
+    val audiobookshelfPlayer: AudiobookshelfPlayer,
+    val audiobookshelfPlaybackManager: AudiobookshelfPlaybackManager,
     private val liveTvRepository: LiveTvRepository,
-    private val offlineModeManager: OfflineModeManager
+    private val offlineModeManager: OfflineModeManager,
 ) : ViewModel() {
     private val _hasLiveTvAccess = MutableStateFlow(true)
     val hasLiveTvAccess = _hasLiveTvAccess.asStateFlow()
 
-    val appLoadingState = combine(
-        appDataRepository.isInitialDataLoaded,
-        appDataRepository.loadingProgress,
-        appDataRepository.loadingPhase
-    ) { isLoaded, progress, phase ->
-        AppLoadingState(
-            isLoading = !isLoaded,
-            loadingProgress = progress,
-            loadingPhase = phase
-        )
-    }.stateIn(
-        scope = viewModelScope,
-        started = SharingStarted.WhileSubscribed(5000),
-        initialValue = AppLoadingState(isLoading = true)
-    )
+    val appLoadingState =
+        combine(
+                appDataRepository.isInitialDataLoaded,
+                appDataRepository.loadingProgress,
+                appDataRepository.loadingPhase,
+            ) { isLoaded, progress, phase ->
+                AppLoadingState(
+                    isLoading = !isLoaded,
+                    loadingProgress = progress,
+                    loadingPhase = phase,
+                )
+            }
+            .stateIn(
+                scope = viewModelScope,
+                started = SharingStarted.WhileSubscribed(5000),
+                initialValue = AppLoadingState(isLoading = true),
+            )
 
     init {
         observeAuthAndLoadData()
@@ -82,8 +92,7 @@ class MainNavigationViewModel @Inject constructor(
                     Timber.d("Fresh login detected")
                     _hasLiveTvAccess.value = false
                     loadAppData()
-                }
-                else if (!isAuthenticated) {
+                } else if (!isAuthenticated) {
                     _hasLiveTvAccess.value = false
                 }
 
@@ -166,5 +175,5 @@ data class AppLoadingState(
     val isLoading: Boolean = false,
     val loadingProgress: Float = 0f,
     val loadingPhase: String = "",
-    val error: String? = null
-)
\ No newline at end of file
+    val error: String? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/player/audiobookshelf/AudiobookshelfPlaybackManager.kt b/app/src/main/java/com/makd/afinity/player/audiobookshelf/AudiobookshelfPlaybackManager.kt
new file mode 100644
index 000000000..d6d1c6f2a
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/player/audiobookshelf/AudiobookshelfPlaybackManager.kt
@@ -0,0 +1,124 @@
+package com.makd.afinity.player.audiobookshelf
+
+import com.makd.afinity.data.models.audiobookshelf.AudioTrack
+import com.makd.afinity.data.models.audiobookshelf.BookChapter
+import com.makd.afinity.data.models.audiobookshelf.PlaybackSession
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+@Singleton
+class AudiobookshelfPlaybackManager @Inject constructor() {
+
+    private val _playbackState = MutableStateFlow(AudiobookshelfPlaybackState())
+    val playbackState: StateFlow<AudiobookshelfPlaybackState> = _playbackState.asStateFlow()
+
+    private val _currentSession = MutableStateFlow<PlaybackSession?>(null)
+    val currentSession: StateFlow<PlaybackSession?> = _currentSession.asStateFlow()
+
+    fun setSession(session: PlaybackSession, serverUrl: String? = null, token: String? = null) {
+        _currentSession.value = session
+
+        val coverUrl =
+            if (serverUrl != null) {
+                val base = "$serverUrl/api/items/${session.libraryItemId}/cover"
+                if (token != null) "$base?token=$token" else base
+            } else {
+                session.coverPath
+            }
+
+        _playbackState.value =
+            _playbackState.value.copy(
+                sessionId = session.id,
+                itemId = session.libraryItemId,
+                episodeId = session.episodeId,
+                duration = session.duration,
+                chapters = session.chapters ?: emptyList(),
+                audioTracks = session.audioTracks ?: emptyList(),
+                displayTitle = session.displayTitle ?: "Unknown",
+                displayAuthor = session.displayAuthor,
+                coverUrl = coverUrl,
+            )
+    }
+
+    fun updatePosition(currentTime: Double) {
+        _playbackState.value =
+            _playbackState.value.copy(
+                currentTime = currentTime,
+                currentChapter = findCurrentChapter(currentTime),
+            )
+    }
+
+    fun updatePlayingState(isPlaying: Boolean) {
+        _playbackState.value = _playbackState.value.copy(isPlaying = isPlaying)
+    }
+
+    fun updateBufferingState(isBuffering: Boolean) {
+        _playbackState.value = _playbackState.value.copy(isBuffering = isBuffering)
+    }
+
+    fun updatePlaybackSpeed(speed: Float) {
+        _playbackState.value = _playbackState.value.copy(playbackSpeed = speed)
+    }
+
+    fun setSleepTimer(endTimeMillis: Long?) {
+        _playbackState.value = _playbackState.value.copy(sleepTimerEndTime = endTimeMillis)
+    }
+
+    fun clearSession() {
+        _currentSession.value = null
+        _playbackState.value = AudiobookshelfPlaybackState()
+    }
+
+    private fun findCurrentChapter(currentTime: Double): BookChapter? {
+        return _playbackState.value.chapters.find { chapter ->
+            currentTime >= chapter.start && currentTime < chapter.end
+        }
+    }
+
+    fun getNextChapter(): BookChapter? {
+        val currentChapter =
+            _playbackState.value.currentChapter
+                ?: return _playbackState.value.chapters.firstOrNull()
+        val currentIndex = _playbackState.value.chapters.indexOf(currentChapter)
+        return _playbackState.value.chapters.getOrNull(currentIndex + 1)
+    }
+
+    fun getPreviousChapter(): BookChapter? {
+        val currentChapter = _playbackState.value.currentChapter ?: return null
+        val currentIndex = _playbackState.value.chapters.indexOf(currentChapter)
+        return _playbackState.value.chapters.getOrNull(currentIndex - 1)
+    }
+}
+
+data class AudiobookshelfPlaybackState(
+    val sessionId: String? = null,
+    val itemId: String? = null,
+    val episodeId: String? = null,
+    val displayTitle: String = "",
+    val displayAuthor: String? = null,
+    val coverUrl: String? = null,
+    val currentTime: Double = 0.0,
+    val duration: Double = 0.0,
+    val isPlaying: Boolean = false,
+    val isBuffering: Boolean = false,
+    val playbackSpeed: Float = 1.0f,
+    val chapters: List<BookChapter> = emptyList(),
+    val audioTracks: List<AudioTrack> = emptyList(),
+    val currentChapter: BookChapter? = null,
+    val sleepTimerEndTime: Long? = null,
+) {
+    val currentChapterIndex: Int
+        get() = currentChapter?.let { chapter -> chapters.indexOf(chapter) } ?: -1
+
+    val progress: Float
+        get() = if (duration > 0) (currentTime / duration).toFloat() else 0f
+
+    val remainingTime: Double
+        get() = (duration - currentTime).coerceAtLeast(0.0)
+
+    val hasSleepTimer: Boolean
+        get() = sleepTimerEndTime != null && sleepTimerEndTime > System.currentTimeMillis()
+}
diff --git a/app/src/main/java/com/makd/afinity/player/audiobookshelf/AudiobookshelfPlayer.kt b/app/src/main/java/com/makd/afinity/player/audiobookshelf/AudiobookshelfPlayer.kt
new file mode 100644
index 000000000..995452f67
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/player/audiobookshelf/AudiobookshelfPlayer.kt
@@ -0,0 +1,338 @@
+package com.makd.afinity.player.audiobookshelf
+
+import android.content.ComponentName
+import android.content.Context
+import android.net.Uri
+import androidx.media3.common.MediaItem
+import androidx.media3.common.MediaMetadata
+import androidx.media3.session.MediaController
+import androidx.media3.session.SessionToken
+import com.google.common.util.concurrent.ListenableFuture
+import com.google.common.util.concurrent.MoreExecutors
+import com.makd.afinity.data.manager.SessionManager
+import com.makd.afinity.data.models.audiobookshelf.PlaybackSession
+import com.makd.afinity.data.repository.AudiobookshelfRepository
+import com.makd.afinity.data.repository.SecurePreferencesRepository
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import timber.log.Timber
+
+@Singleton
+class AudiobookshelfPlayer
+@Inject
+constructor(
+    @ApplicationContext private val context: Context,
+    private val playbackManager: AudiobookshelfPlaybackManager,
+    private val securePreferencesRepository: SecurePreferencesRepository,
+    private val audiobookshelfRepository: AudiobookshelfRepository,
+    private val sessionManager: SessionManager,
+) {
+    private var mediaController: MediaController? = null
+    private var controllerFuture: ListenableFuture<MediaController>? = null
+
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+    private var sleepTimerJob: Job? = null
+
+    init {
+        scope.launch {
+            var previousSessionKey: String? = null
+            sessionManager.currentSession.collect { session ->
+                val newKey = session?.let { "${it.serverId}/${it.userId}" }
+                if (previousSessionKey != null && newKey != previousSessionKey) {
+                    if (playbackManager.playbackState.value.sessionId != null) {
+                        Timber.d("Jellyfin session changed, closing Audiobookshelf playback")
+                        closeSession()
+                    }
+                }
+                previousSessionKey = newKey
+            }
+        }
+
+        scope.launch {
+            var wasAuthenticated = false
+            audiobookshelfRepository.isAuthenticated.collect { isAuthenticated ->
+                if (wasAuthenticated && !isAuthenticated) {
+                    if (playbackManager.playbackState.value.sessionId != null) {
+                        Timber.d("Audiobookshelf auth lost, closing playback")
+                        closeSession()
+                    }
+                }
+                wasAuthenticated = isAuthenticated
+            }
+        }
+    }
+
+    private suspend fun getConnectedController(): MediaController? {
+        if (mediaController != null) return mediaController
+
+        val sessionToken =
+            SessionToken(context, ComponentName(context, AudiobookshelfPlayerService::class.java))
+
+        val future = MediaController.Builder(context, sessionToken).buildAsync()
+        controllerFuture = future
+
+        return try {
+            mediaController = future.await()
+            Timber.d("MediaController connected to Service")
+            mediaController
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to connect MediaController")
+            null
+        }
+    }
+
+    fun loadSession(session: PlaybackSession, baseUrl: String, startPosition: Double? = null) {
+        scope.launch {
+            val controller = getConnectedController() ?: return@launch
+
+            val token = securePreferencesRepository.getCachedAudiobookshelfToken()
+            val isPodcastWithoutEpisode =
+                session.audioTracks.isNullOrEmpty() && session.mediaType == "podcast"
+            val episodes = session.libraryItem?.media?.episodes ?: emptyList()
+
+            val audioTracks =
+                if (isPodcastWithoutEpisode) {
+                    val allTracks =
+                        episodes.mapNotNull { episode ->
+                            episode.audioTrack?.let { track -> track.copy(title = episode.title) }
+                        }
+                    if (allTracks.isNotEmpty()) {
+                        Timber.d("Loading ${allTracks.size} episodes for podcast playlist")
+                        allTracks
+                    } else {
+                        Timber.e("No audio tracks found in any episodes")
+                        return@launch
+                    }
+                } else if (session.audioTracks.isNullOrEmpty()) {
+                    Timber.e("No audio tracks found in session. Session data: $session")
+                    return@launch
+                } else {
+                    session.audioTracks
+                }
+
+            val enhancedSession =
+                if (isPodcastWithoutEpisode && episodes.isNotEmpty()) {
+                    var accumulatedTime = 0.0
+                    val episodeChapters =
+                        episodes.mapNotNull { episode ->
+                            episode.audioTrack?.let {
+                                val chapter =
+                                    com.makd.afinity.data.models.audiobookshelf.BookChapter(
+                                        id = episodes.indexOf(episode),
+                                        start = accumulatedTime,
+                                        end = accumulatedTime + (episode.duration ?: 0.0),
+                                        title = episode.title,
+                                    )
+                                accumulatedTime += episode.duration ?: 0.0
+                                chapter
+                            }
+                        }
+                    val totalDuration = episodes.sumOf { it.duration ?: 0.0 }
+
+                    session.copy(
+                        audioTracks = audioTracks,
+                        displayTitle =
+                            session.mediaMetadata?.title ?: session.displayTitle ?: "Podcast",
+                        displayAuthor = session.mediaMetadata?.authorName ?: session.displayAuthor,
+                        duration = totalDuration,
+                        chapters = episodeChapters,
+                    )
+                } else {
+                    session
+                }
+
+            playbackManager.setSession(enhancedSession, baseUrl, token)
+
+            val mediaItems =
+                audioTracks.mapIndexed { index, track ->
+                    val url =
+                        if (track.contentUrl?.startsWith("http") == true) track.contentUrl
+                        else "$baseUrl${track.contentUrl}"
+
+                    val artUrl =
+                        if (baseUrl.isNotEmpty()) {
+                            "$baseUrl/api/items/${enhancedSession.libraryItemId}/cover?token=$token"
+                        } else enhancedSession.coverPath
+
+                    val itemTitle =
+                        if (isPodcastWithoutEpisode && track.title != null) {
+                            track.title
+                        } else {
+                            enhancedSession.displayTitle
+                                ?: enhancedSession.mediaMetadata?.title
+                                ?: "Unknown"
+                        }
+
+                    val metadata =
+                        MediaMetadata.Builder()
+                            .setTitle(itemTitle)
+                            .setArtist(
+                                enhancedSession.displayAuthor
+                                    ?: enhancedSession.mediaMetadata?.authorName
+                                    ?: ""
+                            )
+                            .setArtworkUri(Uri.parse(artUrl))
+                            .build()
+
+                    MediaItem.Builder()
+                        .setUri(url)
+                        .setMediaId(index.toString())
+                        .setMediaMetadata(metadata)
+                        .build()
+                }
+
+            Timber.d("Sending ${mediaItems.size} items to player")
+
+            controller.stop()
+            controller.clearMediaItems()
+            controller.setMediaItems(mediaItems)
+            controller.prepare()
+
+            val seekPosition = startPosition ?: session.currentTime
+            if (seekPosition > 0) {
+                seekToPosition(seekPosition)
+            }
+            controller.play()
+        }
+    }
+
+    fun play() = mediaController?.play()
+
+    fun pause() = mediaController?.pause()
+
+    fun isPlaying(): Boolean = mediaController?.isPlaying == true
+
+    fun setPlaybackSpeed(speed: Float) {
+        mediaController?.setPlaybackSpeed(speed)
+        playbackManager.updatePlaybackSpeed(speed)
+    }
+
+    fun seekToPosition(positionSeconds: Double) {
+        val controller = mediaController ?: return
+        val audioTracks = playbackManager.currentSession.value?.audioTracks ?: return
+        var accumulatedDuration = 0.0
+
+        for ((index, track) in audioTracks.withIndex()) {
+            if (positionSeconds < accumulatedDuration + track.duration) {
+                val positionInTrack = positionSeconds - accumulatedDuration
+                controller.seekTo(index, (positionInTrack * 1000).toLong())
+                break
+            }
+            accumulatedDuration += track.duration
+        }
+    }
+
+    fun seekToChapter(chapterIndex: Int) {
+        val chapters = playbackManager.playbackState.value.chapters
+        if (chapterIndex in chapters.indices) {
+            seekToPosition(chapters[chapterIndex].start)
+        }
+    }
+
+    fun skipForward(seconds: Int = 30) {
+        val current = playbackManager.playbackState.value.currentTime
+        seekToPosition(current + seconds)
+    }
+
+    fun skipBackward(seconds: Int = 30) {
+        val current = playbackManager.playbackState.value.currentTime
+        seekToPosition((current - seconds).coerceAtLeast(0.0))
+    }
+
+    fun setSleepTimer(durationMinutes: Int) {
+        cancelSleepTimer()
+        if (durationMinutes <= 0) {
+            playbackManager.setSleepTimer(null)
+            return
+        }
+        val endTime = System.currentTimeMillis() + (durationMinutes * 60 * 1000L)
+        playbackManager.setSleepTimer(endTime)
+
+        sleepTimerJob =
+            scope.launch {
+                delay(durationMinutes * 60 * 1000L)
+                pause()
+                playbackManager.setSleepTimer(null)
+                Timber.d("Sleep timer triggered")
+            }
+    }
+
+    fun cancelSleepTimer() {
+        sleepTimerJob?.cancel()
+        sleepTimerJob = null
+        playbackManager.setSleepTimer(null)
+    }
+
+    fun closeSession() {
+        cancelSleepTimer()
+        val state = playbackManager.playbackState.value
+        val sessionId = state.sessionId
+        if (sessionId != null) {
+            scope.launch {
+                try {
+                    val result =
+                        audiobookshelfRepository.closePlaybackSession(
+                            sessionId = sessionId,
+                            currentTime = state.currentTime,
+                            timeListened = state.currentTime,
+                            duration = state.duration,
+                        )
+                    if (result.isSuccess) {
+                        Timber.d("Session closed on server: $sessionId")
+                    } else {
+                        Timber.e(
+                            "Failed to close session on server: ${result.exceptionOrNull()?.message}"
+                        )
+                    }
+                } catch (e: Exception) {
+                    Timber.e(e, "Error closing session on server")
+                }
+            }
+        }
+
+        mediaController?.stop()
+        mediaController?.clearMediaItems()
+
+        controllerFuture?.let { MediaController.releaseFuture(it) }
+        mediaController = null
+        controllerFuture = null
+
+        playbackManager.clearSession()
+        Timber.d("Session closed locally")
+    }
+
+    fun release() {
+        closeSession()
+    }
+}
+
+private suspend fun <T> ListenableFuture<T>.await(): T {
+    return suspendCancellableCoroutine { continuation ->
+        addListener(
+            {
+                try {
+                    continuation.resume(get())
+                } catch (e: Exception) {
+                    if (isCancelled) {
+                        continuation.cancel(e)
+                    } else {
+                        continuation.resumeWithException(e)
+                    }
+                }
+            },
+            MoreExecutors.directExecutor(),
+        )
+
+        continuation.invokeOnCancellation { cancel(false) }
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/player/audiobookshelf/AudiobookshelfPlayerService.kt b/app/src/main/java/com/makd/afinity/player/audiobookshelf/AudiobookshelfPlayerService.kt
new file mode 100644
index 000000000..a26e71856
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/player/audiobookshelf/AudiobookshelfPlayerService.kt
@@ -0,0 +1,197 @@
+package com.makd.afinity.player.audiobookshelf
+
+import android.app.PendingIntent
+import android.content.Intent
+import androidx.annotation.OptIn
+import androidx.media3.common.AudioAttributes
+import androidx.media3.common.C
+import androidx.media3.common.PlaybackException
+import androidx.media3.common.Player
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.datasource.DefaultHttpDataSource
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
+import androidx.media3.session.DefaultMediaNotificationProvider
+import androidx.media3.session.MediaSession
+import androidx.media3.session.MediaSessionService
+import com.google.common.util.concurrent.Futures
+import com.google.common.util.concurrent.ListenableFuture
+import com.makd.afinity.MainActivity
+import com.makd.afinity.R
+import com.makd.afinity.data.repository.SecurePreferencesRepository
+import com.makd.afinity.util.NetworkConnectivityMonitor
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+@AndroidEntryPoint
+class AudiobookshelfPlayerService : MediaSessionService() {
+
+    @Inject lateinit var playbackManager: AudiobookshelfPlaybackManager
+    @Inject lateinit var progressSyncer: AudiobookshelfProgressSyncer
+    @Inject lateinit var securePreferencesRepository: SecurePreferencesRepository
+    @Inject lateinit var networkConnectivityMonitor: NetworkConnectivityMonitor
+
+    private var mediaSession: MediaSession? = null
+    private var exoPlayer: ExoPlayer? = null
+
+    private val serviceScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+    private var positionUpdateJob: Job? = null
+
+    @OptIn(UnstableApi::class)
+    override fun onCreate() {
+        super.onCreate()
+
+        val token = securePreferencesRepository.getCachedAudiobookshelfToken()
+        val dataSourceFactory =
+            DefaultHttpDataSource.Factory()
+                .setAllowCrossProtocolRedirects(true)
+                .setDefaultRequestProperties(
+                    buildMap { if (token != null) put("Authorization", "Bearer $token") }
+                )
+
+        exoPlayer =
+            ExoPlayer.Builder(this)
+                .setAudioAttributes(AudioAttributes.DEFAULT, true)
+                .setHandleAudioBecomingNoisy(true)
+                .setWakeMode(C.WAKE_MODE_NETWORK)
+                .setMediaSourceFactory(DefaultMediaSourceFactory(dataSourceFactory))
+                .build()
+
+        exoPlayer?.addListener(
+            object : Player.Listener {
+                override fun onIsPlayingChanged(isPlaying: Boolean) {
+                    playbackManager.updatePlayingState(isPlaying)
+                    if (isPlaying) {
+                        startPositionUpdates()
+                        progressSyncer.startSyncing()
+                    } else {
+                        stopPositionUpdates()
+                        serviceScope.launch { progressSyncer.syncNow() }
+                        progressSyncer.stopSyncing()
+                    }
+                }
+
+                override fun onPlaybackStateChanged(playbackState: Int) {
+                    when (playbackState) {
+                        Player.STATE_BUFFERING -> playbackManager.updateBufferingState(true)
+                        Player.STATE_READY -> playbackManager.updateBufferingState(false)
+                        Player.STATE_ENDED -> {
+                            playbackManager.updatePlayingState(false)
+                            stopPositionUpdates()
+                            serviceScope.launch { progressSyncer.syncNow() }
+                        }
+
+                        else -> {}
+                    }
+                }
+
+                override fun onPlayerError(error: PlaybackException) {
+                    Timber.e(error, "Player error")
+                    playbackManager.updatePlayingState(false)
+                }
+            }
+        )
+
+        val sessionIntent = Intent(this, MainActivity::class.java)
+        val pendingIntent =
+            PendingIntent.getActivity(
+                this,
+                0,
+                sessionIntent,
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
+            )
+
+        mediaSession =
+            MediaSession.Builder(this, exoPlayer!!)
+                .setSessionActivity(pendingIntent)
+                .setCallback(CustomMediaSessionCallback())
+                .build()
+
+        setMediaNotificationProvider(
+            DefaultMediaNotificationProvider.Builder(this)
+                .setChannelId("afinity_audiobook_playback")
+                .setChannelName(R.string.playback_channel_name)
+                .build()
+                .apply { setSmallIcon(R.drawable.ic_launcher_monochrome) }
+        )
+    }
+
+    override fun onGetSession(controllerInfo: MediaSession.ControllerInfo): MediaSession? {
+        return mediaSession
+    }
+
+    @UnstableApi
+    private inner class CustomMediaSessionCallback : MediaSession.Callback {
+        @UnstableApi
+        override fun onConnect(
+            session: MediaSession,
+            controller: MediaSession.ControllerInfo,
+        ): MediaSession.ConnectionResult {
+            return MediaSession.ConnectionResult.AcceptedResultBuilder(session).build()
+        }
+
+        override fun onPlaybackResumption(
+            mediaSession: MediaSession,
+            controller: MediaSession.ControllerInfo,
+        ): ListenableFuture<MediaSession.MediaItemsWithStartPosition> {
+            Timber.d("System requested playback resumption")
+            return Futures.immediateFuture(
+                MediaSession.MediaItemsWithStartPosition(emptyList(), 0, 0L)
+            )
+        }
+    }
+
+    private fun startPositionUpdates() {
+        stopPositionUpdates()
+        positionUpdateJob =
+            serviceScope.launch {
+                while (isActive) {
+                    val player = exoPlayer ?: break
+
+                    val currentMediaItemIndex = player.currentMediaItemIndex
+                    val audioTracks = playbackManager.playbackState.value.audioTracks
+                    var totalPosition = 0.0
+
+                    for (i in 0 until currentMediaItemIndex) {
+                        totalPosition += audioTracks.getOrNull(i)?.duration ?: 0.0
+                    }
+                    totalPosition += player.currentPosition / 1000.0
+
+                    playbackManager.updatePosition(totalPosition)
+                    delay(1000)
+                }
+            }
+    }
+
+    private fun stopPositionUpdates() {
+        positionUpdateJob?.cancel()
+        positionUpdateJob = null
+    }
+
+    override fun onDestroy() {
+        mediaSession?.run {
+            player.release()
+            release()
+            mediaSession = null
+        }
+        stopPositionUpdates()
+        serviceScope.cancel()
+        super.onDestroy()
+    }
+
+    override fun onTaskRemoved(rootIntent: Intent?) {
+        val player = mediaSession?.player
+        if (player == null || !player.playWhenReady || player.mediaItemCount == 0) {
+            stopSelf()
+        }
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/player/audiobookshelf/AudiobookshelfProgressSyncer.kt b/app/src/main/java/com/makd/afinity/player/audiobookshelf/AudiobookshelfProgressSyncer.kt
new file mode 100644
index 000000000..8024e81f8
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/player/audiobookshelf/AudiobookshelfProgressSyncer.kt
@@ -0,0 +1,109 @@
+package com.makd.afinity.player.audiobookshelf
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+import com.makd.afinity.data.repository.AudiobookshelfRepository
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+@Singleton
+class AudiobookshelfProgressSyncer
+@Inject
+constructor(
+    @ApplicationContext private val context: Context,
+    private val audiobookshelfRepository: AudiobookshelfRepository,
+    private val playbackManager: AudiobookshelfPlaybackManager,
+) {
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+    private var syncJob: Job? = null
+    private var lastSyncTime: Double = 0.0
+    private var totalTimeListened: Double = 0.0
+    private var sessionStartTime: Long = 0L
+
+    companion object {
+        private const val WIFI_SYNC_INTERVAL_MS = 15_000L
+        private const val CELLULAR_SYNC_INTERVAL_MS = 60_000L
+    }
+
+    fun startSyncing() {
+        stopSyncing()
+
+        sessionStartTime = System.currentTimeMillis()
+        lastSyncTime = playbackManager.playbackState.value.currentTime
+        totalTimeListened = 0.0
+
+        syncJob =
+            scope.launch {
+                while (true) {
+                    val interval = getSyncInterval()
+                    delay(interval)
+
+                    syncProgress()
+                }
+            }
+
+        Timber.d("Progress syncer started")
+    }
+
+    fun stopSyncing() {
+        syncJob?.cancel()
+        syncJob = null
+        Timber.d("Progress syncer stopped")
+    }
+
+    suspend fun syncNow() {
+        syncProgress()
+    }
+
+    private suspend fun syncProgress() {
+        val state = playbackManager.playbackState.value
+        val sessionId = state.sessionId ?: return
+
+        val currentTime = state.currentTime
+        val timeListenedSinceLastSync = (currentTime - lastSyncTime).coerceAtLeast(0.0)
+        totalTimeListened += timeListenedSinceLastSync
+        lastSyncTime = currentTime
+
+        try {
+            val result =
+                audiobookshelfRepository.syncPlaybackSession(
+                    sessionId = sessionId,
+                    timeListened = timeListenedSinceLastSync,
+                    currentTime = currentTime,
+                    duration = state.duration,
+                )
+
+            result.fold(
+                onSuccess = { Timber.d("Progress synced: ${currentTime}s / ${state.duration}s") },
+                onFailure = { error -> Timber.w(error, "Failed to sync progress, will retry") },
+            )
+        } catch (e: Exception) {
+            Timber.e(e, "Exception syncing progress")
+        }
+    }
+
+    private fun getSyncInterval(): Long {
+        return if (isOnWifi()) {
+            WIFI_SYNC_INTERVAL_MS
+        } else {
+            CELLULAR_SYNC_INTERVAL_MS
+        }
+    }
+
+    private fun isOnWifi(): Boolean {
+        val connectivityManager =
+            context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        val network = connectivityManager.activeNetwork ?: return false
+        val capabilities = connectivityManager.getNetworkCapabilities(network) ?: return false
+        return capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/player/mpv/MPVPlayer.kt b/app/src/main/java/com/makd/afinity/player/mpv/MPVPlayer.kt
index 850461d45..ebf2e3823 100644
--- a/app/src/main/java/com/makd/afinity/player/mpv/MPVPlayer.kt
+++ b/app/src/main/java/com/makd/afinity/player/mpv/MPVPlayer.kt
@@ -35,20 +35,21 @@ import androidx.media3.common.util.ListenerSet
 import androidx.media3.common.util.Size
 import androidx.media3.common.util.Util
 import dev.jdtech.mpv.MPVLib
+import java.io.File
+import java.io.FileOutputStream
+import java.util.concurrent.CopyOnWriteArraySet
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 import timber.log.Timber
-import java.io.File
-import java.io.FileOutputStream
-import java.util.concurrent.CopyOnWriteArraySet
 
 @androidx.media3.common.util.UnstableApi
 class MPVPlayer(
     context: Context,
     private val audioAttributes: AudioAttributes = AudioAttributes.DEFAULT,
     private val handleAudioFocus: Boolean = true,
-    private var trackSelectionParameters: TrackSelectionParameters = TrackSelectionParameters.DEFAULT,
+    private var trackSelectionParameters: TrackSelectionParameters =
+        TrackSelectionParameters.DEFAULT,
     private val seekBackIncrement: Long = C.DEFAULT_SEEK_BACK_INCREMENT_MS,
     private val seekForwardIncrement: Long = C.DEFAULT_SEEK_FORWARD_INCREMENT_MS,
     private val pauseAtEndOfMediaItems: Boolean = false,
@@ -62,7 +63,9 @@ class MPVPlayer(
     private lateinit var audioFocusRequest: AudioFocusRequestCompat
     private val handler = Handler(context.mainLooper)
 
-    private constructor(builder: Builder) : this(
+    private constructor(
+        builder: Builder
+    ) : this(
         context = builder.context,
         audioAttributes = builder.audioAttributes,
         handleAudioFocus = builder.handleAudioFocus,
@@ -75,9 +78,7 @@ class MPVPlayer(
         hwDec = builder.hwDec,
     )
 
-    class Builder(
-        val context: Context,
-    ) {
+    class Builder(val context: Context) {
         var audioAttributes: AudioAttributes = AudioAttributes.DEFAULT
             private set
 
@@ -128,17 +129,11 @@ class MPVPlayer(
             this.pauseAtEndOfMediaItems = pauseAtEndOfMediaItems
         }
 
-        fun setVideoOutput(videoOutput: String) = apply {
-            this.videoOutput = videoOutput
-        }
+        fun setVideoOutput(videoOutput: String) = apply { this.videoOutput = videoOutput }
 
-        fun setAudioOutput(audioOutput: String) = apply {
-            this.audioOutput = audioOutput
-        }
+        fun setAudioOutput(audioOutput: String) = apply { this.audioOutput = audioOutput }
 
-        fun setHwDec(hwDec: String) = apply {
-            this.hwDec = hwDec
-        }
+        fun setHwDec(hwDec: String) = apply { this.hwDec = hwDec }
 
         fun build() = MPVPlayer(this)
     }
@@ -153,7 +148,8 @@ class MPVPlayer(
             val file = File(mpvDir, fileName)
             if (file.exists()) return@forEach
             try {
-                context.assets.open(fileName, AssetManager.ACCESS_STREAMING)
+                context.assets
+                    .open(fileName, AssetManager.ACCESS_STREAMING)
                     .copyTo(FileOutputStream(file))
             } catch (e: Exception) {
                 Timber.w("Could not copy $fileName: ${e.message}")
@@ -202,26 +198,26 @@ class MPVPlayer(
         MPVLib.addObserver(this)
 
         arrayOf(
-            Property("track-list", MPVLib.MPV_FORMAT_STRING),
-            Property("paused", MPVLib.MPV_FORMAT_FLAG),
-            Property("paused-for-cache", MPVLib.MPV_FORMAT_FLAG),
-            Property("eof-reached", MPVLib.MPV_FORMAT_FLAG),
-            Property("seekable", MPVLib.MPV_FORMAT_FLAG),
-            Property("time-pos", MPVLib.MPV_FORMAT_INT64),
-            Property("duration", MPVLib.MPV_FORMAT_INT64),
-            Property("demuxer-cache-time", MPVLib.MPV_FORMAT_INT64),
-            Property("speed", MPVLib.MPV_FORMAT_DOUBLE),
-            Property("playlist-count", MPVLib.MPV_FORMAT_INT64),
-            Property("playlist-current-pos", MPVLib.MPV_FORMAT_INT64),
-        ).forEach { (name, format) ->
-            MPVLib.observeProperty(name, format)
-        }
+                Property("track-list", MPVLib.MPV_FORMAT_STRING),
+                Property("paused", MPVLib.MPV_FORMAT_FLAG),
+                Property("paused-for-cache", MPVLib.MPV_FORMAT_FLAG),
+                Property("eof-reached", MPVLib.MPV_FORMAT_FLAG),
+                Property("seekable", MPVLib.MPV_FORMAT_FLAG),
+                Property("time-pos", MPVLib.MPV_FORMAT_INT64),
+                Property("duration", MPVLib.MPV_FORMAT_INT64),
+                Property("demuxer-cache-time", MPVLib.MPV_FORMAT_INT64),
+                Property("speed", MPVLib.MPV_FORMAT_DOUBLE),
+                Property("playlist-count", MPVLib.MPV_FORMAT_INT64),
+                Property("playlist-current-pos", MPVLib.MPV_FORMAT_INT64),
+            )
+            .forEach { (name, format) -> MPVLib.observeProperty(name, format) }
 
         if (handleAudioFocus) {
-            audioFocusRequest = AudioFocusRequestCompat.Builder(AudioManagerCompat.AUDIOFOCUS_GAIN)
-                .setAudioAttributes(audioAttributes)
-                .setOnAudioFocusChangeListener(this)
-                .build()
+            audioFocusRequest =
+                AudioFocusRequestCompat.Builder(AudioManagerCompat.AUDIOFOCUS_GAIN)
+                    .setAudioAttributes(audioAttributes)
+                    .setOnAudioFocusChangeListener(this)
+                    .build()
             val res = AudioManagerCompat.requestAudioFocus(audioManager, audioFocusRequest)
             if (res != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
                 MPVLib.setPropertyBoolean("pause", true)
@@ -229,22 +225,19 @@ class MPVPlayer(
         }
     }
 
-    private val listeners: ListenerSet<Player.Listener> = ListenerSet(
-        context.mainLooper,
-        Clock.DEFAULT,
-    ) { listener: Player.Listener, flags: FlagSet ->
-        listener.onEvents(this, Player.Events(flags))
-    }
+    private val listeners: ListenerSet<Player.Listener> =
+        ListenerSet(context.mainLooper, Clock.DEFAULT) { listener: Player.Listener, flags: FlagSet
+            ->
+            listener.onEvents(this, Player.Events(flags))
+        }
     private val videoListeners = CopyOnWriteArraySet<Player.Listener>()
 
     private var internalMediaItems = mutableListOf<MediaItem>()
 
-    @Player.State
-    private var playbackState: Int = STATE_IDLE
+    @Player.State private var playbackState: Int = STATE_IDLE
     private var currentPlayWhenReady: Boolean = false
 
-    @Player.RepeatMode
-    private val repeatMode: Int = REPEAT_MODE_OFF
+    @Player.RepeatMode private val repeatMode: Int = REPEAT_MODE_OFF
     private var currentTracks: Tracks = Tracks.EMPTY
     private var playbackParameters: PlaybackParameters = PlaybackParameters.DEFAULT
 
@@ -282,7 +275,7 @@ class MPVPlayer(
                     if (isPlayerReady) {
                         setPlayerStateAndNotifyIfChanged(
                             playWhenReady = !value,
-                            playWhenReadyChangeReason = PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST
+                            playWhenReadyChangeReason = PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST,
                         )
                     }
                 }
@@ -293,7 +286,8 @@ class MPVPlayer(
                             if (pauseAtEndOfMediaItems) {
                                 setPlayerStateAndNotifyIfChanged(
                                     playWhenReady = false,
-                                    playWhenReadyChangeReason = PLAY_WHEN_READY_CHANGE_REASON_END_OF_MEDIA_ITEM,
+                                    playWhenReadyChangeReason =
+                                        PLAY_WHEN_READY_CHANGE_REASON_END_OF_MEDIA_ITEM,
                                     playbackState = STATE_READY,
                                 )
                             } else {
@@ -303,7 +297,8 @@ class MPVPlayer(
                         } else {
                             setPlayerStateAndNotifyIfChanged(
                                 playWhenReady = false,
-                                playWhenReadyChangeReason = PLAY_WHEN_READY_CHANGE_REASON_END_OF_MEDIA_ITEM,
+                                playWhenReadyChangeReason =
+                                    PLAY_WHEN_READY_CHANGE_REASON_END_OF_MEDIA_ITEM,
                                 playbackState = STATE_ENDED,
                             )
                             resetInternalState()
@@ -350,7 +345,7 @@ class MPVPlayer(
                         listeners.sendEvent(EVENT_TIMELINE_CHANGED) { listener ->
                             listener.onTimelineChanged(
                                 currentTimeline,
-                                TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED
+                                TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED,
                             )
                         }
                     }
@@ -423,7 +418,8 @@ class MPVPlayer(
 
     private fun setPlayerStateAndNotifyIfChanged(
         playWhenReady: Boolean = getPlayWhenReady(),
-        @Player.PlayWhenReadyChangeReason playWhenReadyChangeReason: Int = PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST,
+        @Player.PlayWhenReadyChangeReason
+        playWhenReadyChangeReason: Int = PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST,
         @Player.State playbackState: Int = getPlaybackState(),
     ) {
         var playerStateChanged = false
@@ -455,44 +451,45 @@ class MPVPlayer(
         listeners.flushEvents()
     }
 
-    private val timeline: Timeline = object : Timeline() {
-        override fun getWindowCount(): Int = internalMediaItems.size
-
-        override fun getWindow(
-            windowIndex: Int,
-            window: Window,
-            defaultPositionProjectionUs: Long
-        ): Window {
-            val currentMediaItem =
-                internalMediaItems.getOrNull(windowIndex) ?: MediaItem.Builder().build()
-            return window.set(
-                windowIndex,
-                currentMediaItem,
-                null,
-                C.TIME_UNSET,
-                C.TIME_UNSET,
-                C.TIME_UNSET,
-                isSeekable,
-                !isSeekable,
-                currentMediaItem.liveConfiguration,
-                C.TIME_UNSET,
-                Util.msToUs(currentDurationMs ?: C.TIME_UNSET),
-                windowIndex,
-                windowIndex,
-                C.TIME_UNSET,
-            )
-        }
+    private val timeline: Timeline =
+        object : Timeline() {
+            override fun getWindowCount(): Int = internalMediaItems.size
+
+            override fun getWindow(
+                windowIndex: Int,
+                window: Window,
+                defaultPositionProjectionUs: Long,
+            ): Window {
+                val currentMediaItem =
+                    internalMediaItems.getOrNull(windowIndex) ?: MediaItem.Builder().build()
+                return window.set(
+                    windowIndex,
+                    currentMediaItem,
+                    null,
+                    C.TIME_UNSET,
+                    C.TIME_UNSET,
+                    C.TIME_UNSET,
+                    isSeekable,
+                    !isSeekable,
+                    currentMediaItem.liveConfiguration,
+                    C.TIME_UNSET,
+                    Util.msToUs(currentDurationMs ?: C.TIME_UNSET),
+                    windowIndex,
+                    windowIndex,
+                    C.TIME_UNSET,
+                )
+            }
 
-        override fun getPeriodCount(): Int = internalMediaItems.size
+            override fun getPeriodCount(): Int = internalMediaItems.size
 
-        override fun getPeriod(periodIndex: Int, period: Period, setIds: Boolean): Period {
-            return period.set(null, null, periodIndex, C.TIME_UNSET, 0)
-        }
+            override fun getPeriod(periodIndex: Int, period: Period, setIds: Boolean): Period {
+                return period.set(null, null, periodIndex, C.TIME_UNSET, 0)
+            }
 
-        override fun getIndexOfPeriod(uid: Any): Int = C.INDEX_UNSET
+            override fun getIndexOfPeriod(uid: Any): Int = C.INDEX_UNSET
 
-        override fun getUidOfPeriod(periodIndex: Int): Any = periodIndex as Any
-    }
+            override fun getUidOfPeriod(periodIndex: Int): Any = periodIndex as Any
+        }
 
     override fun getApplicationLooper(): Looper = Looper.getMainLooper()
 
@@ -515,7 +512,7 @@ class MPVPlayer(
     override fun setMediaItems(
         mediaItems: MutableList<MediaItem>,
         startIndex: Int,
-        startPositionMs: Long
+        startPositionMs: Long,
     ) {
         MPVLib.command(arrayOf("playlist-clear"))
         MPVLib.command(arrayOf("playlist-remove", "current"))
@@ -532,19 +529,19 @@ class MPVPlayer(
                     "loadfile",
                     "${mediaItem.localConfiguration?.uri}",
                     "insert-at",
-                    index.toString()
+                    index.toString(),
                 )
             )
         }
     }
 
     override fun moveMediaItems(fromIndex: Int, toIndex: Int, newIndex: Int) {}
+
     override fun replaceMediaItems(
         fromIndex: Int,
         toIndex: Int,
-        mediaItems: MutableList<MediaItem>
-    ) {
-    }
+        mediaItems: MutableList<MediaItem>,
+    ) {}
 
     override fun removeMediaItems(fromIndex: Int, toIndex: Int) {}
 
@@ -554,7 +551,7 @@ class MPVPlayer(
                 arrayOf(
                     "loadfile",
                     "${mediaItem.localConfiguration?.uri}",
-                    if (index == 0) "replace" else "append"
+                    if (index == 0) "replace" else "append",
                 )
             )
         }
@@ -569,7 +566,7 @@ class MPVPlayer(
                         "auto",
                         "${subtitle.label}",
                         "${subtitle.language}",
-                    ),
+                    )
                 )
             }
             if (initialIndex > 0) {
@@ -590,7 +587,7 @@ class MPVPlayer(
                         "auto",
                         "${subtitle.label}",
                         "${subtitle.language}",
-                    ),
+                    )
                 )
             }
             if (currentMediaItemIndex != index) {
@@ -601,7 +598,9 @@ class MPVPlayer(
     }
 
     override fun getPlaybackState(): Int = playbackState
+
     override fun getPlaybackSuppressionReason(): Int = PLAYBACK_SUPPRESSION_REASON_NONE
+
     override fun getPlayerError(): PlaybackException? = null
 
     override fun setPlayWhenReady(playWhenReady: Boolean) {
@@ -628,9 +627,11 @@ class MPVPlayer(
     override fun getPlayWhenReady(): Boolean = currentPlayWhenReady
 
     override fun setRepeatMode(repeatMode: Int) {}
+
     override fun getRepeatMode(): Int = repeatMode
 
     override fun setShuffleModeEnabled(shuffleModeEnabled: Boolean) {}
+
     override fun getShuffleModeEnabled(): Boolean = false
 
     override fun isLoading(): Boolean = playbackState == STATE_BUFFERING
@@ -643,29 +644,32 @@ class MPVPlayer(
     ) {
         if (mediaItemIndex == currentMediaItemIndex) {
 
-            val seekToSeconds = if (positionMs != C.TIME_UNSET) {
-                positionMs / C.MILLIS_PER_SECOND
-            } else {
-                initialSeekTo
-            }
+            val seekToSeconds =
+                if (positionMs != C.TIME_UNSET) {
+                    positionMs / C.MILLIS_PER_SECOND
+                } else {
+                    initialSeekTo
+                }
 
-            val targetMs = if (positionMs != C.TIME_UNSET) {
-                positionMs
-            } else {
-                initialSeekTo * 1000
-            }
+            val targetMs =
+                if (positionMs != C.TIME_UNSET) {
+                    positionMs
+                } else {
+                    initialSeekTo * 1000
+                }
 
-            initialSeekTo = if (isPlayerReady) {
-                MPVLib.command(arrayOf("seek", "$seekToSeconds", "absolute"))
+            initialSeekTo =
+                if (isPlayerReady) {
+                    MPVLib.command(arrayOf("seek", "$seekToSeconds", "absolute"))
 
-                currentPositionMs = targetMs
+                    currentPositionMs = targetMs
 
-                Timber.d("MPV seeking to $seekToSeconds seconds")
-                0L
-            } else {
-                Timber.d("MPV not ready, storing initial seek: $seekToSeconds seconds")
-                seekToSeconds
-            }
+                    Timber.d("MPV seeking to $seekToSeconds seconds")
+                    0L
+                } else {
+                    Timber.d("MPV not ready, storing initial seek: $seekToSeconds seconds")
+                    seekToSeconds
+                }
         } else {
             prepareMediaItem(mediaItemIndex)
             play()
@@ -673,7 +677,9 @@ class MPVPlayer(
     }
 
     override fun getSeekBackIncrement(): Long = seekBackIncrement
+
     override fun getSeekForwardIncrement(): Long = seekForwardIncrement
+
     override fun getMaxSeekToPreviousPosition(): Long = 0
 
     override fun setPlaybackParameters(playbackParameters: PlaybackParameters) {
@@ -695,6 +701,7 @@ class MPVPlayer(
     }
 
     override fun getCurrentTracks(): Tracks = currentTracks
+
     override fun getTrackSelectionParameters(): TrackSelectionParameters = trackSelectionParameters
 
     override fun setTrackSelectionParameters(parameters: TrackSelectionParameters) {
@@ -725,10 +732,7 @@ class MPVPlayer(
         }
     }
 
-    private fun selectTrack(
-        trackType: MPVTrackType,
-        id: String,
-    ) {
+    private fun selectTrack(trackType: MPVTrackType, id: String) {
         MPVLib.setPropertyString(trackType.type, id)
     }
 
@@ -736,14 +740,19 @@ class MPVPlayer(
         currentMediaItem?.mediaMetadata ?: MediaMetadata.EMPTY
 
     override fun getPlaylistMetadata(): MediaMetadata = MediaMetadata.EMPTY
+
     override fun setPlaylistMetadata(mediaMetadata: MediaMetadata) {}
 
     override fun getCurrentTimeline(): Timeline = timeline
+
     override fun getCurrentPeriodIndex(): Int = currentMediaItemIndex
+
     override fun getCurrentMediaItemIndex(): Int = currentMediaItemIndex
 
     override fun getDuration(): Long = currentDurationMs ?: C.TIME_UNSET
+
     override fun getCurrentPosition(): Long = currentPositionMs ?: C.TIME_UNSET
+
     override fun getBufferedPosition(): Long =
         (currentCacheDurationMs ?: getCurrentPosition()).coerceAtMost(duration)
 
@@ -751,9 +760,13 @@ class MPVPlayer(
         (bufferedPosition - currentPosition).coerceAtLeast(0)
 
     override fun isPlayingAd(): Boolean = false
+
     override fun getCurrentAdGroupIndex(): Int = C.INDEX_UNSET
+
     override fun getCurrentAdIndexInAdGroup(): Int = C.INDEX_UNSET
+
     override fun getContentPosition(): Long = currentPosition
+
     override fun getContentBufferedPosition(): Long = bufferedPosition
 
     override fun getAudioAttributes(): AudioAttributes = audioAttributes
@@ -765,9 +778,13 @@ class MPVPlayer(
     override fun getVolume(): Float = MPVLib.getPropertyInt("volume") / 100F
 
     override fun clearVideoSurface() {}
+
     override fun clearVideoSurface(surface: Surface?) {}
+
     override fun setVideoSurface(surface: Surface?) {}
+
     override fun setVideoSurfaceHolder(surfaceHolder: SurfaceHolder?) {}
+
     override fun clearVideoSurfaceHolder(surfaceHolder: SurfaceHolder?) {}
 
     override fun setVideoSurfaceView(surfaceView: SurfaceView?) {
@@ -779,6 +796,7 @@ class MPVPlayer(
     }
 
     override fun setVideoTextureView(textureView: TextureView?) {}
+
     override fun clearVideoTextureView(textureView: TextureView?) {}
 
     override fun getVideoSize(): VideoSize {
@@ -807,6 +825,7 @@ class MPVPlayer(
     }
 
     override fun getDeviceVolume(): Int = MPVLib.getPropertyInt("volume")
+
     override fun isDeviceMuted(): Boolean = MPVLib.getPropertyBoolean("mute")
 
     override fun mute() {
@@ -860,12 +879,18 @@ class MPVPlayer(
             .addIf(COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM, hasPreviousMediaItem() && !isPlayingAd)
             .addIf(
                 COMMAND_SEEK_TO_PREVIOUS,
-                !currentTimeline.isEmpty && (hasPreviousMediaItem() || !isCurrentMediaItemLive || isCurrentMediaItemSeekable) && !isPlayingAd
+                !currentTimeline.isEmpty &&
+                    (hasPreviousMediaItem() ||
+                        !isCurrentMediaItemLive ||
+                        isCurrentMediaItemSeekable) &&
+                    !isPlayingAd,
             )
             .addIf(COMMAND_SEEK_TO_NEXT_MEDIA_ITEM, hasNextMediaItem() && !isPlayingAd)
             .addIf(
                 COMMAND_SEEK_TO_NEXT,
-                !currentTimeline.isEmpty && (hasNextMediaItem() || (isCurrentMediaItemLive && isCurrentMediaItemDynamic)) && !isPlayingAd
+                !currentTimeline.isEmpty &&
+                    (hasNextMediaItem() || (isCurrentMediaItemLive && isCurrentMediaItemDynamic)) &&
+                    !isPlayingAd,
             )
             .addIf(COMMAND_SEEK_TO_MEDIA_ITEM, !isPlayingAd)
             .addIf(COMMAND_SEEK_BACK, isCurrentMediaItemSeekable && !isPlayingAd)
@@ -888,7 +913,8 @@ class MPVPlayer(
 
     override fun onAudioFocusChange(focusChange: Int) {
         when (focusChange) {
-            AudioManager.AUDIOFOCUS_LOSS, AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> {
+            AudioManager.AUDIOFOCUS_LOSS,
+            AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> {
                 audioFocusCallback = {
                     if (getPlayWhenReady()) {
                         playWhenReady = true
@@ -912,25 +938,31 @@ class MPVPlayer(
         }
     }
 
-    private val surfaceHolder = object : SurfaceHolder.Callback {
-        override fun surfaceCreated(holder: SurfaceHolder) {
-            MPVLib.attachSurface(holder.surface)
-            MPVLib.setOptionString("force-window", "yes")
-            MPVLib.setOptionString("vo", videoOutput)
-            MPVLib.setOptionString("vid", "auto")
-        }
+    private val surfaceHolder =
+        object : SurfaceHolder.Callback {
+            override fun surfaceCreated(holder: SurfaceHolder) {
+                MPVLib.attachSurface(holder.surface)
+                MPVLib.setOptionString("force-window", "yes")
+                MPVLib.setOptionString("vo", videoOutput)
+                MPVLib.setOptionString("vid", "auto")
+            }
 
-        override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
-            MPVLib.setPropertyString("android-surface-size", "${width}x$height")
-        }
+            override fun surfaceChanged(
+                holder: SurfaceHolder,
+                format: Int,
+                width: Int,
+                height: Int,
+            ) {
+                MPVLib.setPropertyString("android-surface-size", "${width}x$height")
+            }
 
-        override fun surfaceDestroyed(holder: SurfaceHolder) {
-            MPVLib.setOptionString("vid", "no")
-            MPVLib.setOptionString("vo", "null")
-            MPVLib.setOptionString("force-window", "no")
-            MPVLib.detachSurface()
+            override fun surfaceDestroyed(holder: SurfaceHolder) {
+                MPVLib.setOptionString("vid", "no")
+                MPVLib.setOptionString("vo", "null")
+                MPVLib.setOptionString("force-window", "no")
+                MPVLib.detachSurface()
+            }
         }
-    }
 
     fun setOption(name: String, value: String) {
         try {
@@ -944,18 +976,19 @@ class MPVPlayer(
     companion object {
         private const val AUDIO_FOCUS_DUCKING = 0.5f
 
-        private val permanentAvailableCommands: Player.Commands = Player.Commands.Builder()
-            .addAll(
-                COMMAND_PLAY_PAUSE,
-                COMMAND_SET_SPEED_AND_PITCH,
-                COMMAND_GET_CURRENT_MEDIA_ITEM,
-                COMMAND_GET_METADATA,
-                COMMAND_CHANGE_MEDIA_ITEMS,
-                COMMAND_SET_VIDEO_SURFACE,
-                COMMAND_GET_TRACKS,
-                COMMAND_SET_TRACK_SELECTION_PARAMETERS,
-            )
-            .build()
+        private val permanentAvailableCommands: Player.Commands =
+            Player.Commands.Builder()
+                .addAll(
+                    COMMAND_PLAY_PAUSE,
+                    COMMAND_SET_SPEED_AND_PITCH,
+                    COMMAND_GET_CURRENT_MEDIA_ITEM,
+                    COMMAND_GET_METADATA,
+                    COMMAND_CHANGE_MEDIA_ITEMS,
+                    COMMAND_SET_VIDEO_SURFACE,
+                    COMMAND_GET_TRACKS,
+                    COMMAND_SET_TRACK_SELECTION_PARAMETERS,
+                )
+                .build()
 
         private fun JSONObject.optNullableString(name: String): String? {
             return if (this.has(name) && !this.isNull(name)) {
@@ -976,40 +1009,47 @@ class MPVPlayer(
         private fun createTracksGroupfromMpvJson(json: JSONObject): Tracks.Group {
             val trackType = MPVTrackType.entries.first { it.type == json.optString("type") }
 
-            val baseFormat = Format.Builder()
-                .setId(json.optInt("id"))
-                .setLabel(json.optNullableString("title"))
-                .setLanguage(json.optNullableString("lang"))
-                .setSelectionFlags(if (json.optBoolean("default")) C.SELECTION_FLAG_DEFAULT else 0)
-                .setCodecs(json.optNullableString("codec"))
-                .build()
-
-            val format = when (trackType) {
-                MPVTrackType.VIDEO -> {
-                    baseFormat.buildUpon()
-                        .setSampleMimeType("video/${baseFormat.codecs}")
-                        .setWidth(json.optInt("demux-w", Format.NO_VALUE))
-                        .setHeight(json.optInt("demux-h", Format.NO_VALUE))
-                        .setFrameRate(
-                            (json.optNullableDouble("demux-fps") ?: Format.NO_VALUE).toFloat()
-                        )
-                        .build()
-                }
+            val baseFormat =
+                Format.Builder()
+                    .setId(json.optInt("id"))
+                    .setLabel(json.optNullableString("title"))
+                    .setLanguage(json.optNullableString("lang"))
+                    .setSelectionFlags(
+                        if (json.optBoolean("default")) C.SELECTION_FLAG_DEFAULT else 0
+                    )
+                    .setCodecs(json.optNullableString("codec"))
+                    .build()
+
+            val format =
+                when (trackType) {
+                    MPVTrackType.VIDEO -> {
+                        baseFormat
+                            .buildUpon()
+                            .setSampleMimeType("video/${baseFormat.codecs}")
+                            .setWidth(json.optInt("demux-w", Format.NO_VALUE))
+                            .setHeight(json.optInt("demux-h", Format.NO_VALUE))
+                            .setFrameRate(
+                                (json.optNullableDouble("demux-fps") ?: Format.NO_VALUE).toFloat()
+                            )
+                            .build()
+                    }
 
-                MPVTrackType.AUDIO -> {
-                    baseFormat.buildUpon()
-                        .setSampleMimeType("audio/${baseFormat.codecs}")
-                        .setChannelCount(json.optInt("demux-channel-count", Format.NO_VALUE))
-                        .setSampleRate(json.optInt("demux-samplerate", Format.NO_VALUE))
-                        .build()
-                }
+                    MPVTrackType.AUDIO -> {
+                        baseFormat
+                            .buildUpon()
+                            .setSampleMimeType("audio/${baseFormat.codecs}")
+                            .setChannelCount(json.optInt("demux-channel-count", Format.NO_VALUE))
+                            .setSampleRate(json.optInt("demux-samplerate", Format.NO_VALUE))
+                            .build()
+                    }
 
-                MPVTrackType.SUBTITLE -> {
-                    baseFormat.buildUpon()
-                        .setSampleMimeType("text/${baseFormat.codecs}")
-                        .build()
+                    MPVTrackType.SUBTITLE -> {
+                        baseFormat
+                            .buildUpon()
+                            .setSampleMimeType("text/${baseFormat.codecs}")
+                            .build()
+                    }
                 }
-            }
 
             val trackGroup = TrackGroup(format)
 
@@ -1034,14 +1074,10 @@ class MPVPlayer(
                 if (trackGroups.isNotEmpty()) {
                     tracks = Tracks(trackGroups)
                 }
-            } catch (_: JSONException) {
-            }
+            } catch (_: JSONException) {}
             return tracks
         }
     }
 
-    data class Property(
-        val name: String,
-        val format: Int,
-    )
-}
\ No newline at end of file
+    data class Property(val name: String, val format: Int)
+}
diff --git a/app/src/main/java/com/makd/afinity/player/mpv/MPVTrackType.kt b/app/src/main/java/com/makd/afinity/player/mpv/MPVTrackType.kt
index c09f1b004..80531bec3 100644
--- a/app/src/main/java/com/makd/afinity/player/mpv/MPVTrackType.kt
+++ b/app/src/main/java/com/makd/afinity/player/mpv/MPVTrackType.kt
@@ -8,8 +8,7 @@ import kotlinx.parcelize.Parcelize
 enum class MPVTrackType(val type: String) : Parcelable {
     VIDEO("video"),
     AUDIO("audio"),
-    SUBTITLE("sub"),
-    ;
+    SUBTITLE("sub");
 
     companion object {
         fun fromMedia3TrackType(trackType: Int): MPVTrackType {
@@ -21,4 +20,4 @@ enum class MPVTrackType(val type: String) : Parcelable {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/genre/AudiobookshelfGenreResultsScreen.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/genre/AudiobookshelfGenreResultsScreen.kt
new file mode 100644
index 000000000..ff0982c3a
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/genre/AudiobookshelfGenreResultsScreen.kt
@@ -0,0 +1,277 @@
+package com.makd.afinity.ui.audiobookshelf.genre
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.makd.afinity.R
+import com.makd.afinity.data.models.audiobookshelf.LibraryItem
+import com.makd.afinity.ui.audiobookshelf.library.components.AudiobookCard
+import com.makd.afinity.ui.theme.CardDimensions.gridMinSize
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AudiobookshelfGenreResultsScreen(
+    genre: String,
+    onBackClick: () -> Unit,
+    onItemClick: (String) -> Unit,
+    modifier: Modifier = Modifier,
+    viewModel: AudiobookshelfGenreResultsViewModel = hiltViewModel(),
+    widthSizeClass: WindowWidthSizeClass,
+) {
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+
+    LaunchedEffect(genre) { viewModel.loadGenreResults(genre) }
+
+    Column(modifier = modifier.fillMaxSize().safeDrawingPadding()) {
+        TopAppBar(
+            title = {
+                Text(
+                    text = genre,
+                    style =
+                        MaterialTheme.typography.headlineLarge.copy(fontWeight = FontWeight.Bold),
+                )
+            },
+            navigationIcon = {
+                IconButton(onClick = onBackClick) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.ic_chevron_left),
+                        contentDescription = stringResource(R.string.cd_back),
+                    )
+                }
+            },
+        )
+
+        when {
+            uiState.isLoading -> {
+                Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                    CircularProgressIndicator()
+                }
+            }
+
+            uiState.error != null -> {
+                Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                    Column(
+                        horizontalAlignment = Alignment.CenterHorizontally,
+                        verticalArrangement = Arrangement.spacedBy(8.dp),
+                    ) {
+                        Text(
+                            text = stringResource(R.string.error_something_went_wrong),
+                            style = MaterialTheme.typography.headlineSmall,
+                        )
+                        Text(
+                            text = uiState.error ?: stringResource(R.string.error_unknown),
+                            style = MaterialTheme.typography.bodyMedium,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        )
+                    }
+                }
+            }
+
+            else -> {
+                AudiobookshelfGenreResultsContent(
+                    audiobooks = uiState.audiobooks,
+                    podcasts = uiState.podcasts,
+                    serverUrl = uiState.serverUrl,
+                    onItemClick = onItemClick,
+                    widthSizeClass = widthSizeClass,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun AudiobookshelfGenreResultsContent(
+    audiobooks: List<LibraryItem>,
+    podcasts: List<LibraryItem>,
+    serverUrl: String?,
+    onItemClick: (String) -> Unit,
+    widthSizeClass: WindowWidthSizeClass,
+) {
+    var selectedTab by remember { mutableIntStateOf(0) }
+    val tabs =
+        listOf(
+            stringResource(R.string.filter_audiobooks),
+            stringResource(R.string.media_type_podcast),
+        )
+
+    Column {
+        Box(modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp)) {
+            Surface(
+                modifier = Modifier.fillMaxWidth(),
+                shape = RoundedCornerShape(12.dp),
+                color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.7f),
+                tonalElevation = 2.dp,
+            ) {
+                Row(
+                    modifier = Modifier.fillMaxWidth().padding(4.dp),
+                    horizontalArrangement = Arrangement.spacedBy(4.dp),
+                ) {
+                    tabs.forEachIndexed { index, title ->
+                        val isSelected = selectedTab == index
+                        val count = if (index == 0) audiobooks.size else podcasts.size
+
+                        Surface(
+                            onClick = { selectedTab = index },
+                            modifier = Modifier.weight(1f),
+                            shape = RoundedCornerShape(8.dp),
+                            color =
+                                if (isSelected) {
+                                    MaterialTheme.colorScheme.primary
+                                } else {
+                                    Color.Transparent
+                                },
+                            tonalElevation = if (isSelected) 4.dp else 0.dp,
+                        ) {
+                            Column(
+                                modifier = Modifier.padding(vertical = 12.dp, horizontal = 16.dp),
+                                horizontalAlignment = Alignment.CenterHorizontally,
+                                verticalArrangement = Arrangement.spacedBy(2.dp),
+                            ) {
+                                Text(
+                                    text = title,
+                                    style =
+                                        MaterialTheme.typography.labelLarge.copy(
+                                            fontWeight =
+                                                if (isSelected) FontWeight.SemiBold
+                                                else FontWeight.Medium
+                                        ),
+                                    color =
+                                        if (isSelected) {
+                                            MaterialTheme.colorScheme.onPrimary
+                                        } else {
+                                            MaterialTheme.colorScheme.onSurfaceVariant
+                                        },
+                                )
+
+                                Surface(
+                                    shape = RoundedCornerShape(10.dp),
+                                    color =
+                                        if (isSelected) {
+                                            MaterialTheme.colorScheme.onPrimary.copy(alpha = 0.2f)
+                                        } else {
+                                            MaterialTheme.colorScheme.primary.copy(alpha = 0.15f)
+                                        },
+                                ) {
+                                    Text(
+                                        text = count.toString(),
+                                        modifier =
+                                            Modifier.padding(horizontal = 8.dp, vertical = 2.dp),
+                                        style =
+                                            MaterialTheme.typography.labelSmall.copy(
+                                                fontWeight = FontWeight.Medium
+                                            ),
+                                        color =
+                                            if (isSelected) {
+                                                MaterialTheme.colorScheme.onPrimary
+                                            } else {
+                                                MaterialTheme.colorScheme.primary
+                                            },
+                                    )
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        when (selectedTab) {
+            0 -> {
+                if (audiobooks.isEmpty()) {
+                    EmptyStateMessage(stringResource(R.string.empty_genre_audiobooks))
+                } else {
+                    AudiobookshelfItemGrid(
+                        items = audiobooks,
+                        serverUrl = serverUrl,
+                        onItemClick = onItemClick,
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
+            }
+
+            1 -> {
+                if (podcasts.isEmpty()) {
+                    EmptyStateMessage(stringResource(R.string.empty_genre_podcasts))
+                } else {
+                    AudiobookshelfItemGrid(
+                        items = podcasts,
+                        serverUrl = serverUrl,
+                        onItemClick = onItemClick,
+                        widthSizeClass = widthSizeClass,
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun AudiobookshelfItemGrid(
+    items: List<LibraryItem>,
+    serverUrl: String?,
+    onItemClick: (String) -> Unit,
+    widthSizeClass: WindowWidthSizeClass,
+) {
+    LazyVerticalGrid(
+        columns = GridCells.Adaptive(widthSizeClass.gridMinSize),
+        modifier = Modifier.fillMaxSize(),
+        contentPadding = PaddingValues(16.dp),
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
+        verticalArrangement = Arrangement.spacedBy(16.dp),
+    ) {
+        items(items, key = { it.id }) { item ->
+            AudiobookCard(
+                item = item,
+                serverUrl = serverUrl,
+                onClick = { onItemClick(item.id) },
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
+    }
+}
+
+@Composable
+private fun EmptyStateMessage(message: String) {
+    Box(modifier = Modifier.fillMaxSize().padding(32.dp), contentAlignment = Alignment.Center) {
+        Text(
+            text = message,
+            style = MaterialTheme.typography.bodyLarge,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+        )
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/genre/AudiobookshelfGenreResultsViewModel.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/genre/AudiobookshelfGenreResultsViewModel.kt
new file mode 100644
index 000000000..0e9eec096
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/genre/AudiobookshelfGenreResultsViewModel.kt
@@ -0,0 +1,90 @@
+package com.makd.afinity.ui.audiobookshelf.genre
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.makd.afinity.data.models.audiobookshelf.LibraryItem
+import com.makd.afinity.data.repository.AudiobookshelfRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+@HiltViewModel
+class AudiobookshelfGenreResultsViewModel
+@Inject
+constructor(private val audiobookshelfRepository: AudiobookshelfRepository) : ViewModel() {
+
+    private val _uiState = MutableStateFlow(AudiobookshelfGenreResultsUiState())
+    val uiState: StateFlow<AudiobookshelfGenreResultsUiState> = _uiState.asStateFlow()
+
+    private var currentGenre: String? = null
+
+    fun loadGenreResults(genre: String) {
+        if (genre == currentGenre && _uiState.value.audiobooks.isNotEmpty()) return
+        currentGenre = genre
+
+        viewModelScope.launch {
+            try {
+                _uiState.value = _uiState.value.copy(isLoading = true, error = null)
+
+                val serverUrl = audiobookshelfRepository.currentConfig.value?.serverUrl
+
+                var libraries = audiobookshelfRepository.getLibrariesFlow().first()
+                if (libraries.isEmpty()) {
+                    libraries =
+                        audiobookshelfRepository.refreshLibraries().getOrDefault(emptyList())
+                }
+
+                val results =
+                    libraries
+                        .map { library ->
+                            async {
+                                audiobookshelfRepository
+                                    .getLibraryItemsByGenre(library.id, genre)
+                                    .getOrNull()
+                            }
+                        }
+                        .awaitAll()
+                        .filterNotNull()
+                        .flatten()
+                        .distinctBy { it.id }
+
+                val audiobooks = results.filter { it.mediaType == "book" }
+                val podcasts = results.filter { it.mediaType == "podcast" }
+
+                _uiState.value =
+                    _uiState.value.copy(
+                        audiobooks = audiobooks,
+                        podcasts = podcasts,
+                        serverUrl = serverUrl,
+                        isLoading = false,
+                    )
+
+                Timber.d(
+                    "Genre results loaded: ${audiobooks.size} audiobooks, ${podcasts.size} podcasts for '$genre'"
+                )
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to load genre results")
+                _uiState.value =
+                    _uiState.value.copy(
+                        isLoading = false,
+                        error = e.message ?: "An unknown error occurred",
+                    )
+            }
+        }
+    }
+}
+
+data class AudiobookshelfGenreResultsUiState(
+    val audiobooks: List<LibraryItem> = emptyList(),
+    val podcasts: List<LibraryItem> = emptyList(),
+    val serverUrl: String? = null,
+    val isLoading: Boolean = false,
+    val error: String? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/AudiobookshelfItemScreen.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/AudiobookshelfItemScreen.kt
new file mode 100644
index 000000000..cb4e3e067
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/AudiobookshelfItemScreen.kt
@@ -0,0 +1,423 @@
+package com.makd.afinity.ui.audiobookshelf.item
+
+import android.content.res.Configuration
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.displayCutout
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.unit.dp
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.makd.afinity.R
+import com.makd.afinity.ui.audiobookshelf.item.components.ChapterList
+import com.makd.afinity.ui.audiobookshelf.item.components.EpisodeList
+import com.makd.afinity.ui.audiobookshelf.item.components.ExpandableSynopsis
+import com.makd.afinity.ui.audiobookshelf.item.components.IncludedInSeriesSection
+import com.makd.afinity.ui.audiobookshelf.item.components.ItemHeader
+import com.makd.afinity.ui.audiobookshelf.item.components.ItemHeaderContent
+import com.makd.afinity.ui.audiobookshelf.item.components.ItemHeroBackground
+
+@Composable
+fun AudiobookshelfItemScreen(
+    onNavigateToPlayer: (String, String?, Double?) -> Unit,
+    onNavigateToSeries: (seriesId: String, libraryId: String, seriesName: String) -> Unit =
+        { _, _, _ ->
+        },
+    viewModel: AudiobookshelfItemViewModel = hiltViewModel(),
+) {
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    val item by viewModel.item.collectAsStateWithLifecycle()
+    val progress by viewModel.progress.collectAsStateWithLifecycle()
+    val config by viewModel.currentConfig.collectAsStateWithLifecycle()
+
+    val isPodcast = item?.mediaType?.lowercase() == "podcast"
+    val configuration = LocalConfiguration.current
+    val isLandscape = configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+
+    var chaptersExpanded by remember { mutableStateOf(false) }
+
+    Box(modifier = Modifier.fillMaxSize()) {
+        when {
+            uiState.isLoading -> {
+                CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
+            }
+
+            item != null -> {
+                if (isLandscape) {
+                    val coverUrl =
+                        if (config?.serverUrl != null && item?.media?.coverPath != null) {
+                            "${config?.serverUrl}/api/items/${item?.id}/cover"
+                        } else null
+
+                    ItemHeroBackground(coverUrl = coverUrl)
+
+                    Row(
+                        modifier =
+                            Modifier.fillMaxSize().windowInsetsPadding(WindowInsets.displayCutout)
+                    ) {
+                        Column(
+                            modifier =
+                                Modifier.weight(1f)
+                                    .fillMaxHeight()
+                                    .verticalScroll(rememberScrollState())
+                                    .padding(bottom = 24.dp)
+                        ) {
+                            ItemHeaderContent(
+                                item = item!!,
+                                progress = progress,
+                                coverUrl = coverUrl,
+                                onPlay = { onNavigateToPlayer(viewModel.itemId, null, null) },
+                            )
+                        }
+
+                        LazyColumn(
+                            modifier =
+                                Modifier.weight(1f)
+                                    .fillMaxHeight()
+                                    .background(
+                                        MaterialTheme.colorScheme.surface.copy(alpha = 0.5f)
+                                    ),
+                            contentPadding = WindowInsets.navigationBars.asPaddingValues(),
+                        ) {
+                            item { Spacer(modifier = Modifier.statusBarsPadding()) }
+
+                            if (uiState.seriesDetails.isNotEmpty()) {
+                                item {
+                                    IncludedInSeriesSection(
+                                        seriesList = uiState.seriesDetails,
+                                        serverUrl = config?.serverUrl,
+                                        onSeriesClick = { seriesId, seriesName ->
+                                            onNavigateToSeries(
+                                                seriesId,
+                                                item?.libraryId ?: "",
+                                                seriesName,
+                                            )
+                                        },
+                                        modifier = Modifier.padding(top = 16.dp),
+                                    )
+                                }
+                            }
+
+                            item?.media?.metadata?.description?.let { description ->
+                                item {
+                                    ExpandableSynopsis(
+                                        description = description,
+                                        modifier =
+                                            Modifier.padding(horizontal = 16.dp, vertical = 16.dp),
+                                    )
+                                }
+                            }
+
+                            item?.media?.metadata?.narratorName?.let { narrator ->
+                                item {
+                                    NarratedByRow(
+                                        narrator = narrator,
+                                        modifier = Modifier.padding(horizontal = 16.dp),
+                                    )
+                                }
+                            }
+
+                            val showEpisodes = isPodcast && uiState.episodes.isNotEmpty()
+                            val showChapters = !isPodcast && uiState.chapters.isNotEmpty()
+
+                            if (showEpisodes || showChapters) {
+                                item {
+                                    CollapsibleSectionHeader(
+                                        title = if (showEpisodes) "EPISODES" else "CHAPTERS",
+                                        expanded = chaptersExpanded,
+                                        onToggle = { chaptersExpanded = !chaptersExpanded },
+                                        modifier = Modifier.padding(top = 16.dp),
+                                    )
+                                }
+
+                                if (chaptersExpanded) {
+                                    item {
+                                        if (showEpisodes) {
+                                            EpisodeList(
+                                                episodes = uiState.episodes,
+                                                onEpisodeClick = { /* Details */ },
+                                                onEpisodePlay = { episode ->
+                                                    onNavigateToPlayer(
+                                                        viewModel.itemId,
+                                                        episode.id,
+                                                        null,
+                                                    )
+                                                },
+                                                modifier =
+                                                    Modifier.padding(top = 8.dp, bottom = 16.dp),
+                                            )
+                                        } else {
+                                            ChapterList(
+                                                chapters = uiState.chapters,
+                                                currentPosition = progress?.currentTime,
+                                                onChapterClick = { chapter ->
+                                                    onNavigateToPlayer(
+                                                        viewModel.itemId,
+                                                        null,
+                                                        chapter.start,
+                                                    )
+                                                },
+                                                modifier = Modifier.padding(bottom = 16.dp),
+                                            )
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    LazyColumn(
+                        modifier = Modifier.fillMaxSize(),
+                        contentPadding = WindowInsets.navigationBars.asPaddingValues(),
+                    ) {
+                        item {
+                            ItemHeader(
+                                item = item!!,
+                                progress = progress,
+                                serverUrl = config?.serverUrl,
+                                onPlay = { onNavigateToPlayer(viewModel.itemId, null, null) },
+                            )
+                        }
+
+                        if (uiState.seriesDetails.isNotEmpty()) {
+                            item {
+                                IncludedInSeriesSection(
+                                    seriesList = uiState.seriesDetails,
+                                    serverUrl = config?.serverUrl,
+                                    onSeriesClick = { seriesId, seriesName ->
+                                        onNavigateToSeries(
+                                            seriesId,
+                                            item?.libraryId ?: "",
+                                            seriesName,
+                                        )
+                                    },
+                                    modifier = Modifier.padding(top = 16.dp),
+                                )
+                            }
+                        }
+
+                        item?.media?.metadata?.description?.let { description ->
+                            item {
+                                ExpandableSynopsis(
+                                    description = description,
+                                    modifier =
+                                        Modifier.padding(horizontal = 16.dp, vertical = 16.dp),
+                                )
+                            }
+                        }
+
+                        item?.media?.metadata?.narratorName?.let { narrator ->
+                            item {
+                                NarratedByRow(
+                                    narrator = narrator,
+                                    modifier = Modifier.padding(horizontal = 16.dp),
+                                )
+                            }
+                        }
+
+                        val showEpisodes = isPodcast && uiState.episodes.isNotEmpty()
+                        val showChapters = !isPodcast && uiState.chapters.isNotEmpty()
+
+                        if (showEpisodes || showChapters) {
+                            item {
+                                CollapsibleSectionHeader(
+                                    title = if (showEpisodes) "EPISODES" else "CHAPTERS",
+                                    expanded = chaptersExpanded,
+                                    onToggle = { chaptersExpanded = !chaptersExpanded },
+                                    modifier = Modifier.padding(top = 16.dp),
+                                )
+                            }
+
+                            if (chaptersExpanded) {
+                                item {
+                                    AnimatedVisibility(
+                                        visible = true,
+                                        enter = expandVertically() + fadeIn(),
+                                        exit = shrinkVertically() + fadeOut(),
+                                    ) {
+                                        if (showEpisodes) {
+                                            EpisodeList(
+                                                episodes = uiState.episodes,
+                                                onEpisodeClick = { /* Details */ },
+                                                onEpisodePlay = { episode ->
+                                                    onNavigateToPlayer(
+                                                        viewModel.itemId,
+                                                        episode.id,
+                                                        null,
+                                                    )
+                                                },
+                                                modifier =
+                                                    Modifier.padding(top = 8.dp, bottom = 16.dp),
+                                            )
+                                        } else {
+                                            ChapterList(
+                                                chapters = uiState.chapters,
+                                                currentPosition = progress?.currentTime,
+                                                onChapterClick = { chapter ->
+                                                    onNavigateToPlayer(
+                                                        viewModel.itemId,
+                                                        null,
+                                                        chapter.start,
+                                                    )
+                                                },
+                                                modifier = Modifier.padding(bottom = 16.dp),
+                                            )
+                                        }
+                                    }
+                                }
+                            }
+                        } else {
+                            item { Spacer(modifier = Modifier.height(32.dp)) }
+                        }
+                    }
+                }
+            }
+
+            uiState.error != null -> {
+                Text(
+                    text = "Failed to load item",
+                    modifier = Modifier.align(Alignment.Center),
+                    style = MaterialTheme.typography.bodyLarge,
+                )
+            }
+        }
+
+        AnimatedVisibility(
+            visible = uiState.error != null,
+            enter = fadeIn(),
+            exit = fadeOut(),
+            modifier = Modifier.align(Alignment.BottomCenter),
+        ) {
+            Card(
+                modifier =
+                    Modifier.fillMaxWidth()
+                        .padding(16.dp)
+                        .padding(WindowInsets.navigationBars.asPaddingValues()),
+                colors =
+                    CardDefaults.cardColors(
+                        containerColor = MaterialTheme.colorScheme.errorContainer
+                    ),
+            ) {
+                Text(
+                    text = uiState.error ?: "",
+                    modifier = Modifier.padding(16.dp),
+                    color = MaterialTheme.colorScheme.onErrorContainer,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun CollapsibleSectionHeader(
+    title: String,
+    expanded: Boolean,
+    onToggle: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val interactionSource = remember { MutableInteractionSource() }
+    Row(
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null,
+                    onClick = { onToggle() },
+                )
+                .padding(horizontal = 20.dp, vertical = 12.dp),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Text(
+            text = title,
+            style = MaterialTheme.typography.labelLarge,
+            color = MaterialTheme.colorScheme.primary,
+            fontWeight = FontWeight.Bold,
+        )
+        Icon(
+            painter =
+                painterResource(
+                    id =
+                        if (expanded) R.drawable.ic_keyboard_arrow_up
+                        else R.drawable.ic_keyboard_arrow_down
+                ),
+            contentDescription = if (expanded) "Collapse" else "Expand",
+            tint = MaterialTheme.colorScheme.primary,
+            modifier = Modifier.size(24.dp),
+        )
+    }
+}
+
+@Composable
+private fun NarratedByRow(narrator: String, modifier: Modifier = Modifier) {
+    Text(
+        text =
+            buildAnnotatedString {
+                withStyle(
+                    style =
+                        SpanStyle(
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
+                            fontWeight = FontWeight.Normal,
+                        )
+                ) {
+                    append("Narrated by: ")
+                }
+
+                withStyle(
+                    style =
+                        SpanStyle(
+                            color = MaterialTheme.colorScheme.onSurface,
+                            fontWeight = FontWeight.Medium,
+                        )
+                ) {
+                    append(narrator)
+                }
+            },
+        style = MaterialTheme.typography.bodyMedium,
+        modifier = modifier,
+    )
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/AudiobookshelfItemViewModel.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/AudiobookshelfItemViewModel.kt
new file mode 100644
index 000000000..ca8d672d4
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/AudiobookshelfItemViewModel.kt
@@ -0,0 +1,130 @@
+package com.makd.afinity.ui.audiobookshelf.item
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.makd.afinity.data.models.audiobookshelf.BookChapter
+import com.makd.afinity.data.models.audiobookshelf.LibraryItem
+import com.makd.afinity.data.models.audiobookshelf.MediaProgress
+import com.makd.afinity.data.models.audiobookshelf.PodcastEpisode
+import com.makd.afinity.data.models.audiobookshelf.SeriesItem
+import com.makd.afinity.data.repository.AudiobookshelfRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+@HiltViewModel
+class AudiobookshelfItemViewModel
+@Inject
+constructor(
+    savedStateHandle: SavedStateHandle,
+    private val audiobookshelfRepository: AudiobookshelfRepository,
+) : ViewModel() {
+
+    val itemId: String = savedStateHandle.get<String>("itemId") ?: ""
+
+    private val _uiState = MutableStateFlow(AudiobookshelfItemUiState())
+    val uiState: StateFlow<AudiobookshelfItemUiState> = _uiState.asStateFlow()
+
+    private val _item = MutableStateFlow<LibraryItem?>(null)
+    val item: StateFlow<LibraryItem?> = _item.asStateFlow()
+
+    val progress: StateFlow<MediaProgress?> =
+        audiobookshelfRepository
+            .getProgressForItemFlow(itemId)
+            .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), null)
+
+    val currentConfig = audiobookshelfRepository.currentConfig
+
+    init {
+        loadItem()
+    }
+
+    private fun loadItem() {
+        viewModelScope.launch {
+            _uiState.value = _uiState.value.copy(isLoading = true, error = null)
+
+            val result = audiobookshelfRepository.getItemDetails(itemId)
+
+            result.fold(
+                onSuccess = { item ->
+                    _item.value = item
+                    _uiState.value =
+                        _uiState.value.copy(
+                            isLoading = false,
+                            chapters = item.media.chapters ?: emptyList(),
+                            episodes = item.media.episodes ?: emptyList(),
+                        )
+                    Timber.d("Loaded item: ${item.media.metadata.title}")
+
+                    item.media.metadata.series?.let { seriesList ->
+                        if (seriesList.isNotEmpty()) {
+                            loadSeriesDetails(item.libraryId, seriesList)
+                        }
+                    }
+                },
+                onFailure = { error ->
+                    _uiState.value = _uiState.value.copy(isLoading = false, error = error.message)
+                    Timber.e(error, "Failed to load item")
+                },
+            )
+        }
+    }
+
+    private fun loadSeriesDetails(libraryId: String, seriesItems: List<SeriesItem>) {
+        viewModelScope.launch {
+            val loadedSeries = mutableListOf<SeriesDisplayData>()
+
+            for (seriesItem in seriesItems) {
+                audiobookshelfRepository
+                    .getSeriesItems(libraryId, seriesItem.id, limit = 4)
+                    .fold(
+                        onSuccess = { result ->
+                            loadedSeries.add(
+                                SeriesDisplayData(
+                                    id = seriesItem.id,
+                                    name = seriesItem.name,
+                                    totalBooks = result.totalBooks,
+                                    bookItems = result.items,
+                                )
+                            )
+                        },
+                        onFailure = { e ->
+                            Timber.w(e, "Failed to load series items: ${seriesItem.name}")
+                        },
+                    )
+            }
+
+            _uiState.value = _uiState.value.copy(seriesDetails = loadedSeries)
+        }
+    }
+
+    fun refresh() {
+        loadItem()
+    }
+
+    fun clearError() {
+        _uiState.value = _uiState.value.copy(error = null)
+    }
+}
+
+data class SeriesDisplayData(
+    val id: String,
+    val name: String,
+    val totalBooks: Int,
+    val bookItems: List<LibraryItem>,
+)
+
+data class AudiobookshelfItemUiState(
+    val isLoading: Boolean = false,
+    val chapters: List<BookChapter> = emptyList(),
+    val episodes: List<PodcastEpisode> = emptyList(),
+    val seriesDetails: List<SeriesDisplayData> = emptyList(),
+    val error: String? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/components/ChapterList.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/components/ChapterList.kt
new file mode 100644
index 000000000..0fde70dab
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/components/ChapterList.kt
@@ -0,0 +1,155 @@
+package com.makd.afinity.ui.audiobookshelf.item.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import com.makd.afinity.R
+import com.makd.afinity.data.models.audiobookshelf.BookChapter
+
+@Composable
+fun ChapterList(
+    chapters: List<BookChapter>,
+    currentPosition: Double?,
+    onChapterClick: (BookChapter) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Column(modifier = modifier.fillMaxWidth().padding(horizontal = 16.dp)) {
+        Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+            chapters.forEachIndexed { index, chapter ->
+                val isCurrentChapter =
+                    currentPosition?.let { pos -> pos >= chapter.start && pos < chapter.end }
+                        ?: false
+
+                val isCompleted = currentPosition?.let { pos -> pos >= chapter.end } ?: false
+
+                ChapterItem(
+                    chapter = chapter,
+                    index = index + 1,
+                    isCurrentChapter = isCurrentChapter,
+                    isCompleted = isCompleted,
+                    onClick = { onChapterClick(chapter) },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun ChapterItem(
+    chapter: BookChapter,
+    index: Int,
+    isCurrentChapter: Boolean,
+    isCompleted: Boolean,
+    onClick: () -> Unit,
+) {
+    val backgroundColor =
+        if (isCurrentChapter) {
+            MaterialTheme.colorScheme.primaryContainer
+        } else {
+            Color.Transparent
+        }
+
+    val textColor =
+        if (isCurrentChapter) {
+            MaterialTheme.colorScheme.onPrimaryContainer
+        } else {
+            MaterialTheme.colorScheme.onSurface
+        }
+
+    val iconTint =
+        if (isCurrentChapter) {
+            MaterialTheme.colorScheme.onPrimaryContainer
+        } else {
+            MaterialTheme.colorScheme.onSurfaceVariant
+        }
+
+    val contentAlpha = if (isCompleted && !isCurrentChapter) 0.5f else 1f
+
+    Row(
+        modifier =
+            Modifier.fillMaxWidth()
+                .clip(RoundedCornerShape(12.dp))
+                .background(backgroundColor)
+                .clickable(onClick = onClick)
+                .padding(vertical = 12.dp, horizontal = 12.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Box(modifier = Modifier.width(32.dp), contentAlignment = Alignment.CenterStart) {
+            if (isCurrentChapter) {
+                Icon(
+                    painter = painterResource(id = R.drawable.ic_audio),
+                    contentDescription = "Playing",
+                    tint = iconTint,
+                    modifier = Modifier.size(20.dp),
+                )
+            } else if (isCompleted) {
+                Icon(
+                    painter = painterResource(id = R.drawable.ic_check),
+                    contentDescription = "Completed",
+                    tint = iconTint.copy(alpha = 0.5f),
+                    modifier = Modifier.size(18.dp),
+                )
+            } else {
+                Text(
+                    text = index.toString(),
+                    style = MaterialTheme.typography.labelMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f),
+                    fontWeight = FontWeight.Medium,
+                    modifier = Modifier.align(Alignment.Center),
+                )
+            }
+        }
+
+        Spacer(modifier = Modifier.width(8.dp))
+
+        Column(modifier = Modifier.weight(1f)) {
+            Text(
+                text = chapter.title,
+                style = MaterialTheme.typography.bodyMedium,
+                fontWeight = if (isCurrentChapter) FontWeight.Bold else FontWeight.Normal,
+                color = textColor.copy(alpha = contentAlpha),
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+
+        Spacer(modifier = Modifier.width(16.dp))
+
+        Text(
+            text = formatChapterDuration(chapter.end - chapter.start),
+            style = MaterialTheme.typography.labelSmall,
+            color =
+                if (isCurrentChapter) textColor.copy(alpha = 0.8f)
+                else MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = contentAlpha),
+            fontWeight = FontWeight.Medium,
+        )
+    }
+}
+
+private fun formatChapterDuration(seconds: Double): String {
+    val totalSeconds = seconds.toLong()
+    val minutes = totalSeconds / 60
+    val secs = totalSeconds % 60
+    return "${minutes}:${secs.toString().padStart(2, '0')}"
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/components/EpisodeList.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/components/EpisodeList.kt
new file mode 100644
index 000000000..a64fe88b2
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/components/EpisodeList.kt
@@ -0,0 +1,148 @@
+package com.makd.afinity.ui.audiobookshelf.item.components
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.FilledIconButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButtonDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import com.makd.afinity.R
+import com.makd.afinity.data.models.audiobookshelf.PodcastEpisode
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+@Composable
+fun EpisodeList(
+    episodes: List<PodcastEpisode>,
+    onEpisodeClick: (PodcastEpisode) -> Unit,
+    onEpisodePlay: (PodcastEpisode) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Column(modifier = modifier.fillMaxWidth().padding(horizontal = 16.dp)) {
+        Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+            episodes.forEach { episode ->
+                EpisodeItem(
+                    episode = episode,
+                    onClick = { onEpisodeClick(episode) },
+                    onPlay = { onEpisodePlay(episode) },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun EpisodeItem(episode: PodcastEpisode, onClick: () -> Unit, onPlay: () -> Unit) {
+    Row(
+        modifier =
+            Modifier.fillMaxWidth()
+                .clip(RoundedCornerShape(12.dp))
+                .clickable(onClick = onClick)
+                .padding(vertical = 12.dp, horizontal = 12.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Column(modifier = Modifier.weight(1f)) {
+            Text(
+                text = episode.title,
+                style = MaterialTheme.typography.bodyMedium,
+                fontWeight = FontWeight.SemiBold,
+                color = MaterialTheme.colorScheme.onSurface,
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+            )
+
+            Spacer(modifier = Modifier.height(4.dp))
+
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                episode.publishedAt?.let { timestamp ->
+                    Text(
+                        text = formatDate(timestamp),
+                        style = MaterialTheme.typography.labelSmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                }
+
+                episode.duration?.let { duration ->
+                    if (episode.publishedAt != null) {
+                        Text(
+                            text = " • ",
+                            style = MaterialTheme.typography.labelSmall,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        )
+                    }
+                    Text(
+                        text = formatDuration(duration),
+                        style = MaterialTheme.typography.labelSmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                }
+            }
+
+            episode.description?.let { description ->
+                Spacer(modifier = Modifier.height(6.dp))
+                Text(
+                    text = description,
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.8f),
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                    lineHeight = MaterialTheme.typography.bodySmall.lineHeight * 1.2,
+                )
+            }
+        }
+
+        Spacer(modifier = Modifier.width(12.dp))
+
+        FilledIconButton(
+            onClick = onPlay,
+            modifier = Modifier.size(40.dp),
+            colors =
+                IconButtonDefaults.filledIconButtonColors(
+                    containerColor = MaterialTheme.colorScheme.primaryContainer,
+                    contentColor = MaterialTheme.colorScheme.primary,
+                ),
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_player_play_filled),
+                contentDescription = "Play episode",
+                modifier = Modifier.size(24.dp),
+            )
+        }
+    }
+}
+
+private fun formatDate(timestamp: Long): String {
+    val dateFormat = SimpleDateFormat("MMM d, yyyy", Locale.getDefault())
+    return dateFormat.format(Date(timestamp))
+}
+
+private fun formatDuration(seconds: Double): String {
+    val totalSeconds = seconds.toLong()
+    val hours = totalSeconds / 3600
+    val minutes = (totalSeconds % 3600) / 60
+
+    return if (hours > 0) {
+        "${hours}h ${minutes}m"
+    } else {
+        "${minutes}m"
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/components/IncludedInSeriesSection.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/components/IncludedInSeriesSection.kt
new file mode 100644
index 000000000..cfa656051
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/components/IncludedInSeriesSection.kt
@@ -0,0 +1,84 @@
+package com.makd.afinity.ui.audiobookshelf.item.components
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import com.makd.afinity.R
+import com.makd.afinity.ui.audiobookshelf.item.SeriesDisplayData
+
+@Composable
+fun IncludedInSeriesSection(
+    seriesList: List<SeriesDisplayData>,
+    serverUrl: String?,
+    onSeriesClick: (seriesId: String, seriesName: String) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    if (seriesList.isEmpty()) return
+
+    Column(modifier = modifier.fillMaxWidth().padding(horizontal = 16.dp)) {
+        Text(
+            text = "Included in Series",
+            style = MaterialTheme.typography.titleMedium,
+            fontWeight = FontWeight.Bold,
+        )
+
+        Spacer(modifier = Modifier.height(12.dp))
+
+        seriesList.forEach { series ->
+            val coverUrls =
+                if (serverUrl != null) {
+                    series.bookItems.take(4).map { "$serverUrl/api/items/${it.id}/cover" }
+                } else {
+                    emptyList()
+                }
+
+            Row(
+                modifier =
+                    Modifier.fillMaxWidth()
+                        .clickable { onSeriesClick(series.id, series.name) }
+                        .padding(vertical = 8.dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                SeriesCoverGrid(coverUrls = coverUrls, modifier = Modifier.size(130.dp))
+
+                Spacer(modifier = Modifier.width(16.dp))
+
+                Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center) {
+                    Text(
+                        text = series.name,
+                        style = MaterialTheme.typography.titleMedium,
+                        fontWeight = FontWeight.Bold,
+                    )
+                    Text(
+                        text = "${series.totalBooks} books",
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                }
+
+                Icon(
+                    painter = painterResource(id = R.drawable.ic_chevron_right),
+                    contentDescription = "View series",
+                    tint = MaterialTheme.colorScheme.onSurfaceVariant,
+                    modifier = Modifier.size(24.dp),
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/components/ItemHeader.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/components/ItemHeader.kt
new file mode 100644
index 000000000..d573edca2
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/components/ItemHeader.kt
@@ -0,0 +1,363 @@
+package com.makd.afinity.ui.audiobookshelf.item.components
+
+import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.blur
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import coil3.compose.AsyncImage
+import coil3.request.ImageRequest
+import coil3.request.crossfade
+import com.makd.afinity.R
+import com.makd.afinity.data.models.audiobookshelf.LibraryItem
+import com.makd.afinity.data.models.audiobookshelf.MediaProgress
+import com.makd.afinity.ui.utils.htmlToAnnotatedString
+
+@Composable
+fun ItemHeader(
+    item: LibraryItem,
+    progress: MediaProgress?,
+    serverUrl: String?,
+    onPlay: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val coverUrl =
+        if (serverUrl != null && item.media.coverPath != null) {
+            "$serverUrl/api/items/${item.id}/cover"
+        } else null
+
+    Box(modifier = modifier.fillMaxWidth()) {
+        Box(modifier = Modifier.fillMaxWidth().height(530.dp)) {
+            ItemHeroBackground(coverUrl = coverUrl)
+        }
+
+        ItemHeaderContent(item = item, progress = progress, coverUrl = coverUrl, onPlay = onPlay)
+    }
+}
+
+@Composable
+fun ItemHeroBackground(coverUrl: String?, modifier: Modifier = Modifier) {
+    if (coverUrl != null) {
+        Box(modifier = modifier.fillMaxSize()) {
+            AsyncImage(
+                model =
+                    ImageRequest.Builder(LocalContext.current)
+                        .data(coverUrl)
+                        .crossfade(true)
+                        .build(),
+                contentDescription = null,
+                modifier = Modifier.fillMaxSize().blur(radius = 30.dp).background(Color.Black),
+                alpha = 0.6f,
+                contentScale = ContentScale.Crop,
+            )
+
+            Box(
+                modifier =
+                    Modifier.fillMaxSize()
+                        .background(
+                            Brush.verticalGradient(
+                                colors =
+                                    listOf(
+                                        Color.Transparent,
+                                        MaterialTheme.colorScheme.surface.copy(alpha = 0.5f),
+                                        MaterialTheme.colorScheme.surface,
+                                    ),
+                                startY = 100f,
+                            )
+                        )
+            )
+        }
+    } else {
+        Box(modifier = modifier.fillMaxSize().background(MaterialTheme.colorScheme.surface))
+    }
+}
+
+@Composable
+fun ItemHeaderContent(
+    item: LibraryItem,
+    progress: MediaProgress?,
+    coverUrl: String?,
+    onPlay: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier.fillMaxWidth().padding(horizontal = 16.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        Spacer(modifier = Modifier.statusBarsPadding())
+        Spacer(modifier = Modifier.height(60.dp))
+
+        if (coverUrl != null) {
+            AsyncImage(
+                model = coverUrl,
+                contentDescription = "Cover",
+                modifier =
+                    Modifier.width(200.dp)
+                        .aspectRatio(1f)
+                        .shadow(12.dp, RoundedCornerShape(12.dp))
+                        .clip(RoundedCornerShape(12.dp)),
+                contentScale = ContentScale.Crop,
+            )
+        } else {
+            Card(
+                modifier = Modifier.width(200.dp).aspectRatio(1f),
+                shape = RoundedCornerShape(12.dp),
+                colors =
+                    CardDefaults.cardColors(
+                        containerColor = MaterialTheme.colorScheme.surfaceContainerHighest
+                    ),
+            ) {}
+        }
+
+        Spacer(modifier = Modifier.height(16.dp))
+
+        Text(
+            text = item.media.metadata.title ?: "Unknown Title",
+            style = MaterialTheme.typography.headlineSmall,
+            fontWeight = FontWeight.Bold,
+            maxLines = 3,
+            overflow = TextOverflow.Ellipsis,
+            textAlign = TextAlign.Center,
+        )
+
+        item.media.metadata.authorName?.let { author ->
+            Spacer(modifier = Modifier.height(4.dp))
+            Text(
+                text = "by $author",
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.onSurface,
+                fontWeight = FontWeight.Medium,
+                textAlign = TextAlign.Center,
+            )
+        }
+
+        Spacer(modifier = Modifier.height(8.dp))
+
+        item.media.duration?.let { duration ->
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Text(
+                    text = formatDuration(duration),
+                    style = MaterialTheme.typography.labelMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                )
+
+                if (progress != null && progress.progress > 0) {
+                    Text(
+                        text = " • ",
+                        style = MaterialTheme.typography.labelMedium,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+
+                    Spacer(modifier = Modifier.width(4.dp))
+
+                    CircularProgressIndicator(
+                        progress = { progress.progress.toFloat() },
+                        modifier = Modifier.size(12.dp),
+                        color = Color(0xFFFFC107),
+                        strokeWidth = 2.dp,
+                        trackColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.2f),
+                    )
+
+                    Spacer(modifier = Modifier.width(6.dp))
+
+                    val remainingSeconds = progress.duration - progress.currentTime
+                    Text(
+                        text = "${formatDuration(remainingSeconds)} left",
+                        style = MaterialTheme.typography.labelMedium,
+                        color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.9f),
+                        fontWeight = FontWeight.SemiBold,
+                    )
+                }
+            }
+        }
+
+        val genres = item.media.metadata.genres
+        if (!genres.isNullOrEmpty()) {
+            Spacer(modifier = Modifier.height(8.dp))
+            Row(
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+                modifier = Modifier.align(Alignment.CenterHorizontally),
+            ) {
+                genres.take(2).forEach { genre ->
+                    Surface(
+                        shape = RoundedCornerShape(16.dp),
+                        color = MaterialTheme.colorScheme.surfaceContainerHighest,
+                    ) {
+                        Text(
+                            text = genre,
+                            style = MaterialTheme.typography.labelSmall,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
+                            modifier = Modifier.padding(horizontal = 12.dp, vertical = 4.dp),
+                        )
+                    }
+                }
+            }
+        }
+
+        Spacer(modifier = Modifier.height(24.dp))
+
+        Button(
+            onClick = onPlay,
+            modifier = Modifier.fillMaxWidth().height(56.dp),
+            shape = RoundedCornerShape(28.dp),
+            colors =
+                ButtonDefaults.buttonColors(
+                    containerColor = MaterialTheme.colorScheme.primary,
+                    contentColor = MaterialTheme.colorScheme.onPrimary,
+                ),
+            elevation = ButtonDefaults.buttonElevation(defaultElevation = 2.dp),
+        ) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.Center,
+            ) {
+                Icon(
+                    painter = painterResource(id = R.drawable.ic_player_play_filled),
+                    contentDescription = null,
+                    modifier = Modifier.size(24.dp),
+                )
+                Spacer(modifier = Modifier.width(8.dp))
+                Text(
+                    text =
+                        if (progress != null && progress.progress > 0) "Continue Listening"
+                        else "Play",
+                    style = MaterialTheme.typography.labelLarge,
+                    fontWeight = FontWeight.Bold,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+internal fun ExpandableSynopsis(description: String, modifier: Modifier = Modifier) {
+    var isExpanded by remember { mutableStateOf(false) }
+    var isEllipsized by remember { mutableStateOf(false) }
+
+    val containsHtml =
+        remember(description) {
+            description.contains("<", ignoreCase = true) &&
+                (description.contains("href=", ignoreCase = true) ||
+                    description.contains("<br", ignoreCase = true) ||
+                    description.contains("<p", ignoreCase = true) ||
+                    description.contains("<i>", ignoreCase = true) ||
+                    description.contains("<b>", ignoreCase = true))
+        }
+
+    val linkColor = MaterialTheme.colorScheme.primary
+    val annotatedText =
+        remember(description, linkColor) {
+            if (containsHtml) htmlToAnnotatedString(description, linkColor) else null
+        }
+
+    Column(modifier = modifier.fillMaxWidth()) {
+        Text(
+            text = "Overview",
+            style = MaterialTheme.typography.titleMedium,
+            fontWeight = FontWeight.Bold,
+        )
+        Spacer(modifier = Modifier.height(8.dp))
+
+        val textStyle = MaterialTheme.typography.bodyMedium
+        val textColor = MaterialTheme.colorScheme.onSurfaceVariant
+        val lineHeight = 20.sp
+        val maxLines = if (isExpanded) Int.MAX_VALUE else 4
+        val overflow = if (isExpanded) TextOverflow.Visible else TextOverflow.Ellipsis
+        val animModifier = Modifier.animateContentSize()
+
+        if (containsHtml && annotatedText != null) {
+            Text(
+                text = annotatedText,
+                style = textStyle,
+                color = textColor,
+                lineHeight = lineHeight,
+                maxLines = maxLines,
+                overflow = overflow,
+                modifier = animModifier,
+                onTextLayout = { result ->
+                    if (!isExpanded) isEllipsized = result.hasVisualOverflow
+                },
+            )
+        } else {
+            Text(
+                text = description,
+                style = textStyle,
+                color = textColor,
+                lineHeight = lineHeight,
+                maxLines = maxLines,
+                overflow = overflow,
+                modifier = animModifier,
+                onTextLayout = { result ->
+                    if (!isExpanded) isEllipsized = result.hasVisualOverflow
+                },
+            )
+        }
+
+        if (isEllipsized || isExpanded) {
+            Spacer(modifier = Modifier.height(4.dp))
+            Text(
+                text = if (isExpanded) "Show Less" else "Read more",
+                style = MaterialTheme.typography.labelMedium,
+                color = MaterialTheme.colorScheme.primary,
+                fontWeight = FontWeight.SemiBold,
+                modifier =
+                    Modifier.clickable(
+                            indication = null,
+                            interactionSource = remember { MutableInteractionSource() },
+                        ) {
+                            isExpanded = !isExpanded
+                        }
+                        .padding(vertical = 4.dp),
+            )
+        }
+    }
+}
+
+private fun formatDuration(seconds: Double): String {
+    val totalSeconds = seconds.toLong()
+    val hours = totalSeconds / 3600
+    val minutes = (totalSeconds % 3600) / 60
+    return if (hours > 0) "${hours}h ${minutes}m" else "${minutes}m"
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/components/SeriesCoverGrid.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/components/SeriesCoverGrid.kt
new file mode 100644
index 000000000..b15644020
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/components/SeriesCoverGrid.kt
@@ -0,0 +1,123 @@
+package com.makd.afinity.ui.audiobookshelf.item.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+
+@Composable
+fun SeriesCoverGrid(coverUrls: List<String>, modifier: Modifier = Modifier) {
+    Box(
+        modifier =
+            modifier.aspectRatio(1f).clip(RoundedCornerShape(8.dp)).background(Color.Transparent)
+    ) {
+        when {
+            coverUrls.isEmpty() -> {}
+            coverUrls.size == 1 -> {
+                AsyncImage(
+                    model = coverUrls[0],
+                    contentDescription = null,
+                    modifier = Modifier.fillMaxSize(),
+                    contentScale = ContentScale.Crop,
+                )
+            }
+            coverUrls.size == 2 -> {
+                Row(modifier = Modifier.fillMaxSize()) {
+                    AsyncImage(
+                        model = coverUrls[0],
+                        contentDescription = null,
+                        modifier = Modifier.weight(1f).fillMaxHeight().padding(end = 1.dp),
+                        contentScale = ContentScale.Crop,
+                    )
+                    AsyncImage(
+                        model = coverUrls[1],
+                        contentDescription = null,
+                        modifier = Modifier.weight(1f).fillMaxHeight().padding(start = 1.dp),
+                        contentScale = ContentScale.Crop,
+                    )
+                }
+            }
+            coverUrls.size == 3 -> {
+                Row(modifier = Modifier.fillMaxSize()) {
+                    AsyncImage(
+                        model = coverUrls[0],
+                        contentDescription = null,
+                        modifier = Modifier.weight(1f).fillMaxHeight().padding(end = 1.dp),
+                        contentScale = ContentScale.Crop,
+                    )
+
+                    Column(modifier = Modifier.weight(1f).fillMaxHeight().padding(start = 1.dp)) {
+                        AsyncImage(
+                            model = coverUrls[1],
+                            contentDescription = null,
+                            modifier = Modifier.weight(1f).fillMaxWidth().padding(bottom = 1.dp),
+                            contentScale = ContentScale.Crop,
+                        )
+
+                        AsyncImage(
+                            model = coverUrls[2],
+                            contentDescription = null,
+                            modifier = Modifier.weight(1f).fillMaxWidth().padding(top = 1.dp),
+                            contentScale = ContentScale.Crop,
+                        )
+                    }
+                }
+            }
+            else -> {
+                Column(modifier = Modifier.fillMaxSize()) {
+                    Row(modifier = Modifier.weight(1f).fillMaxWidth()) {
+                        AsyncImage(
+                            model = coverUrls[0],
+                            contentDescription = null,
+                            modifier =
+                                Modifier.weight(1f)
+                                    .fillMaxHeight()
+                                    .padding(end = 1.dp, bottom = 1.dp),
+                            contentScale = ContentScale.Crop,
+                        )
+                        AsyncImage(
+                            model = coverUrls[1],
+                            contentDescription = null,
+                            modifier =
+                                Modifier.weight(1f)
+                                    .fillMaxHeight()
+                                    .padding(start = 1.dp, bottom = 1.dp),
+                            contentScale = ContentScale.Crop,
+                        )
+                    }
+                    Row(modifier = Modifier.weight(1f).fillMaxWidth()) {
+                        AsyncImage(
+                            model = coverUrls[2],
+                            contentDescription = null,
+                            modifier =
+                                Modifier.weight(1f).fillMaxHeight().padding(end = 1.dp, top = 1.dp),
+                            contentScale = ContentScale.Crop,
+                        )
+                        AsyncImage(
+                            model = coverUrls[3],
+                            contentDescription = null,
+                            modifier =
+                                Modifier.weight(1f)
+                                    .fillMaxHeight()
+                                    .padding(start = 1.dp, top = 1.dp),
+                            contentScale = ContentScale.Crop,
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/series/AudiobookshelfSeriesScreen.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/series/AudiobookshelfSeriesScreen.kt
new file mode 100644
index 000000000..c0b689289
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/series/AudiobookshelfSeriesScreen.kt
@@ -0,0 +1,338 @@
+package com.makd.afinity.ui.audiobookshelf.item.series
+
+import android.content.res.Configuration
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.displayCutout
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import coil3.compose.AsyncImage
+import com.makd.afinity.R
+import com.makd.afinity.data.models.audiobookshelf.LibraryItem
+import com.makd.afinity.ui.audiobookshelf.item.components.ItemHeroBackground
+import com.makd.afinity.ui.audiobookshelf.item.components.SeriesCoverGrid
+
+@Composable
+fun AudiobookshelfSeriesScreen(
+    onNavigateToPlayer: (String, String?, Double?) -> Unit,
+    viewModel: AudiobookshelfSeriesViewModel = hiltViewModel(),
+) {
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    val config by viewModel.currentConfig.collectAsStateWithLifecycle()
+    val serverUrl = config?.serverUrl
+
+    val configuration = LocalConfiguration.current
+    val isLandscape = configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+
+    Box(modifier = Modifier.fillMaxSize()) {
+        when {
+            uiState.isLoading -> {
+                CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
+            }
+
+            uiState.books.isNotEmpty() -> {
+                val coverUrls =
+                    if (serverUrl != null) {
+                        uiState.books.take(4).map { "$serverUrl/api/items/${it.id}/cover" }
+                    } else {
+                        emptyList()
+                    }
+
+                if (isLandscape) {
+                    val firstCoverUrl = coverUrls.firstOrNull()
+
+                    ItemHeroBackground(coverUrl = firstCoverUrl)
+
+                    Row(
+                        modifier =
+                            Modifier.fillMaxSize().windowInsetsPadding(WindowInsets.displayCutout)
+                    ) {
+                        Column(
+                            modifier =
+                                Modifier.weight(1f)
+                                    .fillMaxHeight()
+                                    .verticalScroll(rememberScrollState())
+                                    .padding(horizontal = 16.dp)
+                                    .padding(bottom = 24.dp),
+                            horizontalAlignment = Alignment.CenterHorizontally,
+                        ) {
+                            Spacer(modifier = Modifier.statusBarsPadding())
+                            Spacer(modifier = Modifier.height(60.dp))
+
+                            SeriesCoverGrid(
+                                coverUrls = coverUrls,
+                                modifier = Modifier.width(200.dp),
+                            )
+
+                            Spacer(modifier = Modifier.height(16.dp))
+
+                            Text(
+                                text = viewModel.seriesName,
+                                style = MaterialTheme.typography.headlineSmall,
+                                fontWeight = FontWeight.Bold,
+                                textAlign = TextAlign.Center,
+                                maxLines = 2,
+                                overflow = TextOverflow.Ellipsis,
+                            )
+
+                            Spacer(modifier = Modifier.height(4.dp))
+
+                            Text(
+                                text = "${uiState.totalBooks} books",
+                                style = MaterialTheme.typography.bodyMedium,
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                            )
+                        }
+
+                        LazyColumn(
+                            modifier =
+                                Modifier.weight(1f)
+                                    .fillMaxHeight()
+                                    .background(
+                                        MaterialTheme.colorScheme.surface.copy(alpha = 0.5f)
+                                    ),
+                            contentPadding = WindowInsets.navigationBars.asPaddingValues(),
+                            verticalArrangement = Arrangement.spacedBy(12.dp),
+                        ) {
+                            item {
+                                Spacer(modifier = Modifier.statusBarsPadding())
+                                Text(
+                                    text = "Books",
+                                    style = MaterialTheme.typography.titleMedium,
+                                    fontWeight = FontWeight.Bold,
+                                    modifier =
+                                        Modifier.padding(start = 16.dp, top = 16.dp, bottom = 16.dp),
+                                )
+                            }
+
+                            itemsIndexed(uiState.books) { index, book ->
+                                SeriesBookItem(
+                                    book = book,
+                                    bookNumber = index + 1,
+                                    serverUrl = serverUrl,
+                                    onPlay = { onNavigateToPlayer(book.id, null, null) },
+                                )
+                            }
+                        }
+                    }
+                } else {
+                    LazyColumn(
+                        modifier = Modifier.fillMaxSize(),
+                        contentPadding = WindowInsets.navigationBars.asPaddingValues(),
+                        verticalArrangement = Arrangement.spacedBy(12.dp),
+                    ) {
+                        item {
+                            SeriesHeader(
+                                seriesName = viewModel.seriesName,
+                                totalBooks = uiState.totalBooks,
+                                coverUrls = coverUrls,
+                                firstCoverUrl = coverUrls.firstOrNull(),
+                            )
+                        }
+
+                        item {
+                            Text(
+                                text = "Books",
+                                style = MaterialTheme.typography.titleMedium,
+                                fontWeight = FontWeight.Bold,
+                                modifier =
+                                    Modifier.padding(start = 16.dp, top = 24.dp, bottom = 8.dp),
+                            )
+                        }
+
+                        itemsIndexed(uiState.books) { index, book ->
+                            SeriesBookItem(
+                                book = book,
+                                bookNumber = index + 1,
+                                serverUrl = serverUrl,
+                                onPlay = { onNavigateToPlayer(book.id, null, null) },
+                            )
+                        }
+                    }
+                }
+            }
+
+            uiState.error != null -> {
+                Text(
+                    text = "Failed to load series",
+                    modifier = Modifier.align(Alignment.Center),
+                    style = MaterialTheme.typography.bodyLarge,
+                )
+            }
+        }
+
+    }
+}
+
+@Composable
+private fun SeriesHeader(
+    seriesName: String,
+    totalBooks: Int,
+    coverUrls: List<String>,
+    firstCoverUrl: String?,
+) {
+    Box(modifier = Modifier.fillMaxWidth()) {
+        Box(modifier = Modifier.fillMaxWidth().height(400.dp)) {
+            ItemHeroBackground(coverUrl = firstCoverUrl)
+        }
+
+        Column(
+            modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            Spacer(modifier = Modifier.statusBarsPadding())
+            Spacer(modifier = Modifier.height(60.dp))
+
+            SeriesCoverGrid(coverUrls = coverUrls, modifier = Modifier.width(200.dp))
+
+            Spacer(modifier = Modifier.height(16.dp))
+
+            Text(
+                text = seriesName,
+                style = MaterialTheme.typography.headlineSmall,
+                fontWeight = FontWeight.Bold,
+                textAlign = TextAlign.Center,
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+            )
+
+            Spacer(modifier = Modifier.height(4.dp))
+
+            Text(
+                text = "$totalBooks books",
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
+        }
+    }
+}
+
+@Composable
+private fun SeriesBookItem(
+    book: LibraryItem,
+    bookNumber: Int,
+    serverUrl: String?,
+    onPlay: () -> Unit,
+) {
+    val coverUrl = if (serverUrl != null) "$serverUrl/api/items/${book.id}/cover" else null
+
+    val sequence = book.media.metadata.series?.firstOrNull()?.sequence
+    val bookLabel = if (sequence != null) "Book $sequence" else "Book $bookNumber"
+
+    Row(
+        modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 4.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        if (coverUrl != null) {
+            AsyncImage(
+                model = coverUrl,
+                contentDescription = null,
+                modifier = Modifier.size(72.dp).clip(RoundedCornerShape(8.dp)),
+                contentScale = ContentScale.Crop,
+            )
+        } else {
+            Box(
+                modifier =
+                    Modifier.size(72.dp)
+                        .clip(RoundedCornerShape(8.dp))
+                        .background(MaterialTheme.colorScheme.surfaceContainerHighest)
+            )
+        }
+
+        Spacer(modifier = Modifier.width(16.dp))
+
+        Column(modifier = Modifier.weight(1f)) {
+            Text(
+                text = bookLabel.uppercase(),
+                style = MaterialTheme.typography.labelMedium,
+                color = MaterialTheme.colorScheme.primary,
+                fontWeight = FontWeight.Bold,
+            )
+
+            Spacer(modifier = Modifier.height(2.dp))
+
+            Text(
+                text = book.media.metadata.title ?: "Unknown",
+                style = MaterialTheme.typography.titleMedium,
+                fontWeight = FontWeight.SemiBold,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                color = MaterialTheme.colorScheme.onSurface,
+            )
+
+            Spacer(modifier = Modifier.height(2.dp))
+
+            Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) {
+                book.media.metadata.publishedYear?.let { year ->
+                    Text(
+                        text = year,
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                }
+                book.media.duration?.let { duration ->
+                    val prefix = if (book.media.metadata.publishedYear != null) " • " else ""
+                    Text(
+                        text = "$prefix${formatDuration(duration)}",
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                }
+            }
+        }
+
+        IconButton(onClick = onPlay, modifier = Modifier.size(48.dp)) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_player_play_filled),
+                contentDescription = "Play",
+                tint = MaterialTheme.colorScheme.primary,
+                modifier = Modifier.size(32.dp),
+            )
+        }
+    }
+}
+
+private fun formatDuration(seconds: Double): String {
+    val totalSeconds = seconds.toLong()
+    val hours = totalSeconds / 3600
+    val minutes = (totalSeconds % 3600) / 60
+    return if (hours > 0) "${hours}h ${minutes}m" else "${minutes}m"
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/series/AudiobookshelfSeriesViewModel.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/series/AudiobookshelfSeriesViewModel.kt
new file mode 100644
index 000000000..253f6292d
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/item/series/AudiobookshelfSeriesViewModel.kt
@@ -0,0 +1,68 @@
+package com.makd.afinity.ui.audiobookshelf.item.series
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.makd.afinity.data.models.audiobookshelf.LibraryItem
+import com.makd.afinity.data.repository.AudiobookshelfRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+@HiltViewModel
+class AudiobookshelfSeriesViewModel
+@Inject
+constructor(
+    savedStateHandle: SavedStateHandle,
+    private val audiobookshelfRepository: AudiobookshelfRepository,
+) : ViewModel() {
+
+    val seriesId: String = savedStateHandle.get<String>("seriesId") ?: ""
+    val seriesName: String = savedStateHandle.get<String>("seriesName") ?: ""
+    val libraryId: String = savedStateHandle.get<String>("libraryId") ?: ""
+
+    private val _uiState = MutableStateFlow(AudiobookshelfSeriesUiState())
+    val uiState: StateFlow<AudiobookshelfSeriesUiState> = _uiState.asStateFlow()
+
+    val currentConfig = audiobookshelfRepository.currentConfig
+
+    init {
+        loadSeriesItems()
+    }
+
+    private fun loadSeriesItems() {
+        viewModelScope.launch {
+            _uiState.value = _uiState.value.copy(isLoading = true)
+
+            audiobookshelfRepository
+                .getSeriesItems(libraryId, seriesId, limit = 100)
+                .fold(
+                    onSuccess = { result ->
+                        _uiState.value =
+                            _uiState.value.copy(
+                                isLoading = false,
+                                books = result.items,
+                                totalBooks = result.totalBooks,
+                            )
+                        Timber.d("Loaded ${result.totalBooks} books for series: $seriesName")
+                    },
+                    onFailure = { error ->
+                        _uiState.value =
+                            _uiState.value.copy(isLoading = false, error = error.message)
+                        Timber.e(error, "Failed to load series items")
+                    },
+                )
+        }
+    }
+}
+
+data class AudiobookshelfSeriesUiState(
+    val isLoading: Boolean = false,
+    val books: List<LibraryItem> = emptyList(),
+    val totalBooks: Int = 0,
+    val error: String? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/libraries/AudiobookshelfHomeTab.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/libraries/AudiobookshelfHomeTab.kt
new file mode 100644
index 000000000..93f9a204b
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/libraries/AudiobookshelfHomeTab.kt
@@ -0,0 +1,101 @@
+package com.makd.afinity.ui.audiobookshelf.libraries
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import com.makd.afinity.data.models.audiobookshelf.LibraryItem
+import com.makd.afinity.ui.audiobookshelf.library.components.AudiobookCard
+import com.makd.afinity.ui.theme.CardDimensions
+import com.makd.afinity.ui.theme.CardDimensions.portraitWidth
+
+@Composable
+fun AudiobookshelfHomeTab(
+    sections: List<PersonalizedSection>,
+    serverUrl: String?,
+    onItemClick: (LibraryItem) -> Unit,
+    isLoading: Boolean,
+    widthSizeClass: WindowWidthSizeClass,
+) {
+    when {
+        isLoading -> {
+            Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                CircularProgressIndicator()
+            }
+        }
+
+        sections.isEmpty() -> {
+            Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                Text(
+                    text = "No personalized content available",
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                )
+            }
+        }
+
+        else -> {
+            val cardWidth = widthSizeClass.portraitWidth
+            val cardHeight = CardDimensions.calculateHeight(cardWidth, 1f)
+            val fixedRowHeight = cardHeight + 8.dp + 20.dp + 18.dp
+
+            LazyColumn(modifier = Modifier.fillMaxSize()) {
+                sections.forEach { section ->
+                    item(key = section.id) {
+                        Column {
+                            Spacer(modifier = Modifier.height(24.dp))
+                            Column(modifier = Modifier.padding(horizontal = 14.dp)) {
+                                Text(
+                                    text = section.label,
+                                    style =
+                                        MaterialTheme.typography.headlineSmall.copy(
+                                            fontWeight = FontWeight.Bold
+                                        ),
+                                    color = MaterialTheme.colorScheme.onBackground,
+                                    modifier = Modifier.padding(bottom = 16.dp),
+                                )
+
+                                val uniqueItems = section.items.distinctBy { it.id }
+
+                                LazyRow(
+                                    modifier = Modifier.height(fixedRowHeight),
+                                    horizontalArrangement = Arrangement.spacedBy(12.dp),
+                                    contentPadding = PaddingValues(horizontal = 0.dp),
+                                ) {
+                                    items(
+                                        items = uniqueItems,
+                                        key = { item -> "${section.id}_${item.id}" },
+                                    ) { item ->
+                                        AudiobookCard(
+                                            item = item,
+                                            serverUrl = serverUrl,
+                                            onClick = { onItemClick(item) },
+                                            modifier = Modifier.width(cardWidth),
+                                        )
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/libraries/AudiobookshelfLibrariesScreen.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/libraries/AudiobookshelfLibrariesScreen.kt
new file mode 100644
index 000000000..388e806c1
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/libraries/AudiobookshelfLibrariesScreen.kt
@@ -0,0 +1,352 @@
+package com.makd.afinity.ui.audiobookshelf.libraries
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FilterChip
+import androidx.compose.material3.FilterChipDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
+import com.makd.afinity.R
+import com.makd.afinity.navigation.Destination
+import com.makd.afinity.ui.audiobookshelf.library.components.AudiobookCard
+import com.makd.afinity.ui.components.AfinityTopAppBar
+import com.makd.afinity.ui.main.MainUiState
+import com.makd.afinity.ui.settings.AudiobookshelfBottomSheet
+import kotlinx.coroutines.launch
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AudiobookshelfLibrariesScreen(
+    onNavigateToItem: (String) -> Unit,
+    navController: NavController,
+    mainUiState: MainUiState,
+    widthSizeClass: WindowWidthSizeClass,
+    viewModel: AudiobookshelfLibrariesViewModel = hiltViewModel(),
+) {
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    val libraries by viewModel.libraries.collectAsStateWithLifecycle()
+    val isAuthenticated by viewModel.isAuthenticated.collectAsStateWithLifecycle()
+    val personalizedSections by viewModel.personalizedSections.collectAsStateWithLifecycle()
+    val libraryItems by viewModel.libraryItems.collectAsStateWithLifecycle()
+    val allSeries by viewModel.allSeries.collectAsStateWithLifecycle()
+    val config by viewModel.currentConfig.collectAsStateWithLifecycle()
+
+    if (!isAuthenticated) {
+        var showLoginSheet by remember { mutableStateOf(true) }
+        val loginSheetState = rememberModalBottomSheetState()
+
+        if (showLoginSheet) {
+            AudiobookshelfBottomSheet(
+                onDismiss = { showLoginSheet = false },
+                sheetState = loginSheetState,
+            )
+        }
+
+        Scaffold(
+            topBar = {
+                AfinityTopAppBar(
+                    title = {
+                        Text(
+                            text = "Audiobooks",
+                            style =
+                                MaterialTheme.typography.headlineLarge.copy(
+                                    fontWeight = FontWeight.Bold
+                                ),
+                            color = MaterialTheme.colorScheme.onBackground,
+                        )
+                    },
+                    onSearchClick = { navController.navigate(Destination.createSearchRoute()) },
+                    onProfileClick = { navController.navigate(Destination.createSettingsRoute()) },
+                    userProfileImageUrl = mainUiState.userProfileImageUrl,
+                )
+            }
+        ) { paddingValues ->
+            Box(
+                modifier = Modifier.fillMaxSize().padding(paddingValues),
+                contentAlignment = Alignment.Center,
+            ) {
+                Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                    Text(
+                        text = "Connect to Audiobookshelf",
+                        style = MaterialTheme.typography.titleMedium,
+                    )
+                    Spacer(modifier = Modifier.size(12.dp))
+                    Button(onClick = { showLoginSheet = true }) { Text("Connect") }
+                }
+            }
+        }
+        return
+    }
+
+    val tabCount = 2 + libraries.size
+    val pagerState = rememberPagerState(pageCount = { tabCount })
+    val coroutineScope = rememberCoroutineScope()
+
+    LaunchedEffect(pagerState.currentPage) {
+        if (pagerState.currentPage >= 2) {
+            val libraryIndex = pagerState.currentPage - 2
+            if (libraryIndex < libraries.size) {
+                viewModel.loadLibraryItems(libraries[libraryIndex].id)
+            }
+        }
+    }
+
+    Scaffold(
+        topBar = {
+            AfinityTopAppBar(
+                title = {
+                    Text(
+                        text = "Audiobooks",
+                        style =
+                            MaterialTheme.typography.headlineLarge.copy(
+                                fontWeight = FontWeight.Bold
+                            ),
+                        color = MaterialTheme.colorScheme.onBackground,
+                    )
+                },
+                onSearchClick = { navController.navigate(Destination.createSearchRoute()) },
+                onProfileClick = { navController.navigate(Destination.createSettingsRoute()) },
+                userProfileImageUrl = mainUiState.userProfileImageUrl,
+            )
+        }
+    ) { paddingValues ->
+        Box(modifier = Modifier.fillMaxSize().padding(paddingValues)) {
+            if (libraries.isEmpty() && !uiState.isRefreshing) {
+                Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                    if (uiState.isRefreshing) {
+                        CircularProgressIndicator()
+                    } else {
+                        Text(
+                            text = "No libraries found",
+                            style = MaterialTheme.typography.titleMedium,
+                        )
+                    }
+                }
+            } else {
+                Column(modifier = Modifier.fillMaxSize()) {
+                    LazyRow(
+                        modifier = Modifier.fillMaxWidth().padding(bottom = 12.dp),
+                        contentPadding = PaddingValues(horizontal = 16.dp),
+                        horizontalArrangement = Arrangement.spacedBy(8.dp),
+                    ) {
+                        item {
+                            NavigationChip(
+                                selected = pagerState.currentPage == 0,
+                                label = "Home",
+                                iconResId = R.drawable.ic_book_series,
+                                onClick = {
+                                    coroutineScope.launch { pagerState.animateScrollToPage(0) }
+                                },
+                            )
+                        }
+                        item {
+                            NavigationChip(
+                                selected = pagerState.currentPage == 1,
+                                label = "Series",
+                                iconResId = R.drawable.ic_collection,
+                                onClick = {
+                                    coroutineScope.launch { pagerState.animateScrollToPage(1) }
+                                },
+                            )
+                        }
+                        itemsIndexed(libraries) { index, library ->
+                            val iconRes =
+                                when (library.mediaType.lowercase()) {
+                                    "podcast" -> R.drawable.ic_apple_podcast
+                                    "book" -> R.drawable.ic_book_audio
+                                    else -> R.drawable.ic_book
+                                }
+
+                            NavigationChip(
+                                selected = pagerState.currentPage == index + 2,
+                                label = library.name,
+                                iconResId = iconRes,
+                                onClick = {
+                                    coroutineScope.launch {
+                                        pagerState.animateScrollToPage(index + 2)
+                                    }
+                                },
+                            )
+                        }
+                    }
+
+                    HorizontalPager(state = pagerState, modifier = Modifier.fillMaxSize()) { page ->
+                        when (page) {
+                            0 -> {
+                                AudiobookshelfHomeTab(
+                                    sections = personalizedSections,
+                                    serverUrl = config?.serverUrl,
+                                    onItemClick = { item -> onNavigateToItem(item.id) },
+                                    isLoading = uiState.isLoadingPersonalized,
+                                    widthSizeClass = widthSizeClass,
+                                )
+                            }
+
+                            1 -> {
+                                AudiobookshelfSeriesTab(
+                                    seriesList = allSeries,
+                                    serverUrl = config?.serverUrl,
+                                    onItemClick = { item -> onNavigateToItem(item.id) },
+                                    isLoading = uiState.isLoadingSeries,
+                                    widthSizeClass = widthSizeClass,
+                                )
+                            }
+
+                            else -> {
+                                val libraryIndex = page - 2
+                                if (libraryIndex < libraries.size) {
+                                    val library = libraries[libraryIndex]
+                                    val items = libraryItems[library.id]
+
+                                    if (items == null) {
+                                        Box(
+                                            modifier = Modifier.fillMaxSize(),
+                                            contentAlignment = Alignment.Center,
+                                        ) {
+                                            CircularProgressIndicator()
+                                        }
+                                    } else if (items.isEmpty()) {
+                                        Box(
+                                            modifier = Modifier.fillMaxSize(),
+                                            contentAlignment = Alignment.Center,
+                                        ) {
+                                            Text(
+                                                text = "No items in library",
+                                                style = MaterialTheme.typography.bodyMedium,
+                                                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                                            )
+                                        }
+                                    } else {
+                                        LazyVerticalGrid(
+                                            columns = GridCells.Adaptive(minSize = 140.dp),
+                                            modifier = Modifier.fillMaxSize(),
+                                            contentPadding = PaddingValues(16.dp),
+                                            horizontalArrangement = Arrangement.spacedBy(12.dp),
+                                            verticalArrangement = Arrangement.spacedBy(12.dp),
+                                        ) {
+                                            items(items, key = { it.id }) { item ->
+                                                AudiobookCard(
+                                                    item = item,
+                                                    serverUrl = config?.serverUrl,
+                                                    onClick = { onNavigateToItem(item.id) },
+                                                )
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            AnimatedVisibility(
+                visible = uiState.error != null,
+                enter = fadeIn(),
+                exit = fadeOut(),
+                modifier = Modifier.align(Alignment.BottomCenter),
+            ) {
+                Card(
+                    modifier = Modifier.fillMaxWidth().padding(16.dp),
+                    colors =
+                        CardDefaults.cardColors(
+                            containerColor = MaterialTheme.colorScheme.errorContainer
+                        ),
+                ) {
+                    Text(
+                        text = uiState.error ?: "",
+                        modifier = Modifier.padding(16.dp),
+                        color = MaterialTheme.colorScheme.onErrorContainer,
+                    )
+                }
+            }
+        }
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun NavigationChip(selected: Boolean, label: String, iconResId: Int, onClick: () -> Unit) {
+    FilterChip(
+        selected = selected,
+        onClick = onClick,
+        label = {
+            Text(
+                text = label,
+                style =
+                    MaterialTheme.typography.labelLarge.copy(
+                        fontWeight = if (selected) FontWeight.Bold else FontWeight.Medium
+                    ),
+            )
+        },
+        leadingIcon = {
+            Icon(
+                painter = painterResource(id = iconResId),
+                contentDescription = null,
+                modifier = Modifier.size(18.dp),
+            )
+        },
+        shape = CircleShape,
+        border =
+            FilterChipDefaults.filterChipBorder(
+                enabled = true,
+                selected = selected,
+                borderColor =
+                    if (selected) Color.Transparent
+                    else MaterialTheme.colorScheme.outline.copy(alpha = 0.3f),
+                selectedBorderColor = Color.Transparent,
+            ),
+        colors =
+            FilterChipDefaults.filterChipColors(
+                containerColor = Color.Transparent,
+                labelColor = MaterialTheme.colorScheme.onSurfaceVariant,
+                iconColor = MaterialTheme.colorScheme.onSurfaceVariant,
+                selectedContainerColor = MaterialTheme.colorScheme.secondaryContainer,
+                selectedLabelColor = MaterialTheme.colorScheme.onSecondaryContainer,
+                selectedLeadingIconColor = MaterialTheme.colorScheme.onSecondaryContainer,
+            ),
+    )
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/libraries/AudiobookshelfLibrariesViewModel.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/libraries/AudiobookshelfLibrariesViewModel.kt
new file mode 100644
index 000000000..050d1973e
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/libraries/AudiobookshelfLibrariesViewModel.kt
@@ -0,0 +1,270 @@
+package com.makd.afinity.ui.audiobookshelf.libraries
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.makd.afinity.data.models.audiobookshelf.AudiobookshelfSeries
+import com.makd.afinity.data.models.audiobookshelf.Library
+import com.makd.afinity.data.models.audiobookshelf.LibraryItem
+import com.makd.afinity.data.repository.AudiobookshelfConfig
+import com.makd.afinity.data.repository.AudiobookshelfRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+import kotlinx.serialization.json.Json
+import timber.log.Timber
+import javax.inject.Inject
+
+data class PersonalizedSection(val id: String, val label: String, val items: List<LibraryItem>)
+
+@HiltViewModel
+class AudiobookshelfLibrariesViewModel
+@Inject
+constructor(private val audiobookshelfRepository: AudiobookshelfRepository) : ViewModel() {
+
+    private val json = Json { ignoreUnknownKeys = true }
+
+    private val _uiState = MutableStateFlow(AudiobookshelfLibrariesUiState())
+    val uiState: StateFlow<AudiobookshelfLibrariesUiState> = _uiState.asStateFlow()
+
+    val libraries: StateFlow<List<Library>> =
+        audiobookshelfRepository
+            .getLibrariesFlow()
+            .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList())
+
+    val currentConfig: StateFlow<AudiobookshelfConfig?> = audiobookshelfRepository.currentConfig
+
+    val isAuthenticated = audiobookshelfRepository.isAuthenticated
+
+    private val _personalizedSections = MutableStateFlow<List<PersonalizedSection>>(emptyList())
+    private val _genreSections = MutableStateFlow<List<PersonalizedSection>>(emptyList())
+    val personalizedSections: StateFlow<List<PersonalizedSection>> =
+        combine(_personalizedSections, _genreSections) { personalized, genres ->
+                personalized + genres
+            }
+            .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList())
+
+    private val _libraryItems = MutableStateFlow<Map<String, List<LibraryItem>>>(emptyMap())
+    val libraryItems: StateFlow<Map<String, List<LibraryItem>>> = _libraryItems.asStateFlow()
+
+    private val _allSeries = MutableStateFlow<List<AudiobookshelfSeries>>(emptyList())
+    val allSeries: StateFlow<List<AudiobookshelfSeries>> = _allSeries.asStateFlow()
+
+    init {
+        refreshLibraries()
+    }
+
+    fun refreshLibraries() {
+        viewModelScope.launch {
+            _uiState.value = _uiState.value.copy(isRefreshing = true, error = null)
+
+            val result = audiobookshelfRepository.refreshLibraries()
+
+            result.fold(
+                onSuccess = { libraries ->
+                    _uiState.value = _uiState.value.copy(isRefreshing = false)
+                    Timber.d("Refreshed ${libraries.size} libraries")
+
+                    audiobookshelfRepository.refreshProgress()
+                    loadPersonalizedData(libraries)
+                    loadAllSeries(libraries)
+                    loadGenreSections(libraries)
+                },
+                onFailure = { error ->
+                    _uiState.value =
+                        _uiState.value.copy(isRefreshing = false, error = error.message)
+                    Timber.e(error, "Failed to refresh libraries")
+                },
+            )
+        }
+    }
+
+    private fun loadPersonalizedData(libraryList: List<Library>) {
+        viewModelScope.launch {
+            _uiState.value = _uiState.value.copy(isLoadingPersonalized = true)
+
+            val allSections = mutableMapOf<String, PersonalizedSection>()
+
+            for (library in libraryList) {
+                try {
+                    val result = audiobookshelfRepository.getPersonalized(library.id)
+                    result.fold(
+                        onSuccess = { views ->
+                            for (view in views) {
+                                if (view.type == "authors") continue
+
+                                val items =
+                                    view.entities.mapNotNull { element ->
+                                        try {
+                                            json.decodeFromJsonElement(
+                                                LibraryItem.serializer(),
+                                                element,
+                                            )
+                                        } catch (e: Exception) {
+                                            Timber.d(
+                                                "Skipping non-LibraryItem entity in section ${view.id}"
+                                            )
+                                            null
+                                        }
+                                    }
+
+                                if (items.isEmpty()) continue
+
+                                val existing = allSections[view.id]
+                                if (existing != null) {
+                                    val mergedItems = (existing.items + items).distinctBy { it.id }
+                                    allSections[view.id] = existing.copy(items = mergedItems)
+                                } else {
+                                    allSections[view.id] =
+                                        PersonalizedSection(
+                                            id = view.id,
+                                            label = view.label,
+                                            items = items,
+                                        )
+                                }
+                            }
+                        },
+                        onFailure = { error ->
+                            Timber.e(
+                                error,
+                                "Failed to load personalized data for library ${library.id}",
+                            )
+                        },
+                    )
+                } catch (e: Exception) {
+                    Timber.e(e, "Error loading personalized data for library ${library.id}")
+                }
+            }
+
+            _personalizedSections.value = allSections.values.toList()
+            _uiState.value = _uiState.value.copy(isLoadingPersonalized = false)
+        }
+    }
+
+    private fun loadAllSeries(libraryList: List<Library>) {
+        viewModelScope.launch {
+            _uiState.value = _uiState.value.copy(isLoadingSeries = true)
+
+            val allSeriesMap = mutableMapOf<String, AudiobookshelfSeries>()
+
+            for (library in libraryList) {
+                try {
+                    val result = audiobookshelfRepository.getSeries(library.id)
+                    result.fold(
+                        onSuccess = { seriesList ->
+                            for (series in seriesList) {
+                                val existing = allSeriesMap[series.id]
+                                if (existing != null) {
+                                    val mergedBooks =
+                                        (existing.books + series.books).distinctBy { it.id }
+                                    allSeriesMap[series.id] = existing.copy(books = mergedBooks)
+                                } else {
+                                    allSeriesMap[series.id] = series
+                                }
+                            }
+                        },
+                        onFailure = { error ->
+                            Timber.e(error, "Failed to load series for library ${library.id}")
+                        },
+                    )
+                } catch (e: Exception) {
+                    Timber.e(e, "Error loading series for library ${library.id}")
+                }
+            }
+
+            _allSeries.value = allSeriesMap.values.sortedBy { it.nameIgnorePrefix ?: it.name }
+            _uiState.value = _uiState.value.copy(isLoadingSeries = false)
+        }
+    }
+
+    private fun loadGenreSections(libraryList: List<Library>) {
+        viewModelScope.launch {
+            _uiState.value = _uiState.value.copy(isLoadingGenres = true)
+
+            try {
+                val genresResult = audiobookshelfRepository.getGenres()
+                val allGenres = genresResult.getOrNull() ?: emptyList()
+
+                if (allGenres.isEmpty()) {
+                    _uiState.value = _uiState.value.copy(isLoadingGenres = false)
+                    return@launch
+                }
+
+                val selectedGenres = allGenres.shuffled().take(15)
+                val sections = mutableListOf<PersonalizedSection>()
+
+                for (genre in selectedGenres) {
+                    try {
+                        val items =
+                            coroutineScope {
+                                    libraryList
+                                        .map { library ->
+                                            async {
+                                                audiobookshelfRepository
+                                                    .getGenreItemsLimited(library.id, genre, 15)
+                                                    .getOrNull() ?: emptyList()
+                                            }
+                                        }
+                                        .awaitAll()
+                                }
+                                .flatten()
+                                .distinctBy { it.id }
+                                .shuffled()
+                                .take(15)
+
+                        if (items.isNotEmpty()) {
+                            sections.add(
+                                PersonalizedSection(
+                                    id = "genre_$genre",
+                                    label = genre,
+                                    items = items,
+                                )
+                            )
+                        }
+                    } catch (e: Exception) {
+                        Timber.e(e, "Failed to load items for genre '$genre'")
+                    }
+                }
+
+                _genreSections.value = sections
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to load genre sections")
+            }
+
+            _uiState.value = _uiState.value.copy(isLoadingGenres = false)
+        }
+    }
+
+    fun loadLibraryItems(libraryId: String) {
+        if (_libraryItems.value.containsKey(libraryId)) return
+
+        viewModelScope.launch {
+            val result = audiobookshelfRepository.refreshLibraryItems(libraryId)
+            result.fold(
+                onSuccess = { items -> _libraryItems.value += (libraryId to items) },
+                onFailure = { error ->
+                    Timber.e(error, "Failed to load items for library $libraryId")
+                },
+            )
+        }
+    }
+
+    fun clearError() {
+        _uiState.value = _uiState.value.copy(error = null)
+    }
+}
+
+data class AudiobookshelfLibrariesUiState(
+    val isRefreshing: Boolean = false,
+    val isLoadingPersonalized: Boolean = false,
+    val isLoadingSeries: Boolean = false,
+    val isLoadingGenres: Boolean = false,
+    val error: String? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/libraries/AudiobookshelfSeriesTab.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/libraries/AudiobookshelfSeriesTab.kt
new file mode 100644
index 000000000..99dd04647
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/libraries/AudiobookshelfSeriesTab.kt
@@ -0,0 +1,104 @@
+package com.makd.afinity.ui.audiobookshelf.libraries
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import com.makd.afinity.data.models.audiobookshelf.AudiobookshelfSeries
+import com.makd.afinity.data.models.audiobookshelf.LibraryItem
+import com.makd.afinity.ui.audiobookshelf.library.components.AudiobookCard
+import com.makd.afinity.ui.theme.CardDimensions
+import com.makd.afinity.ui.theme.CardDimensions.portraitWidth
+
+@Composable
+fun AudiobookshelfSeriesTab(
+    seriesList: List<AudiobookshelfSeries>,
+    serverUrl: String?,
+    onItemClick: (LibraryItem) -> Unit,
+    isLoading: Boolean,
+    widthSizeClass: WindowWidthSizeClass,
+) {
+    when {
+        isLoading -> {
+            Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                CircularProgressIndicator()
+            }
+        }
+
+        seriesList.isEmpty() -> {
+            Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                Text(
+                    text = "No series found",
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                )
+            }
+        }
+
+        else -> {
+            val cardWidth = widthSizeClass.portraitWidth
+            val cardHeight = CardDimensions.calculateHeight(cardWidth, 1f)
+            val fixedRowHeight = cardHeight + 8.dp + 20.dp + 18.dp
+
+            LazyColumn(modifier = Modifier.fillMaxSize()) {
+                seriesList.forEach { series ->
+                    if (series.books.isNotEmpty()) {
+                        item(key = series.id) {
+                            Column {
+                                Spacer(modifier = Modifier.height(24.dp))
+                                Column(modifier = Modifier.padding(horizontal = 14.dp)) {
+                                    Text(
+                                        text = series.name,
+                                        style =
+                                            MaterialTheme.typography.headlineSmall.copy(
+                                                fontWeight = FontWeight.Bold
+                                            ),
+                                        color = MaterialTheme.colorScheme.onBackground,
+                                        modifier = Modifier.padding(bottom = 16.dp),
+                                    )
+
+                                    val uniqueBooks = series.books.distinctBy { it.id }
+
+                                    LazyRow(
+                                        modifier = Modifier.height(fixedRowHeight),
+                                        horizontalArrangement = Arrangement.spacedBy(12.dp),
+                                        contentPadding = PaddingValues(horizontal = 0.dp),
+                                    ) {
+                                        items(
+                                            items = uniqueBooks,
+                                            key = { item -> "${series.id}_${item.id}" },
+                                        ) { item ->
+                                            AudiobookCard(
+                                                item = item,
+                                                serverUrl = serverUrl,
+                                                onClick = { onItemClick(item) },
+                                                modifier = Modifier.width(cardWidth),
+                                            )
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/libraries/components/LibraryCard.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/libraries/components/LibraryCard.kt
new file mode 100644
index 000000000..ff8b879a0
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/libraries/components/LibraryCard.kt
@@ -0,0 +1,78 @@
+package com.makd.afinity.ui.audiobookshelf.libraries.components
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import com.makd.afinity.R
+import com.makd.afinity.data.models.audiobookshelf.Library
+
+@Composable
+fun LibraryCard(library: Library, onClick: () -> Unit, modifier: Modifier = Modifier) {
+    Card(
+        modifier = modifier.fillMaxWidth().clickable(onClick = onClick),
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(16.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Icon(
+                painter =
+                    when (library.mediaType.lowercase()) {
+                        "podcast" -> painterResource(id = R.drawable.ic_apple_podcast)
+                        else -> painterResource(id = R.drawable.ic_book)
+                    },
+                contentDescription = null,
+                modifier = Modifier.size(40.dp),
+                tint = MaterialTheme.colorScheme.primary,
+            )
+
+            Spacer(modifier = Modifier.width(16.dp))
+
+            Column(modifier = Modifier.weight(1f)) {
+                Text(text = library.name, style = MaterialTheme.typography.titleMedium)
+
+                Text(
+                    text =
+                        when (library.mediaType.lowercase()) {
+                            "podcast" -> "Podcasts"
+                            else -> "Audiobooks"
+                        },
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                )
+
+                library.stats?.let { stats ->
+                    stats.totalItems?.let { count ->
+                        Text(
+                            text = "$count items",
+                            style = MaterialTheme.typography.bodySmall,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        )
+                    }
+                }
+            }
+
+            Icon(
+                painter = painterResource(id = R.drawable.ic_chevron_right),
+                contentDescription = "Open library",
+                tint = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/library/AudiobookshelfLibraryScreen.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/library/AudiobookshelfLibraryScreen.kt
new file mode 100644
index 000000000..eb5d418ba
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/library/AudiobookshelfLibraryScreen.kt
@@ -0,0 +1,182 @@
+package com.makd.afinity.ui.audiobookshelf.library
+
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.makd.afinity.R
+import com.makd.afinity.ui.audiobookshelf.library.components.AudiobookCard
+import com.makd.afinity.ui.audiobookshelf.library.components.PodcastCard
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AudiobookshelfLibraryScreen(
+    onNavigateBack: () -> Unit,
+    onNavigateToItem: (String) -> Unit,
+    viewModel: AudiobookshelfLibraryViewModel = hiltViewModel(),
+) {
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    val library by viewModel.library.collectAsStateWithLifecycle()
+    val items by viewModel.items.collectAsStateWithLifecycle()
+    val config by viewModel.currentConfig.collectAsStateWithLifecycle()
+
+    val displayItems = uiState.searchResults ?: items
+    val isPodcastLibrary = library?.mediaType?.lowercase() == "podcast"
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = { Text(library?.name ?: "Library") },
+                navigationIcon = {
+                    IconButton(onClick = onNavigateBack) {
+                        Icon(
+                            painterResource(id = R.drawable.ic_chevron_left),
+                            contentDescription = "Back",
+                        )
+                    }
+                },
+            )
+        }
+    ) { paddingValues ->
+        Column(modifier = Modifier.fillMaxSize().padding(paddingValues)) {
+            OutlinedTextField(
+                value = uiState.searchQuery,
+                onValueChange = viewModel::search,
+                modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp),
+                placeholder = { Text("Search...") },
+                leadingIcon = {
+                    Icon(painterResource(id = R.drawable.ic_search), contentDescription = null)
+                },
+                trailingIcon = {
+                    if (uiState.searchQuery.isNotEmpty()) {
+                        IconButton(onClick = viewModel::clearSearch) {
+                            Icon(
+                                painterResource(id = R.drawable.ic_clear),
+                                contentDescription = "Clear search",
+                            )
+                        }
+                    } else if (uiState.isSearching) {
+                        CircularProgressIndicator(
+                            modifier = Modifier.padding(8.dp),
+                            strokeWidth = 2.dp,
+                        )
+                    }
+                },
+                singleLine = true,
+            )
+
+            PullToRefreshBox(
+                isRefreshing = uiState.isRefreshing,
+                onRefresh = viewModel::refreshItems,
+                modifier = Modifier.fillMaxSize(),
+            ) {
+                if (displayItems.isEmpty() && !uiState.isRefreshing) {
+                    EmptyState(isSearching = uiState.searchQuery.isNotEmpty())
+                } else {
+                    if (isPodcastLibrary) {
+                        LazyColumn(
+                            modifier = Modifier.fillMaxSize(),
+                            contentPadding = PaddingValues(16.dp),
+                            verticalArrangement = Arrangement.spacedBy(8.dp),
+                        ) {
+                            items(displayItems, key = { it.id }) { item ->
+                                PodcastCard(
+                                    item = item,
+                                    serverUrl = config?.serverUrl,
+                                    onClick = { onNavigateToItem(item.id) },
+                                )
+                            }
+                        }
+                    } else {
+                        LazyVerticalGrid(
+                            columns = GridCells.Adaptive(minSize = 140.dp),
+                            modifier = Modifier.fillMaxSize(),
+                            contentPadding = PaddingValues(16.dp),
+                            horizontalArrangement = Arrangement.spacedBy(12.dp),
+                            verticalArrangement = Arrangement.spacedBy(12.dp),
+                        ) {
+                            items(displayItems, key = { it.id }) { item ->
+                                AudiobookCard(
+                                    item = item,
+                                    serverUrl = config?.serverUrl,
+                                    onClick = { onNavigateToItem(item.id) },
+                                )
+                            }
+                        }
+                    }
+                }
+
+                androidx.compose.animation.AnimatedVisibility(
+                    visible = uiState.error != null,
+                    enter = fadeIn(),
+                    exit = fadeOut(),
+                    modifier = Modifier.align(Alignment.BottomCenter),
+                ) {
+                    Card(
+                        modifier = Modifier.fillMaxWidth().padding(16.dp),
+                        colors =
+                            CardDefaults.cardColors(
+                                containerColor = MaterialTheme.colorScheme.errorContainer
+                            ),
+                    ) {
+                        Text(
+                            text = uiState.error ?: "",
+                            modifier = Modifier.padding(16.dp),
+                            color = MaterialTheme.colorScheme.onErrorContainer,
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun EmptyState(isSearching: Boolean) {
+    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+        Column(horizontalAlignment = Alignment.CenterHorizontally) {
+            Text(
+                text = if (isSearching) "No results found" else "No items in library",
+                style = MaterialTheme.typography.titleMedium,
+            )
+            Spacer(modifier = Modifier.height(8.dp))
+            Text(
+                text = if (isSearching) "Try a different search term" else "Pull to refresh",
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/library/AudiobookshelfLibraryViewModel.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/library/AudiobookshelfLibraryViewModel.kt
new file mode 100644
index 000000000..6c46af6a6
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/library/AudiobookshelfLibraryViewModel.kt
@@ -0,0 +1,122 @@
+package com.makd.afinity.ui.audiobookshelf.library
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.makd.afinity.data.models.audiobookshelf.Library
+import com.makd.afinity.data.models.audiobookshelf.LibraryItem
+import com.makd.afinity.data.repository.AudiobookshelfConfig
+import com.makd.afinity.data.repository.AudiobookshelfRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+@HiltViewModel
+class AudiobookshelfLibraryViewModel
+@Inject
+constructor(
+    savedStateHandle: SavedStateHandle,
+    private val audiobookshelfRepository: AudiobookshelfRepository,
+) : ViewModel() {
+
+    private val libraryId: String = savedStateHandle.get<String>("libraryId") ?: ""
+
+    private val _uiState = MutableStateFlow(AudiobookshelfLibraryUiState())
+    val uiState: StateFlow<AudiobookshelfLibraryUiState> = _uiState.asStateFlow()
+
+    private val _library = MutableStateFlow<Library?>(null)
+    val library: StateFlow<Library?> = _library.asStateFlow()
+
+    val items: StateFlow<List<LibraryItem>> =
+        audiobookshelfRepository
+            .getLibraryItemsFlow(libraryId)
+            .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList())
+
+    val currentConfig: StateFlow<AudiobookshelfConfig?> = audiobookshelfRepository.currentConfig
+
+    init {
+        loadLibrary()
+        refreshItems()
+    }
+
+    private fun loadLibrary() {
+        viewModelScope.launch {
+            val result = audiobookshelfRepository.getLibrary(libraryId)
+            result.fold(
+                onSuccess = { library -> _library.value = library },
+                onFailure = { error -> Timber.e(error, "Failed to load library") },
+            )
+        }
+    }
+
+    fun refreshItems() {
+        viewModelScope.launch {
+            _uiState.value = _uiState.value.copy(isRefreshing = true, error = null)
+
+            val result = audiobookshelfRepository.refreshLibraryItems(libraryId)
+
+            result.fold(
+                onSuccess = { items ->
+                    _uiState.value =
+                        _uiState.value.copy(isRefreshing = false, totalItems = items.size)
+                    Timber.d("Refreshed ${items.size} items for library $libraryId")
+                },
+                onFailure = { error ->
+                    _uiState.value =
+                        _uiState.value.copy(isRefreshing = false, error = error.message)
+                    Timber.e(error, "Failed to refresh items")
+                },
+            )
+        }
+    }
+
+    fun search(query: String) {
+        if (query.isBlank()) {
+            _uiState.value = _uiState.value.copy(searchQuery = "", searchResults = null)
+            return
+        }
+
+        viewModelScope.launch {
+            _uiState.value = _uiState.value.copy(searchQuery = query, isSearching = true)
+
+            val result = audiobookshelfRepository.searchLibrary(libraryId, query)
+
+            result.fold(
+                onSuccess = { searchResponse ->
+                    val searchItems =
+                        (searchResponse.book?.map { it.libraryItem } ?: emptyList()) +
+                            (searchResponse.podcast?.map { it.libraryItem } ?: emptyList())
+
+                    _uiState.value =
+                        _uiState.value.copy(isSearching = false, searchResults = searchItems)
+                },
+                onFailure = { error ->
+                    _uiState.value = _uiState.value.copy(isSearching = false, error = error.message)
+                },
+            )
+        }
+    }
+
+    fun clearSearch() {
+        _uiState.value = _uiState.value.copy(searchQuery = "", searchResults = null)
+    }
+
+    fun clearError() {
+        _uiState.value = _uiState.value.copy(error = null)
+    }
+}
+
+data class AudiobookshelfLibraryUiState(
+    val isRefreshing: Boolean = false,
+    val isSearching: Boolean = false,
+    val searchQuery: String = "",
+    val searchResults: List<LibraryItem>? = null,
+    val totalItems: Int = 0,
+    val error: String? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/library/components/AudiobookCard.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/library/components/AudiobookCard.kt
new file mode 100644
index 000000000..50c15f4d3
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/library/components/AudiobookCard.kt
@@ -0,0 +1,87 @@
+package com.makd.afinity.ui.audiobookshelf.library.components
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+import com.makd.afinity.data.models.audiobookshelf.LibraryItem
+
+@Composable
+fun AudiobookCard(
+    item: LibraryItem,
+    serverUrl: String?,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val coverUrl =
+        if (serverUrl != null && item.media.coverPath != null) {
+            "$serverUrl/api/items/${item.id}/cover"
+        } else null
+
+    Column(modifier = modifier) {
+        Card(
+            onClick = onClick,
+            modifier = Modifier.fillMaxWidth().aspectRatio(1f),
+            colors =
+                CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
+            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
+        ) {
+            Box(modifier = Modifier.fillMaxSize()) {
+                if (coverUrl != null) {
+                    AsyncImage(
+                        model = coverUrl,
+                        contentDescription = "Cover for ${item.media.metadata.title}",
+                        modifier = Modifier.fillMaxSize(),
+                        contentScale = ContentScale.Crop,
+                    )
+                }
+            }
+        }
+
+        Spacer(modifier = Modifier.height(8.dp))
+
+        Text(
+            text = item.media.metadata.title ?: "Unknown Title",
+            style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
+            color = MaterialTheme.colorScheme.onBackground,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+
+        item.media.metadata.authorName?.let { author ->
+            Text(
+                text = author,
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+
+        item.userMediaProgress?.let { progress ->
+            if (progress.progress > 0 && !progress.isFinished) {
+                Spacer(modifier = Modifier.height(4.dp))
+                LinearProgressIndicator(
+                    progress = { progress.progress.toFloat() },
+                    modifier = Modifier.fillMaxWidth(),
+                    trackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/library/components/PodcastCard.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/library/components/PodcastCard.kt
new file mode 100644
index 000000000..5a2363f3e
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/library/components/PodcastCard.kt
@@ -0,0 +1,101 @@
+package com.makd.afinity.ui.audiobookshelf.library.components
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+import com.makd.afinity.R
+import com.makd.afinity.data.models.audiobookshelf.LibraryItem
+
+@Composable
+fun PodcastCard(
+    item: LibraryItem,
+    serverUrl: String?,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Card(
+        onClick = onClick,
+        modifier = modifier.fillMaxWidth(),
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(12.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            val coverUrl =
+                if (serverUrl != null && item.media.coverPath != null) {
+                    "$serverUrl/api/items/${item.id}/cover"
+                } else null
+
+            if (coverUrl != null) {
+                AsyncImage(
+                    model = coverUrl,
+                    contentDescription = "Cover for ${item.media.metadata.title}",
+                    modifier = Modifier.size(64.dp).clip(MaterialTheme.shapes.small),
+                    contentScale = ContentScale.Crop,
+                )
+            } else {
+                Card(
+                    modifier = Modifier.size(64.dp),
+                    colors =
+                        CardDefaults.cardColors(
+                            containerColor = MaterialTheme.colorScheme.surfaceContainerHighest
+                        ),
+                ) {}
+            }
+
+            Spacer(modifier = Modifier.width(12.dp))
+
+            Column(modifier = Modifier.weight(1f)) {
+                Text(
+                    text = item.media.metadata.title ?: "Unknown Podcast",
+                    style = MaterialTheme.typography.bodyMedium,
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                )
+
+                item.media.metadata.authorName?.let { author ->
+                    Text(
+                        text = author,
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+
+                item.media.episodes?.size?.let { count ->
+                    Text(
+                        text = "$count episodes",
+                        style = MaterialTheme.typography.labelSmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                }
+            }
+
+            Icon(
+                painterResource(id = R.drawable.ic_chevron_right),
+                contentDescription = "Open podcast",
+                tint = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/login/AudiobookshelfLoginViewModel.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/login/AudiobookshelfLoginViewModel.kt
new file mode 100644
index 000000000..805c05e17
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/login/AudiobookshelfLoginViewModel.kt
@@ -0,0 +1,171 @@
+package com.makd.afinity.ui.audiobookshelf.login
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.makd.afinity.data.repository.AudiobookshelfRepository
+import com.makd.afinity.data.repository.PreferencesRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+@HiltViewModel
+class AudiobookshelfLoginViewModel
+@Inject
+constructor(
+    private val audiobookshelfRepository: AudiobookshelfRepository,
+    private val preferencesRepository: PreferencesRepository,
+) : ViewModel() {
+
+    private val _uiState = MutableStateFlow(AudiobookshelfLoginUiState())
+    val uiState: StateFlow<AudiobookshelfLoginUiState> = _uiState.asStateFlow()
+
+    val isAuthenticated = audiobookshelfRepository.isAuthenticated
+    val currentConfig = audiobookshelfRepository.currentConfig
+
+    fun updateServerUrl(url: String) {
+        _uiState.value = _uiState.value.copy(serverUrl = url.trim(), error = null)
+    }
+
+    fun updateUsername(username: String) {
+        _uiState.value = _uiState.value.copy(username = username, error = null)
+    }
+
+    fun updatePassword(password: String) {
+        _uiState.value = _uiState.value.copy(password = password, error = null)
+    }
+
+    fun testConnection() {
+        val serverUrl = _uiState.value.serverUrl
+        if (serverUrl.isBlank()) {
+            _uiState.value = _uiState.value.copy(error = "Server URL is required")
+            return
+        }
+
+        viewModelScope.launch {
+            _uiState.value =
+                _uiState.value.copy(
+                    isTestingConnection = true,
+                    error = null,
+                    connectionTestSuccess = false,
+                )
+
+            try {
+                audiobookshelfRepository.setServerUrl(normalizeUrl(serverUrl))
+                _uiState.value =
+                    _uiState.value.copy(isTestingConnection = false, connectionTestSuccess = true)
+                Timber.d("Server URL set: $serverUrl")
+            } catch (e: Exception) {
+                _uiState.value =
+                    _uiState.value.copy(
+                        isTestingConnection = false,
+                        connectionTestSuccess = false,
+                        error = "Failed to set server URL: ${e.message}",
+                    )
+                Timber.e(e, "Failed to test connection")
+            }
+        }
+    }
+
+    fun login() {
+        val currentState = _uiState.value
+
+        if (currentState.serverUrl.isBlank()) {
+            _uiState.value = currentState.copy(error = "Server URL is required")
+            return
+        }
+        if (currentState.username.isBlank()) {
+            _uiState.value = currentState.copy(error = "Username is required")
+            return
+        }
+
+        viewModelScope.launch {
+            _uiState.value = currentState.copy(isLoggingIn = true, error = null)
+
+            val result =
+                audiobookshelfRepository.login(
+                    serverUrl = normalizeUrl(currentState.serverUrl),
+                    username = currentState.username,
+                    password = currentState.password,
+                )
+
+            result.fold(
+                onSuccess = { user ->
+                    _uiState.value = _uiState.value.copy(isLoggingIn = false, isLoggedIn = true)
+                    Timber.d("Audiobookshelf login successful for user: ${user.username}")
+                },
+                onFailure = { error ->
+                    _uiState.value =
+                        _uiState.value.copy(
+                            isLoggingIn = false,
+                            error = "Login failed: ${error.message}",
+                        )
+                    Timber.e(error, "Audiobookshelf login failed")
+                },
+            )
+        }
+    }
+
+    fun logout() {
+        viewModelScope.launch {
+            _uiState.value = _uiState.value.copy(isLoggingIn = true)
+
+            val result = audiobookshelfRepository.logout()
+
+            result.fold(
+                onSuccess = {
+                    _uiState.value = AudiobookshelfLoginUiState()
+                    Timber.d("Audiobookshelf logout successful")
+                },
+                onFailure = { error ->
+                    _uiState.value =
+                        _uiState.value.copy(
+                            isLoggingIn = false,
+                            error = "Logout failed: ${error.message}",
+                        )
+                    Timber.e(error, "Audiobookshelf logout failed")
+                },
+            )
+        }
+    }
+
+    fun clearError() {
+        _uiState.value = _uiState.value.copy(error = null)
+    }
+
+    suspend fun isNotificationPermissionDeclined(): Boolean {
+        return preferencesRepository.getNotificationPermissionDeclined()
+    }
+
+    fun declineNotificationPermission() {
+        viewModelScope.launch { preferencesRepository.setNotificationPermissionDeclined(true) }
+    }
+
+    private fun normalizeUrl(url: String): String {
+        var normalized = url.trim()
+
+        if (!normalized.startsWith("http://") && !normalized.startsWith("https://")) {
+            normalized = "http://$normalized"
+        }
+
+        if (normalized.endsWith("/")) {
+            normalized = normalized.dropLast(1)
+        }
+
+        return normalized
+    }
+}
+
+data class AudiobookshelfLoginUiState(
+    val serverUrl: String = "",
+    val username: String = "",
+    val password: String = "",
+    val isTestingConnection: Boolean = false,
+    val connectionTestSuccess: Boolean = false,
+    val isLoggingIn: Boolean = false,
+    val isLoggedIn: Boolean = false,
+    val error: String? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/AudiobookshelfPlayerScreen.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/AudiobookshelfPlayerScreen.kt
new file mode 100644
index 000000000..f88c8bbdf
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/AudiobookshelfPlayerScreen.kt
@@ -0,0 +1,512 @@
+package com.makd.afinity.ui.audiobookshelf.player
+
+import android.content.res.Configuration
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.basicMarquee
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import coil3.compose.AsyncImage
+import com.makd.afinity.R
+import com.makd.afinity.player.audiobookshelf.AudiobookshelfPlaybackState
+import com.makd.afinity.ui.audiobookshelf.player.components.ChapterSelector
+import com.makd.afinity.ui.audiobookshelf.player.components.PlaybackSpeedSelector
+import com.makd.afinity.ui.audiobookshelf.player.components.PlayerControls
+import com.makd.afinity.ui.audiobookshelf.player.components.SleepTimerDialog
+import com.makd.afinity.ui.audiobookshelf.player.util.rememberDominantColor
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AudiobookshelfPlayerScreen(
+    onNavigateBack: () -> Unit,
+    viewModel: AudiobookshelfPlayerViewModel = hiltViewModel(),
+) {
+    val uiState by viewModel.uiState.collectAsState()
+    val playbackState by viewModel.playbackState.collectAsState()
+    val snackbarHostState = remember { SnackbarHostState() }
+
+    val defaultColor = MaterialTheme.colorScheme.surface
+    val dominantColor = rememberDominantColor(playbackState.coverUrl, defaultColor)
+    val animatedColor by
+        animateColorAsState(
+            targetValue = dominantColor,
+            animationSpec = tween(durationMillis = 800),
+            label = "color",
+        )
+
+    LaunchedEffect(uiState.error) {
+        uiState.error?.let {
+            snackbarHostState.showSnackbar(it)
+            viewModel.clearError()
+        }
+    }
+
+    val configuration = LocalConfiguration.current
+    val isLandscape = configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+
+    Scaffold(
+        snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
+        containerColor = Color.Transparent,
+    ) { paddingValues ->
+        Box(
+            modifier =
+                Modifier.fillMaxSize()
+                    .background(
+                        Brush.verticalGradient(
+                            colors =
+                                listOf(
+                                    animatedColor.copy(alpha = 0.8f),
+                                    MaterialTheme.colorScheme.surface.copy(alpha = 0.1f),
+                                    Color.Black.copy(alpha = 0.9f),
+                                )
+                        )
+                    )
+        ) {
+            if (isLandscape) {
+                LandscapePlayerContent(
+                    playbackState = playbackState,
+                    viewModel = viewModel,
+                    animatedColor = animatedColor,
+                    onNavigateBack = onNavigateBack,
+                    paddingValues = paddingValues,
+                )
+            } else {
+                PortraitPlayerContent(
+                    playbackState = playbackState,
+                    viewModel = viewModel,
+                    animatedColor = animatedColor,
+                    onNavigateBack = onNavigateBack,
+                    paddingValues = paddingValues,
+                )
+            }
+        }
+        if (uiState.showChapterSelector) {
+            ChapterSelector(
+                chapters = playbackState.chapters,
+                currentChapterIndex = playbackState.currentChapterIndex,
+                onChapterSelected = viewModel::seekToChapter,
+                onDismiss = viewModel::dismissChapterSelector,
+            )
+        }
+
+        if (uiState.showSpeedSelector) {
+            PlaybackSpeedSelector(
+                currentSpeed = playbackState.playbackSpeed,
+                onSpeedSelected = viewModel::setPlaybackSpeed,
+                onDismiss = viewModel::dismissSpeedSelector,
+            )
+        }
+
+        if (uiState.showSleepTimerDialog) {
+            SleepTimerDialog(
+                currentTimerEndTime = playbackState.sleepTimerEndTime,
+                onTimerSelected = viewModel::setSleepTimer,
+                onCancelTimer = viewModel::cancelSleepTimer,
+                onDismiss = viewModel::dismissSleepTimerDialog,
+            )
+        }
+    }
+}
+
+@Composable
+fun PortraitPlayerContent(
+    playbackState: AudiobookshelfPlaybackState,
+    viewModel: AudiobookshelfPlayerViewModel,
+    animatedColor: Color,
+    onNavigateBack: () -> Unit,
+    paddingValues: PaddingValues,
+) {
+    Column(
+        modifier = Modifier.fillMaxSize().padding(paddingValues).padding(horizontal = 24.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(top = 16.dp),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            IconButton(onClick = onNavigateBack) {
+                Icon(
+                    painterResource(id = R.drawable.ic_keyboard_arrow_down),
+                    contentDescription = "Minimize",
+                    tint = Color.White,
+                    modifier = Modifier.size(32.dp),
+                )
+            }
+
+            Text(
+                "NOW PLAYING",
+                style = MaterialTheme.typography.labelSmall,
+                color = Color.White.copy(alpha = 0.7f),
+                letterSpacing = 2.sp,
+            )
+
+            IconButton(onClick = { /* Option Menu */ }) {
+                Icon(
+                    painterResource(id = R.drawable.ic_options),
+                    contentDescription = "Options",
+                    tint = Color.White,
+                )
+            }
+        }
+
+        Spacer(modifier = Modifier.height(24.dp))
+
+        Box(modifier = Modifier.weight(1f).fillMaxWidth(), contentAlignment = Alignment.Center) {
+            Surface(
+                modifier =
+                    Modifier.fillMaxWidth()
+                        .aspectRatio(1f)
+                        .shadow(
+                            elevation = 24.dp,
+                            shape = RoundedCornerShape(32.dp),
+                            spotColor = Color.Black,
+                        ),
+                shape = RoundedCornerShape(32.dp),
+                color = Color.Transparent,
+            ) {
+                if (playbackState.coverUrl != null) {
+                    AsyncImage(
+                        model = playbackState.coverUrl,
+                        contentDescription = null,
+                        contentScale = ContentScale.Crop,
+                        modifier = Modifier.fillMaxSize(),
+                    )
+                }
+            }
+        }
+
+        Spacer(modifier = Modifier.height(12.dp))
+
+        Column(modifier = Modifier.fillMaxWidth()) {
+            Text(
+                text = playbackState.displayTitle.ifEmpty { "Unknown Title" },
+                style =
+                    MaterialTheme.typography.headlineMedium.copy(fontWeight = FontWeight.ExtraBold),
+                color = Color.White,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+
+            Spacer(modifier = Modifier.height(4.dp))
+
+            Text(
+                text = playbackState.displayAuthor ?: "Unknown Author",
+                style = MaterialTheme.typography.titleMedium,
+                color = Color.White.copy(alpha = 0.7f),
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+
+            val chapterText = playbackState.currentChapter?.title ?: " "
+            val isChapterVisible = playbackState.currentChapter != null
+
+            Spacer(modifier = Modifier.height(4.dp))
+
+            Text(
+                text = chapterText,
+                style = MaterialTheme.typography.labelLarge,
+                color = animatedColor,
+                maxLines = 1,
+                modifier =
+                    Modifier.alpha(if (isChapterVisible) 1f else 0f)
+                        .basicMarquee(iterations = Int.MAX_VALUE, velocity = 30.dp),
+            )
+        }
+
+        Spacer(modifier = Modifier.height(12.dp))
+
+        PlayerControls(
+            currentTime = playbackState.currentTime,
+            duration = playbackState.duration,
+            isPlaying = playbackState.isPlaying,
+            isBuffering = playbackState.isBuffering,
+            onPlayPauseClick = viewModel::togglePlayPause,
+            onSkipForward = viewModel::skipForward,
+            onSkipBackward = viewModel::skipBackward,
+            onSeek = viewModel::seekTo,
+            onPreviousChapter =
+                if (playbackState.chapters.isNotEmpty() && playbackState.currentChapterIndex > 0) {
+                    { viewModel.seekToChapter(playbackState.currentChapterIndex - 1) }
+                } else null,
+            onNextChapter =
+                if (
+                    playbackState.chapters.isNotEmpty() &&
+                        playbackState.currentChapterIndex < playbackState.chapters.lastIndex
+                ) {
+                    { viewModel.seekToChapter(playbackState.currentChapterIndex + 1) }
+                } else null,
+            accentColor = animatedColor,
+        )
+
+        Spacer(modifier = Modifier.height(24.dp))
+
+        Row(
+            modifier =
+                Modifier.fillMaxWidth(0.5f)
+                    .padding(bottom = 50.dp)
+                    .clip(RoundedCornerShape(50))
+                    .background(Color.White.copy(alpha = 0.1f))
+                    .padding(vertical = 4.dp),
+            horizontalArrangement = Arrangement.SpaceEvenly,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            IconButton(onClick = viewModel::showSpeedSelector) {
+                Box(contentAlignment = Alignment.Center) {
+                    Icon(
+                        painterResource(id = R.drawable.ic_speed),
+                        null,
+                        tint = Color.White.copy(alpha = 0.8f),
+                    )
+                    if (playbackState.playbackSpeed != 1.0f) {
+                        Box(
+                            modifier =
+                                Modifier.size(4.dp)
+                                    .background(
+                                        Color.White,
+                                        androidx.compose.foundation.shape.CircleShape,
+                                    )
+                                    .align(Alignment.TopEnd)
+                        )
+                    }
+                }
+            }
+
+            IconButton(onClick = viewModel::showSleepTimerDialog) {
+                Icon(
+                    painter =
+                        if (playbackState.sleepTimerEndTime != null)
+                            painterResource(id = R.drawable.ic_moon_filled)
+                        else painterResource(id = R.drawable.ic_moon),
+                    contentDescription = null,
+                    tint =
+                        if (playbackState.sleepTimerEndTime != null) animatedColor
+                        else Color.White.copy(alpha = 0.8f),
+                )
+            }
+
+            IconButton(onClick = viewModel::showChapterSelector) {
+                Icon(
+                    painterResource(id = R.drawable.ic_playlist_alt),
+                    null,
+                    tint = Color.White.copy(alpha = 0.8f),
+                )
+            }
+        }
+    }
+}
+
+@Composable
+fun LandscapePlayerContent(
+    playbackState: AudiobookshelfPlaybackState,
+    viewModel: AudiobookshelfPlayerViewModel,
+    animatedColor: Color,
+    onNavigateBack: () -> Unit,
+    paddingValues: PaddingValues,
+) {
+    Row(
+        modifier =
+            Modifier.fillMaxSize()
+                .padding(paddingValues)
+                .padding(horizontal = 32.dp, vertical = 16.dp),
+        horizontalArrangement = Arrangement.spacedBy(32.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Box(
+            modifier = Modifier.weight(0.45f).fillMaxHeight(),
+            contentAlignment = Alignment.Center,
+        ) {
+            Surface(
+                modifier =
+                    Modifier.aspectRatio(1f)
+                        .shadow(
+                            elevation = 16.dp,
+                            shape = RoundedCornerShape(24.dp),
+                            spotColor = Color.Black,
+                        ),
+                shape = RoundedCornerShape(24.dp),
+                color = Color.Transparent,
+            ) {
+                if (playbackState.coverUrl != null) {
+                    AsyncImage(
+                        model = playbackState.coverUrl,
+                        contentDescription = null,
+                        contentScale = ContentScale.Crop,
+                        modifier = Modifier.fillMaxSize(),
+                    )
+                }
+            }
+        }
+
+        Column(
+            modifier = Modifier.weight(0.55f).fillMaxHeight().verticalScroll(rememberScrollState()),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center,
+        ) {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                IconButton(onClick = onNavigateBack) {
+                    Icon(
+                        painterResource(id = R.drawable.ic_keyboard_arrow_down),
+                        "Minimize",
+                        tint = Color.White,
+                    )
+                }
+                Text(
+                    "NOW PLAYING",
+                    style = MaterialTheme.typography.labelSmall,
+                    color = Color.White.copy(alpha = 0.7f),
+                    letterSpacing = 2.sp,
+                )
+                IconButton(onClick = {}) {
+                    Icon(painterResource(id = R.drawable.ic_options), "Options", tint = Color.White)
+                }
+            }
+
+            Spacer(modifier = Modifier.height(16.dp))
+
+            Text(
+                text = playbackState.displayTitle.ifEmpty { "Unknown Title" },
+                style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.Bold),
+                color = Color.White,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+            Text(
+                text = playbackState.displayAuthor ?: "Unknown Author",
+                style = MaterialTheme.typography.bodyMedium,
+                color = Color.White.copy(alpha = 0.7f),
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+
+            val chapterText = playbackState.currentChapter?.title ?: " "
+            val isChapterVisible = playbackState.currentChapter != null
+
+            Spacer(modifier = Modifier.height(4.dp))
+
+            Text(
+                text = chapterText,
+                style = MaterialTheme.typography.labelLarge,
+                color = animatedColor,
+                maxLines = 1,
+                modifier =
+                    Modifier.alpha(if (isChapterVisible) 1f else 0f)
+                        .basicMarquee(iterations = Int.MAX_VALUE, velocity = 30.dp),
+            )
+
+            Spacer(modifier = Modifier.height(24.dp))
+
+            PlayerControls(
+                currentTime = playbackState.currentTime,
+                duration = playbackState.duration,
+                isPlaying = playbackState.isPlaying,
+                isBuffering = playbackState.isBuffering,
+                onPlayPauseClick = viewModel::togglePlayPause,
+                onSkipForward = viewModel::skipForward,
+                onSkipBackward = viewModel::skipBackward,
+                onSeek = viewModel::seekTo,
+                onPreviousChapter =
+                    if (
+                        playbackState.chapters.isNotEmpty() && playbackState.currentChapterIndex > 0
+                    ) {
+                        { viewModel.seekToChapter(playbackState.currentChapterIndex - 1) }
+                    } else null,
+                onNextChapter =
+                    if (
+                        playbackState.chapters.isNotEmpty() &&
+                            playbackState.currentChapterIndex < playbackState.chapters.lastIndex
+                    ) {
+                        { viewModel.seekToChapter(playbackState.currentChapterIndex + 1) }
+                    } else null,
+                accentColor = animatedColor,
+            )
+
+            Spacer(modifier = Modifier.height(24.dp))
+
+            Row(
+                modifier =
+                    Modifier.fillMaxWidth(0.5f)
+                        .clip(RoundedCornerShape(50))
+                        .background(Color.White.copy(alpha = 0.1f))
+                        .padding(vertical = 4.dp),
+                horizontalArrangement = Arrangement.SpaceEvenly,
+            ) {
+                IconButton(onClick = viewModel::showSpeedSelector) {
+                    Icon(
+                        painterResource(id = R.drawable.ic_speed),
+                        null,
+                        tint = Color.White.copy(alpha = 0.8f),
+                    )
+                }
+                IconButton(onClick = viewModel::showSleepTimerDialog) {
+                    Icon(
+                        if (playbackState.sleepTimerEndTime != null)
+                            painterResource(id = R.drawable.ic_moon_filled)
+                        else painterResource(id = R.drawable.ic_moon),
+                        null,
+                        tint =
+                            if (playbackState.sleepTimerEndTime != null) animatedColor
+                            else Color.White.copy(alpha = 0.8f),
+                    )
+                }
+                IconButton(onClick = viewModel::showChapterSelector) {
+                    Icon(
+                        painterResource(id = R.drawable.ic_playlist_alt),
+                        null,
+                        tint = Color.White.copy(alpha = 0.8f),
+                    )
+                }
+            }
+
+            Spacer(modifier = Modifier.height(16.dp))
+        }
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/AudiobookshelfPlayerViewModel.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/AudiobookshelfPlayerViewModel.kt
new file mode 100644
index 000000000..989c79c57
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/AudiobookshelfPlayerViewModel.kt
@@ -0,0 +1,164 @@
+package com.makd.afinity.ui.audiobookshelf.player
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.makd.afinity.data.repository.AudiobookshelfRepository
+import com.makd.afinity.player.audiobookshelf.AudiobookshelfPlaybackManager
+import com.makd.afinity.player.audiobookshelf.AudiobookshelfPlayer
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+@HiltViewModel
+class AudiobookshelfPlayerViewModel
+@Inject
+constructor(
+    savedStateHandle: SavedStateHandle,
+    private val audiobookshelfRepository: AudiobookshelfRepository,
+    private val audiobookshelfPlayer: AudiobookshelfPlayer,
+    val playbackManager: AudiobookshelfPlaybackManager,
+) : ViewModel() {
+
+    private val itemId: String = savedStateHandle.get<String>("itemId") ?: ""
+    private val episodeId: String? = savedStateHandle.get<String>("episodeId")
+    private val startPosition: Double? =
+        savedStateHandle.get<String>("startPosition")?.toDoubleOrNull()
+
+    private val _uiState = MutableStateFlow(AudiobookshelfPlayerUiState())
+    val uiState: StateFlow<AudiobookshelfPlayerUiState> = _uiState.asStateFlow()
+
+    val playbackState = playbackManager.playbackState
+    val currentConfig = audiobookshelfRepository.currentConfig
+
+    init {
+        startPlayback()
+    }
+
+    private fun startPlayback() {
+        val currentState = playbackManager.playbackState.value
+        if (currentState.sessionId != null && currentState.itemId == itemId) {
+            Timber.d("Resuming existing playback session for item: $itemId")
+            if (startPosition != null) {
+                audiobookshelfPlayer.seekToPosition(startPosition)
+            }
+            return
+        }
+
+        viewModelScope.launch {
+            _uiState.value = _uiState.value.copy(isLoading = true, error = null)
+
+            val result = audiobookshelfRepository.startPlaybackSession(itemId, episodeId)
+
+            result.fold(
+                onSuccess = { session ->
+                    val serverUrl = currentConfig.value?.serverUrl
+                    if (serverUrl != null) {
+                        audiobookshelfPlayer.loadSession(session, serverUrl, startPosition)
+                        _uiState.value = _uiState.value.copy(isLoading = false)
+                        Timber.d("Started playback session: ${session.id}")
+                    } else {
+                        _uiState.value =
+                            _uiState.value.copy(
+                                isLoading = false,
+                                error = "Server URL not available",
+                            )
+                    }
+                },
+                onFailure = { error ->
+                    _uiState.value = _uiState.value.copy(isLoading = false, error = error.message)
+                    Timber.e(error, "Failed to start playback session")
+                },
+            )
+        }
+    }
+
+    fun togglePlayPause() {
+        if (audiobookshelfPlayer.isPlaying()) {
+            audiobookshelfPlayer.pause()
+        } else {
+            audiobookshelfPlayer.play()
+        }
+    }
+
+    fun seekTo(positionSeconds: Double) {
+        audiobookshelfPlayer.seekToPosition(positionSeconds)
+    }
+
+    fun skipForward() {
+        audiobookshelfPlayer.skipForward(30)
+    }
+
+    fun skipBackward() {
+        audiobookshelfPlayer.skipBackward(30)
+    }
+
+    fun seekToChapter(chapterIndex: Int) {
+        audiobookshelfPlayer.seekToChapter(chapterIndex)
+        dismissChapterSelector()
+    }
+
+    fun setPlaybackSpeed(speed: Float) {
+        audiobookshelfPlayer.setPlaybackSpeed(speed)
+    }
+
+    fun setSleepTimer(minutes: Int) {
+        audiobookshelfPlayer.setSleepTimer(minutes)
+        dismissSleepTimerDialog()
+    }
+
+    fun cancelSleepTimer() {
+        audiobookshelfPlayer.cancelSleepTimer()
+    }
+
+    fun showChapterSelector() {
+        _uiState.value = _uiState.value.copy(showChapterSelector = true)
+    }
+
+    fun dismissChapterSelector() {
+        _uiState.value = _uiState.value.copy(showChapterSelector = false)
+    }
+
+    fun showSpeedSelector() {
+        _uiState.value = _uiState.value.copy(showSpeedSelector = true)
+    }
+
+    fun dismissSpeedSelector() {
+        _uiState.value = _uiState.value.copy(showSpeedSelector = false)
+    }
+
+    fun showSleepTimerDialog() {
+        _uiState.value = _uiState.value.copy(showSleepTimerDialog = true)
+    }
+
+    fun dismissSleepTimerDialog() {
+        _uiState.value = _uiState.value.copy(showSleepTimerDialog = false)
+    }
+
+    fun clearError() {
+        _uiState.value = _uiState.value.copy(error = null)
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+    }
+
+    fun stopPlayback() {
+        viewModelScope.launch {
+            audiobookshelfPlayer.pause()
+            audiobookshelfPlayer.closeSession()
+        }
+    }
+}
+
+data class AudiobookshelfPlayerUiState(
+    val isLoading: Boolean = false,
+    val showChapterSelector: Boolean = false,
+    val showSpeedSelector: Boolean = false,
+    val showSleepTimerDialog: Boolean = false,
+    val error: String? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/components/ChapterSelector.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/components/ChapterSelector.kt
new file mode 100644
index 000000000..804a31271
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/components/ChapterSelector.kt
@@ -0,0 +1,193 @@
+package com.makd.afinity.ui.audiobookshelf.player.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.makd.afinity.R
+import com.makd.afinity.data.models.audiobookshelf.BookChapter
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ChapterSelector(
+    chapters: List<BookChapter>,
+    currentChapterIndex: Int,
+    onChapterSelected: (Int) -> Unit,
+    onDismiss: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    val listState = rememberLazyListState()
+
+    LaunchedEffect(currentChapterIndex) {
+        if (currentChapterIndex >= 0 && currentChapterIndex < chapters.size) {
+            listState.scrollToItem((currentChapterIndex - 3).coerceAtLeast(0))
+        }
+    }
+
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        sheetState = sheetState,
+        modifier = modifier,
+        containerColor = MaterialTheme.colorScheme.surface,
+        dragHandle = null,
+    ) {
+        Column(modifier = Modifier.fillMaxWidth().fillMaxHeight(0.85f).padding(top = 24.dp)) {
+            Text(
+                text = "CHAPTERS",
+                style = MaterialTheme.typography.labelMedium,
+                color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f),
+                modifier = Modifier.fillMaxWidth(),
+                textAlign = TextAlign.Center,
+                letterSpacing = 2.sp,
+            )
+
+            Spacer(modifier = Modifier.height(24.dp))
+
+            LazyColumn(
+                state = listState,
+                modifier = Modifier.weight(1f),
+                contentPadding = androidx.compose.foundation.layout.PaddingValues(bottom = 32.dp),
+            ) {
+                itemsIndexed(chapters) { index, chapter ->
+                    val isCurrent = index == currentChapterIndex
+                    ChapterRow(
+                        chapter = chapter,
+                        index = index + 1,
+                        isCurrent = isCurrent,
+                        onClick = { onChapterSelected(index) },
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun ChapterRow(chapter: BookChapter, index: Int, isCurrent: Boolean, onClick: () -> Unit) {
+    Row(
+        modifier =
+            Modifier.fillMaxWidth()
+                .clickable(onClick = onClick)
+                .background(
+                    if (isCurrent) MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f)
+                    else MaterialTheme.colorScheme.surface
+                )
+                .padding(horizontal = 24.dp, vertical = 16.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Box(
+            modifier =
+                Modifier.size(32.dp)
+                    .clip(CircleShape)
+                    .background(
+                        if (isCurrent) MaterialTheme.colorScheme.primary
+                        else MaterialTheme.colorScheme.surfaceContainer
+                    ),
+            contentAlignment = Alignment.Center,
+        ) {
+            if (isCurrent) {
+                Icon(
+                    painterResource(id = R.drawable.ic_player_play_filled),
+                    contentDescription = "Playing",
+                    tint = MaterialTheme.colorScheme.onPrimary,
+                    modifier = Modifier.size(16.dp),
+                )
+            } else {
+                Text(
+                    text = index.toString(),
+                    style = MaterialTheme.typography.labelSmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                )
+            }
+        }
+
+        Spacer(modifier = Modifier.width(16.dp))
+
+        Column(modifier = Modifier.weight(1f)) {
+            Text(
+                text = chapter.title,
+                style =
+                    MaterialTheme.typography.bodyLarge.copy(
+                        fontWeight = if (isCurrent) FontWeight.Bold else FontWeight.Medium
+                    ),
+                color =
+                    if (isCurrent) MaterialTheme.colorScheme.primary
+                    else MaterialTheme.colorScheme.onSurface,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+
+            Spacer(modifier = Modifier.height(2.dp))
+
+            Text(
+                text = "${formatTime(chapter.start)} - ${formatTime(chapter.end)}",
+                style = MaterialTheme.typography.labelSmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f),
+            )
+        }
+
+        Box(
+            modifier =
+                Modifier.clip(RoundedCornerShape(8.dp))
+                    .background(MaterialTheme.colorScheme.surfaceContainer)
+                    .padding(horizontal = 8.dp, vertical = 4.dp)
+        ) {
+            Text(
+                text = formatDuration(chapter.end - chapter.start),
+                style = MaterialTheme.typography.labelSmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
+        }
+    }
+}
+
+private fun formatTime(seconds: Double): String {
+    val totalSeconds = seconds.toLong().coerceAtLeast(0)
+    val hours = totalSeconds / 3600
+    val minutes = (totalSeconds % 3600) / 60
+    val secs = totalSeconds % 60
+    return if (hours > 0) String.format("%d:%02d:%02d", hours, minutes, secs)
+    else String.format("%d:%02d", minutes, secs)
+}
+
+private fun formatDuration(seconds: Double): String {
+    val totalSeconds = seconds.toLong().coerceAtLeast(0)
+    val hours = totalSeconds / 3600
+    val minutes = (totalSeconds % 3600) / 60
+    return when {
+        hours > 0 -> "${hours}h ${minutes}m"
+        minutes > 0 -> "${minutes}m"
+        else -> "${totalSeconds}s"
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/components/MiniPlayer.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/components/MiniPlayer.kt
new file mode 100644
index 000000000..8eb1e09e8
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/components/MiniPlayer.kt
@@ -0,0 +1,144 @@
+package com.makd.afinity.ui.audiobookshelf.player.components
+
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+import com.makd.afinity.R
+
+@Composable
+fun MiniPlayer(
+    title: String,
+    author: String?,
+    coverUrl: String?,
+    currentTime: Double,
+    duration: Double,
+    isPlaying: Boolean,
+    isBuffering: Boolean,
+    onPlayPauseClick: () -> Unit,
+    onCloseClick: () -> Unit,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val progress = if (duration > 0) (currentTime / duration).toFloat().coerceIn(0f, 1f) else 0f
+
+    Surface(
+        modifier =
+            modifier
+                .padding(horizontal = 8.dp, vertical = 4.dp)
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(16.dp))
+                .clickable(onClick = onClick),
+        color = MaterialTheme.colorScheme.surfaceContainerHigh.copy(alpha = 0.95f),
+        tonalElevation = 4.dp,
+        shadowElevation = 2.dp,
+    ) {
+        Column {
+            Row(
+                modifier = Modifier.fillMaxWidth().padding(8.dp),
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Box(
+                    modifier =
+                        Modifier.size(44.dp)
+                            .clip(RoundedCornerShape(8.dp))
+                            .background(MaterialTheme.colorScheme.surfaceVariant)
+                ) {
+                    if (coverUrl != null) {
+                        AsyncImage(
+                            model = coverUrl,
+                            contentDescription = title,
+                            contentScale = ContentScale.Crop,
+                            modifier = Modifier.matchParentSize(),
+                        )
+                    }
+                }
+
+                Spacer(modifier = Modifier.width(12.dp))
+
+                Column(modifier = Modifier.weight(1f)) {
+                    Text(
+                        text = title,
+                        style = MaterialTheme.typography.labelLarge,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                        color = MaterialTheme.colorScheme.onSurface,
+                    )
+                    if (author != null) {
+                        Text(
+                            text = author,
+                            style = MaterialTheme.typography.labelMedium,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                        )
+                    }
+                }
+
+                IconButton(onClick = onPlayPauseClick) {
+                    if (isBuffering) {
+                        CircularProgressIndicator(
+                            modifier = Modifier.size(20.dp),
+                            strokeWidth = 2.dp,
+                            color = MaterialTheme.colorScheme.primary,
+                        )
+                    } else {
+                        AnimatedContent(targetState = isPlaying, label = "play_pause") { playing ->
+                            Icon(
+                                painter =
+                                    if (playing) painterResource(R.drawable.ic_player_pause_filled)
+                                    else painterResource(R.drawable.ic_player_play_filled),
+                                contentDescription = if (playing) "Pause" else "Play",
+                                modifier = Modifier.size(32.dp),
+                                tint = MaterialTheme.colorScheme.onSurface,
+                            )
+                        }
+                    }
+                }
+
+                IconButton(onClick = onCloseClick) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.ic_close),
+                        contentDescription = "Close",
+                        modifier = Modifier.size(20.dp),
+                        tint = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                }
+            }
+            LinearProgressIndicator(
+                progress = { progress },
+                modifier = Modifier.fillMaxWidth().height(3.dp),
+                color = MaterialTheme.colorScheme.primary,
+                trackColor = Color.Transparent,
+                strokeCap = StrokeCap.Round,
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/components/PlaybackSpeedSelector.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/components/PlaybackSpeedSelector.kt
new file mode 100644
index 000000000..14d9af1ac
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/components/PlaybackSpeedSelector.kt
@@ -0,0 +1,219 @@
+package com.makd.afinity.ui.audiobookshelf.player.components
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FilledIconButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButtonDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Slider
+import androidx.compose.material3.SliderDefaults
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.makd.afinity.R
+import kotlin.math.roundToInt
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun PlaybackSpeedSelector(
+    currentSpeed: Float,
+    onSpeedSelected: (Float) -> Unit,
+    onDismiss: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val sheetState = rememberModalBottomSheetState()
+
+    val presets = listOf(0.5f, 0.75f, 1.0f, 1.1f, 1.25f, 1.5f, 1.75f, 2.0f, 2.5f, 3.0f)
+    val listState = rememberLazyListState()
+
+    LaunchedEffect(Unit) {
+        val index = presets.indexOfFirst { it == currentSpeed }
+        if (index != -1) {
+            listState.scrollToItem((index - 1).coerceAtLeast(0))
+        }
+    }
+
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        sheetState = sheetState,
+        modifier = modifier,
+        containerColor = MaterialTheme.colorScheme.surfaceContainer,
+        dragHandle = null,
+    ) {
+        Column(
+            modifier = Modifier.fillMaxWidth().padding(24.dp).padding(bottom = 24.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            Text(
+                text = "PLAYBACK SPEED",
+                style = MaterialTheme.typography.labelMedium,
+                color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f),
+                modifier = Modifier.fillMaxWidth(),
+                textAlign = TextAlign.Center,
+                letterSpacing = 2.sp,
+            )
+            Spacer(modifier = Modifier.height(24.dp))
+            Text(
+                text = "${formatSpeed(currentSpeed)}x",
+                style = MaterialTheme.typography.displayMedium.copy(fontWeight = FontWeight.Bold),
+                color = MaterialTheme.colorScheme.onSurface,
+            )
+
+            Spacer(modifier = Modifier.height(32.dp))
+
+            Row(
+                modifier = Modifier.fillMaxWidth().padding(horizontal = 24.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(16.dp),
+            ) {
+                FilledIconButton(
+                    onClick = {
+                        val prev =
+                            presets.lastOrNull { it < currentSpeed - 0.01f } ?: presets.first()
+                        onSpeedSelected(prev)
+                    },
+                    colors =
+                        IconButtonDefaults.filledIconButtonColors(
+                            containerColor = MaterialTheme.colorScheme.surfaceVariant,
+                            contentColor = MaterialTheme.colorScheme.onSurfaceVariant,
+                        ),
+                    modifier = Modifier.size(48.dp),
+                ) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.ic_minus),
+                        contentDescription = "Previous preset",
+                    )
+                }
+
+                Slider(
+                    value = currentSpeed,
+                    onValueChange = { value ->
+                        val snapped = (value * 20).roundToInt() / 20f
+                        onSpeedSelected(snapped)
+                    },
+                    valueRange = presets.first()..presets.last(),
+                    modifier = Modifier.weight(1f),
+                    colors =
+                        SliderDefaults.colors(
+                            thumbColor = MaterialTheme.colorScheme.onSurface,
+                            activeTrackColor = MaterialTheme.colorScheme.onSurface,
+                            inactiveTrackColor = MaterialTheme.colorScheme.surfaceVariant,
+                        ),
+                )
+                FilledIconButton(
+                    onClick = {
+                        val next =
+                            presets.firstOrNull { it > currentSpeed + 0.01f } ?: presets.last()
+                        onSpeedSelected(next)
+                    },
+                    colors =
+                        IconButtonDefaults.filledIconButtonColors(
+                            containerColor = MaterialTheme.colorScheme.surfaceVariant,
+                            contentColor = MaterialTheme.colorScheme.onSurfaceVariant,
+                        ),
+                    modifier = Modifier.size(48.dp),
+                ) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.ic_plus),
+                        contentDescription = "Next preset",
+                    )
+                }
+            }
+
+            Spacer(modifier = Modifier.height(32.dp))
+
+            LazyRow(
+                state = listState,
+                contentPadding = PaddingValues(horizontal = 24.dp),
+                horizontalArrangement = Arrangement.spacedBy(12.dp),
+                modifier = Modifier.fillMaxWidth(),
+            ) {
+                items(presets) { speed ->
+                    PresetSpeedItem(
+                        speed = speed,
+                        isSelected = speed == currentSpeed,
+                        onClick = { onSpeedSelected(speed) },
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun PresetSpeedItem(speed: Float, isSelected: Boolean, onClick: () -> Unit) {
+    Column(horizontalAlignment = Alignment.CenterHorizontally) {
+        Box(
+            modifier =
+                Modifier.width(64.dp)
+                    .height(36.dp)
+                    .clip(RoundedCornerShape(8.dp))
+                    .background(
+                        if (isSelected) MaterialTheme.colorScheme.onSurface else Color.Transparent
+                    )
+                    .border(
+                        BorderStroke(
+                            1.dp,
+                            if (isSelected) Color.Transparent
+                            else MaterialTheme.colorScheme.outlineVariant,
+                        ),
+                        RoundedCornerShape(8.dp),
+                    )
+                    .clickable(onClick = onClick),
+            contentAlignment = Alignment.Center,
+        ) {
+            Text(
+                text = formatSpeed(speed),
+                style = MaterialTheme.typography.labelLarge.copy(fontWeight = FontWeight.Bold),
+                color =
+                    if (isSelected) MaterialTheme.colorScheme.inverseOnSurface
+                    else MaterialTheme.colorScheme.onSurface,
+            )
+        }
+
+        Spacer(modifier = Modifier.height(8.dp))
+        if (speed == 1.0f) {
+            Text(
+                text = "Normal",
+                style = MaterialTheme.typography.labelSmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
+        } else {
+            Text(text = " ", style = MaterialTheme.typography.labelSmall)
+        }
+    }
+}
+
+private fun formatSpeed(speed: Float): String {
+    return if (speed == speed.toLong().toFloat()) "${speed.toLong()}" else "$speed"
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/components/PlayerControls.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/components/PlayerControls.kt
new file mode 100644
index 000000000..77a954e91
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/components/PlayerControls.kt
@@ -0,0 +1,195 @@
+package com.makd.afinity.ui.audiobookshelf.player.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Slider
+import androidx.compose.material3.SliderDefaults
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import com.makd.afinity.R
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun PlayerControls(
+    currentTime: Double,
+    duration: Double,
+    isPlaying: Boolean,
+    isBuffering: Boolean,
+    onPlayPauseClick: () -> Unit,
+    onSkipForward: () -> Unit,
+    onSkipBackward: () -> Unit,
+    onSeek: (Double) -> Unit,
+    onPreviousChapter: (() -> Unit)? = null,
+    onNextChapter: (() -> Unit)? = null,
+    accentColor: Color = MaterialTheme.colorScheme.primary,
+    modifier: Modifier = Modifier,
+) {
+    var sliderPosition by remember(currentTime) { mutableFloatStateOf(currentTime.toFloat()) }
+    var isDragging by remember { mutableFloatStateOf(0f) }
+
+    Column(modifier = modifier.fillMaxWidth()) {
+        Box(contentAlignment = Alignment.CenterStart) {
+            Slider(
+                value = if (isDragging > 0) sliderPosition else currentTime.toFloat(),
+                onValueChange = { value ->
+                    sliderPosition = value
+                    isDragging = 1f
+                },
+                onValueChangeFinished = {
+                    onSeek(sliderPosition.toDouble())
+                    isDragging = 0f
+                },
+                valueRange = 0f..duration.toFloat().coerceAtLeast(1f),
+                modifier = Modifier.fillMaxWidth(),
+                colors =
+                    SliderDefaults.colors(
+                        thumbColor = Color.White,
+                        activeTrackColor = Color.White,
+                        inactiveTrackColor = Color.White.copy(alpha = 0.3f),
+                    ),
+                thumb = {
+                    Box(modifier = Modifier.size(16.dp).background(Color.White, CircleShape))
+                },
+                track = { sliderState ->
+                    SliderDefaults.Track(
+                        sliderState = sliderState,
+                        modifier = Modifier.height(2.dp),
+                        thumbTrackGapSize = 0.dp,
+                        colors =
+                            SliderDefaults.colors(
+                                activeTrackColor = Color.White,
+                                inactiveTrackColor = Color.White.copy(alpha = 0.2f),
+                            ),
+                        drawStopIndicator = null,
+                    )
+                },
+            )
+        }
+
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(top = 8.dp),
+            horizontalArrangement = Arrangement.SpaceBetween,
+        ) {
+            Text(
+                text = formatTime(currentTime),
+                style = MaterialTheme.typography.labelSmall,
+                color = Color.White.copy(alpha = 0.7f),
+            )
+            Text(
+                text = formatTime(duration),
+                style = MaterialTheme.typography.labelSmall,
+                color = Color.White.copy(alpha = 0.7f),
+            )
+        }
+
+        Spacer(modifier = Modifier.height(16.dp))
+
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceEvenly,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            IconButton(
+                onClick = { onPreviousChapter?.invoke() },
+                enabled = onPreviousChapter != null,
+            ) {
+                Icon(
+                    painterResource(id = R.drawable.ic_player_skip_back),
+                    null,
+                    tint = Color.White.copy(alpha = 0.7f),
+                    modifier = Modifier.size(28.dp),
+                )
+            }
+
+            IconButton(onClick = onSkipBackward) {
+                Icon(
+                    painterResource(id = R.drawable.ic_rewind_backward_30),
+                    null,
+                    tint = Color.White,
+                    modifier = Modifier.size(34.dp),
+                )
+            }
+
+            Surface(
+                onClick = onPlayPauseClick,
+                shape = RoundedCornerShape(28.dp),
+                color = Color.White,
+                modifier = Modifier.size(76.dp),
+                shadowElevation = 8.dp,
+            ) {
+                Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {
+                    if (isBuffering) {
+                        CircularProgressIndicator(
+                            modifier = Modifier.size(32.dp),
+                            color = accentColor,
+                            strokeWidth = 3.dp,
+                        )
+                    } else {
+                        Icon(
+                            painter =
+                                if (isPlaying)
+                                    painterResource(id = R.drawable.ic_player_pause_filled)
+                                else painterResource(id = R.drawable.ic_player_play_filled),
+                            contentDescription = null,
+                            tint = Color.Black,
+                            modifier = Modifier.size(38.dp),
+                        )
+                    }
+                }
+            }
+
+            IconButton(onClick = onSkipForward) {
+                Icon(
+                    painterResource(id = R.drawable.ic_rewind_forward_30),
+                    null,
+                    tint = Color.White,
+                    modifier = Modifier.size(34.dp),
+                )
+            }
+
+            IconButton(onClick = { onNextChapter?.invoke() }, enabled = onNextChapter != null) {
+                Icon(
+                    painterResource(id = R.drawable.ic_player_skip_forward),
+                    null,
+                    tint = Color.White.copy(alpha = 0.7f),
+                    modifier = Modifier.size(28.dp),
+                )
+            }
+        }
+    }
+}
+
+private fun formatTime(seconds: Double): String {
+    val totalSeconds = seconds.toLong().coerceAtLeast(0)
+    val hours = totalSeconds / 3600
+    val minutes = (totalSeconds % 3600) / 60
+    val secs = totalSeconds % 60
+    return if (hours > 0) String.format("%d:%02d:%02d", hours, minutes, secs)
+    else String.format("%d:%02d", minutes, secs)
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/components/SleepTimerDialog.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/components/SleepTimerDialog.kt
new file mode 100644
index 000000000..63a8a2b49
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/components/SleepTimerDialog.kt
@@ -0,0 +1,167 @@
+package com.makd.afinity.ui.audiobookshelf.player.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.makd.afinity.R
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun SleepTimerDialog(
+    currentTimerEndTime: Long?,
+    onTimerSelected: (Int) -> Unit,
+    onCancelTimer: () -> Unit,
+    onDismiss: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val sheetState = rememberModalBottomSheetState()
+
+    val timerOptions = listOf(5, 10, 15, 30, 45, 60, 90, 120)
+
+    val isTimerActive =
+        currentTimerEndTime != null && currentTimerEndTime > System.currentTimeMillis()
+    val remainingMinutes =
+        if (isTimerActive && currentTimerEndTime != null) {
+            ((currentTimerEndTime - System.currentTimeMillis()) / 60000).toInt().coerceAtLeast(1)
+        } else null
+
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        sheetState = sheetState,
+        modifier = modifier,
+        containerColor = MaterialTheme.colorScheme.surface,
+        dragHandle = null,
+    ) {
+        Column(modifier = Modifier.fillMaxWidth().padding(24.dp).padding(bottom = 24.dp)) {
+            Text(
+                text = "SLEEP TIMER",
+                style = MaterialTheme.typography.labelMedium,
+                color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f),
+                modifier = Modifier.fillMaxWidth(),
+                textAlign = TextAlign.Center,
+                letterSpacing = 2.sp,
+            )
+
+            Spacer(modifier = Modifier.height(24.dp))
+
+            if (isTimerActive && remainingMinutes != null) {
+                Box(
+                    modifier =
+                        Modifier.fillMaxWidth()
+                            .clip(RoundedCornerShape(20.dp))
+                            .background(MaterialTheme.colorScheme.primaryContainer)
+                            .padding(20.dp)
+                ) {
+                    Column(
+                        horizontalAlignment = Alignment.CenterHorizontally,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) {
+                        Icon(
+                            painter = painterResource(id = R.drawable.ic_timer),
+                            contentDescription = null,
+                            tint = MaterialTheme.colorScheme.primary,
+                            modifier = Modifier.size(32.dp),
+                        )
+                        Spacer(modifier = Modifier.height(8.dp))
+                        Text(
+                            text = "$remainingMinutes min remaining",
+                            style =
+                                MaterialTheme.typography.headlineSmall.copy(
+                                    fontWeight = FontWeight.Bold
+                                ),
+                            color = MaterialTheme.colorScheme.onPrimaryContainer,
+                        )
+                        Spacer(modifier = Modifier.height(16.dp))
+                        Button(
+                            onClick = onCancelTimer,
+                            colors =
+                                ButtonDefaults.buttonColors(
+                                    containerColor = MaterialTheme.colorScheme.surface,
+                                    contentColor = MaterialTheme.colorScheme.error,
+                                ),
+                            shape = RoundedCornerShape(12.dp),
+                            modifier = Modifier.fillMaxWidth(),
+                        ) {
+                            Icon(painterResource(id = R.drawable.ic_timer_off), null)
+                            Spacer(modifier = Modifier.width(8.dp))
+                            Text("Stop Timer")
+                        }
+                    }
+                }
+                Spacer(modifier = Modifier.height(24.dp))
+                Text(
+                    "Set New Timer",
+                    style = MaterialTheme.typography.titleSmall,
+                    color = MaterialTheme.colorScheme.onSurface,
+                )
+                Spacer(modifier = Modifier.height(12.dp))
+            }
+
+            LazyVerticalGrid(
+                columns = GridCells.Fixed(4),
+                horizontalArrangement = Arrangement.spacedBy(12.dp),
+                verticalArrangement = Arrangement.spacedBy(12.dp),
+                modifier = Modifier.fillMaxWidth(),
+            ) {
+                items(timerOptions) { minutes ->
+                    TimerTile(minutes = minutes, onClick = { onTimerSelected(minutes) })
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun TimerTile(minutes: Int, onClick: () -> Unit) {
+    Box(
+        modifier =
+            Modifier.aspectRatio(1.2f)
+                .clip(RoundedCornerShape(16.dp))
+                .background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f))
+                .clickable(onClick = onClick),
+        contentAlignment = Alignment.Center,
+    ) {
+        Column(horizontalAlignment = Alignment.CenterHorizontally) {
+            Text(
+                text = minutes.toString(),
+                style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.Bold),
+                color = MaterialTheme.colorScheme.onSurface,
+            )
+            Text(
+                text = "min",
+                style = MaterialTheme.typography.labelSmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/util/DominantColorState.kt b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/util/DominantColorState.kt
new file mode 100644
index 000000000..f1a7ba0e4
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/audiobookshelf/player/util/DominantColorState.kt
@@ -0,0 +1,52 @@
+package com.makd.afinity.ui.audiobookshelf.player.util
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.graphics.Color
+import androidx.core.graphics.drawable.toBitmap
+import androidx.palette.graphics.Palette
+import coil3.SingletonImageLoader
+import coil3.asDrawable
+import coil3.compose.LocalPlatformContext
+import coil3.request.ImageRequest
+import coil3.request.SuccessResult
+import coil3.request.allowHardware
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+@Composable
+fun rememberDominantColor(url: String?, defaultColor: Color): Color {
+    var dominantColor by remember { mutableStateOf(defaultColor) }
+    val context = LocalPlatformContext.current
+
+    LaunchedEffect(url) {
+        if (url == null) return@LaunchedEffect
+
+        withContext(Dispatchers.IO) {
+            val loader = SingletonImageLoader.get(context)
+            val request = ImageRequest.Builder(context).data(url).allowHardware(false).build()
+
+            val result = loader.execute(request)
+
+            if (result is SuccessResult) {
+                val image = result.image
+                val drawable = image.asDrawable(context.resources)
+                val bitmap = drawable.toBitmap()
+
+                val palette = Palette.from(bitmap).generate()
+                val swatch =
+                    palette.vibrantSwatch
+                        ?: palette.darkVibrantSwatch
+                        ?: palette.mutedSwatch
+                        ?: palette.dominantSwatch
+
+                swatch?.let { dominantColor = Color(it.rgb) }
+            }
+        }
+    }
+    return dominantColor
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/components/AfinitySplashScreen.kt b/app/src/main/java/com/makd/afinity/ui/components/AfinitySplashScreen.kt
index 6ae34760c..7da42092b 100644
--- a/app/src/main/java/com/makd/afinity/ui/components/AfinitySplashScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/components/AfinitySplashScreen.kt
@@ -33,46 +33,38 @@ import com.makd.afinity.R
 fun AfinitySplashScreen(
     statusText: String,
     modifier: Modifier = Modifier,
-    progress: Float? = null
+    progress: Float? = null,
 ) {
     Box(
-        modifier = modifier
-            .fillMaxSize()
-            .background(MaterialTheme.colorScheme.background),
-        contentAlignment = Alignment.Center
+        modifier = modifier.fillMaxSize().background(MaterialTheme.colorScheme.background),
+        contentAlignment = Alignment.Center,
     ) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Center,
-            modifier = Modifier
-                .padding(24.dp)
-                .verticalScroll(rememberScrollState())
+            modifier = Modifier.padding(24.dp).verticalScroll(rememberScrollState()),
         ) {
             Image(
                 painter = painterResource(id = R.drawable.ic_launcher_monochrome),
                 contentDescription = stringResource(R.string.cd_app_logo),
                 modifier = Modifier.size(160.dp),
-                colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary)
+                colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary),
             )
 
             Spacer(modifier = Modifier.height(32.dp))
 
             Text(
                 text = stringResource(R.string.app_name),
-                style = MaterialTheme.typography.headlineLarge.copy(
-                    fontWeight = FontWeight.Bold
-                ),
-                color = MaterialTheme.colorScheme.onBackground
+                style = MaterialTheme.typography.headlineLarge.copy(fontWeight = FontWeight.Bold),
+                color = MaterialTheme.colorScheme.onBackground,
             )
 
             Spacer(modifier = Modifier.height(8.dp))
 
             Text(
                 text = stringResource(R.string.splash_powered_by),
-                style = MaterialTheme.typography.headlineSmall.copy(
-                    fontWeight = FontWeight.Medium
-                ),
-                color = MaterialTheme.colorScheme.onBackground
+                style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Medium),
+                color = MaterialTheme.colorScheme.onBackground,
             )
 
             Spacer(modifier = Modifier.height(24.dp))
@@ -80,7 +72,7 @@ fun AfinitySplashScreen(
             Text(
                 text = statusText,
                 style = MaterialTheme.typography.bodyMedium,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
             )
 
             Spacer(modifier = Modifier.height(16.dp))
@@ -90,23 +82,24 @@ fun AfinitySplashScreen(
 
             LinearProgressIndicator(
                 progress = { currentProgress },
-                modifier = Modifier
-                    .width(240.dp)
-                    .height(6.dp)
-                    .clip(RoundedCornerShape(3.dp))
-                    .alpha(if (showProgress) 1f else 0f),
+                modifier =
+                    Modifier.width(240.dp)
+                        .height(6.dp)
+                        .clip(RoundedCornerShape(3.dp))
+                        .alpha(if (showProgress) 1f else 0f),
                 color = MaterialTheme.colorScheme.primary,
-                trackColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.2f)
+                trackColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.2f),
             )
 
             Spacer(modifier = Modifier.height(8.dp))
 
             Text(
-                text = stringResource(R.string.splash_progress_fmt, (currentProgress * 100).toInt()),
+                text =
+                    stringResource(R.string.splash_progress_fmt, (currentProgress * 100).toInt()),
                 style = MaterialTheme.typography.bodySmall,
                 color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f),
-                modifier = Modifier.alpha(if (showProgress) 1f else 0f)
+                modifier = Modifier.alpha(if (showProgress) 1f else 0f),
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/components/AfinityTopAppBar.kt b/app/src/main/java/com/makd/afinity/ui/components/AfinityTopAppBar.kt
index 0ffb71c81..de8a9fb13 100644
--- a/app/src/main/java/com/makd/afinity/ui/components/AfinityTopAppBar.kt
+++ b/app/src/main/java/com/makd/afinity/ui/components/AfinityTopAppBar.kt
@@ -41,13 +41,12 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.makd.afinity.R
 import com.makd.afinity.data.manager.OfflineModeManager
 import dagger.hilt.android.lifecycle.HiltViewModel
-import timber.log.Timber
 import javax.inject.Inject
+import timber.log.Timber
 
 @HiltViewModel
-class AfinityTopAppBarViewModel @Inject constructor(
-    offlineModeManager: OfflineModeManager
-) : ViewModel() {
+class AfinityTopAppBarViewModel @Inject constructor(offlineModeManager: OfflineModeManager) :
+    ViewModel() {
     val isOffline = offlineModeManager.isOffline
 }
 
@@ -61,7 +60,7 @@ fun AfinityTopAppBar(
     userProfileImageUrl: String? = null,
     backgroundOpacity: Float = 0f,
     actions: @Composable (RowScope.() -> Unit) = {},
-    viewModel: AfinityTopAppBarViewModel = hiltViewModel()
+    viewModel: AfinityTopAppBarViewModel = hiltViewModel(),
 ) {
     val isOffline by viewModel.isOffline.collectAsStateWithLifecycle(initialValue = false)
 
@@ -71,35 +70,31 @@ fun AfinityTopAppBar(
             if (onSearchClick != null) {
                 Button(
                     onClick = onSearchClick,
-                    modifier = Modifier
-                        .height(48.dp)
-                        .width(120.dp),
-                    colors = ButtonDefaults.buttonColors(
-                        containerColor = Color.Black.copy(alpha = 0.3f)
-                    ),
+                    modifier = Modifier.height(48.dp).width(120.dp),
+                    colors =
+                        ButtonDefaults.buttonColors(
+                            containerColor = Color.Black.copy(alpha = 0.3f)
+                        ),
                     shape = RoundedCornerShape(24.dp),
-                    contentPadding = PaddingValues(0.dp)
+                    contentPadding = PaddingValues(0.dp),
                 ) {
-                    Box(
-                        modifier = Modifier.fillMaxSize(),
-                        contentAlignment = Alignment.Center
-                    ) {
+                    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(6.dp)
+                            horizontalArrangement = Arrangement.spacedBy(6.dp),
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_search),
                                 contentDescription = stringResource(R.string.cd_search_icon),
                                 tint = Color.White,
-                                modifier = Modifier.size(20.dp)
+                                modifier = Modifier.size(20.dp),
                             )
                             Text(
                                 text = stringResource(R.string.top_bar_search_hint),
                                 color = Color.White,
                                 style = MaterialTheme.typography.bodyMedium,
                                 fontSize = 20.sp,
-                                fontWeight = FontWeight.Medium
+                                fontWeight = FontWeight.Medium,
                             )
                         }
                     }
@@ -109,19 +104,13 @@ fun AfinityTopAppBar(
 
             if (onProfileClick != null) {
                 Box {
-                    IconButton(
-                        onClick = onProfileClick,
-                        modifier = Modifier.size(48.dp)
-                    ) {
+                    IconButton(onClick = onProfileClick, modifier = Modifier.size(48.dp)) {
                         Box(
-                            modifier = Modifier
-                                .fillMaxSize()
-                                .background(
-                                    Color.Black.copy(alpha = 0.3f),
-                                    CircleShape
-                                )
-                                .clip(CircleShape),
-                            contentAlignment = Alignment.Center
+                            modifier =
+                                Modifier.fillMaxSize()
+                                    .background(Color.Black.copy(alpha = 0.3f), CircleShape)
+                                    .clip(CircleShape),
+                            contentAlignment = Alignment.Center,
                         ) {
                             if (userProfileImageUrl != null) {
                                 AsyncImage(
@@ -130,14 +119,14 @@ fun AfinityTopAppBar(
                                     targetWidth = 48.dp,
                                     targetHeight = 48.dp,
                                     modifier = Modifier.fillMaxSize(),
-                                    contentScale = ContentScale.Crop
+                                    contentScale = ContentScale.Crop,
                                 )
                             } else {
                                 Icon(
                                     painter = painterResource(id = R.drawable.ic_user_circle),
                                     contentDescription = stringResource(R.string.cd_profile_icon),
                                     tint = Color.White,
-                                    modifier = Modifier.size(32.dp)
+                                    modifier = Modifier.size(32.dp),
                                 )
                             }
                         }
@@ -146,21 +135,21 @@ fun AfinityTopAppBar(
                     if (isOffline) {
                         Timber.d("OfflineMode Toggled, icon to be shown")
                         Box(
-                            modifier = Modifier
-                                .align(Alignment.BottomEnd)
-                                .size(20.dp)
-                                .background(
-                                    color = MaterialTheme.colorScheme.tertiaryContainer,
-                                    shape = CircleShape
-                                )
-                                .padding(4.dp),
-                            contentAlignment = Alignment.Center
+                            modifier =
+                                Modifier.align(Alignment.BottomEnd)
+                                    .size(20.dp)
+                                    .background(
+                                        color = MaterialTheme.colorScheme.tertiaryContainer,
+                                        shape = CircleShape,
+                                    )
+                                    .padding(4.dp),
+                            contentAlignment = Alignment.Center,
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_cloud_off),
                                 contentDescription = stringResource(R.string.cd_offline_mode),
                                 tint = MaterialTheme.colorScheme.onTertiaryContainer,
-                                modifier = Modifier.size(14.dp)
+                                modifier = Modifier.size(14.dp),
                             )
                         }
                     }
@@ -169,9 +158,10 @@ fun AfinityTopAppBar(
             }
             actions()
         },
-        colors = TopAppBarDefaults.topAppBarColors(
-            containerColor = MaterialTheme.colorScheme.surface.copy(alpha = backgroundOpacity)
-        ),
-        modifier = modifier
+        colors =
+            TopAppBarDefaults.topAppBarColors(
+                containerColor = MaterialTheme.colorScheme.surface.copy(alpha = backgroundOpacity)
+            ),
+        modifier = modifier,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/components/AsyncImage.kt b/app/src/main/java/com/makd/afinity/ui/components/AsyncImage.kt
index c6c32049b..2d4f9fb29 100644
--- a/app/src/main/java/com/makd/afinity/ui/components/AsyncImage.kt
+++ b/app/src/main/java/com/makd/afinity/ui/components/AsyncImage.kt
@@ -40,72 +40,82 @@ fun AsyncImage(
     blurHash: String? = null,
     targetWidth: Dp? = null,
     targetHeight: Dp? = null,
-    scaleFactor: Float = 1.0f
+    scaleFactor: Float = 1.0f,
 ) {
     val context = LocalContext.current
     val density = LocalDensity.current
 
-    val imageSize = remember(targetWidth, targetHeight, density, scaleFactor) {
-        when {
-            targetWidth != null && targetHeight != null -> {
-                Size(
-                    width = with(density) { (targetWidth.toPx() * scaleFactor).toInt() },
-                    height = with(density) { (targetHeight.toPx() * scaleFactor).toInt() }
-                )
+    val imageSize =
+        remember(targetWidth, targetHeight, density, scaleFactor) {
+            when {
+                targetWidth != null && targetHeight != null -> {
+                    Size(
+                        width = with(density) { (targetWidth.toPx() * scaleFactor).toInt() },
+                        height = with(density) { (targetHeight.toPx() * scaleFactor).toInt() },
+                    )
+                }
+                else -> Size.ORIGINAL
             }
-            else -> Size.ORIGINAL
         }
-    }
 
-    val blurHashPlaceholder = remember(blurHash, targetWidth, targetHeight) {
-        if (!blurHash.isNullOrBlank()) {
-            try {
-                val ratio = if (targetWidth != null && targetHeight != null && targetHeight.value > 0f) {
-                    targetWidth.value / targetHeight.value
-                } else {
-                    1f
-                }
+    val blurHashPlaceholder =
+        remember(blurHash, targetWidth, targetHeight) {
+            if (!blurHash.isNullOrBlank()) {
+                try {
+                    val ratio =
+                        if (
+                            targetWidth != null && targetHeight != null && targetHeight.value > 0f
+                        ) {
+                            targetWidth.value / targetHeight.value
+                        } else {
+                            1f
+                        }
 
-                val baseSize = 32
-                val decodeWidth = if (ratio > 1) baseSize else (baseSize * ratio).toInt()
-                val decodeHeight = if (ratio < 1) baseSize else (baseSize / ratio).toInt()
+                    val baseSize = 32
+                    val decodeWidth = if (ratio > 1) baseSize else (baseSize * ratio).toInt()
+                    val decodeHeight = if (ratio < 1) baseSize else (baseSize / ratio).toInt()
 
-                val bitmap = BlurHash.decode(
-                    blurHash = blurHash,
-                    width = decodeWidth.coerceAtLeast(25),
-                    height = decodeHeight.coerceAtLeast(25)
-                )
-                bitmap?.asImageBitmap()?.let { BitmapPainter(it) }
-            } catch (e: Exception) {
-                Timber.w("Failed to decode blur hash: ${e.message}")
+                    val bitmap =
+                        BlurHash.decode(
+                            blurHash = blurHash,
+                            width = decodeWidth.coerceAtLeast(25),
+                            height = decodeHeight.coerceAtLeast(25),
+                        )
+                    bitmap?.asImageBitmap()?.let { BitmapPainter(it) }
+                } catch (e: Exception) {
+                    Timber.w("Failed to decode blur hash: ${e.message}")
+                    null
+                }
+            } else {
                 null
             }
-        } else {
-            null
         }
-    }
 
     AsyncImage(
-        model = ImageRequest.Builder(context)
-            .data(imageUrl)
-            .size(imageSize)
-            .memoryCachePolicy(CachePolicy.ENABLED)
-            .diskCachePolicy(CachePolicy.ENABLED)
-            .networkCachePolicy(if (imageUrl?.startsWith("file://") == true) CachePolicy.DISABLED else CachePolicy.ENABLED)
-            .crossfade(true)
-            .placeholderMemoryCacheKey(blurHash)
-            .listener(
-                onStart = { onLoading?.invoke(true) },
-                onSuccess = { _, _ ->
-                    onLoading?.invoke(false)
-                    onSuccess?.invoke()
-                },
-                onError = { _, result ->
-                    onLoading?.invoke(false)
-                    onError?.invoke()
-                }
-            )
-            .build(),
+        model =
+            ImageRequest.Builder(context)
+                .data(imageUrl)
+                .size(imageSize)
+                .memoryCachePolicy(CachePolicy.ENABLED)
+                .diskCachePolicy(CachePolicy.ENABLED)
+                .networkCachePolicy(
+                    if (imageUrl?.startsWith("file://") == true) CachePolicy.DISABLED
+                    else CachePolicy.ENABLED
+                )
+                .crossfade(true)
+                .placeholderMemoryCacheKey(blurHash)
+                .listener(
+                    onStart = { onLoading?.invoke(true) },
+                    onSuccess = { _, _ ->
+                        onLoading?.invoke(false)
+                        onSuccess?.invoke()
+                    },
+                    onError = { _, result ->
+                        onLoading?.invoke(false)
+                        onError?.invoke()
+                    },
+                )
+                .build(),
         contentDescription = contentDescription,
         modifier = modifier,
         placeholder = blurHashPlaceholder ?: placeholder,
@@ -114,6 +124,6 @@ fun AsyncImage(
         contentScale = contentScale,
         alpha = alpha,
         colorFilter = colorFilter,
-        filterQuality = filterQuality
+        filterQuality = filterQuality,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/components/ContinueWatchingCard.kt b/app/src/main/java/com/makd/afinity/ui/components/ContinueWatchingCard.kt
index c2d78483b..83d53711b 100644
--- a/app/src/main/java/com/makd/afinity/ui/components/ContinueWatchingCard.kt
+++ b/app/src/main/java/com/makd/afinity/ui/components/ContinueWatchingCard.kt
@@ -28,8 +28,8 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 import com.makd.afinity.R
 import com.makd.afinity.data.models.extensions.backdropBlurHash
 import com.makd.afinity.data.models.extensions.backdropImageUrl
@@ -49,71 +49,61 @@ fun ContinueWatchingCard(
     item: AfinityItem,
     onClick: () -> Unit,
     cardWidth: Dp,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
 
-    Column(
-        modifier = modifier.width(cardWidth)
-    ) {
+    Column(modifier = modifier.width(cardWidth)) {
         Card(
             onClick = onClick,
-            modifier = Modifier
-                .fillMaxWidth()
-                .aspectRatio(CardDimensions.ASPECT_RATIO_LANDSCAPE),
-            colors = CardDefaults.cardColors(
-                containerColor = MaterialTheme.colorScheme.surfaceVariant
-            ),
-            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+            modifier = Modifier.fillMaxWidth().aspectRatio(CardDimensions.ASPECT_RATIO_LANDSCAPE),
+            colors =
+                CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
+            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
         ) {
             Box(modifier = Modifier.fillMaxSize()) {
                 AsyncImage(
-                    imageUrl = item.images.thumbImageUrl ?: item.images.backdropImageUrl
-                    ?: item.images.primaryImageUrl,
+                    imageUrl =
+                        item.images.thumbImageUrl
+                            ?: item.images.backdropImageUrl
+                            ?: item.images.primaryImageUrl,
                     contentDescription = item.name,
-                    blurHash = item.images.thumbBlurHash ?: item.images.backdropBlurHash
-                    ?: item.images.primaryBlurHash,
+                    blurHash =
+                        item.images.thumbBlurHash
+                            ?: item.images.backdropBlurHash
+                            ?: item.images.primaryBlurHash,
                     targetWidth = cardWidth,
                     targetHeight = cardWidth * 9f / 16f,
                     contentScale = ContentScale.Crop,
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .align(Alignment.Center)
+                    modifier = Modifier.fillMaxSize().align(Alignment.Center),
                 )
 
-                val progressPercentage = if (item.runtimeTicks > 0) {
-                    (item.playbackPositionTicks.toFloat() / item.runtimeTicks.toFloat()).coerceIn(
-                        0f,
-                        1f
-                    )
-                } else 0f
+                val progressPercentage =
+                    if (item.runtimeTicks > 0) {
+                        (item.playbackPositionTicks.toFloat() / item.runtimeTicks.toFloat())
+                            .coerceIn(0f, 1f)
+                    } else 0f
 
                 LinearProgressIndicator(
                     progress = { progressPercentage },
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(4.dp)
-                        .align(Alignment.BottomCenter),
+                    modifier = Modifier.fillMaxWidth().height(4.dp).align(Alignment.BottomCenter),
                     color = MaterialTheme.colorScheme.primary,
-                    trackColor = Color.Black.copy(alpha = 0.3f)
+                    trackColor = Color.Black.copy(alpha = 0.3f),
                 )
 
                 if (item.played) {
                     Box(
-                        modifier = Modifier
-                            .align(Alignment.TopEnd)
-                            .padding(8.dp)
-                            .size(24.dp)
-                            .background(
-                                MaterialTheme.colorScheme.primary,
-                                CircleShape
-                            ),
-                        contentAlignment = Alignment.Center
+                        modifier =
+                            Modifier.align(Alignment.TopEnd)
+                                .padding(8.dp)
+                                .size(24.dp)
+                                .background(MaterialTheme.colorScheme.primary, CircleShape),
+                        contentAlignment = Alignment.Center,
                     ) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_check),
                             contentDescription = "Watched",
                             tint = MaterialTheme.colorScheme.onPrimary,
-                            modifier = Modifier.size(16.dp)
+                            modifier = Modifier.size(16.dp),
                         )
                     }
                 }
@@ -126,24 +116,22 @@ fun ContinueWatchingCard(
             is AfinityEpisode -> {
                 Text(
                     text = item.seriesName,
-                    style = MaterialTheme.typography.bodyMedium.copy(
-                        fontWeight = FontWeight.SemiBold
-                    ),
+                    style =
+                        MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
                     color = MaterialTheme.colorScheme.onBackground,
                     maxLines = 1,
-                    overflow = TextOverflow.Ellipsis
+                    overflow = TextOverflow.Ellipsis,
                 )
             }
 
             else -> {
                 Text(
                     text = item.name,
-                    style = MaterialTheme.typography.bodyMedium.copy(
-                        fontWeight = FontWeight.SemiBold
-                    ),
+                    style =
+                        MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
                     color = MaterialTheme.colorScheme.onBackground,
                     maxLines = 1,
-                    overflow = TextOverflow.Ellipsis
+                    overflow = TextOverflow.Ellipsis,
                 )
             }
         }
@@ -161,7 +149,7 @@ fun ContinueWatchingCard(
                             Text(
                                 text = year.toString(),
                                 style = MaterialTheme.typography.bodySmall,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                         }
                     }
@@ -170,18 +158,18 @@ fun ContinueWatchingCard(
                         metadataItems.add {
                             Row(
                                 verticalAlignment = Alignment.CenterVertically,
-                                horizontalArrangement = Arrangement.spacedBy(2.dp)
+                                horizontalArrangement = Arrangement.spacedBy(2.dp),
                             ) {
                                 Icon(
                                     painter = painterResource(id = R.drawable.ic_imdb_logo),
                                     contentDescription = "IMDB",
                                     tint = Color.Unspecified,
-                                    modifier = Modifier.size(18.dp)
+                                    modifier = Modifier.size(18.dp),
                                 )
                                 Text(
                                     text = String.format(Locale.US, "%.1f", imdbRating),
                                     style = MaterialTheme.typography.bodySmall,
-                                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                                 )
                             }
                         }
@@ -191,22 +179,24 @@ fun ContinueWatchingCard(
                         metadataItems.add {
                             Row(verticalAlignment = Alignment.CenterVertically) {
                                 Icon(
-                                    painter = painterResource(
-                                        id = if (rtRating > 60) {
-                                            R.drawable.ic_rotten_tomato_fresh
-                                        } else {
-                                            R.drawable.ic_rotten_tomato_rotten
-                                        }
-                                    ),
+                                    painter =
+                                        painterResource(
+                                            id =
+                                                if (rtRating > 60) {
+                                                    R.drawable.ic_rotten_tomato_fresh
+                                                } else {
+                                                    R.drawable.ic_rotten_tomato_rotten
+                                                }
+                                        ),
                                     contentDescription = "Rotten Tomatoes Rating",
                                     modifier = Modifier.size(12.dp),
-                                    tint = Color.Unspecified
+                                    tint = Color.Unspecified,
                                 )
                                 Spacer(modifier = Modifier.width(2.dp))
                                 Text(
                                     text = "${rtRating.toInt()}%",
                                     style = MaterialTheme.typography.bodySmall,
-                                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                                 )
                             }
                         }
@@ -218,7 +208,7 @@ fun ContinueWatchingCard(
                             Text(
                                 text = "•",
                                 style = MaterialTheme.typography.bodySmall,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                         }
                     }
@@ -228,21 +218,22 @@ fun ContinueWatchingCard(
             is AfinityEpisode -> {
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(4.dp)
+                    horizontalArrangement = Arrangement.spacedBy(4.dp),
                 ) {
                     val metadataItems = mutableListOf<@Composable () -> Unit>()
 
                     if (item.name.isNotBlank()) {
                         metadataItems.add {
-                            val truncatedName = if (item.name.length > 15) {
-                                "S${item.parentIndexNumber}:E${item.indexNumber} • ${
+                            val truncatedName =
+                                if (item.name.length > 15) {
+                                    "S${item.parentIndexNumber}:E${item.indexNumber} • ${
                                     item.name.take(
                                         15
                                     )
                                 }..."
-                            } else {
-                                "S${item.parentIndexNumber}:E${item.indexNumber} • ${item.name}"
-                            }
+                                } else {
+                                    "S${item.parentIndexNumber}:E${item.indexNumber} • ${item.name}"
+                                }
                             Text(
                                 text = truncatedName,
                                 style = MaterialTheme.typography.bodySmall,
@@ -257,18 +248,18 @@ fun ContinueWatchingCard(
                         metadataItems.add {
                             Row(
                                 verticalAlignment = Alignment.CenterVertically,
-                                horizontalArrangement = Arrangement.spacedBy(2.dp)
+                                horizontalArrangement = Arrangement.spacedBy(2.dp),
                             ) {
                                 Icon(
                                     painter = painterResource(id = R.drawable.ic_imdb_logo),
                                     contentDescription = "IMDB",
                                     tint = Color.Unspecified,
-                                    modifier = Modifier.size(18.dp)
+                                    modifier = Modifier.size(18.dp),
                                 )
                                 Text(
                                     text = String.format(Locale.US, "%.1f", imdbRating),
                                     style = MaterialTheme.typography.bodySmall,
-                                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                                 )
                             }
                         }
@@ -280,7 +271,7 @@ fun ContinueWatchingCard(
                             Text(
                                 text = "•",
                                 style = MaterialTheme.typography.bodySmall,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                         }
                     }
@@ -291,22 +282,22 @@ fun ContinueWatchingCard(
                 item.communityRating?.let { rating ->
                     Row(
                         verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.spacedBy(2.dp)
+                        horizontalArrangement = Arrangement.spacedBy(2.dp),
                     ) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_imdb_logo),
                             contentDescription = "IMDB",
                             tint = Color.Unspecified,
-                            modifier = Modifier.size(18.dp)
+                            modifier = Modifier.size(18.dp),
                         )
                         Text(
                             text = String.format(Locale.US, "%.1f", rating),
                             style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
                 }
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/components/EpisodeListCard.kt b/app/src/main/java/com/makd/afinity/ui/components/EpisodeListCard.kt
index ff0b4f42b..5293338d8 100644
--- a/app/src/main/java/com/makd/afinity/ui/components/EpisodeListCard.kt
+++ b/app/src/main/java/com/makd/afinity/ui/components/EpisodeListCard.kt
@@ -51,44 +51,42 @@ fun EpisodeListCard(
     item: AfinityEpisode,
     onClick: () -> Unit,
     thumbnailWidth: Dp,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val interactionSource = remember { MutableInteractionSource() }
 
     Card(
-        modifier = modifier
-            .fillMaxWidth()
-            .clickable(
-                interactionSource = interactionSource,
-                indication = null,
-                onClick = onClick
-            ),
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null,
+                    onClick = onClick,
+                ),
         shape = RoundedCornerShape(8.dp),
-        colors = CardDefaults.cardColors(
-            containerColor = Color.Transparent
-        )
+        colors = CardDefaults.cardColors(containerColor = Color.Transparent),
     ) {
         Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(vertical = 8.dp),
+            modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            verticalAlignment = Alignment.CenterVertically
+            verticalAlignment = Alignment.CenterVertically,
         ) {
             Box(
-                modifier = Modifier
-                    .width(thumbnailWidth)
-                    .aspectRatio(CardDimensions.ASPECT_RATIO_LANDSCAPE)
-                    .clip(MaterialTheme.shapes.medium)
+                modifier =
+                    Modifier.width(thumbnailWidth)
+                        .aspectRatio(CardDimensions.ASPECT_RATIO_LANDSCAPE)
+                        .clip(MaterialTheme.shapes.medium)
             ) {
                 AsyncImage(
-                    imageUrl = item.images.thumbImageUrl
-                        ?: item.images.backdropImageUrl
-                        ?: item.images.primaryImageUrl,
+                    imageUrl =
+                        item.images.thumbImageUrl
+                            ?: item.images.backdropImageUrl
+                            ?: item.images.primaryImageUrl,
                     blurHash = item.images.thumbBlurHash,
                     contentDescription = item.name,
                     modifier = Modifier.fillMaxSize(),
-                    contentScale = ContentScale.Crop
+                    contentScale = ContentScale.Crop,
                 )
 
                 if (item.runtimeTicks != null && item.runtimeTicks > 0) {
@@ -96,71 +94,67 @@ fun EpisodeListCard(
                     if (progress > 0f) {
                         LinearProgressIndicator(
                             progress = { progress },
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .height(4.dp)
-                                .align(Alignment.BottomCenter),
+                            modifier =
+                                Modifier.fillMaxWidth().height(4.dp).align(Alignment.BottomCenter),
                             color = MaterialTheme.colorScheme.primary,
-                            trackColor = Color.Black.copy(alpha = 0.3f)
+                            trackColor = Color.Black.copy(alpha = 0.3f),
                         )
                     }
                 }
 
                 if (item.played) {
                     Box(
-                        modifier = Modifier
-                            .align(Alignment.TopEnd)
-                            .padding(8.dp)
-                            .size(24.dp)
-                            .background(
-                                MaterialTheme.colorScheme.primary,
-                                CircleShape
-                            ),
-                        contentAlignment = Alignment.Center
+                        modifier =
+                            Modifier.align(Alignment.TopEnd)
+                                .padding(8.dp)
+                                .size(24.dp)
+                                .background(MaterialTheme.colorScheme.primary, CircleShape),
+                        contentAlignment = Alignment.Center,
                     ) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_check),
                             contentDescription = "Watched",
                             tint = MaterialTheme.colorScheme.onPrimary,
-                            modifier = Modifier.size(16.dp)
+                            modifier = Modifier.size(16.dp),
                         )
                     }
                 }
             }
 
             Column(
-                modifier = Modifier
-                    .weight(1f)
-                    .fillMaxHeight(),
-                verticalArrangement = Arrangement.Center
+                modifier = Modifier.weight(1f).fillMaxHeight(),
+                verticalArrangement = Arrangement.Center,
             ) {
                 Row(
                     modifier = Modifier.fillMaxWidth(),
                     horizontalArrangement = Arrangement.spacedBy(6.dp),
-                    verticalAlignment = Alignment.CenterVertically
+                    verticalAlignment = Alignment.CenterVertically,
                 ) {
                     Text(
                         text = "S${item.parentIndexNumber}:E${item.indexNumber}",
                         style = MaterialTheme.typography.labelMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
 
                     item.communityRating?.let { rating ->
                         MetadataDot()
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(4.dp)
+                            horizontalArrangement = Arrangement.spacedBy(4.dp),
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_imdb_logo),
                                 contentDescription = "IMDB",
                                 tint = Color.Unspecified,
-                                modifier = Modifier.size(16.dp)
+                                modifier = Modifier.size(16.dp),
                             )
                             Text(
                                 text = String.format(Locale.US, "%.1f", rating),
-                                style = MaterialTheme.typography.labelMedium.copy(fontWeight = FontWeight.Bold),
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                style =
+                                    MaterialTheme.typography.labelMedium.copy(
+                                        fontWeight = FontWeight.Bold
+                                    ),
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                         }
                     }
@@ -168,24 +162,23 @@ fun EpisodeListCard(
 
                 Text(
                     text = item.name ?: "Unknown Episode",
-                    style = MaterialTheme.typography.titleSmall.copy(
-                        fontWeight = FontWeight.SemiBold
-                    ),
+                    style =
+                        MaterialTheme.typography.titleSmall.copy(fontWeight = FontWeight.SemiBold),
                     color = MaterialTheme.colorScheme.onSurface,
                     maxLines = 2,
-                    overflow = TextOverflow.Ellipsis
+                    overflow = TextOverflow.Ellipsis,
                 )
 
                 Row(
                     horizontalArrangement = Arrangement.spacedBy(6.dp),
-                    verticalAlignment = Alignment.CenterVertically
+                    verticalAlignment = Alignment.CenterVertically,
                 ) {
                     item.runtimeTicks?.let { ticks ->
                         val minutes = (ticks / 600000000).toInt()
                         Text(
                             text = "${minutes}min",
                             style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.primary
+                            color = MaterialTheme.colorScheme.primary,
                         )
                     }
 
@@ -194,7 +187,7 @@ fun EpisodeListCard(
                         Text(
                             text = formatDate(date),
                             style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.primary
+                            color = MaterialTheme.colorScheme.primary,
                         )
                     }
                 }
@@ -208,7 +201,7 @@ private fun MetadataDot() {
     Text(
         text = "•",
         style = MaterialTheme.typography.bodySmall,
-        color = MaterialTheme.colorScheme.onSurfaceVariant
+        color = MaterialTheme.colorScheme.onSurfaceVariant,
     )
 }
 
@@ -219,4 +212,4 @@ private fun formatDate(date: LocalDateTime): String {
     } catch (_: Exception) {
         date.toString().take(10)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/components/HeroCarousel.kt b/app/src/main/java/com/makd/afinity/ui/components/HeroCarousel.kt
index 4cc5dbbc9..37ddcd3cf 100644
--- a/app/src/main/java/com/makd/afinity/ui/components/HeroCarousel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/components/HeroCarousel.kt
@@ -60,12 +60,12 @@ import com.makd.afinity.data.models.media.AfinityEpisode
 import com.makd.afinity.data.models.media.AfinityItem
 import com.makd.afinity.data.models.media.AfinityMovie
 import com.makd.afinity.data.models.media.AfinityShow
+import java.util.Locale
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import mx.platacard.pagerindicator.PagerIndicatorOrientation
 import mx.platacard.pagerindicator.PagerWormIndicator
 import timber.log.Timber
-import java.util.Locale
 
 @Composable
 fun HeroCarousel(
@@ -75,7 +75,7 @@ fun HeroCarousel(
     onPlayTrailerClick: (AfinityItem) -> Unit,
     onMoreInformationClick: (AfinityItem) -> Unit,
     modifier: Modifier = Modifier,
-    isScrolling: Boolean = false
+    isScrolling: Boolean = false,
 ) {
     if (items.isEmpty()) return
 
@@ -87,9 +87,7 @@ fun HeroCarousel(
 
     val adjustedStart = if (items.isNotEmpty()) middleStart - (middleStart % items.size) else 0
 
-    val currentPageIndex = rememberSaveable(items.size) {
-        mutableIntStateOf(adjustedStart)
-    }
+    val currentPageIndex = rememberSaveable(items.size) { mutableIntStateOf(adjustedStart) }
 
     if (isLandscape) {
         HeroCarouselLandscape(
@@ -101,7 +99,7 @@ fun HeroCarousel(
             modifier = modifier,
             isScrolling = isScrolling,
             initialPageIndex = currentPageIndex.intValue,
-            onPageChanged = { currentPageIndex.intValue = it }
+            onPageChanged = { currentPageIndex.intValue = it },
         )
     } else {
         HeroCarouselPortrait(
@@ -113,7 +111,7 @@ fun HeroCarousel(
             modifier = modifier,
             isScrolling = isScrolling,
             initialPageIndex = currentPageIndex.intValue,
-            onPageChanged = { currentPageIndex.intValue = it }
+            onPageChanged = { currentPageIndex.intValue = it },
         )
     }
 }
@@ -128,18 +126,14 @@ fun HeroCarouselPortrait(
     modifier: Modifier = Modifier,
     isScrolling: Boolean = false,
     initialPageIndex: Int,
-    onPageChanged: (Int) -> Unit
+    onPageChanged: (Int) -> Unit,
 ) {
     if (items.isEmpty()) return
     val infinitePageCount = Int.MAX_VALUE
-    val pagerState = rememberPagerState(
-        initialPage = initialPageIndex,
-        pageCount = { infinitePageCount }
-    )
+    val pagerState =
+        rememberPagerState(initialPage = initialPageIndex, pageCount = { infinitePageCount })
 
-    LaunchedEffect(pagerState.currentPage) {
-        onPageChanged(pagerState.currentPage)
-    }
+    LaunchedEffect(pagerState.currentPage) { onPageChanged(pagerState.currentPage) }
 
     LaunchedEffect(items.size, isScrolling) {
         if (items.size > 1) {
@@ -154,7 +148,7 @@ fun HeroCarouselPortrait(
                 try {
                     pagerState.animateScrollToPage(
                         page = pagerState.currentPage + 1,
-                        animationSpec = tween(durationMillis = 800)
+                        animationSpec = tween(durationMillis = 800),
                     )
                 } catch (e: Exception) {
                     Timber.w("Hero carousel animation interrupted: ${e.message}")
@@ -180,16 +174,12 @@ fun HeroCarouselPortrait(
         }
     }
 
-    Box(
-        modifier = modifier
-            .fillMaxWidth()
-            .height(height)
-    ) {
+    Box(modifier = modifier.fillMaxWidth().height(height)) {
         HorizontalPager(
             state = pagerState,
             modifier = Modifier.fillMaxSize(),
             beyondViewportPageCount = 1,
-            key = { page -> "hero_page_${page % items.size}" }
+            key = { page -> "hero_page_${page % items.size}" },
         ) { page ->
             val actualIndex = page % items.size
             val item = items[actualIndex]
@@ -200,48 +190,46 @@ fun HeroCarouselPortrait(
                 targetWidth = LocalConfiguration.current.screenWidthDp.dp,
                 targetHeight = height,
                 contentScale = ContentScale.Crop,
-                modifier = Modifier
-                    .fillMaxSize()
-                    .graphicsLayer { alpha = 0.99f }
-                    .drawWithCache {
-                        val gradient = Brush.verticalGradient(
-                            colors = listOf(
-                                Color.Black,
-                                Color.Black.copy(alpha = 0.98f),
-                                Color.Black.copy(alpha = 0.92f),
-                                Color.Black.copy(alpha = 0.78f),
-                                Color.Black.copy(alpha = 0.55f),
-                                Color.Black.copy(alpha = 0.25f),
-                                Color.Transparent
-                            ),
-                            startY = size.height * 0.55f,
-                            endY = size.height
-                        )
-                        onDrawWithContent {
-                            drawContent()
-                            drawRect(Color.Black.copy(alpha = 0.25f))
-                            drawRect(gradient, blendMode = BlendMode.DstIn)
-                        }
-                    }
+                modifier =
+                    Modifier.fillMaxSize()
+                        .graphicsLayer { alpha = 0.99f }
+                        .drawWithCache {
+                            val gradient =
+                                Brush.verticalGradient(
+                                    colors =
+                                        listOf(
+                                            Color.Black,
+                                            Color.Black.copy(alpha = 0.98f),
+                                            Color.Black.copy(alpha = 0.92f),
+                                            Color.Black.copy(alpha = 0.78f),
+                                            Color.Black.copy(alpha = 0.55f),
+                                            Color.Black.copy(alpha = 0.25f),
+                                            Color.Transparent,
+                                        ),
+                                    startY = size.height * 0.55f,
+                                    endY = size.height,
+                                )
+                            onDrawWithContent {
+                                drawContent()
+                                drawRect(Color.Black.copy(alpha = 0.25f))
+                                drawRect(gradient, blendMode = BlendMode.DstIn)
+                            }
+                        },
             )
         }
 
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(24.dp)
-        ) {
+        Box(modifier = Modifier.fillMaxSize().padding(24.dp)) {
             Box(
-                modifier = Modifier
-                    .align(Alignment.BottomCenter)
-                    .fillMaxWidth(0.8f)
-                    .padding(bottom = 144.dp)
-                    .sizeIn(maxHeight = 120.dp)
+                modifier =
+                    Modifier.align(Alignment.BottomCenter)
+                        .fillMaxWidth(0.8f)
+                        .padding(bottom = 144.dp)
+                        .sizeIn(maxHeight = 120.dp)
             ) {
                 Crossfade(
                     targetState = currentItem,
                     animationSpec = tween(durationMillis = 700),
-                    label = "logo_crossfade"
+                    label = "logo_crossfade",
                 ) { item ->
                     Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                         item.images.logo?.let { logoUri ->
@@ -251,25 +239,25 @@ fun HeroCarouselPortrait(
                                 blurHash = null,
                                 targetWidth = (LocalConfiguration.current.screenWidthDp * 0.8f).dp,
                                 targetHeight = 120.dp,
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .wrapContentHeight(),
-                                contentScale = ContentScale.Fit
-                            )
-                        } ?: run {
-                            Text(
-                                text = item.name,
-                                style = MaterialTheme.typography.displaySmall.copy(
-                                    fontWeight = FontWeight.Bold,
-                                    fontSize = 36.sp
-                                ),
-                                color = Color.White,
-                                textAlign = TextAlign.Center,
-                                maxLines = 2,
-                                overflow = TextOverflow.Ellipsis,
-                                modifier = Modifier.fillMaxWidth()
+                                modifier = Modifier.fillMaxWidth().wrapContentHeight(),
+                                contentScale = ContentScale.Fit,
                             )
                         }
+                            ?: run {
+                                Text(
+                                    text = item.name,
+                                    style =
+                                        MaterialTheme.typography.displaySmall.copy(
+                                            fontWeight = FontWeight.Bold,
+                                            fontSize = 36.sp,
+                                        ),
+                                    color = Color.White,
+                                    textAlign = TextAlign.Center,
+                                    maxLines = 2,
+                                    overflow = TextOverflow.Ellipsis,
+                                    modifier = Modifier.fillMaxWidth(),
+                                )
+                            }
                     }
                 }
             }
@@ -277,10 +265,8 @@ fun HeroCarouselPortrait(
             Row(
                 horizontalArrangement = Arrangement.spacedBy(12.dp),
                 verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier
-                    .align(Alignment.BottomCenter)
-                    .padding(bottom = 112.dp)
-                    .fillMaxWidth()
+                modifier =
+                    Modifier.align(Alignment.BottomCenter).padding(bottom = 112.dp).fillMaxWidth(),
             ) {
                 Spacer(modifier = Modifier.weight(1f))
                 HeroMetadata(currentItem)
@@ -288,79 +274,82 @@ fun HeroCarouselPortrait(
             }
 
             Box(
-                modifier = Modifier
-                    .align(Alignment.BottomCenter)
-                    .padding(bottom = 80.dp)
-                    .fillMaxWidth()
+                modifier =
+                    Modifier.align(Alignment.BottomCenter).padding(bottom = 80.dp).fillMaxWidth()
             ) {
-                val genres = when (currentItem) {
-                    is AfinityMovie -> (currentItem as AfinityMovie).genres
-                    is AfinityShow -> (currentItem as AfinityShow).genres
-                    else -> emptyList()
-                }
+                val genres =
+                    when (currentItem) {
+                        is AfinityMovie -> (currentItem as AfinityMovie).genres
+                        is AfinityShow -> (currentItem as AfinityShow).genres
+                        else -> emptyList()
+                    }
                 if (genres.isNotEmpty()) {
                     Text(
                         text = genres.take(3).joinToString(" • "),
-                        style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium),
+                        style =
+                            MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium),
                         color = MaterialTheme.colorScheme.onSurfaceVariant,
                         textAlign = TextAlign.Center,
-                        modifier = Modifier.fillMaxWidth()
+                        modifier = Modifier.fillMaxWidth(),
                     )
                 }
             }
         }
 
         Box(
-            modifier = Modifier
-                .align(Alignment.BottomCenter)
-                .fillMaxWidth()
-                .padding(horizontal = 24.dp, vertical = 16.dp)
+            modifier =
+                Modifier.align(Alignment.BottomCenter)
+                    .fillMaxWidth()
+                    .padding(horizontal = 24.dp, vertical = 16.dp)
         ) {
             IconButton(
                 onClick = { onMoreInformationClick(currentItem) },
-                modifier = Modifier
-                    .align(Alignment.CenterStart)
-                    .size(56.dp)
-                    .background(MaterialTheme.colorScheme.surface.copy(alpha = 0.8f), CircleShape)
+                modifier =
+                    Modifier.align(Alignment.CenterStart)
+                        .size(56.dp)
+                        .background(
+                            MaterialTheme.colorScheme.surface.copy(alpha = 0.8f),
+                            CircleShape,
+                        ),
             ) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_info),
                     contentDescription = stringResource(R.string.hero_btn_more_info),
                     tint = MaterialTheme.colorScheme.onSurface,
-                    modifier = Modifier.size(24.dp)
+                    modifier = Modifier.size(24.dp),
                 )
             }
             Row(
                 horizontalArrangement = Arrangement.spacedBy(16.dp),
-                modifier = Modifier.align(Alignment.CenterEnd)
+                modifier = Modifier.align(Alignment.CenterEnd),
             ) {
                 IconButton(
                     onClick = { onPlayTrailerClick(currentItem) },
-                    modifier = Modifier
-                        .size(56.dp)
-                        .background(
-                            MaterialTheme.colorScheme.surface.copy(alpha = 0.8f),
-                            CircleShape
-                        )
+                    modifier =
+                        Modifier.size(56.dp)
+                            .background(
+                                MaterialTheme.colorScheme.surface.copy(alpha = 0.8f),
+                                CircleShape,
+                            ),
                 ) {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_video),
                         contentDescription = stringResource(R.string.hero_btn_play_trailer),
                         tint = MaterialTheme.colorScheme.onSurface,
-                        modifier = Modifier.size(24.dp)
+                        modifier = Modifier.size(24.dp),
                     )
                 }
                 IconButton(
                     onClick = { onWatchNowClick(currentItem) },
-                    modifier = Modifier
-                        .size(56.dp)
-                        .background(MaterialTheme.colorScheme.primary, CircleShape)
+                    modifier =
+                        Modifier.size(56.dp)
+                            .background(MaterialTheme.colorScheme.primary, CircleShape),
                 ) {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_play_arrow),
                         contentDescription = stringResource(R.string.hero_btn_play_media),
                         tint = MaterialTheme.colorScheme.onPrimary,
-                        modifier = Modifier.size(28.dp)
+                        modifier = Modifier.size(28.dp),
                     )
                 }
             }
@@ -384,14 +373,12 @@ fun HeroCarouselPortrait(
                 currentPageFraction = currentPageFractionState,
                 activeDotColor = MaterialTheme.colorScheme.primary,
                 dotColor = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.4f),
-                modifier = Modifier
-                    .align(Alignment.BottomCenter)
-                    .padding(40.dp),
+                modifier = Modifier.align(Alignment.BottomCenter).padding(40.dp),
                 dotCount = 5,
                 activeDotSize = 8.dp,
                 minDotSize = 4.dp,
                 space = 5.dp,
-                orientation = PagerIndicatorOrientation.Horizontal
+                orientation = PagerIndicatorOrientation.Horizontal,
             )
         }
     }
@@ -407,18 +394,14 @@ private fun HeroCarouselLandscape(
     modifier: Modifier = Modifier,
     isScrolling: Boolean = false,
     initialPageIndex: Int,
-    onPageChanged: (Int) -> Unit
+    onPageChanged: (Int) -> Unit,
 ) {
     if (items.isEmpty()) return
     val infinitePageCount = Int.MAX_VALUE
-    val pagerState = rememberPagerState(
-        initialPage = initialPageIndex,
-        pageCount = { infinitePageCount }
-    )
+    val pagerState =
+        rememberPagerState(initialPage = initialPageIndex, pageCount = { infinitePageCount })
 
-    LaunchedEffect(pagerState.currentPage) {
-        onPageChanged(pagerState.currentPage)
-    }
+    LaunchedEffect(pagerState.currentPage) { onPageChanged(pagerState.currentPage) }
 
     val configuration = LocalConfiguration.current
     val landscapeHeight = (configuration.screenHeightDp * 0.95f).dp
@@ -436,7 +419,7 @@ private fun HeroCarouselLandscape(
                 try {
                     pagerState.animateScrollToPage(
                         page = pagerState.currentPage + 1,
-                        animationSpec = tween(durationMillis = 800)
+                        animationSpec = tween(durationMillis = 800),
                     )
                 } catch (e: Exception) {
                     Timber.w("Hero carousel animation interrupted: ${e.message}")
@@ -462,16 +445,12 @@ private fun HeroCarouselLandscape(
         }
     }
 
-    Box(
-        modifier = modifier
-            .fillMaxWidth()
-            .height(landscapeHeight)
-    ) {
+    Box(modifier = modifier.fillMaxWidth().height(landscapeHeight)) {
         HorizontalPager(
             state = pagerState,
             modifier = Modifier.fillMaxSize(),
             beyondViewportPageCount = 1,
-            key = { page -> "hero_page_${page % items.size}" }
+            key = { page -> "hero_page_${page % items.size}" },
         ) { page ->
             val actualIndex = page % items.size
             val item = items[actualIndex]
@@ -482,137 +461,126 @@ private fun HeroCarouselLandscape(
                 targetWidth = LocalConfiguration.current.screenWidthDp.dp,
                 targetHeight = landscapeHeight,
                 contentScale = ContentScale.Crop,
-                modifier = Modifier
-                    .fillMaxSize()
-                    .graphicsLayer { alpha = 0.99f }
-                    .drawWithCache {
-                        val gradient = Brush.verticalGradient(
-                            colors = listOf(
-                                Color.Black,
-                                Color.Black.copy(alpha = 0.98f),
-                                Color.Black.copy(alpha = 0.92f),
-                                Color.Black.copy(alpha = 0.78f),
-                                Color.Black.copy(alpha = 0.55f),
-                                Color.Black.copy(alpha = 0.25f),
-                                Color.Transparent
-                            ),
-                            startY = size.height * 0.55f,
-                            endY = size.height
-                        )
+                modifier =
+                    Modifier.fillMaxSize()
+                        .graphicsLayer { alpha = 0.99f }
+                        .drawWithCache {
+                            val gradient =
+                                Brush.verticalGradient(
+                                    colors =
+                                        listOf(
+                                            Color.Black,
+                                            Color.Black.copy(alpha = 0.98f),
+                                            Color.Black.copy(alpha = 0.92f),
+                                            Color.Black.copy(alpha = 0.78f),
+                                            Color.Black.copy(alpha = 0.55f),
+                                            Color.Black.copy(alpha = 0.25f),
+                                            Color.Transparent,
+                                        ),
+                                    startY = size.height * 0.55f,
+                                    endY = size.height,
+                                )
 
-                        onDrawWithContent {
-                            drawContent()
-                            drawRect(Color.Black.copy(alpha = 0.25f))
-                            drawRect(gradient, blendMode = BlendMode.DstIn)
-                        }
-                    }
+                            onDrawWithContent {
+                                drawContent()
+                                drawRect(Color.Black.copy(alpha = 0.25f))
+                                drawRect(gradient, blendMode = BlendMode.DstIn)
+                            }
+                        },
             )
         }
 
         Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(start = 48.dp, bottom = 48.dp, top = 48.dp, end = 48.dp)
+            modifier =
+                Modifier.fillMaxSize()
+                    .padding(start = 48.dp, bottom = 48.dp, top = 48.dp, end = 48.dp)
         ) {
-
             Column(
-                modifier = Modifier
-                    .align(Alignment.CenterStart)
-                    .fillMaxWidth(),
-                verticalArrangement = Arrangement.spacedBy(16.dp)
+                modifier = Modifier.align(Alignment.CenterStart).fillMaxWidth(),
+                verticalArrangement = Arrangement.spacedBy(16.dp),
             ) {
-
                 Column(
                     modifier = Modifier.fillMaxWidth(0.75f),
-                    verticalArrangement = Arrangement.spacedBy(16.dp)
+                    verticalArrangement = Arrangement.spacedBy(16.dp),
                 ) {
                     Box(
-                        modifier = Modifier
-                            .fillMaxWidth(0.5f)
-                            .height(100.dp),
-                        contentAlignment = Alignment.CenterStart
+                        modifier = Modifier.fillMaxWidth(0.5f).height(100.dp),
+                        contentAlignment = Alignment.CenterStart,
                     ) {
                         Crossfade(
                             targetState = currentItem,
                             animationSpec = tween(durationMillis = 700),
-                            label = "logo_crossfade"
+                            label = "logo_crossfade",
                         ) { item ->
                             Box(
                                 modifier = Modifier.fillMaxSize(),
-                                contentAlignment = Alignment.CenterStart
+                                contentAlignment = Alignment.CenterStart,
                             ) {
                                 item.images.logo?.let { logoUri ->
                                     AsyncImage(
                                         imageUrl = item.images.logoImageUrlWithTransparency,
                                         contentDescription = "${item.name} logo",
                                         blurHash = null,
-                                        targetWidth = (LocalConfiguration.current.screenWidthDp * 0.4f).dp,
+                                        targetWidth =
+                                            (LocalConfiguration.current.screenWidthDp * 0.4f).dp,
                                         targetHeight = 100.dp,
-                                        modifier = Modifier
-                                            .fillMaxWidth()
-                                            .wrapContentHeight(),
+                                        modifier = Modifier.fillMaxWidth().wrapContentHeight(),
                                         contentScale = ContentScale.Fit,
-                                        alignment = Alignment.CenterStart
-                                    )
-                                } ?: run {
-                                    Text(
-                                        text = item.name,
-                                        style = MaterialTheme.typography.displayMedium.copy(
-                                            fontWeight = FontWeight.Bold
-                                        ),
-                                        color = MaterialTheme.colorScheme.onSurface,
-                                        maxLines = 2,
-                                        overflow = TextOverflow.Ellipsis
+                                        alignment = Alignment.CenterStart,
                                     )
                                 }
+                                    ?: run {
+                                        Text(
+                                            text = item.name,
+                                            style =
+                                                MaterialTheme.typography.displayMedium.copy(
+                                                    fontWeight = FontWeight.Bold
+                                                ),
+                                            color = MaterialTheme.colorScheme.onSurface,
+                                            maxLines = 2,
+                                            overflow = TextOverflow.Ellipsis,
+                                        )
+                                    }
                             }
                         }
                     }
 
-                    Box(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(28.dp)
-                    ) {
+                    Box(modifier = Modifier.fillMaxWidth().height(28.dp)) {
                         Row(
                             horizontalArrangement = Arrangement.spacedBy(12.dp),
-                            verticalAlignment = Alignment.CenterVertically
+                            verticalAlignment = Alignment.CenterVertically,
                         ) {
                             HeroMetadata(currentItem)
                         }
                     }
 
-                    Box(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(20.dp)
-                    ) {
-                        val genres = when (currentItem) {
-                            is AfinityMovie -> (currentItem as AfinityMovie).genres
-                            is AfinityShow -> (currentItem as AfinityShow).genres
-                            else -> emptyList()
-                        }
+                    Box(modifier = Modifier.fillMaxWidth().height(20.dp)) {
+                        val genres =
+                            when (currentItem) {
+                                is AfinityMovie -> (currentItem as AfinityMovie).genres
+                                is AfinityShow -> (currentItem as AfinityShow).genres
+                                else -> emptyList()
+                            }
                         if (genres.isNotEmpty()) {
                             Text(
                                 text = genres.take(3).joinToString(" • "),
-                                style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium),
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                style =
+                                    MaterialTheme.typography.bodyLarge.copy(
+                                        fontWeight = FontWeight.Medium
+                                    ),
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                         }
                     }
 
-                    Box(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(40.dp)
-                    ) {
+                    Box(modifier = Modifier.fillMaxWidth().height(40.dp)) {
                         currentItem.overview?.let { overview ->
                             Text(
                                 text = overview,
                                 style = MaterialTheme.typography.bodyMedium,
                                 color = MaterialTheme.colorScheme.onSurfaceVariant,
                                 maxLines = 2,
-                                overflow = TextOverflow.Ellipsis
+                                overflow = TextOverflow.Ellipsis,
                             )
                         }
                     }
@@ -621,53 +589,52 @@ private fun HeroCarouselLandscape(
                 Row(
                     modifier = Modifier.fillMaxWidth(),
                     verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.SpaceBetween
+                    horizontalArrangement = Arrangement.SpaceBetween,
                 ) {
-
                     Row(horizontalArrangement = Arrangement.spacedBy(24.dp)) {
                         IconButton(
                             onClick = { onMoreInformationClick(currentItem) },
-                            modifier = Modifier
-                                .size(36.dp)
-                                .background(
-                                    MaterialTheme.colorScheme.surface.copy(alpha = 0.8f),
-                                    CircleShape
-                                )
+                            modifier =
+                                Modifier.size(36.dp)
+                                    .background(
+                                        MaterialTheme.colorScheme.surface.copy(alpha = 0.8f),
+                                        CircleShape,
+                                    ),
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_info),
                                 contentDescription = stringResource(R.string.hero_btn_more_info),
                                 tint = MaterialTheme.colorScheme.onSurface,
-                                modifier = Modifier.size(24.dp)
+                                modifier = Modifier.size(24.dp),
                             )
                         }
                         IconButton(
                             onClick = { onPlayTrailerClick(currentItem) },
-                            modifier = Modifier
-                                .size(36.dp)
-                                .background(
-                                    MaterialTheme.colorScheme.surface.copy(alpha = 0.8f),
-                                    CircleShape
-                                )
+                            modifier =
+                                Modifier.size(36.dp)
+                                    .background(
+                                        MaterialTheme.colorScheme.surface.copy(alpha = 0.8f),
+                                        CircleShape,
+                                    ),
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_video),
                                 contentDescription = stringResource(R.string.hero_btn_play_trailer),
                                 tint = MaterialTheme.colorScheme.onSurface,
-                                modifier = Modifier.size(24.dp)
+                                modifier = Modifier.size(24.dp),
                             )
                         }
                         IconButton(
                             onClick = { onWatchNowClick(currentItem) },
-                            modifier = Modifier
-                                .size(36.dp)
-                                .background(MaterialTheme.colorScheme.primary, CircleShape)
+                            modifier =
+                                Modifier.size(36.dp)
+                                    .background(MaterialTheme.colorScheme.primary, CircleShape),
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_play_arrow),
                                 contentDescription = stringResource(R.string.hero_btn_watch_now),
                                 tint = MaterialTheme.colorScheme.onPrimary,
-                                modifier = Modifier.size(24.dp)
+                                modifier = Modifier.size(24.dp),
                             )
                         }
                     }
@@ -679,11 +646,13 @@ private fun HeroCarouselLandscape(
                                 val pageOffset = pagerState.currentPageOffsetFraction
                                 when {
                                     pageOffset > 0.5f && currentPage == items.size - 1 -> 0f
-                                    pageOffset < -0.5f && currentPage == 0 -> (items.size - 1).toFloat()
-                                    else -> (currentPage + pageOffset).coerceIn(
-                                        0f,
+                                    pageOffset < -0.5f && currentPage == 0 ->
                                         (items.size - 1).toFloat()
-                                    )
+                                    else ->
+                                        (currentPage + pageOffset).coerceIn(
+                                            0f,
+                                            (items.size - 1).toFloat(),
+                                        )
                                 }
                             }
                         }
@@ -692,12 +661,13 @@ private fun HeroCarouselLandscape(
                             pageCount = items.size,
                             currentPageFraction = currentPageFractionState,
                             activeDotColor = MaterialTheme.colorScheme.primary,
-                            dotColor = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.4f),
+                            dotColor =
+                                MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.4f),
                             dotCount = 5,
                             activeDotSize = 8.dp,
                             minDotSize = 4.dp,
                             space = 5.dp,
-                            orientation = PagerIndicatorOrientation.Horizontal
+                            orientation = PagerIndicatorOrientation.Horizontal,
                         )
                     }
                 }
@@ -708,28 +678,29 @@ private fun HeroCarouselLandscape(
 
 @Composable
 private fun HeroMetadata(item: AfinityItem) {
-    val communityRating = when (item) {
-        is AfinityMovie -> item.communityRating
-        is AfinityShow -> item.communityRating
-        is AfinityEpisode -> item.communityRating
-        else -> null
-    }
+    val communityRating =
+        when (item) {
+            is AfinityMovie -> item.communityRating
+            is AfinityShow -> item.communityRating
+            is AfinityEpisode -> item.communityRating
+            else -> null
+        }
 
     communityRating?.let { rating ->
         Row(
             verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(4.dp)
+            horizontalArrangement = Arrangement.spacedBy(4.dp),
         ) {
             Icon(
                 painter = painterResource(id = R.drawable.ic_imdb_logo),
                 contentDescription = stringResource(R.string.cd_imdb),
                 tint = Color.Unspecified,
-                modifier = Modifier.size(24.dp)
+                modifier = Modifier.size(24.dp),
             )
             Text(
                 text = String.format(Locale.US, "%.1f", rating),
                 style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium),
-                color = MaterialTheme.colorScheme.onSurfaceVariant
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
             )
         }
     }
@@ -738,21 +709,23 @@ private fun HeroMetadata(item: AfinityItem) {
         item.criticRating?.let { rtRating ->
             Row(
                 verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.spacedBy(4.dp)
+                horizontalArrangement = Arrangement.spacedBy(4.dp),
             ) {
                 Icon(
-                    painter = painterResource(
-                        id = if (rtRating > 60) R.drawable.ic_rotten_tomato_fresh
-                        else R.drawable.ic_rotten_tomato_rotten
-                    ),
+                    painter =
+                        painterResource(
+                            id =
+                                if (rtRating > 60) R.drawable.ic_rotten_tomato_fresh
+                                else R.drawable.ic_rotten_tomato_rotten
+                        ),
                     contentDescription = null,
                     tint = Color.Unspecified,
-                    modifier = Modifier.size(18.dp)
+                    modifier = Modifier.size(18.dp),
                 )
                 Text(
                     text = "${rtRating.toInt()}%",
                     style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium),
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
         }
@@ -760,36 +733,38 @@ private fun HeroMetadata(item: AfinityItem) {
             Text(
                 text = date.year.toString(),
                 style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium),
-                color = MaterialTheme.colorScheme.onSurfaceVariant
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
             )
         }
     }
 
-    val officialRating = when (item) {
-        is AfinityMovie -> item.officialRating
-        is AfinityShow -> item.officialRating
-        else -> null
-    }
+    val officialRating =
+        when (item) {
+            is AfinityMovie -> item.officialRating
+            is AfinityShow -> item.officialRating
+            else -> null
+        }
 
     officialRating?.let { rating ->
         Text(
             text = rating,
             style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium),
             color = MaterialTheme.colorScheme.onSurfaceVariant,
-            modifier = Modifier
-                .background(Color.White.copy(alpha = 0.2f), RoundedCornerShape(4.dp))
-                .padding(horizontal = 6.dp, vertical = 2.dp)
+            modifier =
+                Modifier.background(Color.White.copy(alpha = 0.2f), RoundedCornerShape(4.dp))
+                    .padding(horizontal = 6.dp, vertical = 2.dp),
         )
     }
 
     if (item is AfinityShow) {
         item.seasonCount?.let { count ->
             Text(
-                text = if (count == 1) stringResource(R.string.hero_season_single)
-                else stringResource(R.string.hero_season_plural, count),
+                text =
+                    if (count == 1) stringResource(R.string.hero_season_single)
+                    else stringResource(R.string.hero_season_plural, count),
                 style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium),
-                color = MaterialTheme.colorScheme.onSurfaceVariant
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/components/MediaItemCard.kt b/app/src/main/java/com/makd/afinity/ui/components/MediaItemCard.kt
index 4a18a5130..c91d1ba54 100644
--- a/app/src/main/java/com/makd/afinity/ui/components/MediaItemCard.kt
+++ b/app/src/main/java/com/makd/afinity/ui/components/MediaItemCard.kt
@@ -30,8 +30,8 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 import com.makd.afinity.R
 import com.makd.afinity.data.models.extensions.backdropBlurHash
 import com.makd.afinity.data.models.extensions.backdropImageUrl
@@ -48,23 +48,18 @@ fun MediaItemCard(
     item: AfinityItem,
     onClick: () -> Unit,
     cardWidth: Dp,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val density = LocalDensity.current
     val fontScale = density.fontScale
 
-    Column(
-        modifier = modifier.width(cardWidth)
-    ) {
+    Column(modifier = modifier.width(cardWidth)) {
         Card(
             onClick = onClick,
-            modifier = Modifier
-                .fillMaxWidth()
-                .aspectRatio(CardDimensions.ASPECT_RATIO_PORTRAIT),
-            colors = CardDefaults.cardColors(
-                containerColor = MaterialTheme.colorScheme.surfaceVariant
-            ),
-            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+            modifier = Modifier.fillMaxWidth().aspectRatio(CardDimensions.ASPECT_RATIO_PORTRAIT),
+            colors =
+                CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
+            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
         ) {
             Box(modifier = Modifier.fillMaxSize()) {
                 AsyncImage(
@@ -74,27 +69,24 @@ fun MediaItemCard(
                     targetWidth = cardWidth,
                     targetHeight = cardWidth * 3f / 2f,
                     contentScale = ContentScale.Crop,
-                    modifier = Modifier.fillMaxSize()
+                    modifier = Modifier.fillMaxSize(),
                 )
 
                 when {
                     item.played -> {
                         Box(
-                            modifier = Modifier
-                                .align(Alignment.TopEnd)
-                                .padding(8.dp)
-                                .size(24.dp)
-                                .background(
-                                    MaterialTheme.colorScheme.primary,
-                                    CircleShape
-                                ),
-                            contentAlignment = Alignment.Center
+                            modifier =
+                                Modifier.align(Alignment.TopEnd)
+                                    .padding(8.dp)
+                                    .size(24.dp)
+                                    .background(MaterialTheme.colorScheme.primary, CircleShape),
+                            contentAlignment = Alignment.Center,
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_check),
                                 contentDescription = "Watched",
                                 tint = MaterialTheme.colorScheme.onPrimary,
-                                modifier = Modifier.size(16.dp)
+                                modifier = Modifier.size(16.dp),
                             )
                         }
                     }
@@ -104,22 +96,19 @@ fun MediaItemCard(
                         displayCount?.let { count ->
                             if (count > 0) {
                                 Surface(
-                                    modifier = Modifier
-                                        .align(Alignment.TopEnd)
-                                        .padding(8.dp),
+                                    modifier = Modifier.align(Alignment.TopEnd).padding(8.dp),
                                     shape = RoundedCornerShape(4.dp),
-                                    color = MaterialTheme.colorScheme.primary.copy(alpha = 0.9f)
+                                    color = MaterialTheme.colorScheme.primary.copy(alpha = 0.9f),
                                 ) {
                                     Text(
                                         text = if (count > 99) "99+ EP" else "$count EP",
-                                        style = MaterialTheme.typography.labelSmall.copy(
-                                            fontWeight = FontWeight.Bold
-                                        ),
+                                        style =
+                                            MaterialTheme.typography.labelSmall.copy(
+                                                fontWeight = FontWeight.Bold
+                                            ),
                                         color = MaterialTheme.colorScheme.onPrimary,
-                                        modifier = Modifier.padding(
-                                            horizontal = 6.dp,
-                                            vertical = 2.dp
-                                        )
+                                        modifier =
+                                            Modifier.padding(horizontal = 6.dp, vertical = 2.dp),
                                     )
                                 }
                             }
@@ -133,12 +122,10 @@ fun MediaItemCard(
 
         Text(
             text = item.name,
-            style = MaterialTheme.typography.bodyMedium.copy(
-                fontWeight = FontWeight.SemiBold
-            ),
+            style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
             color = MaterialTheme.colorScheme.onBackground,
             maxLines = 1,
-            overflow = TextOverflow.Ellipsis
+            overflow = TextOverflow.Ellipsis,
         )
 
         Row(
@@ -155,11 +142,14 @@ fun MediaItemCard(
                 metadataItems.add {
                     Text(
                         text = year.toString(),
-                        style = MaterialTheme.typography.bodySmall.copy(
-                            fontSize = MaterialTheme.typography.bodySmall.fontSize *
-                                    if (fontScale > 1.3f) 0.8f else if (fontScale > 1.15f) 0.9f else 1f
-                        ),
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        style =
+                            MaterialTheme.typography.bodySmall.copy(
+                                fontSize =
+                                    MaterialTheme.typography.bodySmall.fontSize *
+                                        if (fontScale > 1.3f) 0.8f
+                                        else if (fontScale > 1.15f) 0.9f else 1f
+                            ),
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
                 }
             }
@@ -172,25 +162,28 @@ fun MediaItemCard(
                 metadataItems.add {
                     Row(
                         verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.spacedBy(2.dp)
+                        horizontalArrangement = Arrangement.spacedBy(2.dp),
                     ) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_imdb_logo),
                             contentDescription = "IMDB",
                             tint = Color.Unspecified,
-                            modifier = Modifier.size(
-                                if (fontScale > 1.3f) 14.dp
-                                else if (fontScale > 1.15f) 16.dp
-                                else 18.dp
-                            )
+                            modifier =
+                                Modifier.size(
+                                    if (fontScale > 1.3f) 14.dp
+                                    else if (fontScale > 1.15f) 16.dp else 18.dp
+                                ),
                         )
                         Text(
                             text = String.format(Locale.US, "%.1f", rating),
-                            style = MaterialTheme.typography.bodySmall.copy(
-                                fontSize = MaterialTheme.typography.bodySmall.fontSize *
-                                        if (fontScale > 1.3f) 0.8f else if (fontScale > 1.15f) 0.9f else 1f
-                            ),
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            style =
+                                MaterialTheme.typography.bodySmall.copy(
+                                    fontSize =
+                                        MaterialTheme.typography.bodySmall.fontSize *
+                                            if (fontScale > 1.3f) 0.8f
+                                            else if (fontScale > 1.15f) 0.9f else 1f
+                                ),
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
                 }
@@ -201,31 +194,36 @@ fun MediaItemCard(
                     metadataItems.add {
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(2.dp)
+                            horizontalArrangement = Arrangement.spacedBy(2.dp),
                         ) {
                             Icon(
-                                painter = painterResource(
-                                    id = if (rtRating > 60) {
-                                        R.drawable.ic_rotten_tomato_fresh
-                                    } else {
-                                        R.drawable.ic_rotten_tomato_rotten
-                                    }
-                                ),
+                                painter =
+                                    painterResource(
+                                        id =
+                                            if (rtRating > 60) {
+                                                R.drawable.ic_rotten_tomato_fresh
+                                            } else {
+                                                R.drawable.ic_rotten_tomato_rotten
+                                            }
+                                    ),
                                 contentDescription = "Rotten Tomatoes",
                                 tint = Color.Unspecified,
-                                modifier = Modifier.size(
-                                    if (fontScale > 1.3f) 10.dp
-                                    else if (fontScale > 1.15f) 11.dp
-                                    else 12.dp
-                                )
+                                modifier =
+                                    Modifier.size(
+                                        if (fontScale > 1.3f) 10.dp
+                                        else if (fontScale > 1.15f) 11.dp else 12.dp
+                                    ),
                             )
                             Text(
                                 text = "${rtRating.toInt()}%",
-                                style = MaterialTheme.typography.bodySmall.copy(
-                                    fontSize = MaterialTheme.typography.bodySmall.fontSize *
-                                            if (fontScale > 1.3f) 0.8f else if (fontScale > 1.15f) 0.9f else 1f
-                                ),
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                style =
+                                    MaterialTheme.typography.bodySmall.copy(
+                                        fontSize =
+                                            MaterialTheme.typography.bodySmall.fontSize *
+                                                if (fontScale > 1.3f) 0.8f
+                                                else if (fontScale > 1.15f) 0.9f else 1f
+                                    ),
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                         }
                     }
@@ -238,10 +236,10 @@ fun MediaItemCard(
                     Text(
                         text = "•",
                         style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
                 }
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/components/RequestConfirmationDialog.kt b/app/src/main/java/com/makd/afinity/ui/components/RequestConfirmationDialog.kt
index ac037a13d..33d430c6c 100644
--- a/app/src/main/java/com/makd/afinity/ui/components/RequestConfirmationDialog.kt
+++ b/app/src/main/java/com/makd/afinity/ui/components/RequestConfirmationDialog.kt
@@ -80,13 +80,13 @@ fun RequestConfirmationDialog(
     originalLanguage: String? = null,
     director: String? = null,
     genres: List<String> = emptyList(),
-    ratingsCombined: RatingsCombined? = null
+    ratingsCombined: RatingsCombined? = null,
 ) {
-    val alreadyRequested = existingStatus != null && (
-            mediaType == MediaType.MOVIE ||
-                    existingStatus == MediaStatus.AVAILABLE ||
-                    existingStatus == MediaStatus.PROCESSING
-            )
+    val alreadyRequested =
+        existingStatus != null &&
+            (mediaType == MediaType.MOVIE ||
+                existingStatus == MediaStatus.AVAILABLE ||
+                existingStatus == MediaStatus.PROCESSING)
     val headerImageUrl = mediaBackdropUrl?.takeIf { it.isNotBlank() } ?: mediaPosterUrl
 
     AlertDialog(
@@ -95,59 +95,52 @@ fun RequestConfirmationDialog(
             Text(
                 text = "Request on Seerr",
                 style = MaterialTheme.typography.titleLarge,
-                fontWeight = FontWeight.Bold
+                fontWeight = FontWeight.Bold,
             )
         },
         text = {
             Column(
                 verticalArrangement = Arrangement.spacedBy(16.dp),
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .verticalScroll(rememberScrollState())
+                modifier = Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
             ) {
                 if (!headerImageUrl.isNullOrBlank()) {
                     Box(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(200.dp)
-                            .clip(RoundedCornerShape(12.dp))
+                        modifier =
+                            Modifier.fillMaxWidth().height(200.dp).clip(RoundedCornerShape(12.dp))
                     ) {
                         AsyncImage(
                             imageUrl = headerImageUrl,
                             contentDescription = mediaTitle,
                             blurHash = null,
                             modifier = Modifier.fillMaxWidth(),
-                            contentScale = ContentScale.Crop
+                            contentScale = ContentScale.Crop,
                         )
 
                         Box(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .height(200.dp)
-                                .background(
-                                    Brush.verticalGradient(
-                                        colors = listOf(
-                                            Color.Transparent,
-                                            Color.Black.copy(alpha = 0.8f)
-                                        ),
-                                        startY = 100f,
-                                        endY = Float.POSITIVE_INFINITY
+                            modifier =
+                                Modifier.fillMaxWidth()
+                                    .height(200.dp)
+                                    .background(
+                                        Brush.verticalGradient(
+                                            colors =
+                                                listOf(
+                                                    Color.Transparent,
+                                                    Color.Black.copy(alpha = 0.8f),
+                                                ),
+                                            startY = 100f,
+                                            endY = Float.POSITIVE_INFINITY,
+                                        )
                                     )
-                                )
                         )
 
-                        Column(
-                            modifier = Modifier
-                                .align(Alignment.BottomStart)
-                                .padding(12.dp)
-                        ) {
+                        Column(modifier = Modifier.align(Alignment.BottomStart).padding(12.dp)) {
                             Text(
                                 text = mediaTitle,
                                 style = MaterialTheme.typography.titleLarge,
                                 fontWeight = FontWeight.Bold,
                                 color = Color.White,
                                 maxLines = 2,
-                                overflow = TextOverflow.Ellipsis
+                                overflow = TextOverflow.Ellipsis,
                             )
 
                             if (!mediaTagline.isNullOrBlank()) {
@@ -158,7 +151,7 @@ fun RequestConfirmationDialog(
                                     fontStyle = FontStyle.Italic,
                                     color = Color.White.copy(alpha = 0.9f),
                                     maxLines = 1,
-                                    overflow = TextOverflow.Ellipsis
+                                    overflow = TextOverflow.Ellipsis,
                                 )
                             }
                         }
@@ -169,14 +162,14 @@ fun RequestConfirmationDialog(
                             text = mediaTitle,
                             style = MaterialTheme.typography.titleLarge,
                             fontWeight = FontWeight.Bold,
-                            color = MaterialTheme.colorScheme.onSurface
+                            color = MaterialTheme.colorScheme.onSurface,
                         )
                         if (!mediaTagline.isNullOrBlank()) {
                             Text(
                                 text = mediaTagline,
                                 style = MaterialTheme.typography.bodyMedium,
                                 fontStyle = FontStyle.Italic,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                         }
                     }
@@ -184,14 +177,14 @@ fun RequestConfirmationDialog(
 
                 Column(
                     verticalArrangement = Arrangement.spacedBy(8.dp),
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier.fillMaxWidth(),
                 ) {
                     data class MetaItem(
                         val icon: Int = 0,
                         val text: String,
                         val contentDesc: String? = null,
                         val tint: Color = Color.Unspecified,
-                        val flagUrl: String? = null
+                        val flagUrl: String? = null,
                     )
 
                     val metadataItems =
@@ -202,20 +195,22 @@ fun RequestConfirmationDialog(
                                         MetaItem(
                                             R.drawable.ic_imdb_logo,
                                             String.format(Locale.US, "%.1f", score),
-                                            "IMDb"
+                                            "IMDb",
                                         )
                                     )
                                 }
 
                                 ratingsCombined?.rt?.criticsScore?.let { score ->
                                     val icon =
-                                        if (score >= 60) R.drawable.ic_rotten_tomato_fresh else R.drawable.ic_rotten_tomato_rotten
+                                        if (score >= 60) R.drawable.ic_rotten_tomato_fresh
+                                        else R.drawable.ic_rotten_tomato_rotten
                                     add(MetaItem(icon, "$score%", "RT Critic"))
                                 }
 
                                 ratingsCombined?.rt?.audienceScore?.let { score ->
                                     val icon =
-                                        if (score >= 60) R.drawable.ic_rt_fresh_popcorn else R.drawable.ic_rt_stale_popcorn
+                                        if (score >= 60) R.drawable.ic_rt_fresh_popcorn
+                                        else R.drawable.ic_rt_stale_popcorn
                                     add(MetaItem(icon, "$score%", "RT Audience"))
                                 }
 
@@ -225,46 +220,51 @@ fun RequestConfirmationDialog(
                                             MetaItem(
                                                 R.drawable.ic_tmdb,
                                                 "${(rating * 10).toInt()}%",
-                                                "TMDB"
+                                                "TMDB",
                                             )
                                         )
                                     }
                                 }
 
-                                originalLanguage?.takeIf { it.isNotBlank() }?.let { lang ->
-                                    add(
-                                        MetaItem(
-                                            icon = R.drawable.ic_language,
-                                            text = lang.uppercase(),
-                                            flagUrl = getAutoFlagUrl(lang),
-                                            contentDesc = "Language"
+                                originalLanguage
+                                    ?.takeIf { it.isNotBlank() }
+                                    ?.let { lang ->
+                                        add(
+                                            MetaItem(
+                                                icon = R.drawable.ic_language,
+                                                text = lang.uppercase(),
+                                                flagUrl = getAutoFlagUrl(lang),
+                                                contentDesc = "Language",
+                                            )
                                         )
-                                    )
-                                }
+                                    }
 
-                                certification?.takeIf { it.isNotBlank() }?.let { cert ->
-                                    add(MetaItem(text = cert))
-                                }
+                                certification
+                                    ?.takeIf { it.isNotBlank() }
+                                    ?.let { cert -> add(MetaItem(text = cert)) }
                             }
                         }
 
                     if (metadataItems.isNotEmpty()) {
                         SeparatedFlowRow(
                             modifier = Modifier.fillMaxWidth(),
-                            separator = { MetadataDot() }
+                            separator = { MetadataDot() },
                         ) {
                             metadataItems.forEach { item ->
                                 Row(
                                     verticalAlignment = Alignment.CenterVertically,
-                                    horizontalArrangement = Arrangement.spacedBy(4.dp)
+                                    horizontalArrangement = Arrangement.spacedBy(4.dp),
                                 ) {
                                     if (item.icon != 0) {
-                                        val itemTint = if (item.contentDesc == "Language") MaterialTheme.colorScheme.onSurface else item.tint
+                                        val itemTint =
+                                            if (item.contentDesc == "Language")
+                                                MaterialTheme.colorScheme.onSurface
+                                            else item.tint
                                         Icon(
                                             painter = painterResource(id = item.icon),
                                             contentDescription = null,
                                             tint = itemTint,
-                                            modifier = Modifier.size(14.dp)
+                                            modifier = Modifier.size(14.dp),
                                         )
                                     }
 
@@ -273,24 +273,44 @@ fun RequestConfirmationDialog(
                                     } else if (item.icon == 0) {
                                         androidx.compose.material3.Surface(
                                             shape = RoundedCornerShape(4.dp),
-                                            border = androidx.compose.foundation.BorderStroke(
-                                                width = 1.dp,
-                                                color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f)
-                                            ),
-                                            color = Color.Transparent
+                                            border =
+                                                androidx.compose.foundation.BorderStroke(
+                                                    width = 1.dp,
+                                                    color =
+                                                        MaterialTheme.colorScheme.onSurface.copy(
+                                                            alpha = 0.5f
+                                                        ),
+                                                ),
+                                            color = Color.Transparent,
                                         ) {
                                             Text(
                                                 text = item.text,
-                                                style = MaterialTheme.typography.labelSmall.copy(fontWeight = FontWeight.Bold),
-                                                color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.9f),
-                                                modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp)
+                                                style =
+                                                    MaterialTheme.typography.labelSmall.copy(
+                                                        fontWeight = FontWeight.Bold
+                                                    ),
+                                                color =
+                                                    MaterialTheme.colorScheme.onSurface.copy(
+                                                        alpha = 0.9f
+                                                    ),
+                                                modifier =
+                                                    Modifier.padding(
+                                                        horizontal = 6.dp,
+                                                        vertical = 2.dp,
+                                                    ),
                                             )
                                         }
                                     } else {
                                         Text(
                                             text = item.text,
-                                            style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
-                                            color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.9f)
+                                            style =
+                                                MaterialTheme.typography.bodyMedium.copy(
+                                                    fontWeight = FontWeight.SemiBold
+                                                ),
+                                            color =
+                                                MaterialTheme.colorScheme.onSurface.copy(
+                                                    alpha = 0.9f
+                                                ),
                                         )
                                     }
                                 }
@@ -306,46 +326,46 @@ fun RequestConfirmationDialog(
                                 text = "Overview",
                                 style = MaterialTheme.typography.titleSmall,
                                 fontWeight = FontWeight.Bold,
-                                color = MaterialTheme.colorScheme.onSurface
+                                color = MaterialTheme.colorScheme.onSurface,
                             )
                             Text(
                                 text = mediaOverview,
                                 style = MaterialTheme.typography.bodyMedium,
                                 color = MaterialTheme.colorScheme.onSurfaceVariant,
-                                lineHeight = MaterialTheme.typography.bodyMedium.lineHeight * 1.2
+                                lineHeight = MaterialTheme.typography.bodyMedium.lineHeight * 1.2,
                             )
                         }
                     }
 
-                    director?.takeIf { it.isNotBlank() }?.let { dir ->
-                        Text(
-                            text = buildAnnotatedString {
-                                withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
-                                    append(
-                                        "Director: "
-                                    )
-                                }
-                                append(dir)
-                            },
-                            style = MaterialTheme.typography.bodyMedium,
-                            color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.9f)
-                        )
-                    }
+                    director
+                        ?.takeIf { it.isNotBlank() }
+                        ?.let { dir ->
+                            Text(
+                                text =
+                                    buildAnnotatedString {
+                                        withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
+                                            append("Director: ")
+                                        }
+                                        append(dir)
+                                    },
+                                style = MaterialTheme.typography.bodyMedium,
+                                color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.9f),
+                            )
+                        }
 
                     releaseDate?.let { date ->
                         val formattedDate = formatReleaseDate(date)
                         if (formattedDate.isNotBlank()) {
                             Text(
-                                text = buildAnnotatedString {
-                                    withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
-                                        append(
-                                            "Release Date: "
-                                        )
-                                    }
-                                    append(formattedDate)
-                                },
+                                text =
+                                    buildAnnotatedString {
+                                        withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
+                                            append("Release Date: ")
+                                        }
+                                        append(formattedDate)
+                                    },
                                 style = MaterialTheme.typography.bodyMedium,
-                                color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.9f)
+                                color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.9f),
                             )
                         }
                     }
@@ -353,32 +373,30 @@ fun RequestConfirmationDialog(
                     runtime?.let { minutes ->
                         if (minutes > 0) {
                             Text(
-                                text = buildAnnotatedString {
-                                    withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
-                                        append(
-                                            "Runtime: "
-                                        )
-                                    }
-                                    append(formatRuntime(minutes))
-                                },
+                                text =
+                                    buildAnnotatedString {
+                                        withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
+                                            append("Runtime: ")
+                                        }
+                                        append(formatRuntime(minutes))
+                                    },
                                 style = MaterialTheme.typography.bodyMedium,
-                                color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.9f)
+                                color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.9f),
                             )
                         }
                     }
 
                     if (genres.isNotEmpty()) {
                         Text(
-                            text = buildAnnotatedString {
-                                withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
-                                    append(
-                                        "Genre: "
-                                    )
-                                }
-                                append(genres.joinToString(", "))
-                            },
+                            text =
+                                buildAnnotatedString {
+                                    withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
+                                        append("Genre: ")
+                                    }
+                                    append(genres.joinToString(", "))
+                                },
                             style = MaterialTheme.typography.bodyMedium,
-                            color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.9f)
+                            color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.9f),
                         )
                     }
                 }
@@ -389,7 +407,7 @@ fun RequestConfirmationDialog(
                         text = "Request this ${mediaType.toApiString()} on Seerr?",
                         style = MaterialTheme.typography.bodyMedium,
                         color = MaterialTheme.colorScheme.onSurfaceVariant,
-                        fontWeight = FontWeight.Medium
+                        fontWeight = FontWeight.Medium,
                     )
                 }
 
@@ -398,7 +416,7 @@ fun RequestConfirmationDialog(
                         availableSeasons = availableSeasons,
                         selectedSeasons = selectedSeasons,
                         onSeasonsChange = onSeasonsChange,
-                        disabledSeasons = disabledSeasons
+                        disabledSeasons = disabledSeasons,
                     )
                 }
             }
@@ -406,13 +424,18 @@ fun RequestConfirmationDialog(
         confirmButton = {
             Button(
                 onClick = onConfirm,
-                enabled = !alreadyRequested && !isLoading && (mediaType == MediaType.MOVIE || selectedSeasons.isNotEmpty() || availableSeasons == 0)
+                enabled =
+                    !alreadyRequested &&
+                        !isLoading &&
+                        (mediaType == MediaType.MOVIE ||
+                            selectedSeasons.isNotEmpty() ||
+                            availableSeasons == 0),
             ) {
                 if (isLoading) {
                     CircularProgressIndicator(
                         modifier = Modifier.size(20.dp),
                         color = MaterialTheme.colorScheme.onPrimary,
-                        strokeWidth = 2.dp
+                        strokeWidth = 2.dp,
                     )
                 } else {
                     Text(if (alreadyRequested) "Already Requested" else "Request")
@@ -420,14 +443,9 @@ fun RequestConfirmationDialog(
             }
         },
         dismissButton = {
-            TextButton(
-                onClick = onDismiss,
-                enabled = !isLoading
-            ) {
-                Text("Cancel")
-            }
+            TextButton(onClick = onDismiss, enabled = !isLoading) { Text("Cancel") }
         },
-        modifier = modifier
+        modifier = modifier,
     )
 }
 
@@ -436,36 +454,30 @@ private fun MetadataDot() {
     Box(contentAlignment = Alignment.Center) {
         Text(
             text = "•",
-            style = MaterialTheme.typography.bodyMedium.copy(
-                fontWeight = FontWeight.SemiBold
-            ),
+            style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
             color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f),
-            modifier = Modifier.padding(horizontal = 2.dp)
+            modifier = Modifier.padding(horizontal = 2.dp),
         )
     }
 }
 
 @Composable
-private fun CircleFlagIcon(
-    url: String,
-    modifier: Modifier = Modifier
-) {
+private fun CircleFlagIcon(url: String, modifier: Modifier = Modifier) {
     val context = LocalContext.current
-    val model = remember(url) {
-        ImageRequest.Builder(context)
-            .data(url)
-            .decoderFactory(SvgDecoder.Factory())
-            .crossfade(true)
-            .build()
-    }
+    val model =
+        remember(url) {
+            ImageRequest.Builder(context)
+                .data(url)
+                .decoderFactory(SvgDecoder.Factory())
+                .crossfade(true)
+                .build()
+        }
 
     AsyncImage(
         model = model,
         contentDescription = "Flag",
-        modifier = modifier
-            .size(14.dp)
-            .clip(CircleShape),
-        contentScale = ContentScale.Crop
+        modifier = modifier.size(14.dp).clip(CircleShape),
+        contentScale = ContentScale.Crop,
     )
 }
 
@@ -474,7 +486,7 @@ fun SeparatedFlowRow(
     modifier: Modifier = Modifier,
     itemSpacing: Dp = 4.dp,
     separator: @Composable () -> Unit,
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
     SubcomposeLayout(modifier = modifier) { constraints ->
         val itemMeasurables = subcompose("content", content)
@@ -495,11 +507,12 @@ fun SeparatedFlowRow(
         var currentWidth = 0
 
         itemPlaceables.forEach { placeable ->
-            val addedWidth = if (currentSequence.isEmpty()) {
-                placeable.width
-            } else {
-                separatorWidth + (spacingPx * 2) + placeable.width
-            }
+            val addedWidth =
+                if (currentSequence.isEmpty()) {
+                    placeable.width
+                } else {
+                    separatorWidth + (spacingPx * 2) + placeable.width
+                }
 
             if (currentWidth + addedWidth <= constraints.maxWidth) {
                 currentSequence.add(placeable)
@@ -513,14 +526,15 @@ fun SeparatedFlowRow(
         if (currentSequence.isNotEmpty()) sequences.add(currentSequence)
 
         val totalSeparatorsNeeded = itemPlaceables.size - sequences.size
-        val separatorList = subcompose("separators_real") {
-            repeat(totalSeparatorsNeeded) { separator() }
-        }.map { it.measure(constraints.copy(minWidth = 0)) }
+        val separatorList =
+            subcompose("separators_real") { repeat(totalSeparatorsNeeded) { separator() } }
+                .map { it.measure(constraints.copy(minWidth = 0)) }
 
         var separatorIndex = 0
 
         val verticalGap = 8.dp.roundToPx()
-        val totalHeight = sequences.sumOf { line -> line.maxOf { it.height } } +
+        val totalHeight =
+            sequences.sumOf { line -> line.maxOf { it.height } } +
                 ((sequences.size - 1) * verticalGap)
 
         layout(constraints.maxWidth, totalHeight) {
@@ -555,55 +569,58 @@ fun SeparatedFlowRow(
 private fun getAutoFlagUrl(langCode: String): String? {
     if (langCode.isBlank()) return null
 
-    val manualMapping = when (langCode.lowercase()) {
-        "en" -> "us"
-        "hi" -> "in"
-        "ja" -> "jp"
-        "ko" -> "kr"
-        "zh" -> "cn"
-        "es" -> "es"
-        "fr" -> "fr"
-        "it" -> "it"
-        "de" -> "de"
-        "ru" -> "ru"
-        "pt" -> "br"
-        "tr" -> "tr"
-        "th" -> "th"
-        "id" -> "id"
-        "tl" -> "ph"
-        "vi" -> "vn"
-        "pl" -> "pl"
-        "uk" -> "ua"
-        "ta" -> "in"
-        "te" -> "in"
-        "ml" -> "in"
-        "kn" -> "in"
-        "pa" -> "in"
-        "mr" -> "in"
-        "bn" -> "in"
-        "sv" -> "se"
-        "da" -> "dk"
-        "no" -> "no"
-        "fi" -> "fi"
-        "is" -> "is"
-        "nl" -> "nl"
-        "cs" -> "cz"
-        "hu" -> "hu"
-        "el" -> "gr"
-        "he" -> "il"
-        "ar" -> "sa"
-        "fa" -> "ir"
-        else -> null
-    }
-
-    val countryCode = manualMapping ?: run {
-        val locale = Locale.forLanguageTag(langCode)
-        locale.country.ifBlank {
-            Locale.getAvailableLocales()
-                .firstOrNull { it.language == langCode && it.country.isNotBlank() }
-                ?.country
+    val manualMapping =
+        when (langCode.lowercase()) {
+            "en" -> "us"
+            "hi" -> "in"
+            "ja" -> "jp"
+            "ko" -> "kr"
+            "zh" -> "cn"
+            "es" -> "es"
+            "fr" -> "fr"
+            "it" -> "it"
+            "de" -> "de"
+            "ru" -> "ru"
+            "pt" -> "br"
+            "tr" -> "tr"
+            "th" -> "th"
+            "id" -> "id"
+            "tl" -> "ph"
+            "vi" -> "vn"
+            "pl" -> "pl"
+            "uk" -> "ua"
+            "ta" -> "in"
+            "te" -> "in"
+            "ml" -> "in"
+            "kn" -> "in"
+            "pa" -> "in"
+            "mr" -> "in"
+            "bn" -> "in"
+            "sv" -> "se"
+            "da" -> "dk"
+            "no" -> "no"
+            "fi" -> "fi"
+            "is" -> "is"
+            "nl" -> "nl"
+            "cs" -> "cz"
+            "hu" -> "hu"
+            "el" -> "gr"
+            "he" -> "il"
+            "ar" -> "sa"
+            "fa" -> "ir"
+            else -> null
         }
-    }
+
+    val countryCode =
+        manualMapping
+            ?: run {
+                val locale = Locale.forLanguageTag(langCode)
+                locale.country.ifBlank {
+                    Locale.getAvailableLocales()
+                        .firstOrNull { it.language == langCode && it.country.isNotBlank() }
+                        ?.country
+                }
+            }
 
     return if (!countryCode.isNullOrBlank()) {
         "https://hatscripts.github.io/circle-flags/flags/${countryCode.lowercase()}.svg"
@@ -630,4 +647,4 @@ private fun formatRuntime(minutes: Int): String {
     } else {
         "${mins}m"
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/components/SeasonSelector.kt b/app/src/main/java/com/makd/afinity/ui/components/SeasonSelector.kt
index e74f3f71c..ea1b13f11 100644
--- a/app/src/main/java/com/makd/afinity/ui/components/SeasonSelector.kt
+++ b/app/src/main/java/com/makd/afinity/ui/components/SeasonSelector.kt
@@ -25,35 +25,33 @@ fun SeasonSelector(
     selectedSeasons: List<Int>,
     onSeasonsChange: (List<Int>) -> Unit,
     disabledSeasons: List<Int> = emptyList(),
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val selectableSeasons = (1..availableSeasons).filter { it !in disabledSeasons }
     val allSelectableSelected = selectableSeasons.all { it in selectedSeasons }
 
-    Column(
-        modifier = modifier.fillMaxWidth(),
-        verticalArrangement = Arrangement.spacedBy(8.dp)
-    ) {
+    Column(modifier = modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) {
         Text(
             text = "Select Seasons",
             style = MaterialTheme.typography.titleSmall,
             fontWeight = FontWeight.SemiBold,
-            color = MaterialTheme.colorScheme.onSurface
+            color = MaterialTheme.colorScheme.onSurface,
         )
 
         if (disabledSeasons.isNotEmpty()) {
             Text(
-                text = "Season${if (disabledSeasons.size > 1) "s" else ""} ${disabledSeasons.joinToString(", ")} already available",
+                text =
+                    "Season${if (disabledSeasons.size > 1) "s" else ""} ${disabledSeasons.joinToString(", ")} already available",
                 style = MaterialTheme.typography.bodySmall,
                 color = MaterialTheme.colorScheme.tertiary,
-                fontWeight = FontWeight.Medium
+                fontWeight = FontWeight.Medium,
             )
         }
 
         if (selectableSeasons.isNotEmpty()) {
             Row(
                 modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.spacedBy(8.dp)
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
             ) {
                 FilterChip(
                     selected = allSelectableSelected && selectableSeasons.isNotEmpty(),
@@ -71,7 +69,7 @@ fun SeasonSelector(
                             if (disabledSeasons.isEmpty()) "All Seasons"
                             else "All Remaining Seasons"
                         )
-                    }
+                    },
                 )
             }
         }
@@ -79,7 +77,7 @@ fun SeasonSelector(
         if (availableSeasons > 0) {
             LazyRow(
                 horizontalArrangement = Arrangement.spacedBy(8.dp),
-                modifier = Modifier.fillMaxWidth()
+                modifier = Modifier.fillMaxWidth(),
             ) {
                 items(availableSeasons) { index ->
                     val seasonNumber = index + 1
@@ -102,7 +100,7 @@ fun SeasonSelector(
                         label = {
                             Row(
                                 verticalAlignment = Alignment.CenterVertically,
-                                horizontalArrangement = Arrangement.spacedBy(4.dp)
+                                horizontalArrangement = Arrangement.spacedBy(4.dp),
                             ) {
                                 Text("Season $seasonNumber")
 
@@ -110,11 +108,11 @@ fun SeasonSelector(
                                     Icon(
                                         painter = painterResource(id = R.drawable.ic_check),
                                         contentDescription = "Included",
-                                        modifier = Modifier.size(16.dp)
+                                        modifier = Modifier.size(16.dp),
                                     )
                                 }
                             }
-                        }
+                        },
                     )
                 }
             }
@@ -123,8 +121,8 @@ fun SeasonSelector(
                 text = "No season information available. All seasons will be requested.",
                 style = MaterialTheme.typography.bodySmall,
                 color = MaterialTheme.colorScheme.onSurfaceVariant,
-                modifier = Modifier.padding(vertical = 4.dp)
+                modifier = Modifier.padding(vertical = 4.dp),
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/downloads/DownloadsViewModel.kt b/app/src/main/java/com/makd/afinity/ui/downloads/DownloadsViewModel.kt
index c58022e31..ec737279c 100644
--- a/app/src/main/java/com/makd/afinity/ui/downloads/DownloadsViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/downloads/DownloadsViewModel.kt
@@ -9,20 +9,22 @@ import com.makd.afinity.data.models.download.DownloadStatus
 import com.makd.afinity.data.repository.PreferencesRepository
 import com.makd.afinity.data.repository.download.DownloadRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
+import java.io.File
+import java.util.UUID
+import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import java.io.File
-import java.util.UUID
-import javax.inject.Inject
 
 @HiltViewModel
-class DownloadsViewModel @Inject constructor(
+class DownloadsViewModel
+@Inject
+constructor(
     private val downloadRepository: DownloadRepository,
-    private val preferencesRepository: PreferencesRepository
+    private val preferencesRepository: PreferencesRepository,
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(DownloadsUiState())
@@ -59,14 +61,11 @@ class DownloadsViewModel @Inject constructor(
     private fun observeDownloads() {
         viewModelScope.launch {
             try {
-                downloadRepository.getActiveDownloadsFlow()
-                    .catch { e ->
-                        Timber.e(e, "Error observing active downloads")
-                    }
+                downloadRepository
+                    .getActiveDownloadsFlow()
+                    .catch { e -> Timber.e(e, "Error observing active downloads") }
                     .collect { activeDownloads ->
-                        _uiState.value = _uiState.value.copy(
-                            activeDownloads = activeDownloads
-                        )
+                        _uiState.value = _uiState.value.copy(activeDownloads = activeDownloads)
                     }
             } catch (e: Exception) {
                 Timber.e(e, "Failed to observe active downloads")
@@ -75,14 +74,12 @@ class DownloadsViewModel @Inject constructor(
 
         viewModelScope.launch {
             try {
-                downloadRepository.getCompletedDownloadsFlow()
-                    .catch { e ->
-                        Timber.e(e, "Error observing completed downloads")
-                    }
+                downloadRepository
+                    .getCompletedDownloadsFlow()
+                    .catch { e -> Timber.e(e, "Error observing completed downloads") }
                     .collect { completedDownloads ->
-                        _uiState.value = _uiState.value.copy(
-                            completedDownloads = completedDownloads
-                        )
+                        _uiState.value =
+                            _uiState.value.copy(completedDownloads = completedDownloads)
                     }
             } catch (e: Exception) {
                 Timber.e(e, "Failed to observe completed downloads")
@@ -96,11 +93,12 @@ class DownloadsViewModel @Inject constructor(
                 val appStorageUsed = downloadRepository.getTotalStorageUsed()
                 val allServersStorageUsed = downloadRepository.getTotalStorageUsedAllServers()
                 val deviceStats = getDeviceStorageStats()
-                _uiState.value = _uiState.value.copy(
-                    totalStorageUsed = appStorageUsed,
-                    totalStorageUsedAllServers = allServersStorageUsed,
-                    deviceStorageStats = deviceStats
-                )
+                _uiState.value =
+                    _uiState.value.copy(
+                        totalStorageUsed = appStorageUsed,
+                        totalStorageUsedAllServers = allServersStorageUsed,
+                        deviceStorageStats = deviceStats,
+                    )
             } catch (e: Exception) {
                 Timber.e(e, "Failed to load storage info")
             }
@@ -113,9 +111,8 @@ class DownloadsViewModel @Inject constructor(
                 val result = downloadRepository.pauseDownload(downloadId)
                 result.onFailure { error ->
                     Timber.e(error, "Failed to pause download")
-                    _uiState.value = _uiState.value.copy(
-                        error = "Failed to pause download: ${error.message}"
-                    )
+                    _uiState.value =
+                        _uiState.value.copy(error = "Failed to pause download: ${error.message}")
                 }
             } catch (e: Exception) {
                 Timber.e(e, "Error pausing download")
@@ -129,9 +126,8 @@ class DownloadsViewModel @Inject constructor(
                 val result = downloadRepository.resumeDownload(downloadId)
                 result.onFailure { error ->
                     Timber.e(error, "Failed to resume download")
-                    _uiState.value = _uiState.value.copy(
-                        error = "Failed to resume download: ${error.message}"
-                    )
+                    _uiState.value =
+                        _uiState.value.copy(error = "Failed to resume download: ${error.message}")
                 }
             } catch (e: Exception) {
                 Timber.e(e, "Error resuming download")
@@ -143,15 +139,18 @@ class DownloadsViewModel @Inject constructor(
         viewModelScope.launch {
             try {
                 val result = downloadRepository.cancelDownload(downloadId)
-                result.onSuccess {
-                    Timber.i("Download cancelled successfully")
-                    loadStorageInfo()
-                }.onFailure { error ->
-                    Timber.e(error, "Failed to cancel download")
-                    _uiState.value = _uiState.value.copy(
-                        error = "Failed to cancel download: ${error.message}"
-                    )
-                }
+                result
+                    .onSuccess {
+                        Timber.i("Download cancelled successfully")
+                        loadStorageInfo()
+                    }
+                    .onFailure { error ->
+                        Timber.e(error, "Failed to cancel download")
+                        _uiState.value =
+                            _uiState.value.copy(
+                                error = "Failed to cancel download: ${error.message}"
+                            )
+                    }
             } catch (e: Exception) {
                 Timber.e(e, "Error cancelling download")
             }
@@ -162,15 +161,18 @@ class DownloadsViewModel @Inject constructor(
         viewModelScope.launch {
             try {
                 val result = downloadRepository.deleteDownload(downloadId)
-                result.onSuccess {
-                    Timber.i("Download deleted successfully")
-                    loadStorageInfo()
-                }.onFailure { error ->
-                    Timber.e(error, "Failed to delete download")
-                    _uiState.value = _uiState.value.copy(
-                        error = "Failed to delete download: ${error.message}"
-                    )
-                }
+                result
+                    .onSuccess {
+                        Timber.i("Download deleted successfully")
+                        loadStorageInfo()
+                    }
+                    .onFailure { error ->
+                        Timber.e(error, "Failed to delete download")
+                        _uiState.value =
+                            _uiState.value.copy(
+                                error = "Failed to delete download: ${error.message}"
+                            )
+                    }
             } catch (e: Exception) {
                 Timber.e(e, "Error deleting download")
             }
@@ -209,7 +211,7 @@ class DownloadsViewModel @Inject constructor(
         val totalBytes: Long,
         val freeBytes: Long,
         val usedBytes: Long,
-        val usagePercentage: Float
+        val usagePercentage: Float,
     )
 
     fun getDeviceStorageStats(): DeviceStorageStats {
@@ -224,7 +226,7 @@ class DownloadsViewModel @Inject constructor(
             totalBytes = totalBytes,
             freeBytes = availableBytes,
             usedBytes = usedBytes,
-            usagePercentage = usedBytes.toFloat() / totalBytes.toFloat()
+            usagePercentage = usedBytes.toFloat() / totalBytes.toFloat(),
         )
     }
 }
@@ -236,5 +238,5 @@ data class DownloadsUiState(
     val totalStorageUsedAllServers: Long = 0L,
     val downloadOverWifiOnly: Boolean = true,
     val deviceStorageStats: DownloadsViewModel.DeviceStorageStats? = null,
-    val error: String? = null
+    val error: String? = null,
 )
diff --git a/app/src/main/java/com/makd/afinity/ui/favorites/FavoritesScreen.kt b/app/src/main/java/com/makd/afinity/ui/favorites/FavoritesScreen.kt
index 9064a0d50..ab883c45e 100644
--- a/app/src/main/java/com/makd/afinity/ui/favorites/FavoritesScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/favorites/FavoritesScreen.kt
@@ -53,14 +53,14 @@ import com.makd.afinity.data.models.media.AfinityMovie
 import com.makd.afinity.data.models.media.AfinityPersonDetail
 import com.makd.afinity.data.models.media.AfinitySeason
 import com.makd.afinity.data.models.media.AfinityShow
-import com.makd.afinity.ui.player.PlayerLauncher
 import com.makd.afinity.navigation.Destination
 import com.makd.afinity.ui.components.AfinityTopAppBar
+import com.makd.afinity.ui.components.AsyncImage
 import com.makd.afinity.ui.components.ContinueWatchingCard
 import com.makd.afinity.ui.components.MediaItemCard
-import com.makd.afinity.ui.components.AsyncImage
 import com.makd.afinity.ui.item.components.EpisodeDetailOverlay
 import com.makd.afinity.ui.main.MainUiState
+import com.makd.afinity.ui.player.PlayerLauncher
 import com.makd.afinity.ui.theme.CardDimensions.landscapeWidth
 import com.makd.afinity.ui.theme.CardDimensions.portraitWidth
 
@@ -73,18 +73,18 @@ fun FavoritesScreen(
     onPersonClick: (String) -> Unit = {},
     navController: NavController,
     viewModel: FavoritesViewModel = hiltViewModel(),
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val context = LocalContext.current
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val selectedEpisode by viewModel.selectedEpisode.collectAsStateWithLifecycle()
     val isLoadingEpisode by viewModel.isLoadingEpisode.collectAsStateWithLifecycle()
-    val selectedEpisodeWatchlistStatus by viewModel.selectedEpisodeWatchlistStatus.collectAsStateWithLifecycle()
-    val selectedEpisodeDownloadInfo by viewModel.selectedEpisodeDownloadInfo.collectAsStateWithLifecycle()
+    val selectedEpisodeWatchlistStatus by
+        viewModel.selectedEpisodeWatchlistStatus.collectAsStateWithLifecycle()
+    val selectedEpisodeDownloadInfo by
+        viewModel.selectedEpisodeDownloadInfo.collectAsStateWithLifecycle()
 
-    LaunchedEffect(Unit) {
-        viewModel.loadFavorites()
-    }
+    LaunchedEffect(Unit) { viewModel.loadFavorites() }
 
     val portraitWidth = widthSizeClass.portraitWidth
     val landscapeWidth = widthSizeClass.landscapeWidth
@@ -95,10 +95,11 @@ fun FavoritesScreen(
                 title = {
                     Text(
                         text = stringResource(R.string.favorites_title),
-                        style = MaterialTheme.typography.headlineLarge.copy(
-                            fontWeight = FontWeight.Bold
-                        ),
-                        color = MaterialTheme.colorScheme.onBackground
+                        style =
+                            MaterialTheme.typography.headlineLarge.copy(
+                                fontWeight = FontWeight.Bold
+                            ),
+                        color = MaterialTheme.colorScheme.onBackground,
                     )
                 },
                 onSearchClick = {
@@ -109,46 +110,39 @@ fun FavoritesScreen(
                     val route = Destination.createSettingsRoute()
                     navController.navigate(route)
                 },
-                userProfileImageUrl = mainUiState.userProfileImageUrl
+                userProfileImageUrl = mainUiState.userProfileImageUrl,
             )
         },
-        modifier = modifier
+        modifier = modifier,
     ) { paddingValues ->
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(paddingValues)
-        ) {
+        Box(modifier = Modifier.fillMaxSize().padding(paddingValues)) {
             when {
                 uiState.isLoading -> {
-                    CircularProgressIndicator(
-                        modifier = Modifier.align(Alignment.Center)
-                    )
+                    CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
                 }
 
                 uiState.error != null -> {
                     Column(
-                        modifier = Modifier
-                            .align(Alignment.Center)
-                            .padding(32.dp),
+                        modifier = Modifier.align(Alignment.Center).padding(32.dp),
                         horizontalAlignment = Alignment.CenterHorizontally,
-                        verticalArrangement = Arrangement.spacedBy(16.dp)
+                        verticalArrangement = Arrangement.spacedBy(16.dp),
                     ) {
                         Text(
                             text = stringResource(R.string.home_error_title),
                             style = MaterialTheme.typography.headlineSmall,
-                            color = MaterialTheme.colorScheme.onBackground
+                            color = MaterialTheme.colorScheme.onBackground,
                         )
                         Text(
                             text = uiState.error ?: stringResource(R.string.error_unknown),
                             style = MaterialTheme.typography.bodyMedium,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
                 }
 
                 else -> {
-                    val hasAnyFavorites = uiState.movies.isNotEmpty() ||
+                    val hasAnyFavorites =
+                        uiState.movies.isNotEmpty() ||
                             uiState.shows.isNotEmpty() ||
                             uiState.seasons.isNotEmpty() ||
                             uiState.episodes.isNotEmpty() ||
@@ -158,38 +152,40 @@ fun FavoritesScreen(
 
                     if (!hasAnyFavorites) {
                         Column(
-                            modifier = Modifier
-                                .align(Alignment.Center)
-                                .padding(32.dp),
+                            modifier = Modifier.align(Alignment.Center).padding(32.dp),
                             horizontalAlignment = Alignment.CenterHorizontally,
-                            verticalArrangement = Arrangement.spacedBy(16.dp)
+                            verticalArrangement = Arrangement.spacedBy(16.dp),
                         ) {
                             Text(
                                 text = stringResource(R.string.favorites_empty_title),
                                 style = MaterialTheme.typography.headlineMedium,
-                                color = MaterialTheme.colorScheme.onBackground
+                                color = MaterialTheme.colorScheme.onBackground,
                             )
                             Text(
                                 text = stringResource(R.string.favorites_empty_message),
                                 style = MaterialTheme.typography.bodyMedium,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                         }
                     } else {
                         LazyColumn(
                             modifier = Modifier.fillMaxSize(),
                             contentPadding = PaddingValues(16.dp),
-                            verticalArrangement = Arrangement.spacedBy(24.dp)
+                            verticalArrangement = Arrangement.spacedBy(24.dp),
                         ) {
                             if (uiState.movies.isNotEmpty()) {
                                 item {
                                     FavoriteSection(
-                                        title = stringResource(R.string.favorites_header_movies, uiState.movies.size)
+                                        title =
+                                            stringResource(
+                                                R.string.favorites_header_movies,
+                                                uiState.movies.size,
+                                            )
                                     ) {
                                         FavoriteMoviesRow(
                                             movies = uiState.movies,
                                             onItemClick = onItemClick,
-                                            cardWidth = portraitWidth
+                                            cardWidth = portraitWidth,
                                         )
                                     }
                                 }
@@ -198,12 +194,16 @@ fun FavoritesScreen(
                             if (uiState.boxSets.isNotEmpty()) {
                                 item {
                                     FavoriteSection(
-                                        title = stringResource(R.string.favorites_header_boxsets, uiState.boxSets.size)
+                                        title =
+                                            stringResource(
+                                                R.string.favorites_header_boxsets,
+                                                uiState.boxSets.size,
+                                            )
                                     ) {
                                         FavoriteBoxSetsRow(
                                             boxSets = uiState.boxSets,
                                             onItemClick = onItemClick,
-                                            cardWidth = portraitWidth
+                                            cardWidth = portraitWidth,
                                         )
                                     }
                                 }
@@ -212,12 +212,16 @@ fun FavoritesScreen(
                             if (uiState.shows.isNotEmpty()) {
                                 item {
                                     FavoriteSection(
-                                        title = stringResource(R.string.favorites_header_shows, uiState.shows.size)
+                                        title =
+                                            stringResource(
+                                                R.string.favorites_header_shows,
+                                                uiState.shows.size,
+                                            )
                                     ) {
                                         FavoriteShowsRow(
                                             shows = uiState.shows,
                                             onItemClick = onItemClick,
-                                            cardWidth = portraitWidth
+                                            cardWidth = portraitWidth,
                                         )
                                     }
                                 }
@@ -226,12 +230,16 @@ fun FavoritesScreen(
                             if (uiState.seasons.isNotEmpty()) {
                                 item {
                                     FavoriteSection(
-                                        title = stringResource(R.string.favorites_header_seasons, uiState.seasons.size)
+                                        title =
+                                            stringResource(
+                                                R.string.favorites_header_seasons,
+                                                uiState.seasons.size,
+                                            )
                                     ) {
                                         FavoriteSeasonsRow(
                                             seasons = uiState.seasons,
                                             onItemClick = onItemClick,
-                                            cardWidth = portraitWidth
+                                            cardWidth = portraitWidth,
                                         )
                                     }
                                 }
@@ -240,14 +248,18 @@ fun FavoritesScreen(
                             if (uiState.episodes.isNotEmpty()) {
                                 item {
                                     FavoriteSection(
-                                        title = stringResource(R.string.favorites_header_episodes, uiState.episodes.size)
+                                        title =
+                                            stringResource(
+                                                R.string.favorites_header_episodes,
+                                                uiState.episodes.size,
+                                            )
                                     ) {
                                         FavoriteEpisodesRow(
                                             episodes = uiState.episodes,
                                             onEpisodeClick = { episode ->
                                                 viewModel.selectEpisode(episode)
                                             },
-                                            cardWidth = landscapeWidth
+                                            cardWidth = landscapeWidth,
                                         )
                                     }
                                 }
@@ -256,7 +268,11 @@ fun FavoritesScreen(
                             if (uiState.channels.isNotEmpty()) {
                                 item {
                                     FavoriteSection(
-                                        title = stringResource(R.string.favorites_header_channels, uiState.channels.size)
+                                        title =
+                                            stringResource(
+                                                R.string.favorites_header_channels,
+                                                uiState.channels.size,
+                                            )
                                     ) {
                                         FavoriteChannelsRow(
                                             channels = uiState.channels,
@@ -264,10 +280,10 @@ fun FavoritesScreen(
                                                 PlayerLauncher.launchLiveChannel(
                                                     context = context,
                                                     channelId = channel.id,
-                                                    channelName = channel.name
+                                                    channelName = channel.name,
                                                 )
                                             },
-                                            cardWidth = landscapeWidth
+                                            cardWidth = landscapeWidth,
                                         )
                                     }
                                 }
@@ -276,11 +292,15 @@ fun FavoritesScreen(
                             if (uiState.people.isNotEmpty()) {
                                 item {
                                     FavoriteSection(
-                                        title = stringResource(R.string.favorites_header_people, uiState.people.size)
+                                        title =
+                                            stringResource(
+                                                R.string.favorites_header_people,
+                                                uiState.people.size,
+                                            )
                                     ) {
                                         FavoritePeopleRow(
                                             people = uiState.people,
-                                            onPersonClick = onPersonClick
+                                            onPersonClick = onPersonClick,
                                         )
                                     }
                                 }
@@ -297,9 +317,7 @@ fun FavoritesScreen(
             episode = episode,
             isInWatchlist = selectedEpisodeWatchlistStatus,
             downloadInfo = selectedEpisodeDownloadInfo,
-            onDismiss = {
-                viewModel.clearSelectedEpisode()
-            },
+            onDismiss = { viewModel.clearSelectedEpisode() },
             onPlayClick = { episodeToPlay, selection ->
                 viewModel.clearSelectedEpisode()
                 com.makd.afinity.ui.player.PlayerLauncher.launch(
@@ -308,37 +326,23 @@ fun FavoritesScreen(
                     mediaSourceId = selection.mediaSourceId,
                     audioStreamIndex = selection.audioStreamIndex,
                     subtitleStreamIndex = selection.subtitleStreamIndex,
-                    startPositionMs = selection.startPositionMs
+                    startPositionMs = selection.startPositionMs,
                 )
             },
-            onToggleFavorite = {
-                viewModel.toggleEpisodeFavorite(episode)
-            },
-            onToggleWatchlist = {
-                viewModel.toggleEpisodeWatchlist(episode)
-            },
-            onToggleWatched = {
-                viewModel.toggleEpisodeWatched(episode)
-            },
-            onDownloadClick = {
-                viewModel.onDownloadClick()
-            },
-            onPauseDownload = {
-                viewModel.pauseDownload()
-            },
-            onResumeDownload = {
-                viewModel.resumeDownload()
-            },
-            onCancelDownload = {
-                viewModel.cancelDownload()
-            },
+            onToggleFavorite = { viewModel.toggleEpisodeFavorite(episode) },
+            onToggleWatchlist = { viewModel.toggleEpisodeWatchlist(episode) },
+            onToggleWatched = { viewModel.toggleEpisodeWatched(episode) },
+            onDownloadClick = { viewModel.onDownloadClick() },
+            onPauseDownload = { viewModel.pauseDownload() },
+            onResumeDownload = { viewModel.resumeDownload() },
+            onCancelDownload = { viewModel.cancelDownload() },
             onGoToSeries = {
                 viewModel.clearSelectedEpisode()
                 episode.seriesId?.let { seriesId ->
                     val route = Destination.createItemDetailRoute(seriesId.toString())
                     navController.navigate(route)
                 }
-            }
+            },
         )
     }
 }
@@ -347,18 +351,13 @@ fun FavoritesScreen(
 private fun FavoriteSection(
     title: String,
     modifier: Modifier = Modifier,
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
-    Column(
-        modifier = modifier,
-        verticalArrangement = Arrangement.spacedBy(16.dp)
-    ) {
+    Column(modifier = modifier, verticalArrangement = Arrangement.spacedBy(16.dp)) {
         Text(
             text = title,
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
-            color = MaterialTheme.colorScheme.onBackground
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+            color = MaterialTheme.colorScheme.onBackground,
         )
         content()
     }
@@ -368,18 +367,14 @@ private fun FavoriteSection(
 private fun FavoriteMoviesRow(
     movies: List<AfinityMovie>,
     onItemClick: (AfinityItem) -> Unit,
-    cardWidth: Dp
+    cardWidth: Dp,
 ) {
     LazyRow(
         horizontalArrangement = Arrangement.spacedBy(12.dp),
-        contentPadding = PaddingValues(horizontal = 0.dp)
+        contentPadding = PaddingValues(horizontal = 0.dp),
     ) {
         items(movies) { movie ->
-            MediaItemCard(
-                item = movie,
-                onClick = { onItemClick(movie) },
-                cardWidth = cardWidth
-            )
+            MediaItemCard(item = movie, onClick = { onItemClick(movie) }, cardWidth = cardWidth)
         }
     }
 }
@@ -388,18 +383,14 @@ private fun FavoriteMoviesRow(
 private fun FavoriteShowsRow(
     shows: List<AfinityShow>,
     onItemClick: (AfinityItem) -> Unit,
-    cardWidth: Dp
+    cardWidth: Dp,
 ) {
     LazyRow(
         horizontalArrangement = Arrangement.spacedBy(12.dp),
-        contentPadding = PaddingValues(horizontal = 0.dp)
+        contentPadding = PaddingValues(horizontal = 0.dp),
     ) {
         items(shows) { show ->
-            MediaItemCard(
-                item = show,
-                onClick = { onItemClick(show) },
-                cardWidth = cardWidth
-            )
+            MediaItemCard(item = show, onClick = { onItemClick(show) }, cardWidth = cardWidth)
         }
     }
 }
@@ -408,18 +399,14 @@ private fun FavoriteShowsRow(
 private fun FavoriteBoxSetsRow(
     boxSets: List<AfinityBoxSet>,
     onItemClick: (AfinityItem) -> Unit,
-    cardWidth: Dp
+    cardWidth: Dp,
 ) {
     LazyRow(
         horizontalArrangement = Arrangement.spacedBy(12.dp),
-        contentPadding = PaddingValues(horizontal = 0.dp)
+        contentPadding = PaddingValues(horizontal = 0.dp),
     ) {
         items(boxSets) { boxSet ->
-            MediaItemCard(
-                item = boxSet,
-                onClick = { onItemClick(boxSet) },
-                cardWidth = cardWidth
-            )
+            MediaItemCard(item = boxSet, onClick = { onItemClick(boxSet) }, cardWidth = cardWidth)
         }
     }
 }
@@ -428,18 +415,14 @@ private fun FavoriteBoxSetsRow(
 private fun FavoriteSeasonsRow(
     seasons: List<AfinitySeason>,
     onItemClick: (AfinityItem) -> Unit,
-    cardWidth: Dp
+    cardWidth: Dp,
 ) {
     LazyRow(
         horizontalArrangement = Arrangement.spacedBy(12.dp),
-        contentPadding = PaddingValues(horizontal = 0.dp)
+        contentPadding = PaddingValues(horizontal = 0.dp),
     ) {
         items(seasons) { season ->
-            MediaItemCard(
-                item = season,
-                onClick = { onItemClick(season) },
-                cardWidth = cardWidth
-            )
+            MediaItemCard(item = season, onClick = { onItemClick(season) }, cardWidth = cardWidth)
         }
     }
 }
@@ -448,62 +431,47 @@ private fun FavoriteSeasonsRow(
 private fun FavoriteEpisodesRow(
     episodes: List<AfinityEpisode>,
     onEpisodeClick: (AfinityEpisode) -> Unit,
-    cardWidth: Dp
+    cardWidth: Dp,
 ) {
     LazyRow(
         horizontalArrangement = Arrangement.spacedBy(12.dp),
-        contentPadding = PaddingValues(horizontal = 0.dp)
+        contentPadding = PaddingValues(horizontal = 0.dp),
     ) {
         items(episodes) { episode ->
             ContinueWatchingCard(
                 item = episode,
                 onClick = { onEpisodeClick(episode) },
-                cardWidth = cardWidth
+                cardWidth = cardWidth,
             )
         }
     }
 }
 
 @Composable
-private fun FavoritePeopleRow(
-    people: List<AfinityPersonDetail>,
-    onPersonClick: (String) -> Unit
-) {
+private fun FavoritePeopleRow(people: List<AfinityPersonDetail>, onPersonClick: (String) -> Unit) {
     LazyRow(
         horizontalArrangement = Arrangement.spacedBy(16.dp),
-        contentPadding = PaddingValues(horizontal = 0.dp)
+        contentPadding = PaddingValues(horizontal = 0.dp),
     ) {
         items(people) { person ->
-            FavoritePersonCard(
-                person = person,
-                onClick = { onPersonClick(person.id.toString()) }
-            )
+            FavoritePersonCard(person = person, onClick = { onPersonClick(person.id.toString()) })
         }
     }
 }
 
 @Composable
-private fun FavoritePersonCard(
-    person: AfinityPersonDetail,
-    onClick: () -> Unit
-) {
+private fun FavoritePersonCard(person: AfinityPersonDetail, onClick: () -> Unit) {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
-        modifier = Modifier
-            .width(80.dp)
-            .clip(RoundedCornerShape(8.dp))
+        modifier = Modifier.width(80.dp).clip(RoundedCornerShape(8.dp)),
     ) {
-        Card(
-            onClick = onClick,
-            shape = CircleShape,
-            modifier = Modifier.size(64.dp)
-        ) {
+        Card(onClick = onClick, shape = CircleShape, modifier = Modifier.size(64.dp)) {
             AsyncImage(
                 imageUrl = person.images.primaryImageUrl,
                 blurHash = person.images.primaryBlurHash,
                 contentDescription = person.name,
                 modifier = Modifier.fillMaxSize(),
-                contentScale = ContentScale.Crop
+                contentScale = ContentScale.Crop,
             )
         }
 
@@ -514,7 +482,7 @@ private fun FavoritePersonCard(
             style = MaterialTheme.typography.bodySmall,
             maxLines = 2,
             overflow = TextOverflow.Ellipsis,
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth(),
         )
     }
 }
@@ -523,62 +491,48 @@ private fun FavoritePersonCard(
 private fun FavoriteChannelsRow(
     channels: List<AfinityChannel>,
     onChannelClick: (AfinityChannel) -> Unit,
-    cardWidth: Dp
+    cardWidth: Dp,
 ) {
     LazyRow(
         horizontalArrangement = Arrangement.spacedBy(12.dp),
-        contentPadding = PaddingValues(horizontal = 0.dp)
+        contentPadding = PaddingValues(horizontal = 0.dp),
     ) {
         items(channels) { channel ->
             FavoriteChannelCard(
                 channel = channel,
                 onClick = { onChannelClick(channel) },
-                cardWidth = cardWidth
+                cardWidth = cardWidth,
             )
         }
     }
 }
 
 @Composable
-private fun FavoriteChannelCard(
-    channel: AfinityChannel,
-    onClick: () -> Unit,
-    cardWidth: Dp
-) {
-    Column(
-        modifier = Modifier.width(cardWidth)
-    ) {
+private fun FavoriteChannelCard(channel: AfinityChannel, onClick: () -> Unit, cardWidth: Dp) {
+    Column(modifier = Modifier.width(cardWidth)) {
         Card(
             onClick = onClick,
-            modifier = Modifier
-                .fillMaxWidth()
-                .aspectRatio(16f / 9f),
-            colors = CardDefaults.cardColors(
-                containerColor = MaterialTheme.colorScheme.surfaceVariant
-            ),
+            modifier = Modifier.fillMaxWidth().aspectRatio(16f / 9f),
+            colors =
+                CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
             elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
-            shape = MaterialTheme.shapes.medium
+            shape = MaterialTheme.shapes.medium,
         ) {
-            Box(
-                modifier = Modifier.fillMaxSize(),
-                contentAlignment = Alignment.Center
-            ) {
+            Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                 val imageUrl = channel.images.primary ?: channel.images.thumb
                 if (imageUrl != null) {
                     AsyncImage(
                         imageUrl = imageUrl.toString(),
                         contentDescription = channel.name,
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .padding(16.dp),
-                        contentScale = ContentScale.Fit
+                        modifier = Modifier.fillMaxSize().padding(16.dp),
+                        contentScale = ContentScale.Fit,
                     )
                 } else {
                     Text(
                         text = channel.channelNumber ?: channel.name.take(3),
                         style = MaterialTheme.typography.headlineMedium,
                         fontWeight = FontWeight.Bold,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
                 }
             }
@@ -592,19 +546,17 @@ private fun FavoriteChannelCard(
                     text = number,
                     style = MaterialTheme.typography.labelSmall,
                     color = MaterialTheme.colorScheme.primary,
-                    fontWeight = FontWeight.Bold
+                    fontWeight = FontWeight.Bold,
                 )
                 Spacer(modifier = Modifier.width(6.dp))
             }
             Text(
                 text = channel.name,
-                style = MaterialTheme.typography.bodyMedium.copy(
-                    fontWeight = FontWeight.SemiBold
-                ),
+                style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
                 color = MaterialTheme.colorScheme.onBackground,
                 maxLines = 1,
-                overflow = TextOverflow.Ellipsis
+                overflow = TextOverflow.Ellipsis,
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/favorites/FavoritesViewModel.kt b/app/src/main/java/com/makd/afinity/ui/favorites/FavoritesViewModel.kt
index adf812774..d4f8f9abd 100644
--- a/app/src/main/java/com/makd/afinity/ui/favorites/FavoritesViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/favorites/FavoritesViewModel.kt
@@ -21,6 +21,7 @@ import com.makd.afinity.data.repository.media.MediaRepository
 import com.makd.afinity.data.repository.userdata.UserDataRepository
 import com.makd.afinity.data.repository.watchlist.WatchlistRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -28,10 +29,11 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltViewModel
-class FavoritesViewModel @Inject constructor(
+class FavoritesViewModel
+@Inject
+constructor(
     private val jellyfinRepository: JellyfinRepository,
     private val userDataRepository: UserDataRepository,
     private val mediaRepository: MediaRepository,
@@ -39,7 +41,7 @@ class FavoritesViewModel @Inject constructor(
     private val watchlistRepository: WatchlistRepository,
     private val downloadRepository: DownloadRepository,
     private val appDataRepository: AppDataRepository,
-    private val liveTvRepository: LiveTvRepository
+    private val liveTvRepository: LiveTvRepository,
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(FavoritesUiState())
@@ -106,25 +108,26 @@ class FavoritesViewModel @Inject constructor(
                     val boxSets = boxSetsDeferred.await()
                     val channels = channelsDeferred.await()
 
-                    _uiState.value = _uiState.value.copy(
-                        isLoading = false,
-                        movies = movies.sortedBy { it.name },
-                        shows = shows.sortedBy { it.name },
-                        seasons = seasons.sortedBy { it.name },
-                        episodes = episodes.sortedBy { it.name },
-                        boxSets = boxSets.sortedBy { it.name },
-                        channels = channels.sortedBy { it.channelNumber ?: it.name },
-                        people = emptyList(),
-                        error = null
-                    )
+                    _uiState.value =
+                        _uiState.value.copy(
+                            isLoading = false,
+                            movies = movies.sortedBy { it.name },
+                            shows = shows.sortedBy { it.name },
+                            seasons = seasons.sortedBy { it.name },
+                            episodes = episodes.sortedBy { it.name },
+                            boxSets = boxSets.sortedBy { it.name },
+                            channels = channels.sortedBy { it.channelNumber ?: it.name },
+                            people = emptyList(),
+                            error = null,
+                        )
                 }
-
             } catch (e: Exception) {
                 Timber.e(e, "Failed to load favorites")
-                _uiState.value = _uiState.value.copy(
-                    isLoading = false,
-                    error = "Failed to load favorites: ${e.message}"
-                )
+                _uiState.value =
+                    _uiState.value.copy(
+                        isLoading = false,
+                        error = "Failed to load favorites: ${e.message}",
+                    )
             }
         }
     }
@@ -138,10 +141,10 @@ class FavoritesViewModel @Inject constructor(
             try {
                 _isLoadingEpisode.value = true
 
-                val fullEpisode = jellyfinRepository.getItem(
-                    episode.id,
-                    fields = FieldSets.ITEM_DETAIL
-                )?.toAfinityEpisode(jellyfinRepository, null)
+                val fullEpisode =
+                    jellyfinRepository
+                        .getItem(episode.id, fields = FieldSets.ITEM_DETAIL)
+                        ?.toAfinityEpisode(jellyfinRepository, null)
 
                 if (fullEpisode != null) {
                     _selectedEpisode.value = fullEpisode
@@ -171,11 +174,12 @@ class FavoritesViewModel @Inject constructor(
     fun toggleEpisodeFavorite(episode: AfinityEpisode) {
         viewModelScope.launch {
             try {
-                val success = if (episode.favorite) {
-                    userDataRepository.removeFromFavorites(episode.id)
-                } else {
-                    userDataRepository.addToFavorites(episode.id)
-                }
+                val success =
+                    if (episode.favorite) {
+                        userDataRepository.removeFromFavorites(episode.id)
+                    } else {
+                        userDataRepository.addToFavorites(episode.id)
+                    }
 
                 if (success) {
                     _selectedEpisode.value = episode.copy(favorite = !episode.favorite)
@@ -193,11 +197,12 @@ class FavoritesViewModel @Inject constructor(
                 val isInWatchlist = _selectedEpisodeWatchlistStatus.value
                 _selectedEpisodeWatchlistStatus.value = !isInWatchlist
 
-                val success = if (isInWatchlist) {
-                    watchlistRepository.removeFromWatchlist(episode.id)
-                } else {
-                    watchlistRepository.addToWatchlist(episode.id, "EPISODE")
-                }
+                val success =
+                    if (isInWatchlist) {
+                        watchlistRepository.removeFromWatchlist(episode.id)
+                    } else {
+                        watchlistRepository.addToWatchlist(episode.id, "EPISODE")
+                    }
 
                 if (!success) {
                     _selectedEpisodeWatchlistStatus.value = isInWatchlist
@@ -218,11 +223,12 @@ class FavoritesViewModel @Inject constructor(
     fun toggleEpisodeWatched(episode: AfinityEpisode) {
         viewModelScope.launch {
             try {
-                val success = if (episode.played) {
-                    userDataRepository.markUnwatched(episode.id)
-                } else {
-                    userDataRepository.markWatched(episode.id)
-                }
+                val success =
+                    if (episode.played) {
+                        userDataRepository.markUnwatched(episode.id)
+                    } else {
+                        userDataRepository.markWatched(episode.id)
+                    }
 
                 if (success) {
                     _selectedEpisode.value = episode.copy(played = !episode.played)
@@ -239,22 +245,27 @@ class FavoritesViewModel @Inject constructor(
         viewModelScope.launch {
             try {
                 val episode = _selectedEpisode.value ?: return@launch
-                val sources = episode.sources.filter {
-                    it.type == com.makd.afinity.data.models.media.AfinitySourceType.REMOTE
-                }
+                val sources =
+                    episode.sources.filter {
+                        it.type == com.makd.afinity.data.models.media.AfinitySourceType.REMOTE
+                    }
 
                 if (sources.isEmpty()) {
-                    Timber.w("No remote sources available for download for episode: ${episode.name}")
+                    Timber.w(
+                        "No remote sources available for download for episode: ${episode.name}"
+                    )
                     return@launch
                 }
 
                 if (sources.size == 1) {
                     val result = downloadRepository.startDownload(episode.id, sources.first().id)
-                    result.onSuccess {
-                        Timber.i("Download started successfully for episode: ${episode.name}")
-                    }.onFailure { error ->
-                        Timber.e(error, "Failed to start download for episode: ${episode.name}")
-                    }
+                    result
+                        .onSuccess {
+                            Timber.i("Download started successfully for episode: ${episode.name}")
+                        }
+                        .onFailure { error ->
+                            Timber.e(error, "Failed to start download for episode: ${episode.name}")
+                        }
                 }
             } catch (e: Exception) {
                 Timber.e(e, "Error starting download")
@@ -267,9 +278,7 @@ class FavoritesViewModel @Inject constructor(
             try {
                 val downloadInfo = _selectedEpisodeDownloadInfo.value ?: return@launch
                 val result = downloadRepository.pauseDownload(downloadInfo.id)
-                result.onFailure { error ->
-                    Timber.e(error, "Failed to pause download")
-                }
+                result.onFailure { error -> Timber.e(error, "Failed to pause download") }
             } catch (e: Exception) {
                 Timber.e(e, "Error pausing download")
             }
@@ -281,9 +290,7 @@ class FavoritesViewModel @Inject constructor(
             try {
                 val downloadInfo = _selectedEpisodeDownloadInfo.value ?: return@launch
                 val result = downloadRepository.resumeDownload(downloadInfo.id)
-                result.onFailure { error ->
-                    Timber.e(error, "Failed to resume download")
-                }
+                result.onFailure { error -> Timber.e(error, "Failed to resume download") }
             } catch (e: Exception) {
                 Timber.e(e, "Error resuming download")
             }
@@ -295,11 +302,9 @@ class FavoritesViewModel @Inject constructor(
             try {
                 val downloadInfo = _selectedEpisodeDownloadInfo.value ?: return@launch
                 val result = downloadRepository.cancelDownload(downloadInfo.id)
-                result.onSuccess {
-                    Timber.i("Download cancelled successfully")
-                }.onFailure { error ->
-                    Timber.e(error, "Failed to cancel download")
-                }
+                result
+                    .onSuccess { Timber.i("Download cancelled successfully") }
+                    .onFailure { error -> Timber.e(error, "Failed to cancel download") }
             } catch (e: Exception) {
                 Timber.e(e, "Error cancelling download")
             }
@@ -316,5 +321,5 @@ data class FavoritesUiState(
     val people: List<com.makd.afinity.data.models.media.AfinityPersonDetail> = emptyList(),
     val channels: List<com.makd.afinity.data.models.livetv.AfinityChannel> = emptyList(),
     val isLoading: Boolean = false,
-    val error: String? = null
-)
\ No newline at end of file
+    val error: String? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/home/HomeScreen.kt b/app/src/main/java/com/makd/afinity/ui/home/HomeScreen.kt
index 99842f121..4821db968 100644
--- a/app/src/main/java/com/makd/afinity/ui/home/HomeScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/home/HomeScreen.kt
@@ -91,8 +91,8 @@ import com.makd.afinity.data.models.media.AfinityShow
 import com.makd.afinity.data.models.media.AfinityStudio
 import com.makd.afinity.navigation.Destination
 import com.makd.afinity.ui.components.AfinityTopAppBar
-import com.makd.afinity.ui.components.HeroCarousel
 import com.makd.afinity.ui.components.AsyncImage
+import com.makd.afinity.ui.components.HeroCarousel
 import com.makd.afinity.ui.home.components.GenreSection
 import com.makd.afinity.ui.home.components.MovieRecommendationSection
 import com.makd.afinity.ui.home.components.NextUpSection
@@ -108,8 +108,8 @@ import com.makd.afinity.ui.main.MainUiState
 import com.makd.afinity.ui.theme.CardDimensions
 import com.makd.afinity.ui.theme.CardDimensions.landscapeWidth
 import com.makd.afinity.ui.theme.CardDimensions.portraitWidth
-import kotlinx.coroutines.delay
 import java.util.Locale
+import kotlinx.coroutines.delay
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -121,7 +121,7 @@ fun HomeScreen(
     modifier: Modifier = Modifier,
     navController: NavController,
     viewModel: HomeViewModel = hiltViewModel(),
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val context = LocalContext.current
@@ -142,406 +142,421 @@ fun HomeScreen(
         }
     }
 
-    DisposableEffect(Unit) {
-        onDispose {
-            viewModel.clearSelectedEpisode()
-        }
-    }
+    DisposableEffect(Unit) { onDispose { viewModel.clearSelectedEpisode() } }
 
-    val isScrolling by remember {
-        derivedStateOf {
-            lazyListState.isScrollInProgress
-        }
-    }
+    val isScrolling by remember { derivedStateOf { lazyListState.isScrollInProgress } }
 
     Box(modifier = modifier.fillMaxSize()) {
         uiState.error?.let { error ->
             Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .background(MaterialTheme.colorScheme.background),
-                contentAlignment = Alignment.Center
+                modifier = Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background),
+                contentAlignment = Alignment.Center,
             ) {
                 Column(
                     horizontalAlignment = Alignment.CenterHorizontally,
-                    verticalArrangement = Arrangement.spacedBy(16.dp)
+                    verticalArrangement = Arrangement.spacedBy(16.dp),
                 ) {
                     Text(
                         text = stringResource(R.string.home_error_title),
                         style = MaterialTheme.typography.headlineSmall,
-                        color = MaterialTheme.colorScheme.onBackground
+                        color = MaterialTheme.colorScheme.onBackground,
                     )
                     Text(
                         text = error,
                         style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
                     Text(
                         text = stringResource(R.string.home_error_message),
                         style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
                 }
             }
-        } ?: run {
-            val configuration = LocalConfiguration.current
-            val isLandscape =
-                configuration.orientation == android.content.res.Configuration.ORIENTATION_LANDSCAPE
+        }
+            ?: run {
+                val configuration = LocalConfiguration.current
+                val isLandscape =
+                    configuration.orientation ==
+                        android.content.res.Configuration.ORIENTATION_LANDSCAPE
 
-            Box(modifier = Modifier.fillMaxSize()) {
-                val density = LocalDensity.current
-                val statusBarHeight = WindowInsets.statusBars.getTop(density)
-                val showCarousel = !uiState.isOffline && uiState.heroCarouselItems.isNotEmpty()
-
-                val continueWatchingItems = if (uiState.isOffline) {
-                    uiState.offlineContinueWatching
-                } else {
-                    uiState.continueWatching
-                }
+                Box(modifier = Modifier.fillMaxSize()) {
+                    val density = LocalDensity.current
+                    val statusBarHeight = WindowInsets.statusBars.getTop(density)
+                    val showCarousel = !uiState.isOffline && uiState.heroCarouselItems.isNotEmpty()
 
-                val firstContentKey = when {
-                    continueWatchingItems.isNotEmpty() -> "continue_watching"
-                    !uiState.isOffline && uiState.isLoading && uiState.latestMedia.isNotEmpty() -> "cw_skeleton"
-                    uiState.downloadedMovies.isNotEmpty() -> "downloaded_movies"
-                    uiState.downloadedShows.isNotEmpty() -> "downloaded_shows"
-                    !uiState.isOffline && uiState.nextUp.isNotEmpty() -> "next_up"
-                    else -> null
-                }
+                    val continueWatchingItems =
+                        if (uiState.isOffline) {
+                            uiState.offlineContinueWatching
+                        } else {
+                            uiState.continueWatching
+                        }
 
-                fun getItemModifier(key: String): Modifier {
-                    return if (isLandscape && key == firstContentKey) {
-                        Modifier
-                            .fillMaxWidth()
-                            .verticalLayoutOffset((-70).dp)
-                    } else {
-                        Modifier.fillMaxWidth()
-                    }
-                }
+                    val firstContentKey =
+                        when {
+                            continueWatchingItems.isNotEmpty() -> "continue_watching"
+                            !uiState.isOffline &&
+                                uiState.isLoading &&
+                                uiState.latestMedia.isNotEmpty() -> "cw_skeleton"
+                            uiState.downloadedMovies.isNotEmpty() -> "downloaded_movies"
+                            uiState.downloadedShows.isNotEmpty() -> "downloaded_shows"
+                            !uiState.isOffline && uiState.nextUp.isNotEmpty() -> "next_up"
+                            else -> null
+                        }
 
-                LazyColumn(
-                    state = lazyListState,
-                    modifier = Modifier.fillMaxSize(),
-                    contentPadding = PaddingValues(
-                        top = if (!showCarousel) with(density) { statusBarHeight.toDp() + 56.dp } else 0.dp,
-                        bottom = 16.dp
-                    )
-                ) {
-                    if (showCarousel) {
-                        item(key = "hero_carousel") {
-                            HeroCarousel(
-                                items = uiState.heroCarouselItems,
-                                height = screenHeight * 0.65f,
-                                isScrolling = isScrolling,
-                                onWatchNowClick = onPlayClick,
-                                onPlayTrailerClick = { item ->
-                                    viewModel.onPlayTrailerClick(context, item)
-                                },
-                                onMoreInformationClick = onItemClick
-                            )
+                    fun getItemModifier(key: String): Modifier {
+                        return if (isLandscape && key == firstContentKey) {
+                            Modifier.fillMaxWidth().verticalLayoutOffset((-70).dp)
+                        } else {
+                            Modifier.fillMaxWidth()
                         }
                     }
 
-                    if (continueWatchingItems.isNotEmpty()) {
-                        item(key = "continue_watching") {
-                            Box(modifier = getItemModifier("continue_watching")) {
-                                Column {
-                                    Spacer(modifier = Modifier.height(24.dp))
-                                    OptimizedContinueWatchingSection(
-                                        items = continueWatchingItems,
-                                        onItemClick = { item ->
-                                            if (item is AfinityEpisode) {
-                                                viewModel.selectEpisode(item)
-                                            } else {
-                                                onItemClick(item)
-                                            }
-                                        },
-                                        widthSizeClass = widthSizeClass
-                                    )
-                                }
+                    LazyColumn(
+                        state = lazyListState,
+                        modifier = Modifier.fillMaxSize(),
+                        contentPadding =
+                            PaddingValues(
+                                top =
+                                    if (!showCarousel)
+                                        with(density) { statusBarHeight.toDp() + 56.dp }
+                                    else 0.dp,
+                                bottom = 16.dp,
+                            ),
+                    ) {
+                        if (showCarousel) {
+                            item(key = "hero_carousel") {
+                                HeroCarousel(
+                                    items = uiState.heroCarouselItems,
+                                    height = screenHeight * 0.65f,
+                                    isScrolling = isScrolling,
+                                    onWatchNowClick = onPlayClick,
+                                    onPlayTrailerClick = { item ->
+                                        viewModel.onPlayTrailerClick(context, item)
+                                    },
+                                    onMoreInformationClick = onItemClick,
+                                )
                             }
                         }
-                    } else if (!uiState.isOffline && uiState.isLoading && uiState.latestMedia.isNotEmpty()) {
-                        item(key = "cw_skeleton") {
-                            Box(modifier = getItemModifier("cw_skeleton")) {
-                                Column {
-                                    Spacer(modifier = Modifier.height(24.dp))
-                                    ContinueWatchingSkeleton(widthSizeClass)
+
+                        if (continueWatchingItems.isNotEmpty()) {
+                            item(key = "continue_watching") {
+                                Box(modifier = getItemModifier("continue_watching")) {
+                                    Column {
+                                        Spacer(modifier = Modifier.height(24.dp))
+                                        OptimizedContinueWatchingSection(
+                                            items = continueWatchingItems,
+                                            onItemClick = { item ->
+                                                if (item is AfinityEpisode) {
+                                                    viewModel.selectEpisode(item)
+                                                } else {
+                                                    onItemClick(item)
+                                                }
+                                            },
+                                            widthSizeClass = widthSizeClass,
+                                        )
+                                    }
+                                }
+                            }
+                        } else if (
+                            !uiState.isOffline &&
+                                uiState.isLoading &&
+                                uiState.latestMedia.isNotEmpty()
+                        ) {
+                            item(key = "cw_skeleton") {
+                                Box(modifier = getItemModifier("cw_skeleton")) {
+                                    Column {
+                                        Spacer(modifier = Modifier.height(24.dp))
+                                        ContinueWatchingSkeleton(widthSizeClass)
+                                    }
                                 }
                             }
                         }
-                    }
 
-                    if (uiState.downloadedMovies.isNotEmpty()) {
-                        item(key = "downloaded_movies") {
-                            Box(modifier = getItemModifier("downloaded_movies")) {
-                                Column {
-                                    Spacer(modifier = Modifier.height(24.dp))
-                                    OptimizedLatestTvSeriesSection(
-                                        title = stringResource(R.string.home_downloaded_movies),
-                                        items = uiState.downloadedMovies,
-                                        onItemClick = onItemClick,
-                                        widthSizeClass = widthSizeClass
-                                    )
+                        if (uiState.downloadedMovies.isNotEmpty()) {
+                            item(key = "downloaded_movies") {
+                                Box(modifier = getItemModifier("downloaded_movies")) {
+                                    Column {
+                                        Spacer(modifier = Modifier.height(24.dp))
+                                        OptimizedLatestTvSeriesSection(
+                                            title = stringResource(R.string.home_downloaded_movies),
+                                            items = uiState.downloadedMovies,
+                                            onItemClick = onItemClick,
+                                            widthSizeClass = widthSizeClass,
+                                        )
+                                    }
                                 }
                             }
                         }
-                    }
 
-                    if (uiState.downloadedShows.isNotEmpty()) {
-                        item(key = "downloaded_shows") {
-                            Box(modifier = getItemModifier("downloaded_shows")) {
-                                Column {
-                                    Spacer(modifier = Modifier.height(24.dp))
-                                    OptimizedLatestTvSeriesSection(
-                                        title = stringResource(R.string.home_downloaded_shows),
-                                        items = uiState.downloadedShows,
-                                        onItemClick = onItemClick,
-                                        widthSizeClass = widthSizeClass
-                                    )
+                        if (uiState.downloadedShows.isNotEmpty()) {
+                            item(key = "downloaded_shows") {
+                                Box(modifier = getItemModifier("downloaded_shows")) {
+                                    Column {
+                                        Spacer(modifier = Modifier.height(24.dp))
+                                        OptimizedLatestTvSeriesSection(
+                                            title = stringResource(R.string.home_downloaded_shows),
+                                            items = uiState.downloadedShows,
+                                            onItemClick = onItemClick,
+                                            widthSizeClass = widthSizeClass,
+                                        )
+                                    }
                                 }
                             }
                         }
-                    }
 
-                    if (!uiState.isOffline && uiState.nextUp.isNotEmpty()) {
-                        item(key = "next_up") {
-                            Box(modifier = getItemModifier("next_up")) {
-                                Column {
-                                    Spacer(modifier = Modifier.height(24.dp))
-                                    NextUpSection(
-                                        episodes = uiState.nextUp,
-                                        onEpisodeClick = { episode ->
-                                            viewModel.selectEpisode(episode)
-                                        },
-                                        widthSizeClass = widthSizeClass
-                                    )
+                        if (!uiState.isOffline && uiState.nextUp.isNotEmpty()) {
+                            item(key = "next_up") {
+                                Box(modifier = getItemModifier("next_up")) {
+                                    Column {
+                                        Spacer(modifier = Modifier.height(24.dp))
+                                        NextUpSection(
+                                            episodes = uiState.nextUp,
+                                            onEpisodeClick = { episode ->
+                                                viewModel.selectEpisode(episode)
+                                            },
+                                            widthSizeClass = widthSizeClass,
+                                        )
+                                    }
                                 }
                             }
                         }
-                    }
 
-                    if (!uiState.isOffline) {
-                        if (uiState.combineLibrarySections) {
-                            if (uiState.latestMovies.isNotEmpty()) {
-                                item(key = "latest_movies_combined") {
+                        if (!uiState.isOffline) {
+                            if (uiState.combineLibrarySections) {
+                                if (uiState.latestMovies.isNotEmpty()) {
+                                    item(key = "latest_movies_combined") {
+                                        Column(modifier = Modifier.fillMaxWidth()) {
+                                            Spacer(modifier = Modifier.height(24.dp))
+                                            OptimizedLatestMoviesSection(
+                                                items = uiState.latestMovies,
+                                                onItemClick = onItemClick,
+                                                widthSizeClass = widthSizeClass,
+                                            )
+                                        }
+                                    }
+                                } else if (uiState.isLoading && uiState.latestMedia.isNotEmpty()) {
+                                    item(key = "movies_skeleton") {
+                                        Column(modifier = Modifier.fillMaxWidth()) {
+                                            Spacer(modifier = Modifier.height(24.dp))
+                                            MoviesSectionSkeleton(widthSizeClass)
+                                        }
+                                    }
+                                }
+                            } else {
+                                items(
+                                    items = uiState.separateMovieLibrarySections,
+                                    key = { (library, _) -> "movie_lib_${library.id}" },
+                                ) { (library, movies) ->
                                     Column(modifier = Modifier.fillMaxWidth()) {
                                         Spacer(modifier = Modifier.height(24.dp))
                                         OptimizedLatestMoviesSection(
-                                            items = uiState.latestMovies,
+                                            title = library.name,
+                                            items = movies,
                                             onItemClick = onItemClick,
-                                            widthSizeClass = widthSizeClass
+                                            widthSizeClass = widthSizeClass,
                                         )
                                     }
                                 }
-                            } else if (uiState.isLoading && uiState.latestMedia.isNotEmpty()) {
-                                item(key = "movies_skeleton") {
-                                    Column(modifier = Modifier.fillMaxWidth()) {
-                                        Spacer(modifier = Modifier.height(24.dp))
-                                        MoviesSectionSkeleton(widthSizeClass)
-                                    }
-                                }
-                            }
-                        } else {
-                            items(
-                                items = uiState.separateMovieLibrarySections,
-                                key = { (library, _) -> "movie_lib_${library.id}" }
-                            ) { (library, movies) ->
-                                Column(modifier = Modifier.fillMaxWidth()) {
-                                    Spacer(modifier = Modifier.height(24.dp))
-                                    OptimizedLatestMoviesSection(
-                                        title = library.name,
-                                        items = movies,
-                                        onItemClick = onItemClick,
-                                        widthSizeClass = widthSizeClass
-                                    )
-                                }
                             }
                         }
-                    }
 
-                    if (!uiState.isOffline) {
-                        if (uiState.combineLibrarySections) {
-                            if (uiState.latestTvSeries.isNotEmpty()) {
-                                item(key = "latest_tv_combined") {
+                        if (!uiState.isOffline) {
+                            if (uiState.combineLibrarySections) {
+                                if (uiState.latestTvSeries.isNotEmpty()) {
+                                    item(key = "latest_tv_combined") {
+                                        Column(modifier = Modifier.fillMaxWidth()) {
+                                            Spacer(modifier = Modifier.height(24.dp))
+                                            OptimizedLatestTvSeriesSection(
+                                                items = uiState.latestTvSeries,
+                                                onItemClick = onItemClick,
+                                                widthSizeClass = widthSizeClass,
+                                            )
+                                        }
+                                    }
+                                } else if (uiState.isLoading && uiState.latestMedia.isNotEmpty()) {
+                                    item(key = "tv_skeleton") {
+                                        Column(modifier = Modifier.fillMaxWidth()) {
+                                            Spacer(modifier = Modifier.height(24.dp))
+                                            TvSeriesSectionSkeleton(widthSizeClass)
+                                        }
+                                    }
+                                }
+                            } else {
+                                items(
+                                    items = uiState.separateTvLibrarySections,
+                                    key = { (library, _) -> "tv_lib_${library.id}" },
+                                ) { (library, shows) ->
                                     Column(modifier = Modifier.fillMaxWidth()) {
                                         Spacer(modifier = Modifier.height(24.dp))
                                         OptimizedLatestTvSeriesSection(
-                                            items = uiState.latestTvSeries,
+                                            title = library.name,
+                                            items = shows,
                                             onItemClick = onItemClick,
-                                            widthSizeClass = widthSizeClass
+                                            widthSizeClass = widthSizeClass,
                                         )
                                     }
                                 }
-                            } else if (uiState.isLoading && uiState.latestMedia.isNotEmpty()) {
-                                item(key = "tv_skeleton") {
-                                    Column(modifier = Modifier.fillMaxWidth()) {
-                                        Spacer(modifier = Modifier.height(24.dp))
-                                        TvSeriesSectionSkeleton(widthSizeClass)
-                                    }
-                                }
                             }
-                        } else {
-                            items(
-                                items = uiState.separateTvLibrarySections,
-                                key = { (library, _) -> "tv_lib_${library.id}" }
-                            ) { (library, shows) ->
+                        }
+
+                        if (!uiState.isOffline && uiState.highestRated.isNotEmpty()) {
+                            item(key = "highest_rated") {
                                 Column(modifier = Modifier.fillMaxWidth()) {
                                     Spacer(modifier = Modifier.height(24.dp))
-                                    OptimizedLatestTvSeriesSection(
-                                        title = library.name,
-                                        items = shows,
+                                    HighestRatedSection(
+                                        items = uiState.highestRated,
                                         onItemClick = onItemClick,
-                                        widthSizeClass = widthSizeClass
+                                        widthSizeClass = widthSizeClass,
                                     )
                                 }
                             }
                         }
-                    }
-
-                    if (!uiState.isOffline && uiState.highestRated.isNotEmpty()) {
-                        item(key = "highest_rated") {
-                            Column(modifier = Modifier.fillMaxWidth()) {
-                                Spacer(modifier = Modifier.height(24.dp))
-                                HighestRatedSection(
-                                    items = uiState.highestRated,
-                                    onItemClick = onItemClick,
-                                    widthSizeClass = widthSizeClass
-                                )
-                            }
-                        }
-                    }
 
-                    if (!uiState.isOffline && uiState.studios.isNotEmpty()) {
-                        item(key = "popular_studios") {
-                            Column(modifier = Modifier.fillMaxWidth()) {
-                                Spacer(modifier = Modifier.height(24.dp))
-                                PopularStudiosSection(
-                                    studios = uiState.studios,
-                                    onStudioClick = { studio ->
-                                        viewModel.onStudioClick(studio, navController)
-                                    },
-                                    widthSizeClass = widthSizeClass
-                                )
-                            }
-                        }
-                    }
-
-                    if (!uiState.isOffline && uiState.combinedSections.isNotEmpty()) {
-                        items(
-                            items = uiState.combinedSections,
-                            key = { section ->
-                                when (section) {
-                                    is HomeSection.Person -> "person_${section.section.hashCode()}"
-                                    is HomeSection.Movie -> "movie_rec_${section.section.hashCode()}"
-                                    is HomeSection.PersonFromMovie -> "person_movie_${section.section.hashCode()}"
-                                    is HomeSection.Genre -> "genre_${section.genreItem.name}_${section.genreItem.type}"
+                        if (!uiState.isOffline && uiState.studios.isNotEmpty()) {
+                            item(key = "popular_studios") {
+                                Column(modifier = Modifier.fillMaxWidth()) {
+                                    Spacer(modifier = Modifier.height(24.dp))
+                                    PopularStudiosSection(
+                                        studios = uiState.studios,
+                                        onStudioClick = { studio ->
+                                            viewModel.onStudioClick(studio, navController)
+                                        },
+                                        widthSizeClass = widthSizeClass,
+                                    )
                                 }
                             }
-                        ) { section ->
-                            Column(modifier = Modifier.fillMaxWidth()) {
-                                Spacer(modifier = Modifier.height(24.dp))
-                                when (section) {
-                                    is HomeSection.Person -> {
-                                        PersonSection(
-                                            section = section.section,
-                                            onItemClick = { movie -> onItemClick(movie) },
-                                            widthSizeClass = widthSizeClass
-                                        )
-                                    }
+                        }
 
-                                    is HomeSection.Movie -> {
-                                        MovieRecommendationSection(
-                                            section = section.section,
-                                            onItemClick = { movie -> onItemClick(movie) },
-                                            widthSizeClass = widthSizeClass
-                                        )
+                        if (!uiState.isOffline && uiState.combinedSections.isNotEmpty()) {
+                            items(
+                                items = uiState.combinedSections,
+                                key = { section ->
+                                    when (section) {
+                                        is HomeSection.Person ->
+                                            "person_${section.section.hashCode()}"
+                                        is HomeSection.Movie ->
+                                            "movie_rec_${section.section.hashCode()}"
+                                        is HomeSection.PersonFromMovie ->
+                                            "person_movie_${section.section.hashCode()}"
+                                        is HomeSection.Genre ->
+                                            "genre_${section.genreItem.name}_${section.genreItem.type}"
                                     }
+                                },
+                            ) { section ->
+                                Column(modifier = Modifier.fillMaxWidth()) {
+                                    Spacer(modifier = Modifier.height(24.dp))
+                                    when (section) {
+                                        is HomeSection.Person -> {
+                                            PersonSection(
+                                                section = section.section,
+                                                onItemClick = { movie -> onItemClick(movie) },
+                                                widthSizeClass = widthSizeClass,
+                                            )
+                                        }
 
-                                    is HomeSection.PersonFromMovie -> {
-                                        PersonFromMovieSection(
-                                            section = section.section,
-                                            onItemClick = { movie -> onItemClick(movie) },
-                                            widthSizeClass = widthSizeClass
-                                        )
-                                    }
+                                        is HomeSection.Movie -> {
+                                            MovieRecommendationSection(
+                                                section = section.section,
+                                                onItemClick = { movie -> onItemClick(movie) },
+                                                widthSizeClass = widthSizeClass,
+                                            )
+                                        }
 
-                                    is HomeSection.Genre -> {
-                                        when (section.genreItem.type) {
-                                            GenreType.MOVIE -> {
-                                                GenreSection(
-                                                    genre = section.genreItem.name,
-                                                    movies = uiState.genreMovies[section.genreItem.name]
-                                                        ?: emptyList(),
-                                                    isLoading = uiState.genreLoadingStates[section.genreItem.name]
-                                                        ?: false,
-                                                    onVisible = {
-                                                        if (uiState.genreMovies[section.genreItem.name] == null) {
-                                                            viewModel.loadMoviesForGenre(
-                                                                section.genreItem.name
-                                                            )
-                                                        }
-                                                    },
-                                                    onItemClick = onItemClick,
-                                                    widthSizeClass = widthSizeClass
-                                                )
-                                            }
+                                        is HomeSection.PersonFromMovie -> {
+                                            PersonFromMovieSection(
+                                                section = section.section,
+                                                onItemClick = { movie -> onItemClick(movie) },
+                                                widthSizeClass = widthSizeClass,
+                                            )
+                                        }
 
-                                            GenreType.SHOW -> {
-                                                ShowGenreSection(
-                                                    genre = section.genreItem.name,
-                                                    shows = uiState.genreShows[section.genreItem.name]
-                                                        ?: emptyList(),
-                                                    isLoading = uiState.genreLoadingStates[section.genreItem.name]
-                                                        ?: false,
-                                                    onVisible = {
-                                                        if (uiState.genreShows[section.genreItem.name] == null) {
-                                                            viewModel.loadShowsForGenre(
-                                                                section.genreItem.name
-                                                            )
-                                                        }
-                                                    },
-                                                    onItemClick = onItemClick,
-                                                    widthSizeClass = widthSizeClass
-                                                )
+                                        is HomeSection.Genre -> {
+                                            when (section.genreItem.type) {
+                                                GenreType.MOVIE -> {
+                                                    GenreSection(
+                                                        genre = section.genreItem.name,
+                                                        movies =
+                                                            uiState.genreMovies[
+                                                                    section.genreItem.name]
+                                                                ?: emptyList(),
+                                                        isLoading =
+                                                            uiState.genreLoadingStates[
+                                                                    section.genreItem.name]
+                                                                ?: false,
+                                                        onVisible = {
+                                                            if (
+                                                                uiState.genreMovies[
+                                                                        section.genreItem.name] ==
+                                                                    null
+                                                            ) {
+                                                                viewModel.loadMoviesForGenre(
+                                                                    section.genreItem.name
+                                                                )
+                                                            }
+                                                        },
+                                                        onItemClick = onItemClick,
+                                                        widthSizeClass = widthSizeClass,
+                                                    )
+                                                }
+
+                                                GenreType.SHOW -> {
+                                                    ShowGenreSection(
+                                                        genre = section.genreItem.name,
+                                                        shows =
+                                                            uiState.genreShows[
+                                                                    section.genreItem.name]
+                                                                ?: emptyList(),
+                                                        isLoading =
+                                                            uiState.genreLoadingStates[
+                                                                    section.genreItem.name]
+                                                                ?: false,
+                                                        onVisible = {
+                                                            if (
+                                                                uiState.genreShows[
+                                                                        section.genreItem.name] ==
+                                                                    null
+                                                            ) {
+                                                                viewModel.loadShowsForGenre(
+                                                                    section.genreItem.name
+                                                                )
+                                                            }
+                                                        },
+                                                        onItemClick = onItemClick,
+                                                        widthSizeClass = widthSizeClass,
+                                                    )
+                                                }
                                             }
                                         }
                                     }
                                 }
                             }
                         }
-                    }
 
-                    item(key = "bottom_padding") {
-                        Spacer(modifier = Modifier.height(32.dp))
+                        item(key = "bottom_padding") { Spacer(modifier = Modifier.height(32.dp)) }
                     }
                 }
             }
-        }
 
         AfinityTopAppBar(
             title = {
                 IconButton(
                     onClick = { /* TODO: Handle app icon click if needed */ },
-                    modifier = Modifier.size(48.dp)
+                    modifier = Modifier.size(48.dp),
                 ) {
                     Box(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .background(
-                                Color.Black.copy(alpha = 0.3f),
-                                CircleShape
-                            )
-                            .clip(CircleShape),
-                        contentAlignment = Alignment.Center
+                        modifier =
+                            Modifier.fillMaxSize()
+                                .background(Color.Black.copy(alpha = 0.3f), CircleShape)
+                                .clip(CircleShape),
+                        contentAlignment = Alignment.Center,
                     ) {
                         Image(
                             painter = painterResource(id = ic_launcher_monochrome),
                             contentDescription = stringResource(R.string.cd_app_logo),
-                            modifier = Modifier
-                                .size(60.dp)
-                                .fillMaxSize(),
+                            modifier = Modifier.size(60.dp).fillMaxSize(),
                             colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary),
-                            contentScale = ContentScale.Fit
+                            contentScale = ContentScale.Fit,
                         )
                     }
                 }
@@ -552,12 +567,14 @@ fun HomeScreen(
             },
             onProfileClick = onProfileClick,
             userProfileImageUrl = mainUiState.userProfileImageUrl,
-            backgroundOpacity = topBarOpacity
+            backgroundOpacity = topBarOpacity,
         )
         val selectedEpisode by viewModel.selectedEpisode.collectAsStateWithLifecycle()
         val isLoadingEpisode by viewModel.isLoadingEpisode.collectAsStateWithLifecycle()
-        val selectedEpisodeWatchlistStatus by viewModel.selectedEpisodeWatchlistStatus.collectAsStateWithLifecycle()
-        val selectedEpisodeDownloadInfo by viewModel.selectedEpisodeDownloadInfo.collectAsStateWithLifecycle()
+        val selectedEpisodeWatchlistStatus by
+            viewModel.selectedEpisodeWatchlistStatus.collectAsStateWithLifecycle()
+        val selectedEpisodeDownloadInfo by
+            viewModel.selectedEpisodeDownloadInfo.collectAsStateWithLifecycle()
 
         var pendingNavigationSeriesId by remember { mutableStateOf<String?>(null) }
 
@@ -568,7 +585,7 @@ fun HomeScreen(
 
         AnimatedVisibility(
             visible = selectedEpisode != null,
-            exit = slideOutVertically(targetOffsetY = { it }) + fadeOut()
+            exit = slideOutVertically(targetOffsetY = { it }) + fadeOut(),
         ) {
             episodeForOverlay?.let { episode ->
                 EpisodeDetailOverlay(
@@ -588,39 +605,24 @@ fun HomeScreen(
                             mediaSourceId = selection.mediaSourceId,
                             audioStreamIndex = selection.audioStreamIndex,
                             subtitleStreamIndex = selection.subtitleStreamIndex,
-                            startPositionMs = selection.startPositionMs
+                            startPositionMs = selection.startPositionMs,
                         )
                     },
-                    onToggleFavorite = {
-                        viewModel.toggleEpisodeFavorite(episode)
-                    },
-                    onToggleWatchlist = {
-                        viewModel.toggleEpisodeWatchlist(episode)
-                    },
-                    onToggleWatched = {
-                        viewModel.toggleEpisodeWatched(episode)
-                    },
-                    onDownloadClick = {
-                        viewModel.onDownloadClick()
-                    },
-                    onPauseDownload = {
-                        viewModel.pauseDownload()
-                    },
-                    onResumeDownload = {
-                        viewModel.resumeDownload()
-                    },
-                    onCancelDownload = {
-                        viewModel.cancelDownload()
-                    },
+                    onToggleFavorite = { viewModel.toggleEpisodeFavorite(episode) },
+                    onToggleWatchlist = { viewModel.toggleEpisodeWatchlist(episode) },
+                    onToggleWatched = { viewModel.toggleEpisodeWatched(episode) },
+                    onDownloadClick = { viewModel.onDownloadClick() },
+                    onPauseDownload = { viewModel.pauseDownload() },
+                    onResumeDownload = { viewModel.resumeDownload() },
+                    onCancelDownload = { viewModel.cancelDownload() },
                     onGoToSeries = {
                         viewModel.clearSelectedEpisode()
                         pendingNavigationSeriesId = episode.seriesId.toString()
-                    }
+                    },
                 )
             }
         }
 
-
         LaunchedEffect(selectedEpisode, pendingNavigationSeriesId) {
             if (selectedEpisode == null && pendingNavigationSeriesId != null) {
                 delay(300)
@@ -632,17 +634,16 @@ fun HomeScreen(
 
         if (uiState.showQualityDialog) {
             val currentEpisode = selectedEpisode
-            val remoteSources = currentEpisode?.sources?.filter {
-                it.type == com.makd.afinity.data.models.media.AfinitySourceType.REMOTE
-            } ?: emptyList()
+            val remoteSources =
+                currentEpisode?.sources?.filter {
+                    it.type == com.makd.afinity.data.models.media.AfinitySourceType.REMOTE
+                } ?: emptyList()
 
             if (remoteSources.isNotEmpty()) {
                 QualitySelectionDialog(
                     sources = remoteSources,
-                    onSourceSelected = { source ->
-                        viewModel.onQualitySelected(source.id)
-                    },
-                    onDismiss = { viewModel.dismissQualityDialog() }
+                    onSourceSelected = { source -> viewModel.onQualitySelected(source.id) },
+                    onDismiss = { viewModel.dismissQualityDialog() },
                 )
             }
         }
@@ -653,22 +654,18 @@ fun HomeScreen(
 private fun HighestRatedSection(
     items: List<AfinityItem>,
     onItemClick: (AfinityItem) -> Unit,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val cardWidth = widthSizeClass.portraitWidth
     val cardHeight = CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_PORTRAIT)
     val fixedRowHeight = cardHeight + 8.dp + 20.dp + 22.dp
 
-    Column(
-        modifier = Modifier.padding(horizontal = 16.dp)
-    ) {
+    Column(modifier = Modifier.padding(horizontal = 16.dp)) {
         Text(
             text = stringResource(R.string.home_critics_choice),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             color = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         val uniqueItems = items.distinctBy { it.id }
@@ -676,17 +673,14 @@ private fun HighestRatedSection(
         LazyRow(
             modifier = Modifier.height(fixedRowHeight),
             horizontalArrangement = Arrangement.spacedBy(22.dp),
-            contentPadding = PaddingValues(start = 4.dp, end = 24.dp)
+            contentPadding = PaddingValues(start = 4.dp, end = 24.dp),
         ) {
-            itemsIndexed(
-                items = uniqueItems,
-                key = { _, item -> item.id }
-            ) { index, item ->
+            itemsIndexed(items = uniqueItems, key = { _, item -> item.id }) { index, item ->
                 HighestRatedCard(
                     item = item,
                     ranking = index + 1,
                     onClick = { onItemClick(item) },
-                    cardWidth = cardWidth
+                    cardWidth = cardWidth,
                 )
             }
         }
@@ -694,49 +688,36 @@ private fun HighestRatedSection(
 }
 
 @Composable
-private fun HighestRatedCard(
-    item: AfinityItem,
-    ranking: Int,
-    onClick: () -> Unit,
-    cardWidth: Dp
-) {
+private fun HighestRatedCard(item: AfinityItem, ranking: Int, onClick: () -> Unit, cardWidth: Dp) {
     val density = LocalDensity.current
     val fontScale = density.fontScale
 
     val baseFontSize = MaterialTheme.typography.bodySmall.fontSize
-    val metadataFontSize = remember(fontScale, baseFontSize) {
-        baseFontSize * if (fontScale > 1.3f) 0.8f else if (fontScale > 1.15f) 0.9f else 1f
-    }
+    val metadataFontSize =
+        remember(fontScale, baseFontSize) {
+            baseFontSize * if (fontScale > 1.3f) 0.8f else if (fontScale > 1.15f) 0.9f else 1f
+        }
 
-    val imdbIconSize = remember(fontScale) {
-        if (fontScale > 1.3f) 14.dp
-        else if (fontScale > 1.15f) 16.dp
-        else 18.dp
-    }
+    val imdbIconSize =
+        remember(fontScale) {
+            if (fontScale > 1.3f) 14.dp else if (fontScale > 1.15f) 16.dp else 18.dp
+        }
 
-    val rtIconSize = remember(fontScale) {
-        if (fontScale > 1.3f) 10.dp
-        else if (fontScale > 1.15f) 11.dp
-        else 12.dp
-    }
+    val rtIconSize =
+        remember(fontScale) {
+            if (fontScale > 1.3f) 10.dp else if (fontScale > 1.15f) 11.dp else 12.dp
+        }
 
-    Column(
-        modifier = Modifier.width(cardWidth)
-    ) {
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .aspectRatio(CardDimensions.ASPECT_RATIO_PORTRAIT)
-        ) {
+    Column(modifier = Modifier.width(cardWidth)) {
+        Box(modifier = Modifier.fillMaxWidth().aspectRatio(CardDimensions.ASPECT_RATIO_PORTRAIT)) {
             Card(
                 onClick = onClick,
-                modifier = Modifier
-                    .fillMaxSize()
-                    .offset(x = 16.dp),
-                colors = CardDefaults.cardColors(
-                    containerColor = MaterialTheme.colorScheme.surfaceVariant
-                ),
-                elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+                modifier = Modifier.fillMaxSize().offset(x = 16.dp),
+                colors =
+                    CardDefaults.cardColors(
+                        containerColor = MaterialTheme.colorScheme.surfaceVariant
+                    ),
+                elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
             ) {
                 Box(modifier = Modifier.fillMaxSize()) {
                     AsyncImage(
@@ -746,27 +727,24 @@ private fun HighestRatedCard(
                         targetWidth = cardWidth,
                         targetHeight = cardWidth * 3f / 2f,
                         contentScale = ContentScale.Crop,
-                        modifier = Modifier.fillMaxSize()
+                        modifier = Modifier.fillMaxSize(),
                     )
 
                     when {
                         item.played -> {
                             Box(
-                                modifier = Modifier
-                                    .align(Alignment.TopEnd)
-                                    .padding(8.dp)
-                                    .size(24.dp)
-                                    .background(
-                                        MaterialTheme.colorScheme.primary,
-                                        CircleShape
-                                    ),
-                                contentAlignment = Alignment.Center
+                                modifier =
+                                    Modifier.align(Alignment.TopEnd)
+                                        .padding(8.dp)
+                                        .size(24.dp)
+                                        .background(MaterialTheme.colorScheme.primary, CircleShape),
+                                contentAlignment = Alignment.Center,
                             ) {
                                 Icon(
                                     painter = painterResource(id = R.drawable.ic_check),
                                     contentDescription = stringResource(R.string.cd_watched_status),
                                     tint = MaterialTheme.colorScheme.onPrimary,
-                                    modifier = Modifier.size(16.dp)
+                                    modifier = Modifier.size(16.dp),
                                 )
                             }
                         }
@@ -776,22 +754,26 @@ private fun HighestRatedCard(
                             displayCount?.let { count ->
                                 if (count > 0) {
                                     Surface(
-                                        modifier = Modifier
-                                            .align(Alignment.TopEnd)
-                                            .padding(8.dp),
+                                        modifier = Modifier.align(Alignment.TopEnd).padding(8.dp),
                                         shape = RoundedCornerShape(4.dp),
-                                        color = MaterialTheme.colorScheme.primary.copy(alpha = 0.9f)
+                                        color = MaterialTheme.colorScheme.primary.copy(alpha = 0.9f),
                                     ) {
                                         Text(
-                                            text = if (count > 99) stringResource(R.string.home_episode_count_plus) else stringResource(R.string.home_episode_count_fmt, count),
-                                            style = MaterialTheme.typography.labelSmall.copy(
-                                                fontWeight = FontWeight.Bold
-                                            ),
+                                            text =
+                                                if (count > 99)
+                                                    stringResource(R.string.home_episode_count_plus)
+                                                else
+                                                    stringResource(
+                                                        R.string.home_episode_count_fmt,
+                                                        count,
+                                                    ),
+                                            style =
+                                                MaterialTheme.typography.labelSmall.copy(
+                                                    fontWeight = FontWeight.Bold
+                                                ),
                                             color = MaterialTheme.colorScheme.onPrimary,
-                                            modifier = Modifier.padding(
-                                                horizontal = 6.dp,
-                                                vertical = 2.dp
-                                            )
+                                            modifier =
+                                                Modifier.padding(horizontal = 6.dp, vertical = 2.dp),
                                         )
                                     }
                                 }
@@ -803,30 +785,25 @@ private fun HighestRatedCard(
 
             Text(
                 text = ranking.toString(),
-                style = MaterialTheme.typography.displayLarge.copy(
-                    fontSize = 82.sp,
-                    fontWeight = FontWeight.Black
-                ),
+                style =
+                    MaterialTheme.typography.displayLarge.copy(
+                        fontSize = 82.sp,
+                        fontWeight = FontWeight.Black,
+                    ),
                 color = MaterialTheme.colorScheme.primary,
-                modifier = Modifier
-                    .align(Alignment.BottomStart)
-                    .offset(y = 12.dp)
+                modifier = Modifier.align(Alignment.BottomStart).offset(y = 12.dp),
             )
         }
 
         Spacer(modifier = Modifier.height(8.dp))
 
-        Column(
-            modifier = Modifier.offset(x = 16.dp)
-        ) {
+        Column(modifier = Modifier.offset(x = 16.dp)) {
             Text(
                 text = item.name,
-                style = MaterialTheme.typography.bodyMedium.copy(
-                    fontWeight = FontWeight.SemiBold
-                ),
+                style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
                 color = MaterialTheme.colorScheme.onBackground,
                 maxLines = 1,
-                overflow = TextOverflow.Ellipsis
+                overflow = TextOverflow.Ellipsis,
             )
 
             Row(
@@ -843,10 +820,11 @@ private fun HighestRatedCard(
                     metadataItems.add {
                         Text(
                             text = year.toString(),
-                            style = MaterialTheme.typography.bodySmall.copy(
-                                fontSize = metadataFontSize
-                            ),
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            style =
+                                MaterialTheme.typography.bodySmall.copy(
+                                    fontSize = metadataFontSize
+                                ),
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
                 }
@@ -859,20 +837,21 @@ private fun HighestRatedCard(
                     metadataItems.add {
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(2.dp)
+                            horizontalArrangement = Arrangement.spacedBy(2.dp),
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_imdb_logo),
                                 contentDescription = stringResource(R.string.cd_imdb),
                                 tint = Color.Unspecified,
-                                modifier = Modifier.size(imdbIconSize)
+                                modifier = Modifier.size(imdbIconSize),
                             )
                             Text(
                                 text = String.format(Locale.US, "%.1f", rating),
-                                style = MaterialTheme.typography.bodySmall.copy(
-                                    fontSize = metadataFontSize
-                                ),
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                style =
+                                    MaterialTheme.typography.bodySmall.copy(
+                                        fontSize = metadataFontSize
+                                    ),
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                         }
                     }
@@ -883,26 +862,30 @@ private fun HighestRatedCard(
                         metadataItems.add {
                             Row(
                                 verticalAlignment = Alignment.CenterVertically,
-                                horizontalArrangement = Arrangement.spacedBy(2.dp)
+                                horizontalArrangement = Arrangement.spacedBy(2.dp),
                             ) {
                                 Icon(
-                                    painter = painterResource(
-                                        id = if (rtRating > 60) {
-                                            R.drawable.ic_rotten_tomato_fresh
-                                        } else {
-                                            R.drawable.ic_rotten_tomato_rotten
-                                        }
-                                    ),
-                                    contentDescription = stringResource(R.string.cd_rotten_tomatoes),
+                                    painter =
+                                        painterResource(
+                                            id =
+                                                if (rtRating > 60) {
+                                                    R.drawable.ic_rotten_tomato_fresh
+                                                } else {
+                                                    R.drawable.ic_rotten_tomato_rotten
+                                                }
+                                        ),
+                                    contentDescription =
+                                        stringResource(R.string.cd_rotten_tomatoes),
                                     tint = Color.Unspecified,
-                                    modifier = Modifier.size(rtIconSize)
+                                    modifier = Modifier.size(rtIconSize),
                                 )
                                 Text(
                                     text = "${rtRating.toInt()}%",
-                                    style = MaterialTheme.typography.bodySmall.copy(
-                                        fontSize = metadataFontSize
-                                    ),
-                                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                                    style =
+                                        MaterialTheme.typography.bodySmall.copy(
+                                            fontSize = metadataFontSize
+                                        ),
+                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                                 )
                             }
                         }
@@ -915,7 +898,7 @@ private fun HighestRatedCard(
                         Text(
                             text = "•",
                             style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
                 }
@@ -928,51 +911,47 @@ private fun HighestRatedCard(
 private fun ContinueWatchingSkeleton(widthSizeClass: WindowWidthSizeClass) {
     val cardWidth = widthSizeClass.portraitWidth
 
-    Column(
-        modifier = Modifier.padding(horizontal = 16.dp)
-    ) {
+    Column(modifier = Modifier.padding(horizontal = 16.dp)) {
         Box(
-            modifier = Modifier
-                .width(200.dp)
-                .height(24.dp)
-                .background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f))
-                .shimmerEffect()
+            modifier =
+                Modifier.width(200.dp)
+                    .height(24.dp)
+                    .background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f))
+                    .shimmerEffect()
         )
 
         Spacer(modifier = Modifier.height(16.dp))
 
         LazyRow(
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 4.dp)
+            contentPadding = PaddingValues(horizontal = 4.dp),
         ) {
             items(5) {
                 Column(modifier = Modifier.width(cardWidth)) {
                     Card(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .aspectRatio(CardDimensions.ASPECT_RATIO_PORTRAIT),
+                        modifier =
+                            Modifier.fillMaxWidth()
+                                .aspectRatio(CardDimensions.ASPECT_RATIO_PORTRAIT),
                         shape = RoundedCornerShape(8.dp),
-                        colors = CardDefaults.cardColors(
-                            containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)
-                        )
+                        colors =
+                            CardDefaults.cardColors(
+                                containerColor =
+                                    MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)
+                            ),
                     ) {
-                        Box(
-                            modifier = Modifier
-                                .fillMaxSize()
-                                .shimmerEffect()
-                        )
+                        Box(modifier = Modifier.fillMaxSize().shimmerEffect())
                     }
 
                     Spacer(modifier = Modifier.height(8.dp))
                     Box(
-                        modifier = Modifier
-                            .width(cardWidth * 0.8f)
-                            .height(16.dp)
-                            .background(
-                                MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f),
-                                RoundedCornerShape(4.dp)
-                            )
-                            .shimmerEffect()
+                        modifier =
+                            Modifier.width(cardWidth * 0.8f)
+                                .height(16.dp)
+                                .background(
+                                    MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f),
+                                    RoundedCornerShape(4.dp),
+                                )
+                                .shimmerEffect()
                     )
                 }
             }
@@ -984,69 +963,65 @@ private fun ContinueWatchingSkeleton(widthSizeClass: WindowWidthSizeClass) {
 private fun MoviesSectionSkeleton(widthSizeClass: WindowWidthSizeClass) {
     val cardWidth = widthSizeClass.portraitWidth
 
-    Column(
-        modifier = Modifier.padding(horizontal = 16.dp)
-    ) {
+    Column(modifier = Modifier.padding(horizontal = 16.dp)) {
         Box(
-            modifier = Modifier
-                .width(150.dp)
-                .height(24.dp)
-                .background(
-                    MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f),
-                    RoundedCornerShape(4.dp)
-                )
-                .shimmerEffect()
+            modifier =
+                Modifier.width(150.dp)
+                    .height(24.dp)
+                    .background(
+                        MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f),
+                        RoundedCornerShape(4.dp),
+                    )
+                    .shimmerEffect()
         )
 
         Spacer(modifier = Modifier.height(16.dp))
 
         LazyRow(
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 4.dp)
+            contentPadding = PaddingValues(horizontal = 4.dp),
         ) {
             items(6) {
                 Column(modifier = Modifier.width(cardWidth)) {
                     Card(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .aspectRatio(CardDimensions.ASPECT_RATIO_PORTRAIT),
+                        modifier =
+                            Modifier.fillMaxWidth()
+                                .aspectRatio(CardDimensions.ASPECT_RATIO_PORTRAIT),
                         shape = RoundedCornerShape(8.dp),
-                        colors = CardDefaults.cardColors(
-                            containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)
-                        ),
-                        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+                        colors =
+                            CardDefaults.cardColors(
+                                containerColor =
+                                    MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)
+                            ),
+                        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
                     ) {
-                        Box(
-                            modifier = Modifier
-                                .fillMaxSize()
-                                .shimmerEffect()
-                        )
+                        Box(modifier = Modifier.fillMaxSize().shimmerEffect())
                     }
 
                     Spacer(modifier = Modifier.height(8.dp))
 
                     Box(
-                        modifier = Modifier
-                            .width(cardWidth * 0.9f)
-                            .height(16.dp)
-                            .background(
-                                MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f),
-                                RoundedCornerShape(4.dp)
-                            )
-                            .shimmerEffect()
+                        modifier =
+                            Modifier.width(cardWidth * 0.9f)
+                                .height(16.dp)
+                                .background(
+                                    MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f),
+                                    RoundedCornerShape(4.dp),
+                                )
+                                .shimmerEffect()
                     )
 
                     Spacer(modifier = Modifier.height(4.dp))
 
                     Box(
-                        modifier = Modifier
-                            .width(cardWidth * 0.6f)
-                            .height(12.dp)
-                            .background(
-                                MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.2f),
-                                RoundedCornerShape(4.dp)
-                            )
-                            .shimmerEffect()
+                        modifier =
+                            Modifier.width(cardWidth * 0.6f)
+                                .height(12.dp)
+                                .background(
+                                    MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.2f),
+                                    RoundedCornerShape(4.dp),
+                                )
+                                .shimmerEffect()
                     )
                 }
             }
@@ -1058,56 +1033,52 @@ private fun MoviesSectionSkeleton(widthSizeClass: WindowWidthSizeClass) {
 private fun TvSeriesSectionSkeleton(widthSizeClass: WindowWidthSizeClass) {
     val cardWidth = widthSizeClass.portraitWidth
 
-    Column(
-        modifier = Modifier.padding(horizontal = 16.dp)
-    ) {
+    Column(modifier = Modifier.padding(horizontal = 16.dp)) {
         Box(
-            modifier = Modifier
-                .width(180.dp)
-                .height(24.dp)
-                .background(
-                    MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f),
-                    RoundedCornerShape(4.dp)
-                )
-                .shimmerEffect()
+            modifier =
+                Modifier.width(180.dp)
+                    .height(24.dp)
+                    .background(
+                        MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f),
+                        RoundedCornerShape(4.dp),
+                    )
+                    .shimmerEffect()
         )
 
         Spacer(modifier = Modifier.height(16.dp))
 
         LazyRow(
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 4.dp)
+            contentPadding = PaddingValues(horizontal = 4.dp),
         ) {
             items(6) {
                 Column(modifier = Modifier.width(cardWidth)) {
                     Card(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .aspectRatio(CardDimensions.ASPECT_RATIO_PORTRAIT),
+                        modifier =
+                            Modifier.fillMaxWidth()
+                                .aspectRatio(CardDimensions.ASPECT_RATIO_PORTRAIT),
                         shape = RoundedCornerShape(8.dp),
-                        colors = CardDefaults.cardColors(
-                            containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)
-                        ),
-                        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+                        colors =
+                            CardDefaults.cardColors(
+                                containerColor =
+                                    MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)
+                            ),
+                        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
                     ) {
                         Box(modifier = Modifier.fillMaxSize()) {
-                            Box(
-                                modifier = Modifier
-                                    .fillMaxSize()
-                                    .shimmerEffect()
-                            )
+                            Box(modifier = Modifier.fillMaxSize().shimmerEffect())
 
                             Box(
-                                modifier = Modifier
-                                    .align(Alignment.TopEnd)
-                                    .padding(8.dp)
-                                    .width(50.dp)
-                                    .height(20.dp)
-                                    .background(
-                                        MaterialTheme.colorScheme.primary.copy(alpha = 0.3f),
-                                        RoundedCornerShape(4.dp)
-                                    )
-                                    .shimmerEffect()
+                                modifier =
+                                    Modifier.align(Alignment.TopEnd)
+                                        .padding(8.dp)
+                                        .width(50.dp)
+                                        .height(20.dp)
+                                        .background(
+                                            MaterialTheme.colorScheme.primary.copy(alpha = 0.3f),
+                                            RoundedCornerShape(4.dp),
+                                        )
+                                        .shimmerEffect()
                             )
                         }
                     }
@@ -1115,27 +1086,27 @@ private fun TvSeriesSectionSkeleton(widthSizeClass: WindowWidthSizeClass) {
                     Spacer(modifier = Modifier.height(8.dp))
 
                     Box(
-                        modifier = Modifier
-                            .width(cardWidth * 0.9f)
-                            .height(16.dp)
-                            .background(
-                                MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f),
-                                RoundedCornerShape(4.dp)
-                            )
-                            .shimmerEffect()
+                        modifier =
+                            Modifier.width(cardWidth * 0.9f)
+                                .height(16.dp)
+                                .background(
+                                    MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f),
+                                    RoundedCornerShape(4.dp),
+                                )
+                                .shimmerEffect()
                     )
 
                     Spacer(modifier = Modifier.height(4.dp))
 
                     Box(
-                        modifier = Modifier
-                            .width(cardWidth * 0.7f)
-                            .height(12.dp)
-                            .background(
-                                MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.2f),
-                                RoundedCornerShape(4.dp)
-                            )
-                            .shimmerEffect()
+                        modifier =
+                            Modifier.width(cardWidth * 0.7f)
+                                .height(12.dp)
+                                .background(
+                                    MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.2f),
+                                    RoundedCornerShape(4.dp),
+                                )
+                                .shimmerEffect()
                     )
                 }
             }
@@ -1147,30 +1118,31 @@ private fun TvSeriesSectionSkeleton(widthSizeClass: WindowWidthSizeClass) {
 fun Modifier.shimmerEffect(): Modifier = composed {
     val transition = rememberInfiniteTransition(label = "shimmer")
 
-    val translateAnimation by transition.animateFloat(
-        initialValue = 0f,
-        targetValue = 1000f,
-        animationSpec = infiniteRepeatable(
-            animation = tween(
-                durationMillis = 1000,
-                easing = LinearEasing
-            ),
-            repeatMode = RepeatMode.Restart
-        ),
-        label = "shimmerTranslate"
-    )
-
-    val shimmerColors = listOf(
-        MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.6f),
-        MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.2f),
-        MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.6f),
-    )
-
-    val brush = Brush.linearGradient(
-        colors = shimmerColors,
-        start = Offset.Zero,
-        end = Offset(x = translateAnimation, y = translateAnimation)
-    )
+    val translateAnimation by
+        transition.animateFloat(
+            initialValue = 0f,
+            targetValue = 1000f,
+            animationSpec =
+                infiniteRepeatable(
+                    animation = tween(durationMillis = 1000, easing = LinearEasing),
+                    repeatMode = RepeatMode.Restart,
+                ),
+            label = "shimmerTranslate",
+        )
+
+    val shimmerColors =
+        listOf(
+            MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.6f),
+            MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.2f),
+            MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.6f),
+        )
+
+    val brush =
+        Brush.linearGradient(
+            colors = shimmerColors,
+            start = Offset.Zero,
+            end = Offset(x = translateAnimation, y = translateAnimation),
+        )
 
     background(brush)
 }
@@ -1179,38 +1151,31 @@ fun Modifier.shimmerEffect(): Modifier = composed {
 private fun PopularStudiosSection(
     studios: List<AfinityStudio>,
     onStudioClick: (AfinityStudio) -> Unit,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val cardWidth = widthSizeClass.landscapeWidth
     val cardHeight =
         CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_LANDSCAPE)
     val fixedRowHeight = cardHeight + 8.dp
 
-    Column(
-        modifier = Modifier.padding(horizontal = 16.dp)
-    ) {
+    Column(modifier = Modifier.padding(horizontal = 16.dp)) {
         Text(
             text = stringResource(R.string.home_popular_studios),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             color = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         LazyRow(
             modifier = Modifier.height(fixedRowHeight),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
-            itemsIndexed(
-                items = studios,
-                key = { _, studio -> studio.id }
-            ) { _, studio ->
+            itemsIndexed(items = studios, key = { _, studio -> studio.id }) { _, studio ->
                 StudioCard(
                     studio = studio,
                     onClick = { onStudioClick(studio) },
-                    cardWidth = cardWidth
+                    cardWidth = cardWidth,
                 )
             }
         }
@@ -1218,23 +1183,14 @@ private fun PopularStudiosSection(
 }
 
 @Composable
-private fun StudioCard(
-    studio: AfinityStudio,
-    onClick: () -> Unit,
-    cardWidth: Dp
-) {
-    Column(
-        modifier = Modifier.width(cardWidth)
-    ) {
+private fun StudioCard(studio: AfinityStudio, onClick: () -> Unit, cardWidth: Dp) {
+    Column(modifier = Modifier.width(cardWidth)) {
         Card(
             onClick = onClick,
-            modifier = Modifier
-                .fillMaxWidth()
-                .aspectRatio(CardDimensions.ASPECT_RATIO_LANDSCAPE),
-            colors = CardDefaults.cardColors(
-                containerColor = MaterialTheme.colorScheme.surfaceVariant
-            ),
-            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+            modifier = Modifier.fillMaxWidth().aspectRatio(CardDimensions.ASPECT_RATIO_LANDSCAPE),
+            colors =
+                CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
+            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
         ) {
             Box(modifier = Modifier.fillMaxSize()) {
                 studio.primaryImageUrl?.let { imageUrl ->
@@ -1245,33 +1201,35 @@ private fun StudioCard(
                         targetWidth = cardWidth,
                         targetHeight = cardWidth * 9f / 16f,
                         contentScale = ContentScale.Crop,
-                        modifier = Modifier.fillMaxSize()
+                        modifier = Modifier.fillMaxSize(),
                     )
-                } ?: run {
-                    Box(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .background(MaterialTheme.colorScheme.surfaceVariant),
-                        contentAlignment = Alignment.Center
-                    ) {
-                        Icon(
-                            painter = painterResource(id = R.drawable.ic_tmdb_collection),
-                            contentDescription = null,
-                            tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                            modifier = Modifier.size(48.dp)
-                        )
-                    }
                 }
+                    ?: run {
+                        Box(
+                            modifier =
+                                Modifier.fillMaxSize()
+                                    .background(MaterialTheme.colorScheme.surfaceVariant),
+                            contentAlignment = Alignment.Center,
+                        ) {
+                            Icon(
+                                painter = painterResource(id = R.drawable.ic_tmdb_collection),
+                                contentDescription = null,
+                                tint = MaterialTheme.colorScheme.onSurfaceVariant,
+                                modifier = Modifier.size(48.dp),
+                            )
+                        }
+                    }
             }
         }
     }
 }
 
-fun Modifier.verticalLayoutOffset(yOffset: Dp) = this.layout { measurable, constraints ->
-    val placeable = measurable.measure(constraints)
-    val yOffsetPx = yOffset.roundToPx()
+fun Modifier.verticalLayoutOffset(yOffset: Dp) =
+    this.layout { measurable, constraints ->
+        val placeable = measurable.measure(constraints)
+        val yOffsetPx = yOffset.roundToPx()
 
-    layout(placeable.width, placeable.height + yOffsetPx) {
-        placeable.placeRelative(0, yOffsetPx)
+        layout(placeable.width, placeable.height + yOffsetPx) {
+            placeable.placeRelative(0, yOffsetPx)
+        }
     }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/makd/afinity/ui/home/HomeViewModel.kt b/app/src/main/java/com/makd/afinity/ui/home/HomeViewModel.kt
index 5572934b5..819d66c4d 100644
--- a/app/src/main/java/com/makd/afinity/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/home/HomeViewModel.kt
@@ -33,6 +33,7 @@ import com.makd.afinity.data.repository.watchlist.WatchlistRepository
 import com.makd.afinity.navigation.Destination
 import com.makd.afinity.ui.utils.IntentUtils
 import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -49,10 +50,11 @@ import org.jellyfin.sdk.model.api.PersonKind.ACTOR
 import org.jellyfin.sdk.model.api.PersonKind.DIRECTOR
 import org.jellyfin.sdk.model.api.PersonKind.WRITER
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltViewModel
-class HomeViewModel @Inject constructor(
+class HomeViewModel
+@Inject
+constructor(
     private val appDataRepository: AppDataRepository,
     private val jellyfinRepository: JellyfinRepository,
     private val userDataRepository: UserDataRepository,
@@ -84,7 +86,9 @@ class HomeViewModel @Inject constructor(
         viewModelScope.launch {
             appDataRepository.isInitialDataLoaded.collect { isLoaded ->
                 if (!isLoaded) {
-                    Timber.d("Data cleared detected (Session Switch/Clear), resetting HomeViewModel UI state")
+                    Timber.d(
+                        "Data cleared detected (Session Switch/Clear), resetting HomeViewModel UI state"
+                    )
                     loadedRecommendationSections.clear()
                     cachedShuffledGenres = emptyList()
                     renderedPeopleNames.clear()
@@ -95,7 +99,9 @@ class HomeViewModel @Inject constructor(
 
                     _uiState.value = HomeUiState()
                 } else {
-                    Timber.d("Initial Data Loaded: Triggering secondary content load (Studios, Genres, Recs)")
+                    Timber.d(
+                        "Initial Data Loaded: Triggering secondary content load (Studios, Genres, Recs)"
+                    )
                     launch { loadStudios() }
                     launch { loadCombinedGenres() }
                     launch { loadNewHomescreenSections() }
@@ -284,11 +290,13 @@ class HomeViewModel @Inject constructor(
                             directorTask,
                             writerTask,
                             becauseYouWatchedTask,
-                            actorFromRecentTask
+                            actorFromRecentTask,
                         )
                     }
 
-                    Timber.d("Loaded ${loadedRecommendationSections.size} total recommendation sections")
+                    Timber.d(
+                        "Loaded ${loadedRecommendationSections.size} total recommendation sections"
+                    )
 
                     withContext(Dispatchers.Main) {
                         appDataRepository.combinedGenres.value.let { genres ->
@@ -306,41 +314,48 @@ class HomeViewModel @Inject constructor(
 
     private suspend fun loadAllActorSections() {
         try {
-            val topActors = appDataRepository.getTopPeople(
-                type = ACTOR,
-                limit = 75,
-                minAppearances = 5
-            )
+            val topActors =
+                appDataRepository.getTopPeople(type = ACTOR, limit = 75, minAppearances = 5)
 
             val availableActors = topActors.filterNot { it.person.name in renderedPeopleNames }
             val maxActorSections = 15
             val selectedActors = availableActors.shuffled().take(maxActorSections)
 
             coroutineScope {
-                selectedActors.map { actor ->
-                    async {
-                        try {
-                            val section = appDataRepository.getPersonSection(
-                                personWithCount = actor,
-                                sectionType = com.makd.afinity.data.models.PersonSectionType.STARRING
-                            )
-
-                            if (section != null) {
-                                recommendationMutex.withLock {
-                                    renderedPeopleNames.add(actor.person.name)
-                                    section.items.forEach { renderedItemIds.add(it.id) }
-                                    loadedRecommendationSections.add(HomeSection.Person(section))
+                selectedActors
+                    .map { actor ->
+                        async {
+                            try {
+                                val section =
+                                    appDataRepository.getPersonSection(
+                                        personWithCount = actor,
+                                        sectionType =
+                                            com.makd.afinity.data.models.PersonSectionType.STARRING,
+                                    )
+
+                                if (section != null) {
+                                    recommendationMutex.withLock {
+                                        renderedPeopleNames.add(actor.person.name)
+                                        section.items.forEach { renderedItemIds.add(it.id) }
+                                        loadedRecommendationSections.add(
+                                            HomeSection.Person(section)
+                                        )
+                                    }
+                                    Timber.d(
+                                        "Loaded 'Starring ${section.person.name}' section (${section.items.size} items)"
+                                    )
                                 }
-                                Timber.d("Loaded 'Starring ${section.person.name}' section (${section.items.size} items)")
+                            } catch (e: Exception) {
+                                Timber.w(e, "Failed to load actor section for ${actor.person.name}")
                             }
-                        } catch (e: Exception) {
-                            Timber.w(e, "Failed to load actor section for ${actor.person.name}")
                         }
                     }
-                }.awaitAll()
+                    .awaitAll()
             }
 
-            Timber.d("Loaded ${loadedRecommendationSections.count { it is HomeSection.Person && it.section.sectionType == com.makd.afinity.data.models.PersonSectionType.STARRING }} actor sections (max: $maxActorSections)")
+            Timber.d(
+                "Loaded ${loadedRecommendationSections.count { it is HomeSection.Person && it.section.sectionType == com.makd.afinity.data.models.PersonSectionType.STARRING }} actor sections (max: $maxActorSections)"
+            )
         } catch (e: Exception) {
             Timber.e(e, "Failed to load actor sections")
         }
@@ -348,11 +363,8 @@ class HomeViewModel @Inject constructor(
 
     private suspend fun loadAllDirectorSections() {
         try {
-            val topDirectors = appDataRepository.getTopPeople(
-                type = DIRECTOR,
-                limit = 75,
-                minAppearances = 5
-            )
+            val topDirectors =
+                appDataRepository.getTopPeople(type = DIRECTOR, limit = 75, minAppearances = 5)
 
             val availableDirectors =
                 topDirectors.filterNot { it.person.name in renderedPeopleNames }
@@ -360,33 +372,44 @@ class HomeViewModel @Inject constructor(
             val selectedDirectors = availableDirectors.shuffled().take(maxDirectorSections)
 
             coroutineScope {
-                selectedDirectors.map { director ->
-                    async {
-                        try {
-                            val section = appDataRepository.getPersonSection(
-                                personWithCount = director,
-                                sectionType = com.makd.afinity.data.models.PersonSectionType.DIRECTED_BY
-                            )
-
-                            if (section != null) {
-                                recommendationMutex.withLock {
-                                    renderedPeopleNames.add(director.person.name)
-                                    section.items.forEach { renderedItemIds.add(it.id) }
-                                    loadedRecommendationSections.add(HomeSection.Person(section))
+                selectedDirectors
+                    .map { director ->
+                        async {
+                            try {
+                                val section =
+                                    appDataRepository.getPersonSection(
+                                        personWithCount = director,
+                                        sectionType =
+                                            com.makd.afinity.data.models.PersonSectionType
+                                                .DIRECTED_BY,
+                                    )
+
+                                if (section != null) {
+                                    recommendationMutex.withLock {
+                                        renderedPeopleNames.add(director.person.name)
+                                        section.items.forEach { renderedItemIds.add(it.id) }
+                                        loadedRecommendationSections.add(
+                                            HomeSection.Person(section)
+                                        )
+                                    }
+                                    Timber.d(
+                                        "Loaded 'Directed by ${section.person.name}' section (${section.items.size} items)"
+                                    )
                                 }
-                                Timber.d("Loaded 'Directed by ${section.person.name}' section (${section.items.size} items)")
+                            } catch (e: Exception) {
+                                Timber.w(
+                                    e,
+                                    "Failed to load director section for ${director.person.name}",
+                                )
                             }
-                        } catch (e: Exception) {
-                            Timber.w(
-                                e,
-                                "Failed to load director section for ${director.person.name}"
-                            )
                         }
                     }
-                }.awaitAll()
+                    .awaitAll()
             }
 
-            Timber.d("Loaded ${loadedRecommendationSections.count { it is HomeSection.Person && it.section.sectionType == com.makd.afinity.data.models.PersonSectionType.DIRECTED_BY }} director sections (max: $maxDirectorSections)")
+            Timber.d(
+                "Loaded ${loadedRecommendationSections.count { it is HomeSection.Person && it.section.sectionType == com.makd.afinity.data.models.PersonSectionType.DIRECTED_BY }} director sections (max: $maxDirectorSections)"
+            )
         } catch (e: Exception) {
             Timber.e(e, "Failed to load director sections")
         }
@@ -394,41 +417,52 @@ class HomeViewModel @Inject constructor(
 
     private suspend fun loadAllWriterSections() {
         try {
-            val topWriters = appDataRepository.getTopPeople(
-                type = WRITER,
-                limit = 50,
-                minAppearances = 3
-            )
+            val topWriters =
+                appDataRepository.getTopPeople(type = WRITER, limit = 50, minAppearances = 3)
 
             val availableWriters = topWriters.filterNot { it.person.name in renderedPeopleNames }
             val maxWriterSections = 7
             val selectedWriters = availableWriters.shuffled().take(maxWriterSections)
 
             coroutineScope {
-                selectedWriters.map { writer ->
-                    async {
-                        try {
-                            val section = appDataRepository.getPersonSection(
-                                personWithCount = writer,
-                                sectionType = com.makd.afinity.data.models.PersonSectionType.WRITTEN_BY
-                            )
-
-                            if (section != null) {
-                                recommendationMutex.withLock {
-                                    renderedPeopleNames.add(writer.person.name)
-                                    section.items.forEach { renderedItemIds.add(it.id) }
-                                    loadedRecommendationSections.add(HomeSection.Person(section))
+                selectedWriters
+                    .map { writer ->
+                        async {
+                            try {
+                                val section =
+                                    appDataRepository.getPersonSection(
+                                        personWithCount = writer,
+                                        sectionType =
+                                            com.makd.afinity.data.models.PersonSectionType
+                                                .WRITTEN_BY,
+                                    )
+
+                                if (section != null) {
+                                    recommendationMutex.withLock {
+                                        renderedPeopleNames.add(writer.person.name)
+                                        section.items.forEach { renderedItemIds.add(it.id) }
+                                        loadedRecommendationSections.add(
+                                            HomeSection.Person(section)
+                                        )
+                                    }
+                                    Timber.d(
+                                        "Loaded 'Written by ${section.person.name}' section (${section.items.size} items)"
+                                    )
                                 }
-                                Timber.d("Loaded 'Written by ${section.person.name}' section (${section.items.size} items)")
+                            } catch (e: Exception) {
+                                Timber.w(
+                                    e,
+                                    "Failed to load writer section for ${writer.person.name}",
+                                )
                             }
-                        } catch (e: Exception) {
-                            Timber.w(e, "Failed to load writer section for ${writer.person.name}")
                         }
                     }
-                }.awaitAll()
+                    .awaitAll()
             }
 
-            Timber.d("Loaded ${loadedRecommendationSections.count { it is HomeSection.Person && it.section.sectionType == com.makd.afinity.data.models.PersonSectionType.WRITTEN_BY }} writer sections (max: $maxWriterSections)")
+            Timber.d(
+                "Loaded ${loadedRecommendationSections.count { it is HomeSection.Person && it.section.sectionType == com.makd.afinity.data.models.PersonSectionType.WRITTEN_BY }} writer sections (max: $maxWriterSections)"
+            )
         } catch (e: Exception) {
             Timber.e(e, "Failed to load writer sections")
         }
@@ -439,37 +473,43 @@ class HomeViewModel @Inject constructor(
             val maxBecauseYouWatchedSections = 7
             var loadedCount = 0
             while (loadedCount < maxBecauseYouWatchedSections) {
-                val referenceMovie = appDataRepository.getRandomRecentlyWatchedMovie(
-                    excludedMovies = renderedWatchedMovies
-                ) ?: break
+                val referenceMovie =
+                    appDataRepository.getRandomRecentlyWatchedMovie(
+                        excludedMovies = renderedWatchedMovies
+                    ) ?: break
 
                 renderedWatchedMovies.add(referenceMovie.id)
 
-                val similarMovies = jellyfinRepository.getSimilarMovies(
-                    movieId = referenceMovie.id,
-                    limit = 32
-                )
-                    .filterNot { it.id in renderedItemIds }
-                    .shuffled()
-                    .take(20)
+                val similarMovies =
+                    jellyfinRepository
+                        .getSimilarMovies(movieId = referenceMovie.id, limit = 32)
+                        .filterNot { it.id in renderedItemIds }
+                        .shuffled()
+                        .take(20)
 
                 if (similarMovies.size >= 5) {
-                    val section = MovieSection(
-                        referenceMovie = referenceMovie,
-                        recommendedItems = similarMovies,
-                        sectionType = com.makd.afinity.data.models.MovieSectionType.BECAUSE_YOU_WATCHED
-                    )
+                    val section =
+                        MovieSection(
+                            referenceMovie = referenceMovie,
+                            recommendedItems = similarMovies,
+                            sectionType =
+                                com.makd.afinity.data.models.MovieSectionType.BECAUSE_YOU_WATCHED,
+                        )
 
                     similarMovies.forEach { renderedItemIds.add(it.id) }
                     loadedRecommendationSections.add(HomeSection.Movie(section))
                     loadedCount++
-                    Timber.d("Loaded 'Because you watched ${referenceMovie.name}' section (${similarMovies.size} items)")
+                    Timber.d(
+                        "Loaded 'Because you watched ${referenceMovie.name}' section (${similarMovies.size} items)"
+                    )
                 } else {
                     break
                 }
             }
 
-            Timber.d("Loaded $loadedCount 'Because you watched' sections (max: $maxBecauseYouWatchedSections)")
+            Timber.d(
+                "Loaded $loadedCount 'Because you watched' sections (max: $maxBecauseYouWatchedSections)"
+            )
         } catch (e: Exception) {
             Timber.e(e, "Failed to load 'Because you watched' sections")
         }
@@ -480,16 +520,18 @@ class HomeViewModel @Inject constructor(
             val maxActorFromRecentSections = 3
             var loadedCount = 0
             while (loadedCount < maxActorFromRecentSections) {
-                val randomMovie = appDataRepository.getRandomRecentlyWatchedMovie(
-                    excludedMovies = renderedStarringWatchedMovies
-                ) ?: break
+                val randomMovie =
+                    appDataRepository.getRandomRecentlyWatchedMovie(
+                        excludedMovies = renderedStarringWatchedMovies
+                    ) ?: break
 
                 renderedStarringWatchedMovies.add(randomMovie.id)
 
-                val movieItem = jellyfinRepository.getItem(
-                    itemId = randomMovie.id,
-                    fields = listOf(org.jellyfin.sdk.model.api.ItemFields.PEOPLE)
-                )
+                val movieItem =
+                    jellyfinRepository.getItem(
+                        itemId = randomMovie.id,
+                        fields = listOf(org.jellyfin.sdk.model.api.ItemFields.PEOPLE),
+                    )
 
                 val movieWithPeople = movieItem?.toAfinityMovie(jellyfinRepository.getBaseUrl())
                 if (movieWithPeople == null) {
@@ -497,9 +539,10 @@ class HomeViewModel @Inject constructor(
                     continue
                 }
 
-                val availableActors = movieWithPeople.people
-                    .filter { it.type == ACTOR }
-                    .filterNot { it.name in renderedActorNames }
+                val availableActors =
+                    movieWithPeople.people
+                        .filter { it.type == ACTOR }
+                        .filterNot { it.name in renderedActorNames }
 
                 if (availableActors.isEmpty()) {
                     Timber.d("No available actors in '${randomMovie.name}'")
@@ -509,44 +552,51 @@ class HomeViewModel @Inject constructor(
                 val selectedActor = availableActors.take(3).randomOrNull() ?: continue
                 renderedActorNames.add(selectedActor.name)
 
-                val allActorItems = jellyfinRepository.getPersonItems(
-                    personId = selectedActor.id,
-                    includeItemTypes = listOf("MOVIE"),
-                    fields = listOf(org.jellyfin.sdk.model.api.ItemFields.PEOPLE)
-                )
+                val allActorItems =
+                    jellyfinRepository.getPersonItems(
+                        personId = selectedActor.id,
+                        includeItemTypes = listOf("MOVIE"),
+                        fields = listOf(org.jellyfin.sdk.model.api.ItemFields.PEOPLE),
+                    )
 
-                val actorMovies = allActorItems
-                    .filter { item ->
-                        when (item) {
-                            is AfinityMovie -> {
-                                item.people.any { person ->
-                                    person.id == selectedActor.id && person.type == ACTOR
+                val actorMovies =
+                    allActorItems
+                        .filter { item ->
+                            when (item) {
+                                is AfinityMovie -> {
+                                    item.people.any { person ->
+                                        person.id == selectedActor.id && person.type == ACTOR
+                                    }
                                 }
-                            }
 
-                            else -> false
+                                else -> false
+                            }
                         }
-                    }
-                    .filterIsInstance<AfinityMovie>()
-                    .filterNot { it.id == randomMovie.id || it.id in renderedItemIds }
-                    .shuffled()
-                    .take(20)
+                        .filterIsInstance<AfinityMovie>()
+                        .filterNot { it.id == randomMovie.id || it.id in renderedItemIds }
+                        .shuffled()
+                        .take(20)
 
                 if (actorMovies.size >= 5) {
-                    val section = PersonFromMovieSection(
-                        person = selectedActor,
-                        referenceMovie = movieWithPeople,
-                        items = actorMovies
-                    )
+                    val section =
+                        PersonFromMovieSection(
+                            person = selectedActor,
+                            referenceMovie = movieWithPeople,
+                            items = actorMovies,
+                        )
 
                     actorMovies.forEach { renderedItemIds.add(it.id) }
                     loadedRecommendationSections.add(HomeSection.PersonFromMovie(section))
                     loadedCount++
-                    Timber.d("Loaded 'Starring ${selectedActor.name} because you watched ${randomMovie.name}' section (${actorMovies.size} items)")
+                    Timber.d(
+                        "Loaded 'Starring ${selectedActor.name} because you watched ${randomMovie.name}' section (${actorMovies.size} items)"
+                    )
                 }
             }
 
-            Timber.d("Loaded $loadedCount 'Starring actor from recent' sections (max: $maxActorFromRecentSections)")
+            Timber.d(
+                "Loaded $loadedCount 'Starring actor from recent' sections (max: $maxActorFromRecentSections)"
+            )
         } catch (e: Exception) {
             Timber.e(e, "Failed to load actor from recent sections")
         }
@@ -561,19 +611,22 @@ class HomeViewModel @Inject constructor(
             val completedDownloads = downloadRepository.getCompletedDownloadsFlow().first()
             val downloadedItemIds = completedDownloads.map { it.itemId }.toSet()
 
-            val downloadedMovies = databaseRepository.getAllMovies(userId)
-                .filter { movie -> movie.id in downloadedItemIds }
+            val downloadedMovies =
+                databaseRepository.getAllMovies(userId).filter { movie ->
+                    movie.id in downloadedItemIds
+                }
 
             val allShows = databaseRepository.getAllShows(userId)
-            val downloadedShows = allShows.filter { show ->
-                show.seasons.any { season ->
-                    season.episodes.any { episode ->
-                        episode.id in downloadedItemIds
+            val downloadedShows =
+                allShows.filter { show ->
+                    show.seasons.any { season ->
+                        season.episodes.any { episode -> episode.id in downloadedItemIds }
                     }
                 }
-            }
 
-            Timber.d("Found ${downloadedMovies.size} movies and ${downloadedShows.size} shows with downloads")
+            Timber.d(
+                "Found ${downloadedMovies.size} movies and ${downloadedShows.size} shows with downloads"
+            )
 
             val offlineContinueWatching = mutableListOf<AfinityItem>()
 
@@ -586,9 +639,10 @@ class HomeViewModel @Inject constructor(
             allShows.forEach { show ->
                 show.seasons.forEach { season ->
                     season.episodes.forEach { episode ->
-                        if (episode.playbackPositionTicks > 0 &&
-                            !episode.played &&
-                            episode.id in downloadedItemIds
+                        if (
+                            episode.playbackPositionTicks > 0 &&
+                                !episode.played &&
+                                episode.id in downloadedItemIds
                         ) {
                             offlineContinueWatching.add(episode)
                         }
@@ -596,21 +650,25 @@ class HomeViewModel @Inject constructor(
                 }
             }
 
-            val sortedOfflineContinueWatching = offlineContinueWatching.sortedByDescending { item ->
-                when (item) {
-                    is AfinityMovie -> item.playbackPositionTicks
-                    is AfinityEpisode -> item.playbackPositionTicks
-                    else -> 0L
+            val sortedOfflineContinueWatching =
+                offlineContinueWatching.sortedByDescending { item ->
+                    when (item) {
+                        is AfinityMovie -> item.playbackPositionTicks
+                        is AfinityEpisode -> item.playbackPositionTicks
+                        else -> 0L
+                    }
                 }
-            }
 
-            Timber.d("Found ${sortedOfflineContinueWatching.size} items to continue watching offline")
-
-            _uiState.value = _uiState.value.copy(
-                downloadedMovies = downloadedMovies,
-                downloadedShows = downloadedShows,
-                offlineContinueWatching = sortedOfflineContinueWatching
+            Timber.d(
+                "Found ${sortedOfflineContinueWatching.size} items to continue watching offline"
             )
+
+            _uiState.value =
+                _uiState.value.copy(
+                    downloadedMovies = downloadedMovies,
+                    downloadedShows = downloadedShows,
+                    offlineContinueWatching = sortedOfflineContinueWatching,
+                )
         } catch (e: Exception) {
             Timber.e(e, "Failed to load downloaded content")
         }
@@ -635,10 +693,10 @@ class HomeViewModel @Inject constructor(
             try {
                 _isLoadingEpisode.value = true
 
-                val fullEpisode = jellyfinRepository.getItem(
-                    episode.id,
-                    fields = FieldSets.ITEM_DETAIL
-                )?.toAfinityEpisode(jellyfinRepository, null)
+                val fullEpisode =
+                    jellyfinRepository
+                        .getItem(episode.id, fields = FieldSets.ITEM_DETAIL)
+                        ?.toAfinityEpisode(jellyfinRepository, null)
 
                 if (fullEpisode != null) {
                     _selectedEpisode.value = fullEpisode
@@ -688,11 +746,12 @@ class HomeViewModel @Inject constructor(
     fun toggleEpisodeFavorite(episode: AfinityEpisode) {
         viewModelScope.launch {
             try {
-                val success = if (episode.favorite) {
-                    userDataRepository.removeFromFavorites(episode.id)
-                } else {
-                    userDataRepository.addToFavorites(episode.id)
-                }
+                val success =
+                    if (episode.favorite) {
+                        userDataRepository.removeFromFavorites(episode.id)
+                    } else {
+                        userDataRepository.addToFavorites(episode.id)
+                    }
 
                 if (success) {
                     _selectedEpisode.value = episode.copy(favorite = !episode.favorite)
@@ -710,11 +769,12 @@ class HomeViewModel @Inject constructor(
 
                 _selectedEpisodeWatchlistStatus.value = !isInWatchlist
 
-                val success = if (isInWatchlist) {
-                    watchlistRepository.removeFromWatchlist(episode.id)
-                } else {
-                    watchlistRepository.addToWatchlist(episode.id, "EPISODE")
-                }
+                val success =
+                    if (isInWatchlist) {
+                        watchlistRepository.removeFromWatchlist(episode.id)
+                    } else {
+                        watchlistRepository.addToWatchlist(episode.id, "EPISODE")
+                    }
 
                 if (!success) {
                     _selectedEpisodeWatchlistStatus.value = isInWatchlist
@@ -736,17 +796,19 @@ class HomeViewModel @Inject constructor(
         viewModelScope.launch {
             try {
                 val isNowPlayed = !episode.played
-                val updatedEpisode = episode.copy(
-                    played = isNowPlayed,
-                    playbackPositionTicks = if (!isNowPlayed) episode.runtimeTicks else 0
-                )
+                val updatedEpisode =
+                    episode.copy(
+                        played = isNowPlayed,
+                        playbackPositionTicks = if (!isNowPlayed) episode.runtimeTicks else 0,
+                    )
                 _selectedEpisode.value = updatedEpisode
 
-                val success = if (episode.played) {
-                    userDataRepository.markUnwatched(episode.id)
-                } else {
-                    userDataRepository.markWatched(episode.id)
-                }
+                val success =
+                    if (episode.played) {
+                        userDataRepository.markUnwatched(episode.id)
+                    } else {
+                        userDataRepository.markWatched(episode.id)
+                    }
 
                 if (success) {
                     mediaRepository.refreshItemUserData(episode.id, FieldSets.REFRESH_USER_DATA)
@@ -768,12 +830,13 @@ class HomeViewModel @Inject constructor(
 
     fun onPlayTrailerClick(context: Context, item: AfinityItem) {
         Timber.d("Play trailer clicked: ${item.name}")
-        val trailerUrl = when (item) {
-            is AfinityMovie -> item.trailer
-            is AfinityShow -> item.trailer
-            is AfinityVideo -> item.trailer
-            else -> null
-        }
+        val trailerUrl =
+            when (item) {
+                is AfinityMovie -> item.trailer
+                is AfinityShow -> item.trailer
+                is AfinityVideo -> item.trailer
+                else -> null
+            }
         IntentUtils.openYouTubeUrl(context, trailerUrl)
     }
 
@@ -832,20 +895,26 @@ class HomeViewModel @Inject constructor(
             try {
                 val episode = _selectedEpisode.value ?: return@launch
                 val sources =
-                    episode.sources.filter { it.type == com.makd.afinity.data.models.media.AfinitySourceType.REMOTE }
+                    episode.sources.filter {
+                        it.type == com.makd.afinity.data.models.media.AfinitySourceType.REMOTE
+                    }
 
                 if (sources.isEmpty()) {
-                    Timber.w("No remote sources available for download for episode: ${episode.name}")
+                    Timber.w(
+                        "No remote sources available for download for episode: ${episode.name}"
+                    )
                     return@launch
                 }
 
                 if (sources.size == 1) {
                     val result = downloadRepository.startDownload(episode.id, sources.first().id)
-                    result.onSuccess {
-                        Timber.i("Download started successfully for episode: ${episode.name}")
-                    }.onFailure { error ->
-                        Timber.e(error, "Failed to start download for episode: ${episode.name}")
-                    }
+                    result
+                        .onSuccess {
+                            Timber.i("Download started successfully for episode: ${episode.name}")
+                        }
+                        .onFailure { error ->
+                            Timber.e(error, "Failed to start download for episode: ${episode.name}")
+                        }
                 } else {
                     _uiState.value = _uiState.value.copy(showQualityDialog = true)
                 }
@@ -860,11 +929,13 @@ class HomeViewModel @Inject constructor(
             try {
                 val episode = _selectedEpisode.value ?: return@launch
                 val result = downloadRepository.startDownload(episode.id, sourceId)
-                result.onSuccess {
-                    Timber.i("Download started successfully for episode: ${episode.name}")
-                }.onFailure { error ->
-                    Timber.e(error, "Failed to start download for episode: ${episode.name}")
-                }
+                result
+                    .onSuccess {
+                        Timber.i("Download started successfully for episode: ${episode.name}")
+                    }
+                    .onFailure { error ->
+                        Timber.e(error, "Failed to start download for episode: ${episode.name}")
+                    }
                 _uiState.value = _uiState.value.copy(showQualityDialog = false)
             } catch (e: Exception) {
                 Timber.e(e, "Error starting download with selected quality")
@@ -881,9 +952,7 @@ class HomeViewModel @Inject constructor(
             try {
                 val downloadInfo = _selectedEpisodeDownloadInfo.value ?: return@launch
                 val result = downloadRepository.pauseDownload(downloadInfo.id)
-                result.onFailure { error ->
-                    Timber.e(error, "Failed to pause download")
-                }
+                result.onFailure { error -> Timber.e(error, "Failed to pause download") }
             } catch (e: Exception) {
                 Timber.e(e, "Error pausing download")
             }
@@ -895,9 +964,7 @@ class HomeViewModel @Inject constructor(
             try {
                 val downloadInfo = _selectedEpisodeDownloadInfo.value ?: return@launch
                 val result = downloadRepository.resumeDownload(downloadInfo.id)
-                result.onFailure { error ->
-                    Timber.e(error, "Failed to resume download")
-                }
+                result.onFailure { error -> Timber.e(error, "Failed to resume download") }
             } catch (e: Exception) {
                 Timber.e(e, "Error resuming download")
             }
@@ -909,11 +976,9 @@ class HomeViewModel @Inject constructor(
             try {
                 val downloadInfo = _selectedEpisodeDownloadInfo.value ?: return@launch
                 val result = downloadRepository.cancelDownload(downloadInfo.id)
-                result.onSuccess {
-                    Timber.i("Download cancelled successfully")
-                }.onFailure { error ->
-                    Timber.e(error, "Failed to cancel download")
-                }
+                result
+                    .onSuccess { Timber.i("Download cancelled successfully") }
+                    .onFailure { error -> Timber.e(error, "Failed to cancel download") }
             } catch (e: Exception) {
                 Timber.e(e, "Error cancelling download")
             }
@@ -928,13 +993,15 @@ class HomeViewModel @Inject constructor(
             loadNewHomescreenSections()
         }
     }
-
 }
 
 sealed interface HomeSection {
     data class Person(val section: PersonSection) : HomeSection
+
     data class Movie(val section: MovieSection) : HomeSection
+
     data class PersonFromMovie(val section: PersonFromMovieSection) : HomeSection
+
     data class Genre(val genreItem: GenreItem) : HomeSection
 }
 
@@ -957,8 +1024,9 @@ data class HomeUiState(
     val isLoading: Boolean = false,
     val error: String? = null,
     val combineLibrarySections: Boolean = false,
-    val separateMovieLibrarySections: List<Pair<AfinityCollection, List<AfinityMovie>>> = emptyList(),
+    val separateMovieLibrarySections: List<Pair<AfinityCollection, List<AfinityMovie>>> =
+        emptyList(),
     val separateTvLibrarySections: List<Pair<AfinityCollection, List<AfinityShow>>> = emptyList(),
     val isOffline: Boolean = false,
-    val showQualityDialog: Boolean = false
-)
\ No newline at end of file
+    val showQualityDialog: Boolean = false,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/home/components/GenreSection.kt b/app/src/main/java/com/makd/afinity/ui/home/components/GenreSection.kt
index e2819b8dc..e9aecda87 100644
--- a/app/src/main/java/com/makd/afinity/ui/home/components/GenreSection.kt
+++ b/app/src/main/java/com/makd/afinity/ui/home/components/GenreSection.kt
@@ -55,7 +55,7 @@ fun GenreSection(
     onVisible: () -> Unit,
     onItemClick: (AfinityItem) -> Unit,
     widthSizeClass: WindowWidthSizeClass,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     var hasBeenVisible by remember { mutableStateOf(false) }
 
@@ -71,16 +71,12 @@ fun GenreSection(
 
     val fixedRowHeight = cardHeight + 8.dp + 20.dp + 22.dp
 
-    Column(
-        modifier = modifier.padding(horizontal = 14.dp)
-    ) {
+    Column(modifier = modifier.padding(horizontal = 14.dp)) {
         Text(
             text = stringResource(R.string.home_genre_movies_title, genre),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             color = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         if (isLoading && movies.isEmpty()) {
@@ -89,16 +85,13 @@ fun GenreSection(
             LazyRow(
                 modifier = Modifier.height(fixedRowHeight),
                 horizontalArrangement = Arrangement.spacedBy(12.dp),
-                contentPadding = PaddingValues(horizontal = 0.dp)
+                contentPadding = PaddingValues(horizontal = 0.dp),
             ) {
-                items(
-                    items = movies,
-                    key = { movie -> "genre_${genre}_${movie.id}" }
-                ) { movie ->
+                items(items = movies, key = { movie -> "genre_${genre}_${movie.id}" }) { movie ->
                     MediaItemCard(
                         item = movie,
                         onClick = { onItemClick(movie) },
-                        cardWidth = cardWidth
+                        cardWidth = cardWidth,
                     )
                 }
             }
@@ -107,42 +100,36 @@ fun GenreSection(
 }
 
 @Composable
-private fun GenreSkeletonRow(
-    cardWidth: Dp,
-    height: Dp
-) {
+private fun GenreSkeletonRow(cardWidth: Dp, height: Dp) {
     LazyRow(
         modifier = Modifier.height(height),
         horizontalArrangement = Arrangement.spacedBy(12.dp),
-        contentPadding = PaddingValues(horizontal = 0.dp)
+        contentPadding = PaddingValues(horizontal = 0.dp),
     ) {
         items(6) {
             Column(modifier = Modifier.width(cardWidth)) {
                 Card(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .aspectRatio(CardDimensions.ASPECT_RATIO_PORTRAIT),
+                    modifier =
+                        Modifier.fillMaxWidth().aspectRatio(CardDimensions.ASPECT_RATIO_PORTRAIT),
                     shape = RoundedCornerShape(8.dp),
-                    colors = CardDefaults.cardColors(
-                        containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)
-                    ),
-                    elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+                    colors =
+                        CardDefaults.cardColors(
+                            containerColor =
+                                MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)
+                        ),
+                    elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
                 ) {
-                    Box(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .shimmerEffect()
-                    )
+                    Box(modifier = Modifier.fillMaxSize().shimmerEffect())
                 }
 
                 Spacer(modifier = Modifier.height(8.dp))
 
                 Box(
-                    modifier = Modifier
-                        .width(cardWidth * 0.8f)
-                        .height(14.dp)
-                        .padding(horizontal = 4.dp)
-                        .shimmerEffect()
+                    modifier =
+                        Modifier.width(cardWidth * 0.8f)
+                            .height(14.dp)
+                            .padding(horizontal = 4.dp)
+                            .shimmerEffect()
                 )
             }
         }
@@ -153,30 +140,31 @@ private fun GenreSkeletonRow(
 fun Modifier.shimmerEffect(): Modifier = composed {
     val transition = rememberInfiniteTransition(label = "shimmer")
 
-    val translateAnimation by transition.animateFloat(
-        initialValue = 0f,
-        targetValue = 1000f,
-        animationSpec = infiniteRepeatable(
-            animation = tween(
-                durationMillis = 1000,
-                easing = LinearEasing
-            ),
-            repeatMode = RepeatMode.Restart
-        ),
-        label = "shimmerTranslate"
-    )
+    val translateAnimation by
+        transition.animateFloat(
+            initialValue = 0f,
+            targetValue = 1000f,
+            animationSpec =
+                infiniteRepeatable(
+                    animation = tween(durationMillis = 1000, easing = LinearEasing),
+                    repeatMode = RepeatMode.Restart,
+                ),
+            label = "shimmerTranslate",
+        )
 
-    val shimmerColors = listOf(
-        MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.6f),
-        MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.2f),
-        MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.6f),
-    )
+    val shimmerColors =
+        listOf(
+            MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.6f),
+            MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.2f),
+            MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.6f),
+        )
 
-    val brush = Brush.linearGradient(
-        colors = shimmerColors,
-        start = Offset.Zero,
-        end = Offset(x = translateAnimation, y = translateAnimation)
-    )
+    val brush =
+        Brush.linearGradient(
+            colors = shimmerColors,
+            start = Offset.Zero,
+            end = Offset(x = translateAnimation, y = translateAnimation),
+        )
 
     background(brush)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/home/components/HomeSections.kt b/app/src/main/java/com/makd/afinity/ui/home/components/HomeSections.kt
index be08ececc..96645f470 100644
--- a/app/src/main/java/com/makd/afinity/ui/home/components/HomeSections.kt
+++ b/app/src/main/java/com/makd/afinity/ui/home/components/HomeSections.kt
@@ -28,22 +28,19 @@ fun OptimizedContinueWatchingSection(
     items: List<AfinityItem>,
     onItemClick: (AfinityItem) -> Unit,
     widthSizeClass: WindowWidthSizeClass,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val cardWidth = widthSizeClass.landscapeWidth
-    val cardHeight = CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_LANDSCAPE)
+    val cardHeight =
+        CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_LANDSCAPE)
     val fixedRowHeight = cardHeight + 8.dp + 20.dp + 22.dp
 
-    Column(
-        modifier = Modifier.padding(horizontal = 14.dp)
-    ) {
+    Column(modifier = Modifier.padding(horizontal = 14.dp)) {
         Text(
             text = stringResource(R.string.home_continue_watching),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             color = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         val uniqueItems = items.distinctBy { it.id }
@@ -51,16 +48,13 @@ fun OptimizedContinueWatchingSection(
         LazyRow(
             modifier = Modifier.height(fixedRowHeight),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
-            items(
-                items = uniqueItems,
-                key = { item -> "continue_${item.id}" }
-            ) { item ->
+            items(items = uniqueItems, key = { item -> "continue_${item.id}" }) { item ->
                 ContinueWatchingCard(
                     item = item,
                     onClick = { onItemClick(item) },
-                    cardWidth = cardWidth
+                    cardWidth = cardWidth,
                 )
             }
         }
@@ -73,22 +67,18 @@ fun OptimizedLatestMoviesSection(
     onItemClick: (AfinityItem) -> Unit,
     widthSizeClass: WindowWidthSizeClass,
     modifier: Modifier = Modifier,
-    title: String = stringResource(R.string.home_latest_movies)
+    title: String = stringResource(R.string.home_latest_movies),
 ) {
     val cardWidth = widthSizeClass.portraitWidth
     val cardHeight = CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_PORTRAIT)
     val fixedRowHeight = cardHeight + 8.dp + 20.dp + 22.dp
 
-    Column(
-        modifier = Modifier.padding(horizontal = 14.dp)
-    ) {
+    Column(modifier = Modifier.padding(horizontal = 14.dp)) {
         Text(
             text = title,
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             color = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         val uniqueItems = items.distinctBy { it.id }
@@ -96,17 +86,10 @@ fun OptimizedLatestMoviesSection(
         LazyRow(
             modifier = Modifier.height(fixedRowHeight),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
-            items(
-                items = uniqueItems,
-                key = { item -> "latest_movie_${item.id}" }
-            ) { item ->
-                MediaItemCard(
-                    item = item,
-                    onClick = { onItemClick(item) },
-                    cardWidth = cardWidth
-                )
+            items(items = uniqueItems, key = { item -> "latest_movie_${item.id}" }) { item ->
+                MediaItemCard(item = item, onClick = { onItemClick(item) }, cardWidth = cardWidth)
             }
         }
     }
@@ -118,22 +101,18 @@ fun OptimizedLatestTvSeriesSection(
     onItemClick: (AfinityItem) -> Unit,
     widthSizeClass: WindowWidthSizeClass,
     modifier: Modifier = Modifier,
-    title: String = stringResource(R.string.home_latest_tv_series)
+    title: String = stringResource(R.string.home_latest_tv_series),
 ) {
     val cardWidth = widthSizeClass.portraitWidth
     val cardHeight = CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_PORTRAIT)
     val fixedRowHeight = cardHeight + 8.dp + 20.dp + 22.dp
 
-    Column(
-        modifier = Modifier.padding(horizontal = 14.dp)
-    ) {
+    Column(modifier = Modifier.padding(horizontal = 14.dp)) {
         Text(
             text = title,
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             color = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         val uniqueItems = items.distinctBy { it.id }
@@ -141,18 +120,11 @@ fun OptimizedLatestTvSeriesSection(
         LazyRow(
             modifier = Modifier.height(fixedRowHeight),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
-            items(
-                items = uniqueItems,
-                key = { item -> "latest_tv_${item.id}" }
-            ) { item ->
-                MediaItemCard(
-                    item = item,
-                    onClick = { onItemClick(item) },
-                    cardWidth = cardWidth
-                )
+            items(items = uniqueItems, key = { item -> "latest_tv_${item.id}" }) { item ->
+                MediaItemCard(item = item, onClick = { onItemClick(item) }, cardWidth = cardWidth)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/home/components/NextUpSection.kt b/app/src/main/java/com/makd/afinity/ui/home/components/NextUpSection.kt
index 0e5d198f1..289d7e814 100644
--- a/app/src/main/java/com/makd/afinity/ui/home/components/NextUpSection.kt
+++ b/app/src/main/java/com/makd/afinity/ui/home/components/NextUpSection.kt
@@ -26,39 +26,33 @@ fun NextUpSection(
     episodes: List<AfinityEpisode>,
     onEpisodeClick: (AfinityEpisode) -> Unit,
     widthSizeClass: WindowWidthSizeClass,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val cardWidth = widthSizeClass.landscapeWidth
-    val cardHeight = CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_LANDSCAPE)
+    val cardHeight =
+        CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_LANDSCAPE)
     val fixedRowHeight = cardHeight + 8.dp + 20.dp + 22.dp
 
-    Column(
-        modifier = Modifier.padding(horizontal = 14.dp)
-    ) {
+    Column(modifier = Modifier.padding(horizontal = 14.dp)) {
         Text(
             text = stringResource(R.string.home_next_up),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             color = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         LazyRow(
             modifier = Modifier.height(fixedRowHeight),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
-            items(
-                items = episodes,
-                key = { episode -> "nextup_${episode.id}" }
-            ) { episode ->
+            items(items = episodes, key = { episode -> "nextup_${episode.id}" }) { episode ->
                 ContinueWatchingCard(
                     item = episode,
                     onClick = { onEpisodeClick(episode) },
-                    cardWidth = cardWidth
+                    cardWidth = cardWidth,
                 )
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/home/components/RecommendationsSection.kt b/app/src/main/java/com/makd/afinity/ui/home/components/RecommendationsSection.kt
index 8baf884b9..7421f5851 100644
--- a/app/src/main/java/com/makd/afinity/ui/home/components/RecommendationsSection.kt
+++ b/app/src/main/java/com/makd/afinity/ui/home/components/RecommendationsSection.kt
@@ -31,43 +31,41 @@ fun PersonSection(
     section: PersonSection,
     onItemClick: (AfinityMovie) -> Unit,
     widthSizeClass: WindowWidthSizeClass,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val cardWidth = widthSizeClass.portraitWidth
     val cardHeight = CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_PORTRAIT)
     val fixedRowHeight = cardHeight + 8.dp + 20.dp + 22.dp
 
-    Column(
-        modifier = modifier.padding(horizontal = 14.dp)
-    ) {
-        val title = when (section.sectionType) {
-            PersonSectionType.STARRING -> stringResource(R.string.home_person_starring, section.person.name)
-            PersonSectionType.DIRECTED_BY -> stringResource(R.string.home_person_directed_by, section.person.name)
-            PersonSectionType.WRITTEN_BY -> stringResource(R.string.home_person_written_by, section.person.name)
-        }
+    Column(modifier = modifier.padding(horizontal = 14.dp)) {
+        val title =
+            when (section.sectionType) {
+                PersonSectionType.STARRING ->
+                    stringResource(R.string.home_person_starring, section.person.name)
+                PersonSectionType.DIRECTED_BY ->
+                    stringResource(R.string.home_person_directed_by, section.person.name)
+                PersonSectionType.WRITTEN_BY ->
+                    stringResource(R.string.home_person_written_by, section.person.name)
+            }
         Text(
             text = title,
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             color = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         LazyRow(
             modifier = Modifier.height(fixedRowHeight),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
             items(
                 items = section.items,
-                key = { movie -> "person_${section.sectionType.name}_${section.person.id}_${movie.id}" }
+                key = { movie ->
+                    "person_${section.sectionType.name}_${section.person.id}_${movie.id}"
+                },
             ) { movie ->
-                MediaItemCard(
-                    item = movie,
-                    onClick = { onItemClick(movie) },
-                    cardWidth = cardWidth
-                )
+                MediaItemCard(item = movie, onClick = { onItemClick(movie) }, cardWidth = cardWidth)
             }
         }
     }
@@ -78,42 +76,43 @@ fun MovieRecommendationSection(
     section: MovieSection,
     onItemClick: (AfinityMovie) -> Unit,
     widthSizeClass: WindowWidthSizeClass,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val cardWidth = widthSizeClass.portraitWidth
     val cardHeight = CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_PORTRAIT)
     val fixedRowHeight = cardHeight + 8.dp + 20.dp + 22.dp
 
-    Column(
-        modifier = modifier.padding(horizontal = 14.dp)
-    ) {
-        val title = when (section.sectionType) {
-            MovieSectionType.BECAUSE_YOU_WATCHED -> stringResource(R.string.home_because_you_watched, section.referenceMovie.name)
-            MovieSectionType.STARRING_ACTOR_FROM -> stringResource(R.string.home_starring_from_watched, "", section.referenceMovie.name)
-        }
+    Column(modifier = modifier.padding(horizontal = 14.dp)) {
+        val title =
+            when (section.sectionType) {
+                MovieSectionType.BECAUSE_YOU_WATCHED ->
+                    stringResource(R.string.home_because_you_watched, section.referenceMovie.name)
+                MovieSectionType.STARRING_ACTOR_FROM ->
+                    stringResource(
+                        R.string.home_starring_from_watched,
+                        "",
+                        section.referenceMovie.name,
+                    )
+            }
         Text(
             text = title,
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             color = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         LazyRow(
             modifier = Modifier.height(fixedRowHeight),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
             items(
                 items = section.recommendedItems,
-                key = { movie -> "recommend_${section.sectionType.name}_${section.referenceMovie.id}_${movie.id}" }
+                key = { movie ->
+                    "recommend_${section.sectionType.name}_${section.referenceMovie.id}_${movie.id}"
+                },
             ) { movie ->
-                MediaItemCard(
-                    item = movie,
-                    onClick = { onItemClick(movie) },
-                    cardWidth = cardWidth
-                )
+                MediaItemCard(item = movie, onClick = { onItemClick(movie) }, cardWidth = cardWidth)
             }
         }
     }
@@ -124,39 +123,38 @@ fun PersonFromMovieSection(
     section: PersonFromMovieSection,
     onItemClick: (AfinityMovie) -> Unit,
     widthSizeClass: WindowWidthSizeClass,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val cardWidth = widthSizeClass.portraitWidth
     val cardHeight = CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_PORTRAIT)
     val fixedRowHeight = cardHeight + 8.dp + 20.dp + 22.dp
 
-    Column(
-        modifier = modifier.padding(horizontal = 14.dp)
-    ) {
+    Column(modifier = modifier.padding(horizontal = 14.dp)) {
         Text(
-            text = stringResource(R.string.home_starring_from_watched, section.person.name, section.referenceMovie.name),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
+            text =
+                stringResource(
+                    R.string.home_starring_from_watched,
+                    section.person.name,
+                    section.referenceMovie.name,
+                ),
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             color = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         LazyRow(
             modifier = Modifier.height(fixedRowHeight),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
             items(
                 items = section.items,
-                key = { movie -> "actor_recent_${section.person.id}_${section.referenceMovie.id}_${movie.id}" }
+                key = { movie ->
+                    "actor_recent_${section.person.id}_${section.referenceMovie.id}_${movie.id}"
+                },
             ) { movie ->
-                MediaItemCard(
-                    item = movie,
-                    onClick = { onItemClick(movie) },
-                    cardWidth = cardWidth
-                )
+                MediaItemCard(item = movie, onClick = { onItemClick(movie) }, cardWidth = cardWidth)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/home/components/ShowGenreSection.kt b/app/src/main/java/com/makd/afinity/ui/home/components/ShowGenreSection.kt
index fb1356030..8e56d381a 100644
--- a/app/src/main/java/com/makd/afinity/ui/home/components/ShowGenreSection.kt
+++ b/app/src/main/java/com/makd/afinity/ui/home/components/ShowGenreSection.kt
@@ -45,7 +45,7 @@ fun ShowGenreSection(
     onVisible: () -> Unit,
     onItemClick: (AfinityItem) -> Unit,
     widthSizeClass: WindowWidthSizeClass,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     var hasBeenVisible by remember { mutableStateOf(false) }
 
@@ -63,11 +63,9 @@ fun ShowGenreSection(
     Column(modifier = modifier.padding(horizontal = 14.dp)) {
         Text(
             text = stringResource(R.string.home_genre_shows_title, genre),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             color = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         if (isLoading && shows.isEmpty()) {
@@ -76,15 +74,13 @@ fun ShowGenreSection(
             LazyRow(
                 modifier = Modifier.height(fixedRowHeight),
                 horizontalArrangement = Arrangement.spacedBy(12.dp),
-                contentPadding = PaddingValues(horizontal = 0.dp)
+                contentPadding = PaddingValues(horizontal = 0.dp),
             ) {
-                items(
-                    shows,
-                    key = { "show_genre_${genre}_${it.id}" }) { show ->
+                items(shows, key = { "show_genre_${genre}_${it.id}" }) { show ->
                     MediaItemCard(
                         item = show,
                         onClick = { onItemClick(show) },
-                        cardWidth = cardWidth
+                        cardWidth = cardWidth,
                     )
                 }
             }
@@ -93,44 +89,38 @@ fun ShowGenreSection(
 }
 
 @Composable
-private fun ShowGenreSkeletonRow(
-    cardWidth: Dp,
-    height: Dp
-) {
+private fun ShowGenreSkeletonRow(cardWidth: Dp, height: Dp) {
     LazyRow(
         modifier = Modifier.height(height),
         horizontalArrangement = Arrangement.spacedBy(12.dp),
-        contentPadding = PaddingValues(horizontal = 0.dp)
+        contentPadding = PaddingValues(horizontal = 0.dp),
     ) {
         items(6) {
             Column(modifier = Modifier.width(cardWidth)) {
                 Card(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .aspectRatio(CardDimensions.ASPECT_RATIO_PORTRAIT),
+                    modifier =
+                        Modifier.fillMaxWidth().aspectRatio(CardDimensions.ASPECT_RATIO_PORTRAIT),
                     shape = RoundedCornerShape(8.dp),
-                    colors = CardDefaults.cardColors(
-                        containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)
-                    ),
-                    elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+                    colors =
+                        CardDefaults.cardColors(
+                            containerColor =
+                                MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)
+                        ),
+                    elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
                 ) {
-                    Box(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .shimmerEffect()
-                    )
+                    Box(modifier = Modifier.fillMaxSize().shimmerEffect())
                 }
 
                 Spacer(modifier = Modifier.height(8.dp))
 
                 Box(
-                    modifier = Modifier
-                        .width(cardWidth * 0.8f)
-                        .height(14.dp)
-                        .padding(horizontal = 4.dp)
-                        .shimmerEffect()
+                    modifier =
+                        Modifier.width(cardWidth * 0.8f)
+                            .height(14.dp)
+                            .padding(horizontal = 4.dp)
+                            .shimmerEffect()
                 )
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/item/ItemDetailScreen.kt b/app/src/main/java/com/makd/afinity/ui/item/ItemDetailScreen.kt
index 2564b3da7..ed105655e 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/ItemDetailScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/ItemDetailScreen.kt
@@ -1,7 +1,10 @@
+@file:OptIn(UnstableApi::class)
+
 package com.makd.afinity.ui.item
 
 import android.content.Context
 import android.content.res.Configuration
+import androidx.annotation.OptIn
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -53,6 +56,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.media3.common.util.UnstableApi
 import androidx.navigation.NavController
 import androidx.paging.PagingData
 import com.makd.afinity.R
@@ -107,24 +111,21 @@ fun ItemDetailScreen(
     navController: NavController,
     modifier: Modifier = Modifier,
     viewModel: ItemDetailViewModel = hiltViewModel(),
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val selectedEpisode by viewModel.selectedEpisode.collectAsStateWithLifecycle()
     val nextEpisode = uiState.nextEpisode
     val context = LocalContext.current
-    val selectedEpisodeWatchlistStatus by viewModel.selectedEpisodeWatchlistStatus.collectAsStateWithLifecycle()
-    val selectedEpisodeDownloadInfo by viewModel.selectedEpisodeDownloadInfo.collectAsStateWithLifecycle()
+    val selectedEpisodeWatchlistStatus by
+        viewModel.selectedEpisodeWatchlistStatus.collectAsStateWithLifecycle()
+    val selectedEpisodeDownloadInfo by
+        viewModel.selectedEpisodeDownloadInfo.collectAsStateWithLifecycle()
 
-    Box(
-        modifier = modifier.fillMaxSize()
-    ) {
+    Box(modifier = modifier.fillMaxSize()) {
         when {
             uiState.isLoading -> {
-                Box(
-                    modifier = Modifier.fillMaxSize(),
-                    contentAlignment = Alignment.Center
-                ) {
+                Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                     CircularProgressIndicator()
                 }
             }
@@ -132,26 +133,24 @@ fun ItemDetailScreen(
         when {
             uiState.error != null -> {
                 Column(
-                    modifier = Modifier
-                        .align(Alignment.Center)
-                        .padding(32.dp),
+                    modifier = Modifier.align(Alignment.Center).padding(32.dp),
                     horizontalAlignment = Alignment.CenterHorizontally,
-                    verticalArrangement = Arrangement.spacedBy(16.dp)
+                    verticalArrangement = Arrangement.spacedBy(16.dp),
                 ) {
                     Text(
                         text = stringResource(R.string.home_error_title),
                         style = MaterialTheme.typography.headlineSmall,
-                        color = MaterialTheme.colorScheme.onBackground
+                        color = MaterialTheme.colorScheme.onBackground,
                     )
                     Text(
                         text = uiState.error!!,
                         style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
                     Text(
                         text = stringResource(R.string.home_error_message),
                         style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
                 }
             }
@@ -180,7 +179,7 @@ fun ItemDetailScreen(
                     },
                     navController = navController,
                     viewModel = viewModel,
-                    widthSizeClass = widthSizeClass
+                    widthSizeClass = widthSizeClass,
                 )
             }
         }
@@ -202,46 +201,31 @@ fun ItemDetailScreen(
                         audioStreamIndex = selection.audioStreamIndex,
                         subtitleStreamIndex = selection.subtitleStreamIndex,
                         seasonId = seasonId,
-                        startPositionMs = selection.startPositionMs
+                        startPositionMs = selection.startPositionMs,
                     )
                 },
-                onToggleFavorite = {
-                    viewModel.toggleEpisodeFavorite(episode)
-                },
-                onToggleWatchlist = {
-                    viewModel.toggleEpisodeWatchlist(episode)
-                },
-                onToggleWatched = {
-                    viewModel.toggleEpisodeWatched(episode)
-                },
-                onDownloadClick = {
-                    viewModel.onDownloadClick()
-                },
-                onPauseDownload = {
-                    viewModel.pauseDownload()
-                },
-                onResumeDownload = {
-                    viewModel.resumeDownload()
-                },
-                onCancelDownload = {
-                    viewModel.cancelDownload()
-                }
+                onToggleFavorite = { viewModel.toggleEpisodeFavorite(episode) },
+                onToggleWatchlist = { viewModel.toggleEpisodeWatchlist(episode) },
+                onToggleWatched = { viewModel.toggleEpisodeWatched(episode) },
+                onDownloadClick = { viewModel.onDownloadClick() },
+                onPauseDownload = { viewModel.pauseDownload() },
+                onResumeDownload = { viewModel.resumeDownload() },
+                onCancelDownload = { viewModel.cancelDownload() },
             )
         }
 
         if (uiState.showQualityDialog) {
             val currentItem = selectedEpisode ?: uiState.item
-            val remoteSources = currentItem?.sources?.filter {
-                it.type == com.makd.afinity.data.models.media.AfinitySourceType.REMOTE
-            } ?: emptyList()
+            val remoteSources =
+                currentItem?.sources?.filter {
+                    it.type == com.makd.afinity.data.models.media.AfinitySourceType.REMOTE
+                } ?: emptyList()
 
             if (remoteSources.isNotEmpty()) {
                 QualitySelectionDialog(
                     sources = remoteSources,
-                    onSourceSelected = { source ->
-                        viewModel.onQualitySelected(source.id)
-                    },
-                    onDismiss = { viewModel.dismissQualityDialog() }
+                    onSourceSelected = { source -> viewModel.onQualitySelected(source.id) },
+                    onDismiss = { viewModel.dismissQualityDialog() },
                 )
             }
         }
@@ -266,7 +250,7 @@ private fun ItemDetailContent(
     onSpecialFeatureClick: (AfinityItem) -> Unit,
     navController: NavController,
     viewModel: ItemDetailViewModel,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val context = LocalContext.current
     val configuration = LocalConfiguration.current
@@ -291,7 +275,7 @@ private fun ItemDetailContent(
             navController = navController,
             viewModel = viewModel,
             context = context,
-            widthSizeClass = widthSizeClass
+            widthSizeClass = widthSizeClass,
         )
     } else {
         PortraitItemDetailContent(
@@ -312,7 +296,7 @@ private fun ItemDetailContent(
             navController = navController,
             viewModel = viewModel,
             context = context,
-            widthSizeClass = widthSizeClass
+            widthSizeClass = widthSizeClass,
         )
     }
 }
@@ -336,7 +320,7 @@ private fun LandscapeItemDetailContent(
     navController: NavController,
     viewModel: ItemDetailViewModel,
     context: Context,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val preferencesRepository = rememberPreferencesRepository()
     val density = androidx.compose.ui.platform.LocalDensity.current
@@ -345,26 +329,26 @@ private fun LandscapeItemDetailContent(
         WindowInsets.displayCutout.getLeft(density, androidx.compose.ui.unit.LayoutDirection.Ltr)
 
     val originalColorScheme = MaterialTheme.colorScheme
-    val landscapeColorScheme = remember(originalColorScheme) {
-        originalColorScheme.copy(
-            onBackground = Color.White,
-            onSurface = Color.White,
-            onSurfaceVariant = Color.White.copy(alpha = 0.7f),
-            outline = Color.White.copy(alpha = 0.5f)
-        )
-    }
+    val landscapeColorScheme =
+        remember(originalColorScheme) {
+            originalColorScheme.copy(
+                onBackground = Color.White,
+                onSurface = Color.White,
+                onSurfaceVariant = Color.White.copy(alpha = 0.7f),
+                outline = Color.White.copy(alpha = 0.5f),
+            )
+        }
 
     MaterialTheme(colorScheme = landscapeColorScheme) {
-
-        Box(
-            modifier = Modifier.fillMaxSize()
-        ) {
-            val backdropUrl = if (item is AfinitySeason) {
-                item.images.backdropImageUrl ?: item.images.showBackdropImageUrl
-                ?: item.images.primaryImageUrl
-            } else {
-                item.images.backdropImageUrl ?: item.images.primaryImageUrl
-            }
+        Box(modifier = Modifier.fillMaxSize()) {
+            val backdropUrl =
+                if (item is AfinitySeason) {
+                    item.images.backdropImageUrl
+                        ?: item.images.showBackdropImageUrl
+                        ?: item.images.primaryImageUrl
+                } else {
+                    item.images.backdropImageUrl ?: item.images.primaryImageUrl
+                }
 
             if (backdropUrl != null) {
                 AsyncImage(
@@ -372,124 +356,125 @@ private fun LandscapeItemDetailContent(
                     contentDescription = stringResource(R.string.cd_backdrop_fmt, item.name),
                     targetWidth = 1920.dp,
                     targetHeight = 1080.dp,
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .blur(0.dp),
+                    modifier = Modifier.fillMaxSize().blur(0.dp),
                     contentScale = ContentScale.Crop,
-                    alignment = Alignment.Center
+                    alignment = Alignment.Center,
                 )
             }
 
-            Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .background(Color.Black.copy(alpha = 0.4f))
-            )
+            Box(modifier = Modifier.fillMaxSize().background(Color.Black.copy(alpha = 0.4f)))
 
             Image(
                 painter = painterResource(id = R.drawable.mask),
                 contentDescription = "Mask overlay",
                 modifier = Modifier.fillMaxSize(),
                 contentScale = ContentScale.Crop,
-                alignment = Alignment.Center
+                alignment = Alignment.Center,
             )
 
             LazyColumn(
                 modifier = Modifier.fillMaxSize(),
-                contentPadding = PaddingValues(
-                    top = with(density) { statusBarHeight.toDp() + 16.dp },
-                    start = with(density) { displayCutoutLeft.toDp() + 16.dp },
-                    end = 16.dp,
-                    bottom = 16.dp
-                )
+                contentPadding =
+                    PaddingValues(
+                        top = with(density) { statusBarHeight.toDp() + 16.dp },
+                        start = with(density) { displayCutoutLeft.toDp() + 16.dp },
+                        end = 16.dp,
+                        bottom = 16.dp,
+                    ),
             ) {
                 item {
-                    Column(
-                        verticalArrangement = Arrangement.spacedBy(16.dp)
-                    ) {
-                        val logoToDisplay = if (item is AfinitySeason) {
-                            item.images.showLogo
-                        } else {
-                            item.images.logo
-                        }
+                    Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
+                        val logoToDisplay =
+                            if (item is AfinitySeason) {
+                                item.images.showLogo
+                            } else {
+                                item.images.logo
+                            }
 
-                        val logoUrlToDisplay = if (item is AfinitySeason) {
-                            item.images.showLogoImageUrl?.let { url ->
-                                if (url.contains("?")) "$url&format=png" else "$url?format=png"
+                        val logoUrlToDisplay =
+                            if (item is AfinitySeason) {
+                                item.images.showLogoImageUrl?.let { url ->
+                                    if (url.contains("?")) "$url&format=png" else "$url?format=png"
+                                }
+                            } else {
+                                item.images.logoImageUrlWithTransparency
                             }
-                        } else {
-                            item.images.logoImageUrlWithTransparency
-                        }
 
-                        val logoNameToDisplay = if (item is AfinitySeason) {
-                            item.seriesName
-                        } else {
-                            item.name
-                        }
+                        val logoNameToDisplay =
+                            if (item is AfinitySeason) {
+                                item.seriesName
+                            } else {
+                                item.name
+                            }
 
                         if (logoToDisplay != null) {
                             AsyncImage(
                                 imageUrl = logoUrlToDisplay,
-                                contentDescription = stringResource(
-                                    R.string.cd_logo_fmt,
-                                    logoNameToDisplay
-                                ),
+                                contentDescription =
+                                    stringResource(R.string.cd_logo_fmt, logoNameToDisplay),
                                 targetWidth = 300.dp,
                                 targetHeight = 150.dp,
-                                modifier = Modifier
-                                    .fillMaxWidth(0.8f)
-                                    .height(150.dp),
+                                modifier = Modifier.fillMaxWidth(0.8f).height(150.dp),
                                 contentScale = ContentScale.Fit,
-                                alignment = Alignment.CenterStart
+                                alignment = Alignment.CenterStart,
                             )
                         } else {
                             Text(
                                 text = logoNameToDisplay,
-                                style = MaterialTheme.typography.headlineLarge.copy(
-                                    fontWeight = FontWeight.Bold,
-                                    fontSize = 32.sp
-                                ),
+                                style =
+                                    MaterialTheme.typography.headlineLarge.copy(
+                                        fontWeight = FontWeight.Bold,
+                                        fontSize = 32.sp,
+                                    ),
                                 color = MaterialTheme.colorScheme.onBackground,
                                 maxLines = 3,
-                                overflow = TextOverflow.Ellipsis
+                                overflow = TextOverflow.Ellipsis,
                             )
                         }
 
                         MetadataRow(item = item)
 
-                        val mediaSourceOptions = remember(item) {
-                            item.sources.mapIndexed { index, source ->
-                                val videoStream =
-                                    source.mediaStreams.firstOrNull { it.type == MediaStreamType.VIDEO }
+                        val mediaSourceOptions =
+                            remember(item) {
+                                item.sources.mapIndexed { index, source ->
+                                    val videoStream =
+                                        source.mediaStreams.firstOrNull {
+                                            it.type == MediaStreamType.VIDEO
+                                        }
 
-                                val resolution = when {
-                                    (videoStream?.height ?: 0) > 2160 -> "8K"
-                                    (videoStream?.height ?: 0) > 1080 -> "4K"
-                                    (videoStream?.height ?: 0) > 720 -> "1080p"
-                                    (videoStream?.height ?: 0) > 480 -> "720p"
-                                    else -> "SD"
-                                }
+                                    val resolution =
+                                        when {
+                                            (videoStream?.height ?: 0) > 2160 -> "8K"
+                                            (videoStream?.height ?: 0) > 1080 -> "4K"
+                                            (videoStream?.height ?: 0) > 720 -> "1080p"
+                                            (videoStream?.height ?: 0) > 480 -> "720p"
+                                            else -> "SD"
+                                        }
 
-                                val displayName = when {
-                                    source.name.isNotBlank() && source.name != "Default" -> source.name
-                                    else -> {
-                                        val codec = videoStream?.codec?.uppercase() ?: "Unknown"
-                                        "$resolution $codec"
-                                    }
-                                }
+                                    val displayName =
+                                        when {
+                                            source.name.isNotBlank() && source.name != "Default" ->
+                                                source.name
+                                            else -> {
+                                                val codec =
+                                                    videoStream?.codec?.uppercase() ?: "Unknown"
+                                                "$resolution $codec"
+                                            }
+                                        }
 
-                                MediaSourceOption(
-                                    id = source.id,
-                                    name = displayName,
-                                    quality = resolution,
-                                    codec = videoStream?.codec?.uppercase() ?: "Unknown",
-                                    size = source.size,
-                                    isDefault = index == 0
-                                )
+                                    MediaSourceOption(
+                                        id = source.id,
+                                        name = displayName,
+                                        quality = resolution,
+                                        codec = videoStream?.codec?.uppercase() ?: "Unknown",
+                                        size = source.size,
+                                        isDefault = index == 0,
+                                    )
+                                }
                             }
-                        }
 
-                        val selectedMediaSource by viewModel.selectedMediaSource.collectAsStateWithLifecycle()
+                        val selectedMediaSource by
+                            viewModel.selectedMediaSource.collectAsStateWithLifecycle()
 
                         LaunchedEffect(mediaSourceOptions) {
                             if (selectedMediaSource == null && mediaSourceOptions.isNotEmpty()) {
@@ -497,65 +482,81 @@ private fun LandscapeItemDetailContent(
                             }
                         }
 
-                        val hasTrailer = when (item) {
-                            is AfinityMovie -> item.trailer != null
-                            is AfinityShow -> item.trailer != null
-                            is AfinityVideo -> item.trailer != null
-                            else -> false
-                        }
+                        val hasTrailer =
+                            when (item) {
+                                is AfinityMovie -> item.trailer != null
+                                is AfinityShow -> item.trailer != null
+                                is AfinityVideo -> item.trailer != null
+                                else -> false
+                            }
 
                         Row(
                             horizontalArrangement = Arrangement.spacedBy(8.dp),
-                            verticalAlignment = Alignment.CenterVertically
+                            verticalAlignment = Alignment.CenterVertically,
                         ) {
                             if (item !is AfinityBoxSet && item.canPlay) {
                                 Box(
-                                    modifier = Modifier
-                                        .weight(1f, fill = false)
-                                        .widthIn(max = 200.dp)
+                                    modifier =
+                                        Modifier.weight(1f, fill = false).widthIn(max = 200.dp)
                                 ) {
                                     when (item) {
                                         is AfinityShow -> {
                                             when {
                                                 nextEpisode == null -> {
                                                     Button(
-                                                        onClick = { },
+                                                        onClick = {},
                                                         enabled = false,
-                                                        modifier = Modifier
-                                                            .fillMaxWidth()
-                                                            .height(56.dp),
-                                                        shape = RoundedCornerShape(28.dp)
+                                                        modifier =
+                                                            Modifier.fillMaxWidth().height(56.dp),
+                                                        shape = RoundedCornerShape(28.dp),
                                                     ) {
                                                         CircularProgressIndicator(
                                                             modifier = Modifier.size(16.dp),
-                                                            strokeWidth = 2.dp
+                                                            strokeWidth = 2.dp,
                                                         )
                                                         Spacer(modifier = Modifier.width(8.dp))
-                                                        Text(stringResource(R.string.status_loading))
+                                                        Text(
+                                                            stringResource(R.string.status_loading)
+                                                        )
                                                     }
                                                 }
 
                                                 else -> {
                                                     val episode = nextEpisode!!
-                                                    val (buttonText, buttonIcon) = when {
-                                                        episode.playbackPositionTicks > 0 && episode.playbackPositionTicks >= episode.runtimeTicks -> {
-                                                            stringResource(R.string.action_rewatch) to painterResource(
-                                                                id = R.drawable.ic_replay
-                                                            )
-                                                        }
+                                                    val (buttonText, buttonIcon) =
+                                                        when {
+                                                            episode.playbackPositionTicks > 0 &&
+                                                                episode.playbackPositionTicks >=
+                                                                    episode.runtimeTicks -> {
+                                                                stringResource(
+                                                                    R.string.action_rewatch
+                                                                ) to
+                                                                    painterResource(
+                                                                        id = R.drawable.ic_replay
+                                                                    )
+                                                            }
 
-                                                        episode.playbackPositionTicks > 0 && episode.runtimeTicks > 0 -> {
-                                                            stringResource(R.string.action_resume_playback) to painterResource(
-                                                                id = R.drawable.ic_play_arrow
-                                                            )
-                                                        }
+                                                            episode.playbackPositionTicks > 0 &&
+                                                                episode.runtimeTicks > 0 -> {
+                                                                stringResource(
+                                                                    R.string.action_resume_playback
+                                                                ) to
+                                                                    painterResource(
+                                                                        id =
+                                                                            R.drawable.ic_play_arrow
+                                                                    )
+                                                            }
 
-                                                        else -> {
-                                                            stringResource(R.string.action_play) to painterResource(
-                                                                id = R.drawable.ic_play_arrow
-                                                            )
+                                                            else -> {
+                                                                stringResource(
+                                                                    R.string.action_play
+                                                                ) to
+                                                                    painterResource(
+                                                                        id =
+                                                                            R.drawable.ic_play_arrow
+                                                                    )
+                                                            }
                                                         }
-                                                    }
 
                                                     PlaybackSelectionButton(
                                                         item = episode,
@@ -563,35 +564,60 @@ private fun LandscapeItemDetailContent(
                                                         buttonIcon = buttonIcon,
                                                         onPlayClick = { selection ->
                                                             if (episode.sources.isEmpty()) {
-                                                                Timber.w("Episode ${episode.name} has no media sources")
+                                                                Timber.w(
+                                                                    "Episode ${episode.name} has no media sources"
+                                                                )
                                                                 return@PlaybackSelectionButton
                                                             }
 
                                                             val mediaSourceId =
                                                                 selectedMediaSource?.id
-                                                                    ?: episode.sources.firstOrNull {
-                                                                        it.type == com.makd.afinity.data.models.media.AfinitySourceType.LOCAL
-                                                                    }?.id
-                                                                    ?: episode.sources.firstOrNull()?.id
+                                                                    ?: episode.sources
+                                                                        .firstOrNull {
+                                                                            it.type ==
+                                                                                com.makd.afinity
+                                                                                    .data
+                                                                                    .models
+                                                                                    .media
+                                                                                    .AfinitySourceType
+                                                                                    .LOCAL
+                                                                        }
+                                                                        ?.id
+                                                                    ?: episode.sources
+                                                                        .firstOrNull()
+                                                                        ?.id
                                                                     ?: ""
 
-                                                            val finalSelection = selection.copy(
-                                                                mediaSourceId = mediaSourceId,
-                                                                startPositionMs = if (episode.playbackPositionTicks > 0) {
-                                                                    episode.playbackPositionTicks / 10000
-                                                                } else {
-                                                                    0L
-                                                                }
-                                                            )
+                                                            val finalSelection =
+                                                                selection.copy(
+                                                                    mediaSourceId = mediaSourceId,
+                                                                    startPositionMs =
+                                                                        if (
+                                                                            episode
+                                                                                .playbackPositionTicks >
+                                                                                0
+                                                                        ) {
+                                                                            episode
+                                                                                .playbackPositionTicks /
+                                                                                10000
+                                                                        } else {
+                                                                            0L
+                                                                        },
+                                                                )
                                                             PlayerLauncher.launch(
                                                                 context = navController.context,
                                                                 itemId = episode.id,
-                                                                mediaSourceId = finalSelection.mediaSourceId,
-                                                                audioStreamIndex = finalSelection.audioStreamIndex,
-                                                                subtitleStreamIndex = finalSelection.subtitleStreamIndex,
-                                                                startPositionMs = finalSelection.startPositionMs
+                                                                mediaSourceId =
+                                                                    finalSelection.mediaSourceId,
+                                                                audioStreamIndex =
+                                                                    finalSelection.audioStreamIndex,
+                                                                subtitleStreamIndex =
+                                                                    finalSelection
+                                                                        .subtitleStreamIndex,
+                                                                startPositionMs =
+                                                                    finalSelection.startPositionMs,
                                                             )
-                                                        }
+                                                        },
                                                     )
                                                 }
                                             }
@@ -601,43 +627,59 @@ private fun LandscapeItemDetailContent(
                                             when {
                                                 nextEpisode == null -> {
                                                     Button(
-                                                        onClick = { },
+                                                        onClick = {},
                                                         enabled = false,
-                                                        modifier = Modifier
-                                                            .fillMaxWidth()
-                                                            .height(56.dp),
-                                                        shape = RoundedCornerShape(28.dp)
+                                                        modifier =
+                                                            Modifier.fillMaxWidth().height(56.dp),
+                                                        shape = RoundedCornerShape(28.dp),
                                                     ) {
                                                         CircularProgressIndicator(
                                                             modifier = Modifier.size(16.dp),
-                                                            strokeWidth = 2.dp
+                                                            strokeWidth = 2.dp,
                                                         )
                                                         Spacer(modifier = Modifier.width(8.dp))
-                                                        Text(stringResource(R.string.status_loading))
+                                                        Text(
+                                                            stringResource(R.string.status_loading)
+                                                        )
                                                     }
                                                 }
 
                                                 else -> {
                                                     val episode = nextEpisode!!
-                                                    val (buttonText, buttonIcon) = when {
-                                                        episode.playbackPositionTicks > 0 && episode.playbackPositionTicks >= episode.runtimeTicks -> {
-                                                            stringResource(R.string.action_rewatch) to painterResource(
-                                                                id = R.drawable.ic_replay
-                                                            )
-                                                        }
+                                                    val (buttonText, buttonIcon) =
+                                                        when {
+                                                            episode.playbackPositionTicks > 0 &&
+                                                                episode.playbackPositionTicks >=
+                                                                    episode.runtimeTicks -> {
+                                                                stringResource(
+                                                                    R.string.action_rewatch
+                                                                ) to
+                                                                    painterResource(
+                                                                        id = R.drawable.ic_replay
+                                                                    )
+                                                            }
 
-                                                        episode.playbackPositionTicks > 0 && episode.runtimeTicks > 0 -> {
-                                                            stringResource(R.string.action_resume_playback) to painterResource(
-                                                                id = R.drawable.ic_play_arrow
-                                                            )
-                                                        }
+                                                            episode.playbackPositionTicks > 0 &&
+                                                                episode.runtimeTicks > 0 -> {
+                                                                stringResource(
+                                                                    R.string.action_resume_playback
+                                                                ) to
+                                                                    painterResource(
+                                                                        id =
+                                                                            R.drawable.ic_play_arrow
+                                                                    )
+                                                            }
 
-                                                        else -> {
-                                                            stringResource(R.string.action_play) to painterResource(
-                                                                id = R.drawable.ic_play_arrow
-                                                            )
+                                                            else -> {
+                                                                stringResource(
+                                                                    R.string.action_play
+                                                                ) to
+                                                                    painterResource(
+                                                                        id =
+                                                                            R.drawable.ic_play_arrow
+                                                                    )
+                                                            }
                                                         }
-                                                    }
 
                                                     PlaybackSelectionButton(
                                                         item = episode,
@@ -645,89 +687,129 @@ private fun LandscapeItemDetailContent(
                                                         buttonIcon = buttonIcon,
                                                         onPlayClick = { selection ->
                                                             if (episode.sources.isEmpty()) {
-                                                                Timber.w("Episode ${episode.name} has no media sources")
+                                                                Timber.w(
+                                                                    "Episode ${episode.name} has no media sources"
+                                                                )
                                                                 return@PlaybackSelectionButton
                                                             }
 
                                                             val mediaSourceId =
                                                                 selectedMediaSource?.id
-                                                                    ?: episode.sources.firstOrNull {
-                                                                        it.type == com.makd.afinity.data.models.media.AfinitySourceType.LOCAL
-                                                                    }?.id
-                                                                    ?: episode.sources.firstOrNull()?.id
+                                                                    ?: episode.sources
+                                                                        .firstOrNull {
+                                                                            it.type ==
+                                                                                com.makd.afinity
+                                                                                    .data
+                                                                                    .models
+                                                                                    .media
+                                                                                    .AfinitySourceType
+                                                                                    .LOCAL
+                                                                        }
+                                                                        ?.id
+                                                                    ?: episode.sources
+                                                                        .firstOrNull()
+                                                                        ?.id
                                                                     ?: ""
 
-                                                            val finalSelection = selection.copy(
-                                                                mediaSourceId = mediaSourceId,
-                                                                startPositionMs = if (episode.playbackPositionTicks > 0) {
-                                                                    episode.playbackPositionTicks / 10000
-                                                                } else {
-                                                                    0L
-                                                                }
-                                                            )
+                                                            val finalSelection =
+                                                                selection.copy(
+                                                                    mediaSourceId = mediaSourceId,
+                                                                    startPositionMs =
+                                                                        if (
+                                                                            episode
+                                                                                .playbackPositionTicks >
+                                                                                0
+                                                                        ) {
+                                                                            episode
+                                                                                .playbackPositionTicks /
+                                                                                10000
+                                                                        } else {
+                                                                            0L
+                                                                        },
+                                                                )
                                                             PlayerLauncher.launch(
                                                                 context = navController.context,
                                                                 itemId = episode.id,
-                                                                mediaSourceId = finalSelection.mediaSourceId,
-                                                                audioStreamIndex = finalSelection.audioStreamIndex,
-                                                                subtitleStreamIndex = finalSelection.subtitleStreamIndex,
-                                                                startPositionMs = finalSelection.startPositionMs,
-                                                                seasonId = item.id
+                                                                mediaSourceId =
+                                                                    finalSelection.mediaSourceId,
+                                                                audioStreamIndex =
+                                                                    finalSelection.audioStreamIndex,
+                                                                subtitleStreamIndex =
+                                                                    finalSelection
+                                                                        .subtitleStreamIndex,
+                                                                startPositionMs =
+                                                                    finalSelection.startPositionMs,
+                                                                seasonId = item.id,
                                                             )
-                                                        }
+                                                        },
                                                     )
                                                 }
                                             }
                                         }
 
                                         else -> {
-                                            val (buttonText, buttonIcon) = when {
-                                                item.playbackPositionTicks > 0 && item.playbackPositionTicks >= item.runtimeTicks -> {
-                                                    stringResource(R.string.action_rewatch) to painterResource(
-                                                        id = R.drawable.ic_replay
-                                                    )
-                                                }
+                                            val (buttonText, buttonIcon) =
+                                                when {
+                                                    item.playbackPositionTicks > 0 &&
+                                                        item.playbackPositionTicks >=
+                                                            item.runtimeTicks -> {
+                                                        stringResource(R.string.action_rewatch) to
+                                                            painterResource(
+                                                                id = R.drawable.ic_replay
+                                                            )
+                                                    }
 
-                                                item.playbackPositionTicks > 0 && item.runtimeTicks > 0 -> {
-                                                    stringResource(R.string.action_resume_playback) to painterResource(
-                                                        id = R.drawable.ic_play_arrow
-                                                    )
-                                                }
+                                                    item.playbackPositionTicks > 0 &&
+                                                        item.runtimeTicks > 0 -> {
+                                                        stringResource(
+                                                            R.string.action_resume_playback
+                                                        ) to
+                                                            painterResource(
+                                                                id = R.drawable.ic_play_arrow
+                                                            )
+                                                    }
 
-                                                else -> {
-                                                    stringResource(R.string.hero_btn_watch_now) to painterResource(
-                                                        id = R.drawable.ic_play_arrow
-                                                    )
+                                                    else -> {
+                                                        stringResource(
+                                                            R.string.hero_btn_watch_now
+                                                        ) to
+                                                            painterResource(
+                                                                id = R.drawable.ic_play_arrow
+                                                            )
+                                                    }
                                                 }
-                                            }
 
                                             PlaybackSelectionButton(
                                                 item = item,
                                                 buttonText = buttonText,
                                                 buttonIcon = buttonIcon,
                                                 onPlayClick = { selection ->
-                                                    val finalSelection = selection.copy(
-                                                        mediaSourceId = selectedMediaSource?.id
-                                                            ?: selection.mediaSourceId
-                                                    )
+                                                    val finalSelection =
+                                                        selection.copy(
+                                                            mediaSourceId =
+                                                                selectedMediaSource?.id
+                                                                    ?: selection.mediaSourceId
+                                                        )
                                                     PlayerLauncher.launch(
                                                         context = navController.context,
                                                         itemId = item.id,
-                                                        mediaSourceId = finalSelection.mediaSourceId,
-                                                        audioStreamIndex = finalSelection.audioStreamIndex,
-                                                        subtitleStreamIndex = finalSelection.subtitleStreamIndex,
-                                                        startPositionMs = finalSelection.startPositionMs
+                                                        mediaSourceId =
+                                                            finalSelection.mediaSourceId,
+                                                        audioStreamIndex =
+                                                            finalSelection.audioStreamIndex,
+                                                        subtitleStreamIndex =
+                                                            finalSelection.subtitleStreamIndex,
+                                                        startPositionMs =
+                                                            finalSelection.startPositionMs,
                                                     )
-                                                }
+                                                },
                                             )
                                         }
                                     }
                                 }
                             }
 
-                            Row(
-                                horizontalArrangement = Arrangement.SpaceEvenly
-                            ) {
+                            Row(horizontalArrangement = Arrangement.SpaceEvenly) {
                                 IconButton(
                                     onClick = {
                                         if (hasTrailer) {
@@ -737,48 +819,55 @@ private fun LandscapeItemDetailContent(
                                             }
                                         }
                                     },
-                                    enabled = hasTrailer
+                                    enabled = hasTrailer,
                                 ) {
                                     Icon(
                                         painter = painterResource(id = R.drawable.ic_video),
-                                        contentDescription = stringResource(R.string.hero_btn_play_trailer),
-                                        tint = if (hasTrailer) {
-                                            MaterialTheme.colorScheme.primary
-                                        } else {
-                                            MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f)
-                                        },
-                                        modifier = Modifier.size(28.dp)
+                                        contentDescription =
+                                            stringResource(R.string.hero_btn_play_trailer),
+                                        tint =
+                                            if (hasTrailer) {
+                                                MaterialTheme.colorScheme.primary
+                                            } else {
+                                                MaterialTheme.colorScheme.onSurface.copy(
+                                                    alpha = 0.38f
+                                                )
+                                            },
+                                        modifier = Modifier.size(28.dp),
                                     )
                                 }
 
-                                IconButton(
-                                    onClick = { viewModel.toggleWatchlist() }
-                                ) {
+                                IconButton(onClick = { viewModel.toggleWatchlist() }) {
                                     Icon(
-                                        painter = if (isInWatchlist) painterResource(id = R.drawable.ic_bookmark_filled) else painterResource(
-                                            id = R.drawable.ic_bookmark
-                                        ),
-                                        contentDescription = if (isInWatchlist)
-                                            stringResource(R.string.cd_watchlist_remove)
-                                        else
-                                            stringResource(R.string.cd_watchlist_add),
-                                        tint = if (isInWatchlist) Color(0xFFFF9800) else MaterialTheme.colorScheme.onBackground,
-                                        modifier = Modifier.size(28.dp)
+                                        painter =
+                                            if (isInWatchlist)
+                                                painterResource(id = R.drawable.ic_bookmark_filled)
+                                            else painterResource(id = R.drawable.ic_bookmark),
+                                        contentDescription =
+                                            if (isInWatchlist)
+                                                stringResource(R.string.cd_watchlist_remove)
+                                            else stringResource(R.string.cd_watchlist_add),
+                                        tint =
+                                            if (isInWatchlist) Color(0xFFFF9800)
+                                            else MaterialTheme.colorScheme.onBackground,
+                                        modifier = Modifier.size(28.dp),
                                     )
                                 }
 
                                 if (item is AfinityShow || item is AfinitySeason) {
                                     IconButton(
                                         onClick = {
-                                            val episode = when (item) {
-                                                is AfinityShow -> nextEpisode
-                                                is AfinitySeason -> nextEpisode
-                                                else -> null
-                                            }
+                                            val episode =
+                                                when (item) {
+                                                    is AfinityShow -> nextEpisode
+                                                    is AfinitySeason -> nextEpisode
+                                                    else -> null
+                                                }
 
                                             episode?.let { ep ->
-                                                val mediaSourceId = ep.sources.firstOrNull()?.id
-                                                    ?: return@IconButton
+                                                val mediaSourceId =
+                                                    ep.sources.firstOrNull()?.id
+                                                        ?: return@IconButton
                                                 PlayerLauncher.launch(
                                                     context = context,
                                                     itemId = ep.id,
@@ -786,54 +875,62 @@ private fun LandscapeItemDetailContent(
                                                     audioStreamIndex = null,
                                                     subtitleStreamIndex = null,
                                                     startPositionMs = 0L,
-                                                    seasonId = if (item is AfinitySeason) item.id else null,
-                                                    shuffle = true
+                                                    seasonId =
+                                                        if (item is AfinitySeason) item.id
+                                                        else null,
+                                                    shuffle = true,
                                                 )
                                             }
                                         }
                                     ) {
                                         Icon(
-                                            painter = painterResource(id = R.drawable.ic_arrows_shuffle),
-                                            contentDescription = stringResource(R.string.cd_shuffle_play),
+                                            painter =
+                                                painterResource(id = R.drawable.ic_arrows_shuffle),
+                                            contentDescription =
+                                                stringResource(R.string.cd_shuffle_play),
                                             tint = MaterialTheme.colorScheme.onBackground,
-                                            modifier = Modifier.size(28.dp)
+                                            modifier = Modifier.size(28.dp),
                                         )
                                     }
                                 }
 
-                                IconButton(
-                                    onClick = { viewModel.toggleFavorite() }
-                                ) {
+                                IconButton(onClick = { viewModel.toggleFavorite() }) {
                                     Icon(
-                                        painter = if (item.favorite) painterResource(id = R.drawable.ic_favorite_filled) else painterResource(
-                                            id = R.drawable.ic_favorite
-                                        ),
-                                        contentDescription = if (item.favorite)
-                                            stringResource(R.string.cd_favorite_remove)
-                                        else
-                                            stringResource(R.string.cd_favorite_add),
-                                        tint = if (item.favorite) Color.Red else MaterialTheme.colorScheme.onBackground,
-                                        modifier = Modifier.size(28.dp)
+                                        painter =
+                                            if (item.favorite)
+                                                painterResource(id = R.drawable.ic_favorite_filled)
+                                            else painterResource(id = R.drawable.ic_favorite),
+                                        contentDescription =
+                                            if (item.favorite)
+                                                stringResource(R.string.cd_favorite_remove)
+                                            else stringResource(R.string.cd_favorite_add),
+                                        tint =
+                                            if (item.favorite) Color.Red
+                                            else MaterialTheme.colorScheme.onBackground,
+                                        modifier = Modifier.size(28.dp),
                                     )
                                 }
 
-                                IconButton(
-                                    onClick = { viewModel.toggleWatched() }
-                                ) {
+                                IconButton(onClick = { viewModel.toggleWatched() }) {
                                     Icon(
-                                        painter = if (item.played) painterResource(id = R.drawable.ic_circle_check) else painterResource(
-                                            id = R.drawable.ic_circle_check_outline
-                                        ),
-                                        contentDescription = if (item.played)
-                                            stringResource(R.string.cd_watched_unmark)
-                                        else
-                                            stringResource(R.string.cd_watched_mark),
-                                        tint = if (item.played) {
-                                            Color.Green
-                                        } else {
-                                            MaterialTheme.colorScheme.onBackground
-                                        },
-                                        modifier = Modifier.size(28.dp)
+                                        painter =
+                                            if (item.played)
+                                                painterResource(id = R.drawable.ic_circle_check)
+                                            else
+                                                painterResource(
+                                                    id = R.drawable.ic_circle_check_outline
+                                                ),
+                                        contentDescription =
+                                            if (item.played)
+                                                stringResource(R.string.cd_watched_unmark)
+                                            else stringResource(R.string.cd_watched_mark),
+                                        tint =
+                                            if (item.played) {
+                                                Color.Green
+                                            } else {
+                                                MaterialTheme.colorScheme.onBackground
+                                            },
+                                        modifier = Modifier.size(28.dp),
                                     )
                                 }
 
@@ -843,7 +940,7 @@ private fun LandscapeItemDetailContent(
                                     onPauseClick = { viewModel.pauseDownload() },
                                     onResumeClick = { viewModel.resumeDownload() },
                                     onCancelClick = { viewModel.cancelDownload() },
-                                    isLandscape = true
+                                    isLandscape = true,
                                 )
                             }
                         }
@@ -851,79 +948,87 @@ private fun LandscapeItemDetailContent(
                         VideoQualitySelection(
                             mediaSourceOptions = mediaSourceOptions,
                             selectedSource = selectedMediaSource,
-                            onSourceSelected = viewModel::selectMediaSource
+                            onSourceSelected = viewModel::selectMediaSource,
                         )
 
                         when (item) {
-                            is AfinityShow -> SeriesDetailContent(
-                                item = item,
-                                seasons = seasons,
-                                nextEpisode = nextEpisode,
-                                specialFeatures = specialFeatures,
-                                containingBoxSets = containingBoxSets,
-                                onEpisodeClick = { clickedEpisode ->
-                                    if (clickedEpisode.sources.isEmpty()) {
-                                        Timber.w("Episode ${clickedEpisode.name} has no media sources")
-                                        return@SeriesDetailContent
-                                    }
-                                    val mediaSourceId =
-                                        clickedEpisode.sources.firstOrNull()?.id ?: ""
-                                    val startPositionMs =
-                                        if (clickedEpisode.playbackPositionTicks > 0) {
-                                            clickedEpisode.playbackPositionTicks / 10000
-                                        } else {
-                                            0L
+                            is AfinityShow ->
+                                SeriesDetailContent(
+                                    item = item,
+                                    seasons = seasons,
+                                    nextEpisode = nextEpisode,
+                                    specialFeatures = specialFeatures,
+                                    containingBoxSets = containingBoxSets,
+                                    onEpisodeClick = { clickedEpisode ->
+                                        if (clickedEpisode.sources.isEmpty()) {
+                                            Timber.w(
+                                                "Episode ${clickedEpisode.name} has no media sources"
+                                            )
+                                            return@SeriesDetailContent
                                         }
-                                    PlayerLauncher.launch(
-                                        context = navController.context,
-                                        itemId = clickedEpisode.id,
-                                        mediaSourceId = mediaSourceId,
-                                        audioStreamIndex = null,
-                                        subtitleStreamIndex = null,
-                                        startPositionMs = startPositionMs
-                                    )
-                                },
-                                onSpecialFeatureClick = { specialFeature ->
-                                    val route =
-                                        Destination.createItemDetailRoute(specialFeature.id.toString())
-                                    navController.navigate(route)
-                                },
-                                navController = navController,
-                                widthSizeClass = widthSizeClass
-                            )
+                                        val mediaSourceId =
+                                            clickedEpisode.sources.firstOrNull()?.id ?: ""
+                                        val startPositionMs =
+                                            if (clickedEpisode.playbackPositionTicks > 0) {
+                                                clickedEpisode.playbackPositionTicks / 10000
+                                            } else {
+                                                0L
+                                            }
+                                        PlayerLauncher.launch(
+                                            context = navController.context,
+                                            itemId = clickedEpisode.id,
+                                            mediaSourceId = mediaSourceId,
+                                            audioStreamIndex = null,
+                                            subtitleStreamIndex = null,
+                                            startPositionMs = startPositionMs,
+                                        )
+                                    },
+                                    onSpecialFeatureClick = { specialFeature ->
+                                        val route =
+                                            Destination.createItemDetailRoute(
+                                                specialFeature.id.toString()
+                                            )
+                                        navController.navigate(route)
+                                    },
+                                    navController = navController,
+                                    widthSizeClass = widthSizeClass,
+                                )
 
-                            is AfinitySeason -> SeasonDetailContent(
-                                season = item,
-                                episodesPagingData = episodesPagingData,
-                                specialFeatures = specialFeatures,
-                                onEpisodeClick = { episode ->
-                                    viewModel.selectEpisode(episode)
-                                },
-                                onSpecialFeatureClick = onSpecialFeatureClick,
-                                navController = navController,
-                                preferencesRepository = preferencesRepository,
-                                widthSizeClass = widthSizeClass
-                            )
+                            is AfinitySeason ->
+                                SeasonDetailContent(
+                                    season = item,
+                                    episodesPagingData = episodesPagingData,
+                                    specialFeatures = specialFeatures,
+                                    onEpisodeClick = { episode ->
+                                        viewModel.selectEpisode(episode)
+                                    },
+                                    onSpecialFeatureClick = onSpecialFeatureClick,
+                                    navController = navController,
+                                    preferencesRepository = preferencesRepository,
+                                    widthSizeClass = widthSizeClass,
+                                )
 
-                            is AfinityMovie -> MovieDetailContent(
-                                item = item,
-                                baseUrl = baseUrl,
-                                specialFeatures = specialFeatures,
-                                containingBoxSets = containingBoxSets,
-                                onSpecialFeatureClick = onSpecialFeatureClick,
-                                onPlayClick = { movie, selection ->
-                                    onPlayClick(movie, selection)
-                                },
-                                navController = navController,
-                                widthSizeClass = widthSizeClass
-                            )
+                            is AfinityMovie ->
+                                MovieDetailContent(
+                                    item = item,
+                                    baseUrl = baseUrl,
+                                    specialFeatures = specialFeatures,
+                                    containingBoxSets = containingBoxSets,
+                                    onSpecialFeatureClick = onSpecialFeatureClick,
+                                    onPlayClick = { movie, selection ->
+                                        onPlayClick(movie, selection)
+                                    },
+                                    navController = navController,
+                                    widthSizeClass = widthSizeClass,
+                                )
 
-                            is AfinityBoxSet -> BoxSetDetailContent(
-                                item = item,
-                                boxSetItems = boxSetItems,
-                                onItemClick = onBoxSetItemClick,
-                                widthSizeClass = widthSizeClass
-                            )
+                            is AfinityBoxSet ->
+                                BoxSetDetailContent(
+                                    item = item,
+                                    boxSetItems = boxSetItems,
+                                    onItemClick = onBoxSetItemClick,
+                                    widthSizeClass = widthSizeClass,
+                                )
 
                             else -> {
                                 TaglineSection(item = item)
@@ -938,7 +1043,7 @@ private fun LandscapeItemDetailContent(
                                             Destination.createPersonRoute(personId.toString())
                                         navController.navigate(route)
                                     },
-                                    widthSizeClass = widthSizeClass
+                                    widthSizeClass = widthSizeClass,
                                 )
                             }
                         }
@@ -951,7 +1056,7 @@ private fun LandscapeItemDetailContent(
                                         Destination.createItemDetailRoute(similarItem.id.toString())
                                     navController.navigate(route)
                                 },
-                                widthSizeClass = widthSizeClass
+                                widthSizeClass = widthSizeClass,
                             )
                         }
                     }
@@ -980,7 +1085,7 @@ private fun PortraitItemDetailContent(
     navController: NavController,
     viewModel: ItemDetailViewModel,
     context: Context,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val preferencesRepository = rememberPreferencesRepository()
     val configuration = LocalConfiguration.current
@@ -989,44 +1094,42 @@ private fun PortraitItemDetailContent(
 
     LazyColumn(
         modifier = Modifier.fillMaxSize(),
-        contentPadding = PaddingValues(bottom = bottomPadding + 16.dp)
+        contentPadding = PaddingValues(bottom = bottomPadding + 16.dp),
     ) {
-        item {
-            HeroSection(
-                item = item,
-                onPlayClick = onPlayClick
-            )
-        }
+        item { HeroSection(item = item, onPlayClick = onPlayClick) }
 
         item {
             val overlayOffset = (-110).dp
 
             Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .verticalLayoutOffset(overlayOffset)
-                    .padding(start = 16.dp, end = 16.dp, top = 0.dp, bottom = 16.dp),
-                verticalArrangement = Arrangement.spacedBy(16.dp)
+                modifier =
+                    Modifier.fillMaxWidth()
+                        .verticalLayoutOffset(overlayOffset)
+                        .padding(start = 16.dp, end = 16.dp, top = 0.dp, bottom = 16.dp),
+                verticalArrangement = Arrangement.spacedBy(16.dp),
             ) {
-                val logoToDisplay = if (item is AfinitySeason) {
-                    item.images.showLogo
-                } else {
-                    item.images.logo
-                }
+                val logoToDisplay =
+                    if (item is AfinitySeason) {
+                        item.images.showLogo
+                    } else {
+                        item.images.logo
+                    }
 
-                val logoUrlToDisplay = if (item is AfinitySeason) {
-                    item.images.showLogoImageUrl?.let { url ->
-                        if (url.contains("?")) "$url&format=png" else "$url?format=png"
+                val logoUrlToDisplay =
+                    if (item is AfinitySeason) {
+                        item.images.showLogoImageUrl?.let { url ->
+                            if (url.contains("?")) "$url&format=png" else "$url?format=png"
+                        }
+                    } else {
+                        item.images.logoImageUrlWithTransparency
                     }
-                } else {
-                    item.images.logoImageUrlWithTransparency
-                }
 
-                val logoNameToDisplay = if (item is AfinitySeason) {
-                    item.seriesName
-                } else {
-                    item.name
-                }
+                val logoNameToDisplay =
+                    if (item is AfinitySeason) {
+                        item.seriesName
+                    } else {
+                        item.name
+                    }
 
                 if (logoToDisplay != null) {
                     val logoAlignment =
@@ -1036,18 +1139,13 @@ private fun PortraitItemDetailContent(
 
                     AsyncImage(
                         imageUrl = logoUrlToDisplay,
-                        contentDescription = stringResource(
-                            R.string.cd_logo_fmt,
-                            logoNameToDisplay
-                        ),
+                        contentDescription =
+                            stringResource(R.string.cd_logo_fmt, logoNameToDisplay),
                         targetWidth = 240.dp,
                         targetHeight = 120.dp,
-                        modifier = Modifier
-                            .fillMaxWidth(0.8f)
-                            .height(120.dp)
-                            .align(logoAlignment),
+                        modifier = Modifier.fillMaxWidth(0.8f).height(120.dp).align(logoAlignment),
                         contentScale = ContentScale.Fit,
-                        alignment = logoContentAlignment
+                        alignment = logoContentAlignment,
                     )
                 } else {
                     Spacer(modifier = Modifier.height(0.dp))
@@ -1056,53 +1154,59 @@ private fun PortraitItemDetailContent(
                 if (logoToDisplay == null) {
                     Text(
                         text = logoNameToDisplay,
-                        style = MaterialTheme.typography.headlineLarge.copy(
-                            fontWeight = FontWeight.Bold,
-                            fontSize = 32.sp
-                        ),
+                        style =
+                            MaterialTheme.typography.headlineLarge.copy(
+                                fontWeight = FontWeight.Bold,
+                                fontSize = 32.sp,
+                            ),
                         color = MaterialTheme.colorScheme.onBackground,
                         maxLines = 3,
                         overflow = TextOverflow.Ellipsis,
                         textAlign = TextAlign.Center,
-                        modifier = Modifier.fillMaxWidth()
+                        modifier = Modifier.fillMaxWidth(),
                     )
                 }
 
                 MetadataRow(item = item)
 
-                val mediaSourceOptions = remember(item) {
-                    item.sources.mapIndexed { index, source ->
-                        val videoStream =
-                            source.mediaStreams.firstOrNull { it.type == MediaStreamType.VIDEO }
-
-                        val resolution = when {
-                            (videoStream?.height ?: 0) > 2160 -> "8K"
-                            (videoStream?.height ?: 0) > 1080 -> "4K"
-                            (videoStream?.height ?: 0) > 720 -> "1080p"
-                            (videoStream?.height ?: 0) > 480 -> "720p"
-                            else -> "SD"
-                        }
+                val mediaSourceOptions =
+                    remember(item) {
+                        item.sources.mapIndexed { index, source ->
+                            val videoStream =
+                                source.mediaStreams.firstOrNull { it.type == MediaStreamType.VIDEO }
 
-                        val displayName = when {
-                            source.name.isNotBlank() && source.name != "Default" -> source.name
-                            else -> {
-                                val codec = videoStream?.codec?.uppercase() ?: "Unknown"
-                                "$resolution $codec"
-                            }
-                        }
+                            val resolution =
+                                when {
+                                    (videoStream?.height ?: 0) > 2160 -> "8K"
+                                    (videoStream?.height ?: 0) > 1080 -> "4K"
+                                    (videoStream?.height ?: 0) > 720 -> "1080p"
+                                    (videoStream?.height ?: 0) > 480 -> "720p"
+                                    else -> "SD"
+                                }
 
-                        MediaSourceOption(
-                            id = source.id,
-                            name = displayName,
-                            quality = resolution,
-                            codec = videoStream?.codec?.uppercase() ?: "Unknown",
-                            size = source.size,
-                            isDefault = index == 0
-                        )
+                            val displayName =
+                                when {
+                                    source.name.isNotBlank() && source.name != "Default" ->
+                                        source.name
+                                    else -> {
+                                        val codec = videoStream?.codec?.uppercase() ?: "Unknown"
+                                        "$resolution $codec"
+                                    }
+                                }
+
+                            MediaSourceOption(
+                                id = source.id,
+                                name = displayName,
+                                quality = resolution,
+                                codec = videoStream?.codec?.uppercase() ?: "Unknown",
+                                size = source.size,
+                                isDefault = index == 0,
+                            )
+                        }
                     }
-                }
 
-                val selectedMediaSource by viewModel.selectedMediaSource.collectAsStateWithLifecycle()
+                val selectedMediaSource by
+                    viewModel.selectedMediaSource.collectAsStateWithLifecycle()
 
                 LaunchedEffect(mediaSourceOptions) {
                     if (selectedMediaSource == null && mediaSourceOptions.isNotEmpty()) {
@@ -1110,19 +1214,19 @@ private fun PortraitItemDetailContent(
                     }
                 }
 
-                val hasTrailer = when (item) {
-                    is AfinityMovie -> item.trailer != null
-                    is AfinityShow -> item.trailer != null
-                    is AfinityVideo -> item.trailer != null
-                    else -> false
-                }
+                val hasTrailer =
+                    when (item) {
+                        is AfinityMovie -> item.trailer != null
+                        is AfinityShow -> item.trailer != null
+                        is AfinityVideo -> item.trailer != null
+                        else -> false
+                    }
 
                 if (isLandscape) {
                     Row(
                         horizontalArrangement = Arrangement.spacedBy(8.dp),
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                    }
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {}
                 } else {
                     if (item !is AfinityBoxSet && item.canPlay) {
                         when (item) {
@@ -1131,16 +1235,14 @@ private fun PortraitItemDetailContent(
                                 when {
                                     nextEpisode == null -> {
                                         Button(
-                                            onClick = { },
+                                            onClick = {},
                                             enabled = false,
-                                            modifier = Modifier
-                                                .fillMaxWidth()
-                                                .height(56.dp),
-                                            shape = RoundedCornerShape(28.dp)
+                                            modifier = Modifier.fillMaxWidth().height(56.dp),
+                                            shape = RoundedCornerShape(28.dp),
                                         ) {
                                             CircularProgressIndicator(
                                                 modifier = Modifier.size(16.dp),
-                                                strokeWidth = 2.dp
+                                                strokeWidth = 2.dp,
                                             )
                                             Spacer(modifier = Modifier.width(8.dp))
                                             Text(stringResource(R.string.status_loading))
@@ -1149,25 +1251,32 @@ private fun PortraitItemDetailContent(
 
                                     else -> {
                                         val episode = nextEpisode!!
-                                        val (buttonText, buttonIcon) = when {
-                                            episode.playbackPositionTicks > 0 && episode.playbackPositionTicks >= episode.runtimeTicks -> {
-                                                stringResource(R.string.action_rewatch) to painterResource(
-                                                    id = R.drawable.ic_replay
-                                                )
-                                            }
+                                        val (buttonText, buttonIcon) =
+                                            when {
+                                                episode.playbackPositionTicks > 0 &&
+                                                    episode.playbackPositionTicks >=
+                                                        episode.runtimeTicks -> {
+                                                    stringResource(R.string.action_rewatch) to
+                                                        painterResource(id = R.drawable.ic_replay)
+                                                }
 
-                                            episode.playbackPositionTicks > 0 && episode.runtimeTicks > 0 -> {
-                                                stringResource(R.string.action_resume_playback) to painterResource(
-                                                    id = R.drawable.ic_play_arrow
-                                                )
-                                            }
+                                                episode.playbackPositionTicks > 0 &&
+                                                    episode.runtimeTicks > 0 -> {
+                                                    stringResource(
+                                                        R.string.action_resume_playback
+                                                    ) to
+                                                        painterResource(
+                                                            id = R.drawable.ic_play_arrow
+                                                        )
+                                                }
 
-                                            else -> {
-                                                stringResource(R.string.action_play) to painterResource(
-                                                    id = R.drawable.ic_play_arrow
-                                                )
+                                                else -> {
+                                                    stringResource(R.string.action_play) to
+                                                        painterResource(
+                                                            id = R.drawable.ic_play_arrow
+                                                        )
+                                                }
                                             }
-                                        }
 
                                         PlaybackSelectionButton(
                                             item = episode,
@@ -1175,34 +1284,48 @@ private fun PortraitItemDetailContent(
                                             buttonIcon = buttonIcon,
                                             onPlayClick = { selection ->
                                                 if (episode.sources.isEmpty()) {
-                                                    Timber.w("Episode ${episode.name} has no media sources")
+                                                    Timber.w(
+                                                        "Episode ${episode.name} has no media sources"
+                                                    )
                                                     return@PlaybackSelectionButton
                                                 }
 
-                                                val mediaSourceId = selectedMediaSource?.id
-                                                    ?: episode.sources.firstOrNull {
-                                                        it.type == com.makd.afinity.data.models.media.AfinitySourceType.LOCAL
-                                                    }?.id
-                                                    ?: episode.sources.firstOrNull()?.id
-                                                    ?: ""
-
-                                                val finalSelection = selection.copy(
-                                                    mediaSourceId = mediaSourceId,
-                                                    startPositionMs = if (episode.playbackPositionTicks > 0) {
-                                                        episode.playbackPositionTicks / 10000
-                                                    } else {
-                                                        0L
-                                                    }
-                                                )
+                                                val mediaSourceId =
+                                                    selectedMediaSource?.id
+                                                        ?: episode.sources
+                                                            .firstOrNull {
+                                                                it.type ==
+                                                                    com.makd.afinity.data.models
+                                                                        .media
+                                                                        .AfinitySourceType
+                                                                        .LOCAL
+                                                            }
+                                                            ?.id
+                                                        ?: episode.sources.firstOrNull()?.id
+                                                        ?: ""
+
+                                                val finalSelection =
+                                                    selection.copy(
+                                                        mediaSourceId = mediaSourceId,
+                                                        startPositionMs =
+                                                            if (episode.playbackPositionTicks > 0) {
+                                                                episode.playbackPositionTicks /
+                                                                    10000
+                                                            } else {
+                                                                0L
+                                                            },
+                                                    )
                                                 PlayerLauncher.launch(
                                                     context = navController.context,
                                                     itemId = episode.id,
                                                     mediaSourceId = finalSelection.mediaSourceId,
-                                                    audioStreamIndex = finalSelection.audioStreamIndex,
-                                                    subtitleStreamIndex = finalSelection.subtitleStreamIndex,
-                                                    startPositionMs = finalSelection.startPositionMs
+                                                    audioStreamIndex =
+                                                        finalSelection.audioStreamIndex,
+                                                    subtitleStreamIndex =
+                                                        finalSelection.subtitleStreamIndex,
+                                                    startPositionMs = finalSelection.startPositionMs,
                                                 )
-                                            }
+                                            },
                                         )
                                     }
                                 }
@@ -1213,16 +1336,14 @@ private fun PortraitItemDetailContent(
                                 when {
                                     nextEpisode == null -> {
                                         Button(
-                                            onClick = { },
+                                            onClick = {},
                                             enabled = false,
-                                            modifier = Modifier
-                                                .fillMaxWidth()
-                                                .height(56.dp),
-                                            shape = RoundedCornerShape(28.dp)
+                                            modifier = Modifier.fillMaxWidth().height(56.dp),
+                                            shape = RoundedCornerShape(28.dp),
                                         ) {
                                             CircularProgressIndicator(
                                                 modifier = Modifier.size(16.dp),
-                                                strokeWidth = 2.dp
+                                                strokeWidth = 2.dp,
                                             )
                                             Spacer(modifier = Modifier.width(8.dp))
                                             Text(stringResource(R.string.status_loading))
@@ -1231,25 +1352,32 @@ private fun PortraitItemDetailContent(
 
                                     else -> {
                                         val episode = nextEpisode!!
-                                        val (buttonText, buttonIcon) = when {
-                                            episode.playbackPositionTicks > 0 && episode.playbackPositionTicks >= episode.runtimeTicks -> {
-                                                stringResource(R.string.action_rewatch) to painterResource(
-                                                    id = R.drawable.ic_replay
-                                                )
-                                            }
+                                        val (buttonText, buttonIcon) =
+                                            when {
+                                                episode.playbackPositionTicks > 0 &&
+                                                    episode.playbackPositionTicks >=
+                                                        episode.runtimeTicks -> {
+                                                    stringResource(R.string.action_rewatch) to
+                                                        painterResource(id = R.drawable.ic_replay)
+                                                }
 
-                                            episode.playbackPositionTicks > 0 && episode.runtimeTicks > 0 -> {
-                                                stringResource(R.string.action_resume_playback) to painterResource(
-                                                    id = R.drawable.ic_play_arrow
-                                                )
-                                            }
+                                                episode.playbackPositionTicks > 0 &&
+                                                    episode.runtimeTicks > 0 -> {
+                                                    stringResource(
+                                                        R.string.action_resume_playback
+                                                    ) to
+                                                        painterResource(
+                                                            id = R.drawable.ic_play_arrow
+                                                        )
+                                                }
 
-                                            else -> {
-                                                stringResource(R.string.action_play) to painterResource(
-                                                    id = R.drawable.ic_play_arrow
-                                                )
+                                                else -> {
+                                                    stringResource(R.string.action_play) to
+                                                        painterResource(
+                                                            id = R.drawable.ic_play_arrow
+                                                        )
+                                                }
                                             }
-                                        }
 
                                         PlaybackSelectionButton(
                                             item = episode,
@@ -1257,79 +1385,96 @@ private fun PortraitItemDetailContent(
                                             buttonIcon = buttonIcon,
                                             onPlayClick = { selection ->
                                                 if (episode.sources.isEmpty()) {
-                                                    Timber.w("Episode ${episode.name} has no media sources")
+                                                    Timber.w(
+                                                        "Episode ${episode.name} has no media sources"
+                                                    )
                                                     return@PlaybackSelectionButton
                                                 }
 
-                                                val mediaSourceId = selectedMediaSource?.id
-                                                    ?: episode.sources.firstOrNull {
-                                                        it.type == com.makd.afinity.data.models.media.AfinitySourceType.LOCAL
-                                                    }?.id
-                                                    ?: episode.sources.firstOrNull()?.id
-                                                    ?: ""
-
-                                                val finalSelection = selection.copy(
-                                                    mediaSourceId = mediaSourceId,
-                                                    startPositionMs = if (episode.playbackPositionTicks > 0) {
-                                                        episode.playbackPositionTicks / 10000
-                                                    } else {
-                                                        0L
-                                                    }
-                                                )
+                                                val mediaSourceId =
+                                                    selectedMediaSource?.id
+                                                        ?: episode.sources
+                                                            .firstOrNull {
+                                                                it.type ==
+                                                                    com.makd.afinity.data.models
+                                                                        .media
+                                                                        .AfinitySourceType
+                                                                        .LOCAL
+                                                            }
+                                                            ?.id
+                                                        ?: episode.sources.firstOrNull()?.id
+                                                        ?: ""
+
+                                                val finalSelection =
+                                                    selection.copy(
+                                                        mediaSourceId = mediaSourceId,
+                                                        startPositionMs =
+                                                            if (episode.playbackPositionTicks > 0) {
+                                                                episode.playbackPositionTicks /
+                                                                    10000
+                                                            } else {
+                                                                0L
+                                                            },
+                                                    )
                                                 PlayerLauncher.launch(
                                                     context = navController.context,
                                                     itemId = episode.id,
                                                     mediaSourceId = finalSelection.mediaSourceId,
-                                                    audioStreamIndex = finalSelection.audioStreamIndex,
-                                                    subtitleStreamIndex = finalSelection.subtitleStreamIndex,
-                                                    startPositionMs = finalSelection.startPositionMs,
-                                                    seasonId = item.id
+                                                    audioStreamIndex =
+                                                        finalSelection.audioStreamIndex,
+                                                    subtitleStreamIndex =
+                                                        finalSelection.subtitleStreamIndex,
+                                                    startPositionMs =
+                                                        finalSelection.startPositionMs,
+                                                    seasonId = item.id,
                                                 )
-                                            }
+                                            },
                                         )
                                     }
                                 }
                             }
 
                             else -> {
-                                val (buttonText, buttonIcon) = when {
-                                    item.playbackPositionTicks > 0 && item.playbackPositionTicks >= item.runtimeTicks -> {
-                                        stringResource(R.string.action_rewatch) to painterResource(
-                                            id = R.drawable.ic_replay
-                                        )
-                                    }
+                                val (buttonText, buttonIcon) =
+                                    when {
+                                        item.playbackPositionTicks > 0 &&
+                                            item.playbackPositionTicks >= item.runtimeTicks -> {
+                                            stringResource(R.string.action_rewatch) to
+                                                painterResource(id = R.drawable.ic_replay)
+                                        }
 
-                                    item.playbackPositionTicks > 0 && item.runtimeTicks > 0 -> {
-                                        stringResource(R.string.action_resume_playback) to painterResource(
-                                            id = R.drawable.ic_play_arrow
-                                        )
-                                    }
+                                        item.playbackPositionTicks > 0 && item.runtimeTicks > 0 -> {
+                                            stringResource(R.string.action_resume_playback) to
+                                                painterResource(id = R.drawable.ic_play_arrow)
+                                        }
 
-                                    else -> {
-                                        stringResource(R.string.hero_btn_watch_now) to painterResource(
-                                            id = R.drawable.ic_play_arrow
-                                        )
+                                        else -> {
+                                            stringResource(R.string.hero_btn_watch_now) to
+                                                painterResource(id = R.drawable.ic_play_arrow)
+                                        }
                                     }
-                                }
 
                                 PlaybackSelectionButton(
                                     item = item,
                                     buttonText = buttonText,
                                     buttonIcon = buttonIcon,
                                     onPlayClick = { selection ->
-                                        val finalSelection = selection.copy(
-                                            mediaSourceId = selectedMediaSource?.id
-                                                ?: selection.mediaSourceId
-                                        )
+                                        val finalSelection =
+                                            selection.copy(
+                                                mediaSourceId =
+                                                    selectedMediaSource?.id
+                                                        ?: selection.mediaSourceId
+                                            )
                                         PlayerLauncher.launch(
                                             context = navController.context,
                                             itemId = item.id,
                                             mediaSourceId = finalSelection.mediaSourceId,
                                             audioStreamIndex = finalSelection.audioStreamIndex,
-                                            subtitleStreamIndex = finalSelection.subtitleStreamIndex,
-                                            startPositionMs = finalSelection.startPositionMs
+                                            subtitleStreamIndex =
+                                                finalSelection.subtitleStreamIndex,
+                                            startPositionMs = finalSelection.startPositionMs,
                                         )
-                                    }
+                                    },
                                 )
                             }
                         }
@@ -1337,11 +1482,9 @@ private fun PortraitItemDetailContent(
 
                     Row(
                         modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.SpaceEvenly
+                        horizontalArrangement = Arrangement.SpaceEvenly,
                     ) {
-                        Column(
-                            horizontalAlignment = Alignment.CenterHorizontally
-                        ) {
+                        Column(horizontalAlignment = Alignment.CenterHorizontally) {
                             IconButton(
                                 onClick = {
                                     if (hasTrailer) {
@@ -1351,52 +1494,52 @@ private fun PortraitItemDetailContent(
                                         }
                                     }
                                 },
-                                enabled = hasTrailer
+                                enabled = hasTrailer,
                             ) {
                                 Icon(
                                     painter = painterResource(id = R.drawable.ic_video),
-                                    contentDescription = stringResource(R.string.hero_btn_play_trailer),
-                                    tint = if (hasTrailer) {
-                                        MaterialTheme.colorScheme.primary
-                                    } else {
-                                        MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f)
-                                    },
-                                    modifier = Modifier.size(28.dp)
+                                    contentDescription =
+                                        stringResource(R.string.hero_btn_play_trailer),
+                                    tint =
+                                        if (hasTrailer) {
+                                            MaterialTheme.colorScheme.primary
+                                        } else {
+                                            MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f)
+                                        },
+                                    modifier = Modifier.size(28.dp),
                                 )
                             }
                         }
 
-                        Column(
-                            horizontalAlignment = Alignment.CenterHorizontally
-                        ) {
-                            IconButton(
-                                onClick = { viewModel.toggleWatchlist() }
-                            ) {
+                        Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                            IconButton(onClick = { viewModel.toggleWatchlist() }) {
                                 Icon(
-                                    painter = if (isInWatchlist) painterResource(id = R.drawable.ic_bookmark_filled) else painterResource(
-                                        id = R.drawable.ic_bookmark
-                                    ),
-                                    contentDescription = if (isInWatchlist)
-                                        stringResource(R.string.cd_watchlist_remove)
-                                    else
-                                        stringResource(R.string.cd_watchlist_add),
-                                    tint = if (isInWatchlist) Color(0xFFFF9800) else MaterialTheme.colorScheme.onBackground,
-                                    modifier = Modifier.size(28.dp)
+                                    painter =
+                                        if (isInWatchlist)
+                                            painterResource(id = R.drawable.ic_bookmark_filled)
+                                        else painterResource(id = R.drawable.ic_bookmark),
+                                    contentDescription =
+                                        if (isInWatchlist)
+                                            stringResource(R.string.cd_watchlist_remove)
+                                        else stringResource(R.string.cd_watchlist_add),
+                                    tint =
+                                        if (isInWatchlist) Color(0xFFFF9800)
+                                        else MaterialTheme.colorScheme.onBackground,
+                                    modifier = Modifier.size(28.dp),
                                 )
                             }
                         }
 
                         if (item is AfinityShow || item is AfinitySeason) {
-                            Column(
-                                horizontalAlignment = Alignment.CenterHorizontally
-                            ) {
+                            Column(horizontalAlignment = Alignment.CenterHorizontally) {
                                 IconButton(
                                     onClick = {
-                                        val episode = when (item) {
-                                            is AfinityShow -> nextEpisode
-                                            is AfinitySeason -> nextEpisode
-                                            else -> null
-                                        }
+                                        val episode =
+                                            when (item) {
+                                                is AfinityShow -> nextEpisode
+                                                is AfinitySeason -> nextEpisode
+                                                else -> null
+                                            }
 
                                         episode?.let { ep ->
                                             val mediaSourceId =
@@ -1408,76 +1551,76 @@ private fun PortraitItemDetailContent(
                                                 audioStreamIndex = null,
                                                 subtitleStreamIndex = null,
                                                 startPositionMs = 0L,
-                                                seasonId = if (item is AfinitySeason) item.id else null,
-                                                shuffle = true
+                                                seasonId =
+                                                    if (item is AfinitySeason) item.id else null,
+                                                shuffle = true,
                                             )
                                         }
                                     }
                                 ) {
                                     Icon(
-                                        painter = painterResource(id = R.drawable.ic_arrows_shuffle),
-                                        contentDescription = stringResource(R.string.cd_shuffle_play),
+                                        painter =
+                                            painterResource(id = R.drawable.ic_arrows_shuffle),
+                                        contentDescription =
+                                            stringResource(R.string.cd_shuffle_play),
                                         tint = MaterialTheme.colorScheme.onBackground,
-                                        modifier = Modifier.size(28.dp)
+                                        modifier = Modifier.size(28.dp),
                                     )
                                 }
                             }
                         }
 
-                        Column(
-                            horizontalAlignment = Alignment.CenterHorizontally
-                        ) {
-                            IconButton(
-                                onClick = { viewModel.toggleFavorite() }
-                            ) {
+                        Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                            IconButton(onClick = { viewModel.toggleFavorite() }) {
                                 Icon(
-                                    painter = if (item.favorite) painterResource(id = R.drawable.ic_favorite_filled) else painterResource(
-                                        id = R.drawable.ic_favorite
-                                    ),
-                                    contentDescription = if (item.favorite)
-                                        stringResource(R.string.cd_favorite_remove)
-                                    else
-                                        stringResource(R.string.cd_favorite_add),
-                                    tint = if (item.favorite) Color.Red else MaterialTheme.colorScheme.onBackground,
-                                    modifier = Modifier.size(28.dp)
+                                    painter =
+                                        if (item.favorite)
+                                            painterResource(id = R.drawable.ic_favorite_filled)
+                                        else painterResource(id = R.drawable.ic_favorite),
+                                    contentDescription =
+                                        if (item.favorite)
+                                            stringResource(R.string.cd_favorite_remove)
+                                        else stringResource(R.string.cd_favorite_add),
+                                    tint =
+                                        if (item.favorite) Color.Red
+                                        else MaterialTheme.colorScheme.onBackground,
+                                    modifier = Modifier.size(28.dp),
                                 )
                             }
                         }
 
-                        Column(
-                            horizontalAlignment = Alignment.CenterHorizontally
-                        ) {
-                            IconButton(
-                                onClick = { viewModel.toggleWatched() }
-                            ) {
+                        Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                            IconButton(onClick = { viewModel.toggleWatched() }) {
                                 Icon(
-                                    painter = if (item.played) painterResource(id = R.drawable.ic_circle_check) else painterResource(
-                                        id = R.drawable.ic_circle_check_outline
-                                    ),
-                                    contentDescription = if (item.played)
-                                        stringResource(R.string.cd_watched_unmark)
-                                    else
-                                        stringResource(R.string.cd_watched_mark),
-                                    tint = if (item.played) {
-                                        Color.Green
-                                    } else {
-                                        MaterialTheme.colorScheme.onBackground
-                                    },
-                                    modifier = Modifier.size(28.dp)
+                                    painter =
+                                        if (item.played)
+                                            painterResource(id = R.drawable.ic_circle_check)
+                                        else
+                                            painterResource(
+                                                id = R.drawable.ic_circle_check_outline
+                                            ),
+                                    contentDescription =
+                                        if (item.played) stringResource(R.string.cd_watched_unmark)
+                                        else stringResource(R.string.cd_watched_mark),
+                                    tint =
+                                        if (item.played) {
+                                            Color.Green
+                                        } else {
+                                            MaterialTheme.colorScheme.onBackground
+                                        },
+                                    modifier = Modifier.size(28.dp),
                                 )
                             }
                         }
 
-                        Column(
-                            horizontalAlignment = Alignment.CenterHorizontally
-                        ) {
+                        Column(horizontalAlignment = Alignment.CenterHorizontally) {
                             DownloadProgressIndicator(
                                 downloadInfo = downloadInfo,
                                 onDownloadClick = { viewModel.onDownloadClick() },
                                 onPauseClick = { viewModel.pauseDownload() },
                                 onResumeClick = { viewModel.resumeDownload() },
                                 onCancelClick = { viewModel.cancelDownload() },
-                                isLandscape = false
+                                isLandscape = false,
                             )
                         }
                     }
@@ -1486,77 +1629,78 @@ private fun PortraitItemDetailContent(
                 VideoQualitySelection(
                     mediaSourceOptions = mediaSourceOptions,
                     selectedSource = selectedMediaSource,
-                    onSourceSelected = viewModel::selectMediaSource
+                    onSourceSelected = viewModel::selectMediaSource,
                 )
 
                 when (item) {
-                    is AfinityShow -> SeriesDetailContent(
-                        item = item,
-                        seasons = seasons,
-                        nextEpisode = nextEpisode,
-                        specialFeatures = specialFeatures,
-                        containingBoxSets = containingBoxSets,
-                        onEpisodeClick = { clickedEpisode ->
-                            if (clickedEpisode.sources.isEmpty()) {
-                                Timber.w("Episode ${clickedEpisode.name} has no media sources")
-                                return@SeriesDetailContent
-                            }
-                            val mediaSourceId = clickedEpisode.sources.firstOrNull()?.id ?: ""
-                            val startPositionMs = if (clickedEpisode.playbackPositionTicks > 0) {
-                                clickedEpisode.playbackPositionTicks / 10000
-                            } else {
-                                0L
-                            }
-                            PlayerLauncher.launch(
-                                context = navController.context,
-                                itemId = clickedEpisode.id,
-                                mediaSourceId = mediaSourceId,
-                                audioStreamIndex = null,
-                                subtitleStreamIndex = null,
-                                startPositionMs = startPositionMs
-                            )
-                        },
-                        onSpecialFeatureClick = { specialFeature ->
-                            val route =
-                                Destination.createItemDetailRoute(specialFeature.id.toString())
-                            navController.navigate(route)
-                        },
-                        navController = navController,
-                        widthSizeClass = widthSizeClass
-                    )
+                    is AfinityShow ->
+                        SeriesDetailContent(
+                            item = item,
+                            seasons = seasons,
+                            nextEpisode = nextEpisode,
+                            specialFeatures = specialFeatures,
+                            containingBoxSets = containingBoxSets,
+                            onEpisodeClick = { clickedEpisode ->
+                                if (clickedEpisode.sources.isEmpty()) {
+                                    Timber.w("Episode ${clickedEpisode.name} has no media sources")
+                                    return@SeriesDetailContent
+                                }
+                                val mediaSourceId = clickedEpisode.sources.firstOrNull()?.id ?: ""
+                                val startPositionMs =
+                                    if (clickedEpisode.playbackPositionTicks > 0) {
+                                        clickedEpisode.playbackPositionTicks / 10000
+                                    } else {
+                                        0L
+                                    }
+                                PlayerLauncher.launch(
+                                    context = navController.context,
+                                    itemId = clickedEpisode.id,
+                                    mediaSourceId = mediaSourceId,
+                                    audioStreamIndex = null,
+                                    subtitleStreamIndex = null,
+                                    startPositionMs = startPositionMs,
+                                )
+                            },
+                            onSpecialFeatureClick = { specialFeature ->
+                                val route =
+                                    Destination.createItemDetailRoute(specialFeature.id.toString())
+                                navController.navigate(route)
+                            },
+                            navController = navController,
+                            widthSizeClass = widthSizeClass,
+                        )
 
-                    is AfinitySeason -> SeasonDetailContent(
-                        season = item,
-                        episodesPagingData = episodesPagingData,
-                        specialFeatures = specialFeatures,
-                        onEpisodeClick = { episode ->
-                            viewModel.selectEpisode(episode)
-                        },
-                        onSpecialFeatureClick = onSpecialFeatureClick,
-                        navController = navController,
-                        preferencesRepository = preferencesRepository,
-                        widthSizeClass = widthSizeClass
-                    )
+                    is AfinitySeason ->
+                        SeasonDetailContent(
+                            season = item,
+                            episodesPagingData = episodesPagingData,
+                            specialFeatures = specialFeatures,
+                            onEpisodeClick = { episode -> viewModel.selectEpisode(episode) },
+                            onSpecialFeatureClick = onSpecialFeatureClick,
+                            navController = navController,
+                            preferencesRepository = preferencesRepository,
+                            widthSizeClass = widthSizeClass,
+                        )
 
-                    is AfinityMovie -> MovieDetailContent(
-                        item = item,
-                        baseUrl = baseUrl,
-                        specialFeatures = specialFeatures,
-                        containingBoxSets = containingBoxSets,
-                        onSpecialFeatureClick = onSpecialFeatureClick,
-                        onPlayClick = { movie, selection ->
-                            onPlayClick(movie, selection)
-                        },
-                        navController = navController,
-                        widthSizeClass = widthSizeClass
-                    )
+                    is AfinityMovie ->
+                        MovieDetailContent(
+                            item = item,
+                            baseUrl = baseUrl,
+                            specialFeatures = specialFeatures,
+                            containingBoxSets = containingBoxSets,
+                            onSpecialFeatureClick = onSpecialFeatureClick,
+                            onPlayClick = { movie, selection -> onPlayClick(movie, selection) },
+                            navController = navController,
+                            widthSizeClass = widthSizeClass,
+                        )
 
-                    is AfinityBoxSet -> BoxSetDetailContent(
-                        item = item,
-                        boxSetItems = boxSetItems,
-                        onItemClick = onBoxSetItemClick,
-                        widthSizeClass = widthSizeClass
-                    )
+                    is AfinityBoxSet ->
+                        BoxSetDetailContent(
+                            item = item,
+                            boxSetItems = boxSetItems,
+                            onItemClick = onBoxSetItemClick,
+                            widthSizeClass = widthSizeClass,
+                        )
 
                     else -> {
                         TaglineSection(item = item)
@@ -1570,7 +1714,7 @@ private fun PortraitItemDetailContent(
                                 val route = Destination.createPersonRoute(personId.toString())
                                 navController.navigate(route)
                             },
-                            widthSizeClass = widthSizeClass
+                            widthSizeClass = widthSizeClass,
                         )
                     }
                 }
@@ -1582,7 +1726,7 @@ private fun PortraitItemDetailContent(
                             val route = Destination.createItemDetailRoute(similarItem.id.toString())
                             navController.navigate(route)
                         },
-                        widthSizeClass = widthSizeClass
+                        widthSizeClass = widthSizeClass,
                     )
                 }
             }
@@ -1600,11 +1744,9 @@ fun SeriesDetailContent(
     onEpisodeClick: (AfinityEpisode) -> Unit,
     onSpecialFeatureClick: (AfinityItem) -> Unit,
     navController: NavController,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
-    Column(
-        verticalArrangement = Arrangement.spacedBy(16.dp)
-    ) {
+    Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
         TaglineSection(item = item)
 
         OverviewSection(item = item)
@@ -1613,7 +1755,7 @@ fun SeriesDetailContent(
             NextUpSection(
                 episode = nextEpisode,
                 onEpisodeClick = onEpisodeClick,
-                widthSizeClass = widthSizeClass
+                widthSizeClass = widthSizeClass,
             )
         }
 
@@ -1626,7 +1768,7 @@ fun SeriesDetailContent(
         SpecialFeaturesSection(
             specialFeatures = specialFeatures,
             onItemClick = onSpecialFeatureClick,
-            widthSizeClass = widthSizeClass
+            widthSizeClass = widthSizeClass,
         )
 
         CastSection(
@@ -1635,7 +1777,7 @@ fun SeriesDetailContent(
                 val route = Destination.createPersonRoute(personId.toString())
                 navController.navigate(route)
             },
-            widthSizeClass = widthSizeClass
+            widthSizeClass = widthSizeClass,
         )
 
         InCollectionsSection(
@@ -1644,14 +1786,14 @@ fun SeriesDetailContent(
                 val route = Destination.createItemDetailRoute(boxSet.id.toString())
                 navController.navigate(route)
             },
-            widthSizeClass = widthSizeClass
+            widthSizeClass = widthSizeClass,
         )
 
         if (seasons.isNotEmpty()) {
             SeasonsSection(
                 seasons = seasons,
                 navController = navController,
-                widthSizeClass = widthSizeClass
+                widthSizeClass = widthSizeClass,
             )
         }
     }
@@ -1665,4 +1807,4 @@ fun Modifier.verticalLayoutOffset(yOffset: Dp) =
         layout(placeable.width, placeable.height + yOffsetPx) {
             placeable.placeRelative(0, yOffsetPx)
         }
-    }
\ No newline at end of file
+    }
diff --git a/app/src/main/java/com/makd/afinity/ui/item/ItemDetailViewModel.kt b/app/src/main/java/com/makd/afinity/ui/item/ItemDetailViewModel.kt
index 0cb8c473c..9df2b76b8 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/ItemDetailViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/ItemDetailViewModel.kt
@@ -37,6 +37,8 @@ import com.makd.afinity.data.repository.userdata.UserDataRepository
 import com.makd.afinity.ui.item.components.shared.MediaSourceOption
 import com.makd.afinity.ui.item.components.shared.PlaybackSelection
 import dagger.hilt.android.lifecycle.HiltViewModel
+import java.util.UUID
+import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -45,11 +47,11 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 import org.jellyfin.sdk.model.api.BaseItemKind
 import timber.log.Timber
-import java.util.UUID
-import javax.inject.Inject
 
 @HiltViewModel
-class ItemDetailViewModel @Inject constructor(
+class ItemDetailViewModel
+@Inject
+constructor(
     private val jellyfinRepository: JellyfinRepository,
     private val userDataRepository: UserDataRepository,
     private val mediaRepository: MediaRepository,
@@ -58,13 +60,14 @@ class ItemDetailViewModel @Inject constructor(
     private val offlineModeManager: OfflineModeManager,
     private val authRepository: AuthRepository,
     private val playbackStateManager: PlaybackStateManager,
-    savedStateHandle: SavedStateHandle
+    savedStateHandle: SavedStateHandle,
 ) : ViewModel() {
 
-    private val itemId: UUID = UUID.fromString(
-        savedStateHandle.get<String>("itemId")
-            ?: throw IllegalArgumentException("itemId is required")
-    )
+    private val itemId: UUID =
+        UUID.fromString(
+            savedStateHandle.get<String>("itemId")
+                ?: throw IllegalArgumentException("itemId is required")
+        )
 
     private val _episodesPagingData = MutableStateFlow<Flow<PagingData<AfinityEpisode>>?>(null)
     private val _episodeStatusUpdates = MutableStateFlow<Map<UUID, Boolean>>(emptyMap())
@@ -82,10 +85,11 @@ class ItemDetailViewModel @Inject constructor(
     init {
         viewModelScope.launch {
             try {
-                val boxSets = mediaRepository.getBoxSetsContaining(
-                    itemId = itemId,
-                    fields = FieldSets.MEDIA_ITEM_CARDS
-                )
+                val boxSets =
+                    mediaRepository.getBoxSetsContaining(
+                        itemId = itemId,
+                        fields = FieldSets.MEDIA_ITEM_CARDS,
+                    )
                 _uiState.value = _uiState.value.copy(containingBoxSets = boxSets)
             } catch (e: Exception) {
                 Timber.e(e, "Failed to load containing BoxSets in init")
@@ -105,9 +109,11 @@ class ItemDetailViewModel @Inject constructor(
                     }
 
                     is PlaybackEvent.Synced -> {
-                        val isChildUpdate = _uiState.value.seasons.any { season ->
-                            season.episodes.any { it.id == event.itemId } || season.id == event.itemId
-                        }
+                        val isChildUpdate =
+                            _uiState.value.seasons.any { season ->
+                                season.episodes.any { it.id == event.itemId } ||
+                                    season.id == event.itemId
+                            }
 
                         if (event.itemId == itemId || isChildUpdate) {
                             Timber.d("Global sync event (child or self), refreshing details...")
@@ -131,28 +137,24 @@ class ItemDetailViewModel @Inject constructor(
 
     private fun applyOptimisticUpdate(positionTicks: Long) {
         val currentItem = _uiState.value.item ?: return
-        val percentage = if (currentItem.runtimeTicks > 0) {
-            positionTicks.toDouble() / currentItem.runtimeTicks.toDouble()
-        } else 0.0
+        val percentage =
+            if (currentItem.runtimeTicks > 0) {
+                positionTicks.toDouble() / currentItem.runtimeTicks.toDouble()
+            } else 0.0
         val isPlayed = currentItem.played || (percentage > 0.9)
-        val updatedItem = when (currentItem) {
-            is AfinityMovie -> currentItem.copy(
-                playbackPositionTicks = positionTicks,
-                played = isPlayed
-            )
+        val updatedItem =
+            when (currentItem) {
+                is AfinityMovie ->
+                    currentItem.copy(playbackPositionTicks = positionTicks, played = isPlayed)
 
-            is AfinityEpisode -> currentItem.copy(
-                playbackPositionTicks = positionTicks,
-                played = isPlayed
-            )
+                is AfinityEpisode ->
+                    currentItem.copy(playbackPositionTicks = positionTicks, played = isPlayed)
 
-            is AfinityVideo -> currentItem.copy(
-                playbackPositionTicks = positionTicks,
-                played = isPlayed
-            )
+                is AfinityVideo ->
+                    currentItem.copy(playbackPositionTicks = positionTicks, played = isPlayed)
 
-            else -> currentItem
-        }
+                else -> currentItem
+            }
         _uiState.value = _uiState.value.copy(item = updatedItem)
         Timber.d("Optimistic update applied: Pos=${positionTicks}, Played=${isPlayed}")
     }
@@ -194,10 +196,7 @@ class ItemDetailViewModel @Inject constructor(
                     }
                 }
 
-                launch {
-                    syncWithServerInBackground()
-                }
-
+                launch { syncWithServerInBackground() }
             } catch (e: Exception) {
                 Timber.e(e, "Failed to refresh from cache")
             }
@@ -206,23 +205,22 @@ class ItemDetailViewModel @Inject constructor(
 
     private suspend fun syncWithServerInBackground() {
         try {
-            val serverItem = jellyfinRepository.getItem(itemId)?.let { baseItemDto ->
-                when (baseItemDto.type) {
-                    BaseItemKind.MOVIE ->
-                        baseItemDto.toAfinityMovie(jellyfinRepository, null)
+            val serverItem =
+                jellyfinRepository.getItem(itemId)?.let { baseItemDto ->
+                    when (baseItemDto.type) {
+                        BaseItemKind.MOVIE -> baseItemDto.toAfinityMovie(jellyfinRepository, null)
 
-                    BaseItemKind.SERIES ->
-                        baseItemDto.toAfinityShow(jellyfinRepository)
+                        BaseItemKind.SERIES -> baseItemDto.toAfinityShow(jellyfinRepository)
 
-                    BaseItemKind.EPISODE ->
-                        baseItemDto.toAfinityEpisode(jellyfinRepository, null)
+                        BaseItemKind.EPISODE ->
+                            baseItemDto.toAfinityEpisode(jellyfinRepository, null)
 
-                    BaseItemKind.BOX_SET ->
-                        baseItemDto.toAfinityBoxSet(jellyfinRepository.getBaseUrl())
+                        BaseItemKind.BOX_SET ->
+                            baseItemDto.toAfinityBoxSet(jellyfinRepository.getBaseUrl())
 
-                    else -> null
+                        else -> null
+                    }
                 }
-            }
 
             if (serverItem != null) {
                 val currentItem = _uiState.value.item
@@ -231,7 +229,6 @@ class ItemDetailViewModel @Inject constructor(
                     Timber.d("UI updated from server sync: ${serverItem.name}")
                 }
             }
-
         } catch (e: Exception) {
             Timber.w(e, "Background server sync failed (non-critical)")
         }
@@ -239,8 +236,8 @@ class ItemDetailViewModel @Inject constructor(
 
     private fun hasSignificantChanges(cached: AfinityItem, server: AfinityItem): Boolean {
         return cached.playbackPositionTicks != server.playbackPositionTicks ||
-                cached.played != server.played ||
-                cached.favorite != server.favorite
+            cached.played != server.played ||
+            cached.favorite != server.favorite
     }
 
     fun loadItem() {
@@ -250,12 +247,13 @@ class ItemDetailViewModel @Inject constructor(
 
                 val isOffline = offlineModeManager.isCurrentlyOffline()
 
-                val item = if (isOffline) {
-                    Timber.d("Device is offline, loading item from database")
-                    loadItemFromDatabase()
-                } else {
-                    jellyfinRepository.getItem(itemId, fields = FieldSets.ITEM_DETAIL)
-                        ?.let { baseItemDto ->
+                val item =
+                    if (isOffline) {
+                        Timber.d("Device is offline, loading item from database")
+                        loadItemFromDatabase()
+                    } else {
+                        jellyfinRepository.getItem(itemId, fields = FieldSets.ITEM_DETAIL)?.let {
+                            baseItemDto ->
                             Timber.d("MediaSources count: ${baseItemDto.mediaSources?.size ?: 0}")
 
                             when (baseItemDto.type) {
@@ -282,13 +280,15 @@ class ItemDetailViewModel @Inject constructor(
                                 else -> null
                             }
                         }
-                }
+                    }
 
                 if (item == null) {
-                    _uiState.value = _uiState.value.copy(
-                        isLoading = false,
-                        error = if (isOffline) "Item not available offline" else "Item not found"
-                    )
+                    _uiState.value =
+                        _uiState.value.copy(
+                            isLoading = false,
+                            error =
+                                if (isOffline) "Item not available offline" else "Item not found",
+                        )
                     return@launch
                 }
 
@@ -301,7 +301,9 @@ class ItemDetailViewModel @Inject constructor(
                         is AfinityShow -> {
                             if (item.seasons.isNotEmpty()) {
                                 _uiState.value = _uiState.value.copy(seasons = item.seasons)
-                                Timber.d("Loaded ${item.seasons.size} seasons from database for show: ${item.name}")
+                                Timber.d(
+                                    "Loaded ${item.seasons.size} seasons from database for show: ${item.name}"
+                                )
 
                                 val nextEpisode = getNextEpisodeOffline(item)
                                 _uiState.value = _uiState.value.copy(nextEpisode = nextEpisode)
@@ -311,14 +313,16 @@ class ItemDetailViewModel @Inject constructor(
 
                         is AfinitySeason -> {
                             if (item.episodes.isNotEmpty()) {
-                                Timber.d("Setting up ${item.episodes.size} episodes from database for season: ${item.name}")
-                                val pagingData = kotlinx.coroutines.flow.flowOf(
-                                    PagingData.from(item.episodes.toList())
+                                Timber.d(
+                                    "Setting up ${item.episodes.size} episodes from database for season: ${item.name}"
                                 )
+                                val pagingData =
+                                    kotlinx.coroutines.flow.flowOf(
+                                        PagingData.from(item.episodes.toList())
+                                    )
                                 _episodesPagingData.value = pagingData
-                                _uiState.value = _uiState.value.copy(
-                                    episodesPagingData = pagingData
-                                )
+                                _uiState.value =
+                                    _uiState.value.copy(episodesPagingData = pagingData)
                                 Timber.d("Episodes paging data set in UI state for offline season")
 
                                 val nextEpisode = getNextEpisodeForSeasonOffline(item)
@@ -326,24 +330,24 @@ class ItemDetailViewModel @Inject constructor(
                                 Timber.d("Next episode for season: ${nextEpisode?.name ?: "none"}")
                             } else {
                                 Timber.d("No episodes cached for season, setting empty paging data")
-                                val emptyPagingData = kotlinx.coroutines.flow.flowOf(
-                                    PagingData.empty<AfinityEpisode>()
-                                )
+                                val emptyPagingData =
+                                    kotlinx.coroutines.flow.flowOf(
+                                        PagingData.empty<AfinityEpisode>()
+                                    )
                                 _episodesPagingData.value = emptyPagingData
-                                _uiState.value = _uiState.value.copy(
-                                    episodesPagingData = emptyPagingData
-                                )
+                                _uiState.value =
+                                    _uiState.value.copy(episodesPagingData = emptyPagingData)
                             }
                         }
                     }
                 }
-
             } catch (e: Exception) {
                 Timber.e(e, "Failed to load item: $itemId")
-                _uiState.value = _uiState.value.copy(
-                    isLoading = false,
-                    error = "Failed to load item: ${e.message}"
-                )
+                _uiState.value =
+                    _uiState.value.copy(
+                        isLoading = false,
+                        error = "Failed to load item: ${e.message}",
+                    )
             }
         }
     }
@@ -366,7 +370,9 @@ class ItemDetailViewModel @Inject constructor(
 
             val season = databaseRepository.getSeason(itemId, userId)
             if (season != null) {
-                Timber.d("Loaded season from database: ${season.name} with ${season.episodes.size} episodes")
+                Timber.d(
+                    "Loaded season from database: ${season.name} with ${season.episodes.size} episodes"
+                )
                 return season
             }
 
@@ -406,9 +412,8 @@ class ItemDetailViewModel @Inject constructor(
                     }
                     launch {
                         try {
-                            val seasons = item.seasons.ifEmpty {
-                                jellyfinRepository.getSeasons(item.id)
-                            }
+                            val seasons =
+                                item.seasons.ifEmpty { jellyfinRepository.getSeasons(item.id) }
                             _uiState.value = _uiState.value.copy(seasons = seasons)
                         } catch (e: Exception) {
                             Timber.e(e, "Failed to load seasons")
@@ -442,32 +447,41 @@ class ItemDetailViewModel @Inject constructor(
                             val isCurrentlyOffline = offlineModeManager.isCurrentlyOffline()
                             if (isCurrentlyOffline) {
                                 if (item.episodes.isNotEmpty()) {
-                                    Timber.d("Using ${item.episodes.size} episodes from database for season: ${item.name}")
-                                    _episodesPagingData.value = kotlinx.coroutines.flow.flowOf(
-                                        PagingData.from(item.episodes.toList())
+                                    Timber.d(
+                                        "Using ${item.episodes.size} episodes from database for season: ${item.name}"
                                     )
+                                    _episodesPagingData.value =
+                                        kotlinx.coroutines.flow.flowOf(
+                                            PagingData.from(item.episodes.toList())
+                                        )
                                 } else {
-                                    Timber.d("No episodes cached for season: ${item.name}, showing empty list")
-                                    _episodesPagingData.value = kotlinx.coroutines.flow.flowOf(
-                                        PagingData.empty()
+                                    Timber.d(
+                                        "No episodes cached for season: ${item.name}, showing empty list"
                                     )
+                                    _episodesPagingData.value =
+                                        kotlinx.coroutines.flow.flowOf(PagingData.empty())
                                 }
                             } else {
-                                val basePager = Pager(
-                                    config = PagingConfig(
-                                        pageSize = 50,
-                                        enablePlaceholders = false,
-                                        initialLoadSize = 50
-                                    )
-                                ) {
-                                    EpisodesPagingSource(
-                                        mediaRepository = mediaRepository,
-                                        seasonId = item.id,
-                                        seriesId = item.seriesId
-                                    )
-                                }.flow.cachedIn(viewModelScope)
+                                val basePager =
+                                    Pager(
+                                            config =
+                                                PagingConfig(
+                                                    pageSize = 50,
+                                                    enablePlaceholders = false,
+                                                    initialLoadSize = 50,
+                                                )
+                                        ) {
+                                            EpisodesPagingSource(
+                                                mediaRepository = mediaRepository,
+                                                seasonId = item.id,
+                                                seriesId = item.seriesId,
+                                            )
+                                        }
+                                        .flow
+                                        .cachedIn(viewModelScope)
                                 val combinedFlow =
-                                    basePager.combine(_episodeStatusUpdates) { pagingData, updates ->
+                                    basePager.combine(_episodeStatusUpdates) { pagingData, updates
+                                        ->
                                         pagingData.map { episode ->
                                             updates[episode.id]?.let { isPlayed ->
                                                 episode.copy(played = isPlayed)
@@ -478,9 +492,8 @@ class ItemDetailViewModel @Inject constructor(
                                 _episodesPagingData.value = combinedFlow
                             }
 
-                            _uiState.value = _uiState.value.copy(
-                                episodesPagingData = _episodesPagingData.value
-                            )
+                            _uiState.value =
+                                _uiState.value.copy(episodesPagingData = _episodesPagingData.value)
                         } catch (e: Exception) {
                             Timber.e(e, "Failed to load episodes")
                         }
@@ -502,15 +515,17 @@ class ItemDetailViewModel @Inject constructor(
                 is AfinityBoxSet -> {
                     launch {
                         try {
-                            val response = jellyfinRepository.getItems(
-                                parentId = item.id,
-                                includeItemTypes = listOf("MOVIE", "SERIES"),
-                                limit = 100,
-                                sortBy = SortBy.RELEASE_DATE
-                            )
-                            val items = response.items?.mapNotNull { baseItem ->
-                                baseItem.toAfinityItem(jellyfinRepository.getBaseUrl())
-                            } ?: emptyList()
+                            val response =
+                                jellyfinRepository.getItems(
+                                    parentId = item.id,
+                                    includeItemTypes = listOf("MOVIE", "SERIES"),
+                                    limit = 100,
+                                    sortBy = SortBy.RELEASE_DATE,
+                                )
+                            val items =
+                                response.items?.mapNotNull { baseItem ->
+                                    baseItem.toAfinityItem(jellyfinRepository.getBaseUrl())
+                                } ?: emptyList()
                             _uiState.value = _uiState.value.copy(boxSetItems = items)
                         } catch (e: Exception) {
                             Timber.e(e, "Failed to load boxset items")
@@ -590,23 +605,23 @@ class ItemDetailViewModel @Inject constructor(
         viewModelScope.launch {
             try {
                 _isLoadingEpisode.value = true
-                val fullEpisode = try {
-                    jellyfinRepository.getItem(
-                        episode.id,
-                        fields = FieldSets.ITEM_DETAIL
-                    )?.toAfinityEpisode(jellyfinRepository, null)
-                } catch (e: Exception) {
-                    Timber.d(e, "Failed to load episode from online, trying database")
+                val fullEpisode =
                     try {
-                        val userId = authRepository.currentUser.value?.id
-                        if (userId != null) {
-                            databaseRepository.getEpisode(episode.id, userId)
-                        } else null
-                    } catch (dbError: Exception) {
-                        Timber.e(dbError, "Failed to load episode from database")
-                        null
+                        jellyfinRepository
+                            .getItem(episode.id, fields = FieldSets.ITEM_DETAIL)
+                            ?.toAfinityEpisode(jellyfinRepository, null)
+                    } catch (e: Exception) {
+                        Timber.d(e, "Failed to load episode from online, trying database")
+                        try {
+                            val userId = authRepository.currentUser.value?.id
+                            if (userId != null) {
+                                databaseRepository.getEpisode(episode.id, userId)
+                            } else null
+                        } catch (dbError: Exception) {
+                            Timber.e(dbError, "Failed to load episode from database")
+                            null
+                        }
                     }
-                }
 
                 if (fullEpisode != null) {
                     _selectedEpisode.value = fullEpisode
@@ -647,11 +662,12 @@ class ItemDetailViewModel @Inject constructor(
     fun toggleEpisodeFavorite(episode: AfinityEpisode) {
         viewModelScope.launch {
             try {
-                val success = if (episode.favorite) {
-                    userDataRepository.removeFromFavorites(episode.id)
-                } else {
-                    userDataRepository.addToFavorites(episode.id)
-                }
+                val success =
+                    if (episode.favorite) {
+                        userDataRepository.removeFromFavorites(episode.id)
+                    } else {
+                        userDataRepository.addToFavorites(episode.id)
+                    }
 
                 if (success) {
                     _selectedEpisode.value = episode.copy(favorite = !episode.favorite)
@@ -670,10 +686,7 @@ class ItemDetailViewModel @Inject constructor(
                 _selectedEpisodeWatchlistStatus.value = !isLiked
                 _selectedEpisode.value = _selectedEpisode.value?.copy(liked = !isLiked)
 
-                val success = userDataRepository.setLike(
-                    itemId = episode.id,
-                    isLiked = !isLiked
-                )
+                val success = userDataRepository.setLike(itemId = episode.id, isLiked = !isLiked)
 
                 if (!success) {
                     _selectedEpisodeWatchlistStatus.value = isLiked
@@ -695,17 +708,19 @@ class ItemDetailViewModel @Inject constructor(
             try {
                 val isNowPlayed = !episode.played
                 _episodeStatusUpdates.value += (episode.id to isNowPlayed)
-                val updatedEpisode = episode.copy(
-                    played = isNowPlayed,
-                    playbackPositionTicks = if (!isNowPlayed) episode.runtimeTicks else 0
-                )
+                val updatedEpisode =
+                    episode.copy(
+                        played = isNowPlayed,
+                        playbackPositionTicks = if (!isNowPlayed) episode.runtimeTicks else 0,
+                    )
                 _selectedEpisode.value = updatedEpisode
                 updateOptimisticCounters(episode, isNowPlayed)
-                val success = if (episode.played) {
-                    userDataRepository.markUnwatched(episode.id)
-                } else {
-                    userDataRepository.markWatched(episode.id)
-                }
+                val success =
+                    if (episode.played) {
+                        userDataRepository.markUnwatched(episode.id)
+                    } else {
+                        userDataRepository.markWatched(episode.id)
+                    }
 
                 if (success) {
                     mediaRepository.refreshItemUserData(episode.id, FieldSets.REFRESH_USER_DATA)
@@ -729,35 +744,34 @@ class ItemDetailViewModel @Inject constructor(
 
     private fun updateOptimisticCounters(episode: AfinityEpisode, isNowPlayed: Boolean) {
         val change = if (isNowPlayed) -1 else 1
-        val updatedSeasons = _uiState.value.seasons.map { season ->
-            if (season.id == episode.seasonId) {
-                val currentCount = season.unplayedItemCount ?: 0
-                val newCount = (currentCount + change).coerceAtLeast(0)
-                season.copy(unplayedItemCount = newCount)
-            } else {
-                season
-            }
-        }
-        val updatedItem = when (val currentItem = _uiState.value.item) {
-            is AfinityShow if currentItem.id == episode.seriesId -> {
-                val currentCount = currentItem.unplayedItemCount ?: 0
-                val newCount = (currentCount + change).coerceAtLeast(0)
-                currentItem.copy(unplayedItemCount = newCount)
+        val updatedSeasons =
+            _uiState.value.seasons.map { season ->
+                if (season.id == episode.seasonId) {
+                    val currentCount = season.unplayedItemCount ?: 0
+                    val newCount = (currentCount + change).coerceAtLeast(0)
+                    season.copy(unplayedItemCount = newCount)
+                } else {
+                    season
+                }
             }
+        val updatedItem =
+            when (val currentItem = _uiState.value.item) {
+                is AfinityShow if currentItem.id == episode.seriesId -> {
+                    val currentCount = currentItem.unplayedItemCount ?: 0
+                    val newCount = (currentCount + change).coerceAtLeast(0)
+                    currentItem.copy(unplayedItemCount = newCount)
+                }
 
-            is AfinitySeason if currentItem.id == episode.seasonId -> {
-                val currentCount = currentItem.unplayedItemCount ?: 0
-                val newCount = (currentCount + change).coerceAtLeast(0)
-                currentItem.copy(unplayedItemCount = newCount)
-            }
+                is AfinitySeason if currentItem.id == episode.seasonId -> {
+                    val currentCount = currentItem.unplayedItemCount ?: 0
+                    val newCount = (currentCount + change).coerceAtLeast(0)
+                    currentItem.copy(unplayedItemCount = newCount)
+                }
 
-            else -> currentItem
-        }
+                else -> currentItem
+            }
 
-        _uiState.value = _uiState.value.copy(
-            seasons = updatedSeasons,
-            item = updatedItem
-        )
+        _uiState.value = _uiState.value.copy(seasons = updatedSeasons, item = updatedItem)
     }
 
     fun clearSelectedEpisode() {
@@ -771,29 +785,30 @@ class ItemDetailViewModel @Inject constructor(
             try {
                 val currentItem = _uiState.value.item ?: return@launch
 
-                val optimisticItem = when (currentItem) {
-                    is AfinityMovie -> currentItem.copy(favorite = !currentItem.favorite)
-                    is AfinityShow -> currentItem.copy(favorite = !currentItem.favorite)
-                    is AfinityEpisode -> currentItem.copy(favorite = !currentItem.favorite)
-                    is AfinityBoxSet -> currentItem.copy(favorite = !currentItem.favorite)
-                    is AfinitySeason -> currentItem.copy(favorite = !currentItem.favorite)
-                    else -> currentItem
-                }
+                val optimisticItem =
+                    when (currentItem) {
+                        is AfinityMovie -> currentItem.copy(favorite = !currentItem.favorite)
+                        is AfinityShow -> currentItem.copy(favorite = !currentItem.favorite)
+                        is AfinityEpisode -> currentItem.copy(favorite = !currentItem.favorite)
+                        is AfinityBoxSet -> currentItem.copy(favorite = !currentItem.favorite)
+                        is AfinitySeason -> currentItem.copy(favorite = !currentItem.favorite)
+                        else -> currentItem
+                    }
                 _uiState.value = _uiState.value.copy(item = optimisticItem)
 
                 launch {
-                    val success = if (currentItem.favorite) {
-                        userDataRepository.removeFromFavorites(currentItem.id)
-                    } else {
-                        userDataRepository.addToFavorites(currentItem.id)
-                    }
+                    val success =
+                        if (currentItem.favorite) {
+                            userDataRepository.removeFromFavorites(currentItem.id)
+                        } else {
+                            userDataRepository.addToFavorites(currentItem.id)
+                        }
 
                     if (!success) {
                         _uiState.value = _uiState.value.copy(item = currentItem)
                         Timber.w("Failed to toggle favorite status, reverted UI")
                     }
                 }
-
             } catch (e: Exception) {
                 Timber.e(e, "Error toggling favorite status")
             }
@@ -805,41 +820,50 @@ class ItemDetailViewModel @Inject constructor(
             try {
                 val currentItem = _uiState.value.item ?: return@launch
 
-                val optimisticItem = when (currentItem) {
-                    is AfinityMovie -> currentItem.copy(
-                        played = !currentItem.played,
-                        playbackPositionTicks = if (!currentItem.played) currentItem.runtimeTicks else 0
-                    )
+                val optimisticItem =
+                    when (currentItem) {
+                        is AfinityMovie ->
+                            currentItem.copy(
+                                played = !currentItem.played,
+                                playbackPositionTicks =
+                                    if (!currentItem.played) currentItem.runtimeTicks else 0,
+                            )
 
-                    is AfinityShow -> currentItem.copy(played = !currentItem.played)
-                    is AfinityEpisode -> currentItem.copy(
-                        played = !currentItem.played,
-                        playbackPositionTicks = if (!currentItem.played) currentItem.runtimeTicks else 0
-                    )
+                        is AfinityShow -> currentItem.copy(played = !currentItem.played)
+                        is AfinityEpisode ->
+                            currentItem.copy(
+                                played = !currentItem.played,
+                                playbackPositionTicks =
+                                    if (!currentItem.played) currentItem.runtimeTicks else 0,
+                            )
 
-                    is AfinityBoxSet -> currentItem.copy(played = !currentItem.played)
-                    is AfinitySeason -> currentItem.copy(played = !currentItem.played)
-                    is AfinityVideo -> currentItem.copy(
-                        played = !currentItem.played,
-                        playbackPositionTicks = if (!currentItem.played) currentItem.runtimeTicks else 0
-                    )
+                        is AfinityBoxSet -> currentItem.copy(played = !currentItem.played)
+                        is AfinitySeason -> currentItem.copy(played = !currentItem.played)
+                        is AfinityVideo ->
+                            currentItem.copy(
+                                played = !currentItem.played,
+                                playbackPositionTicks =
+                                    if (!currentItem.played) currentItem.runtimeTicks else 0,
+                            )
 
-                    else -> currentItem
-                }
+                        else -> currentItem
+                    }
                 _uiState.value = _uiState.value.copy(item = optimisticItem)
 
                 launch {
-                    val success = if (currentItem.played) {
-                        userDataRepository.markUnwatched(currentItem.id)
-                    } else {
-                        userDataRepository.markWatched(currentItem.id)
-                    }
+                    val success =
+                        if (currentItem.played) {
+                            userDataRepository.markUnwatched(currentItem.id)
+                        } else {
+                            userDataRepository.markWatched(currentItem.id)
+                        }
 
                     if (success) {
-                        val refreshed = mediaRepository.refreshItemUserData(
-                            currentItem.id,
-                            FieldSets.REFRESH_USER_DATA
-                        )
+                        val refreshed =
+                            mediaRepository.refreshItemUserData(
+                                currentItem.id,
+                                FieldSets.REFRESH_USER_DATA,
+                            )
 
                         if (refreshed is AfinityEpisode && refreshed.played) {
                             mediaRepository.invalidateNextUpCache()
@@ -849,7 +873,6 @@ class ItemDetailViewModel @Inject constructor(
                         Timber.w("Failed to toggle watched status, reverted UI")
                     }
                 }
-
             } catch (e: Exception) {
                 Timber.e(e, "Error toggling watched status")
             }
@@ -861,21 +884,23 @@ class ItemDetailViewModel @Inject constructor(
             try {
                 val currentItem = _uiState.value.item ?: return@launch
 
-                val optimisticItem = when (currentItem) {
-                    is AfinityMovie -> currentItem.copy(liked = !currentItem.liked)
-                    is AfinityShow -> currentItem.copy(liked = !currentItem.liked)
-                    is AfinityEpisode -> currentItem.copy(liked = !currentItem.liked)
-                    is AfinitySeason -> currentItem.copy(liked = !currentItem.liked)
-                    is AfinityBoxSet -> currentItem.copy(liked = !currentItem.liked)
-                    else -> currentItem
-                }
+                val optimisticItem =
+                    when (currentItem) {
+                        is AfinityMovie -> currentItem.copy(liked = !currentItem.liked)
+                        is AfinityShow -> currentItem.copy(liked = !currentItem.liked)
+                        is AfinityEpisode -> currentItem.copy(liked = !currentItem.liked)
+                        is AfinitySeason -> currentItem.copy(liked = !currentItem.liked)
+                        is AfinityBoxSet -> currentItem.copy(liked = !currentItem.liked)
+                        else -> currentItem
+                    }
                 _uiState.value = _uiState.value.copy(item = optimisticItem)
 
                 launch {
-                    val success = userDataRepository.setLike(
-                        itemId = currentItem.id,
-                        isLiked = !currentItem.liked
-                    )
+                    val success =
+                        userDataRepository.setLike(
+                            itemId = currentItem.id,
+                            isLiked = !currentItem.liked,
+                        )
 
                     if (!success) {
                         _uiState.value = _uiState.value.copy(item = currentItem)
@@ -892,7 +917,9 @@ class ItemDetailViewModel @Inject constructor(
         // TODO: Implement playback with selection
         Timber.d("Play clicked for item: ${item.name}")
         if (selection != null) {
-            Timber.d("Selected - MediaSource: ${selection.mediaSourceId}, Audio: ${selection.audioStreamIndex}, Subtitle: ${selection.subtitleStreamIndex}")
+            Timber.d(
+                "Selected - MediaSource: ${selection.mediaSourceId}, Audio: ${selection.audioStreamIndex}, Subtitle: ${selection.subtitleStreamIndex}"
+            )
         }
     }
 
@@ -905,7 +932,9 @@ class ItemDetailViewModel @Inject constructor(
             try {
                 val item = _selectedEpisode.value ?: _uiState.value.item ?: return@launch
                 val sources =
-                    item.sources.filter { it.type == com.makd.afinity.data.models.media.AfinitySourceType.REMOTE }
+                    item.sources.filter {
+                        it.type == com.makd.afinity.data.models.media.AfinitySourceType.REMOTE
+                    }
 
                 if (sources.isEmpty()) {
                     Timber.w("No remote sources available for download for item: ${item.name}")
@@ -915,11 +944,9 @@ class ItemDetailViewModel @Inject constructor(
                 if (sources.size == 1) {
                     Timber.d("Only one source available, starting download immediately")
                     val result = downloadRepository.startDownload(item.id, sources.first().id)
-                    result.onSuccess {
-                        Timber.i("Download started successfully for: ${item.name}")
-                    }.onFailure { error ->
-                        Timber.e(error, "Failed to start download")
-                    }
+                    result
+                        .onSuccess { Timber.i("Download started successfully for: ${item.name}") }
+                        .onFailure { error -> Timber.e(error, "Failed to start download") }
                 } else {
                     _uiState.value = _uiState.value.copy(showQualityDialog = true)
                 }
@@ -937,11 +964,9 @@ class ItemDetailViewModel @Inject constructor(
                 _uiState.value = _uiState.value.copy(showQualityDialog = false)
 
                 val result = downloadRepository.startDownload(item.id, sourceId)
-                result.onSuccess {
-                    Timber.i("Download started successfully for: ${item.name}")
-                }.onFailure { error ->
-                    Timber.e(error, "Failed to start download")
-                }
+                result
+                    .onSuccess { Timber.i("Download started successfully for: ${item.name}") }
+                    .onFailure { error -> Timber.e(error, "Failed to start download") }
             } catch (e: Exception) {
                 Timber.e(e, "Error starting download")
             }
@@ -955,13 +980,12 @@ class ItemDetailViewModel @Inject constructor(
     fun pauseDownload() {
         viewModelScope.launch {
             try {
-                val downloadInfo = _uiState.value.downloadInfo
-                    ?: _selectedEpisodeDownloadInfo.value
-                    ?: return@launch
+                val downloadInfo =
+                    _uiState.value.downloadInfo
+                        ?: _selectedEpisodeDownloadInfo.value
+                        ?: return@launch
                 val result = downloadRepository.pauseDownload(downloadInfo.id)
-                result.onFailure { error ->
-                    Timber.e(error, "Failed to pause download")
-                }
+                result.onFailure { error -> Timber.e(error, "Failed to pause download") }
             } catch (e: Exception) {
                 Timber.e(e, "Error pausing download")
             }
@@ -971,13 +995,12 @@ class ItemDetailViewModel @Inject constructor(
     fun resumeDownload() {
         viewModelScope.launch {
             try {
-                val downloadInfo = _uiState.value.downloadInfo
-                    ?: _selectedEpisodeDownloadInfo.value
-                    ?: return@launch
+                val downloadInfo =
+                    _uiState.value.downloadInfo
+                        ?: _selectedEpisodeDownloadInfo.value
+                        ?: return@launch
                 val result = downloadRepository.resumeDownload(downloadInfo.id)
-                result.onFailure { error ->
-                    Timber.e(error, "Failed to resume download")
-                }
+                result.onFailure { error -> Timber.e(error, "Failed to resume download") }
             } catch (e: Exception) {
                 Timber.e(e, "Error resuming download")
             }
@@ -987,15 +1010,14 @@ class ItemDetailViewModel @Inject constructor(
     fun cancelDownload() {
         viewModelScope.launch {
             try {
-                val downloadInfo = _uiState.value.downloadInfo
-                    ?: _selectedEpisodeDownloadInfo.value
-                    ?: return@launch
+                val downloadInfo =
+                    _uiState.value.downloadInfo
+                        ?: _selectedEpisodeDownloadInfo.value
+                        ?: return@launch
                 val result = downloadRepository.cancelDownload(downloadInfo.id)
-                result.onSuccess {
-                    Timber.i("Download cancelled successfully")
-                }.onFailure { error ->
-                    Timber.e(error, "Failed to cancel download")
-                }
+                result
+                    .onSuccess { Timber.i("Download cancelled successfully") }
+                    .onFailure { error -> Timber.e(error, "Failed to cancel download") }
             } catch (e: Exception) {
                 Timber.e(e, "Error cancelling download")
             }
@@ -1003,16 +1025,16 @@ class ItemDetailViewModel @Inject constructor(
     }
 
     private fun getNextEpisodeOffline(show: AfinityShow): AfinityEpisode? {
-        val allEpisodes = show.seasons
-            .sortedBy { it.indexNumber }
-            .flatMap { season ->
-                season.episodes.sortedBy { it.indexNumber }
+        val allEpisodes =
+            show.seasons
+                .sortedBy { it.indexNumber }
+                .flatMap { season -> season.episodes.sortedBy { it.indexNumber } }
+
+        val inProgressEpisode =
+            allEpisodes.firstOrNull { episode ->
+                episode.playbackPositionTicks > 0 && !episode.played
             }
 
-        val inProgressEpisode = allEpisodes.firstOrNull { episode ->
-            episode.playbackPositionTicks > 0 && !episode.played
-        }
-
         if (inProgressEpisode != null) {
             return inProgressEpisode
         }
@@ -1020,13 +1042,11 @@ class ItemDetailViewModel @Inject constructor(
         return allEpisodes.firstOrNull { !it.played }
     }
 
-
     private fun getNextEpisodeForSeasonOffline(season: AfinitySeason): AfinityEpisode? {
         val episodes = season.episodes.sortedBy { it.indexNumber }
 
-        val inProgressEpisode = episodes.firstOrNull { episode ->
-            episode.playbackPositionTicks > 0 && !episode.played
-        }
+        val inProgressEpisode =
+            episodes.firstOrNull { episode -> episode.playbackPositionTicks > 0 && !episode.played }
 
         if (inProgressEpisode != null) {
             return inProgressEpisode
@@ -1048,5 +1068,5 @@ data class ItemDetailUiState(
     val nextEpisode: AfinityEpisode? = null,
     val episodesPagingData: Flow<PagingData<AfinityEpisode>>? = null,
     val showQualityDialog: Boolean = false,
-    val downloadInfo: DownloadInfo? = null
-)
\ No newline at end of file
+    val downloadInfo: DownloadInfo? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/item/components/BoxSetDetailContent.kt b/app/src/main/java/com/makd/afinity/ui/item/components/BoxSetDetailContent.kt
index 7b6b3567f..5736dc824 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/components/BoxSetDetailContent.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/components/BoxSetDetailContent.kt
@@ -25,13 +25,11 @@ fun BoxSetDetailContent(
     item: AfinityBoxSet,
     boxSetItems: List<AfinityItem>,
     onItemClick: (AfinityItem) -> Unit,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val cardWidth = widthSizeClass.portraitWidth
 
-    Column(
-        verticalArrangement = Arrangement.spacedBy(16.dp)
-    ) {
+    Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
         TaglineSection(item = item)
 
         OverviewSection(item = item)
@@ -42,11 +40,7 @@ fun BoxSetDetailContent(
 
         ExternalLinksSection(item = item)
 
-        BoxSetItemsSection(
-            items = boxSetItems,
-            onItemClick = onItemClick,
-            cardWidth = cardWidth
-        )
+        BoxSetItemsSection(items = boxSetItems, onItemClick = onItemClick, cardWidth = cardWidth)
     }
 }
 
@@ -54,30 +48,22 @@ fun BoxSetDetailContent(
 internal fun BoxSetItemsSection(
     items: List<AfinityItem>,
     onItemClick: (AfinityItem) -> Unit,
-    cardWidth: Dp
+    cardWidth: Dp,
 ) {
-    Column(
-        verticalArrangement = Arrangement.spacedBy(12.dp)
-    ) {
+    Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
         Text(
             text = stringResource(R.string.boxset_items_in_collection),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
-            color = MaterialTheme.colorScheme.onBackground
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+            color = MaterialTheme.colorScheme.onBackground,
         )
 
         LazyRow(
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
             items(items) { item ->
-                MediaItemCard(
-                    item = item,
-                    onClick = { onItemClick(item) },
-                    cardWidth = cardWidth
-                )
+                MediaItemCard(item = item, onClick = { onItemClick(item) }, cardWidth = cardWidth)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/item/components/DownloadProgressIndicator.kt b/app/src/main/java/com/makd/afinity/ui/item/components/DownloadProgressIndicator.kt
index 06a08cce1..cf70c36de 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/components/DownloadProgressIndicator.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/components/DownloadProgressIndicator.kt
@@ -24,26 +24,31 @@ fun DownloadProgressIndicator(
     onResumeClick: () -> Unit,
     onCancelClick: () -> Unit,
     isLandscape: Boolean = false,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     IconButton(
         onClick = {
             when (downloadInfo?.status) {
-                null, DownloadStatus.FAILED, DownloadStatus.CANCELLED -> onDownloadClick()
-                DownloadStatus.DOWNLOADING, DownloadStatus.QUEUED -> onCancelClick()
+                null,
+                DownloadStatus.FAILED,
+                DownloadStatus.CANCELLED -> onDownloadClick()
+                DownloadStatus.DOWNLOADING,
+                DownloadStatus.QUEUED -> onCancelClick()
                 DownloadStatus.PAUSED -> onResumeClick()
                 DownloadStatus.COMPLETED -> onCancelClick()
             }
         },
-        modifier = modifier
+        modifier = modifier,
     ) {
         when (downloadInfo?.status) {
-            null, DownloadStatus.FAILED, DownloadStatus.CANCELLED -> {
+            null,
+            DownloadStatus.FAILED,
+            DownloadStatus.CANCELLED -> {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_download),
                     contentDescription = "Download",
                     tint = MaterialTheme.colorScheme.onBackground,
-                    modifier = Modifier.size(28.dp)
+                    modifier = Modifier.size(28.dp),
                 )
             }
 
@@ -58,7 +63,7 @@ fun DownloadProgressIndicator(
                         painter = painterResource(id = R.drawable.ic_cancel),
                         contentDescription = "Cancel Download",
                         modifier = Modifier.size(16.dp),
-                        tint = Color.Red
+                        tint = Color.Red,
                     )
                 }
             }
@@ -68,7 +73,7 @@ fun DownloadProgressIndicator(
                     painter = painterResource(id = R.drawable.ic_hourglass_empty),
                     contentDescription = "Queued - Tap to Cancel",
                     tint = MaterialTheme.colorScheme.primary,
-                    modifier = Modifier.size(28.dp)
+                    modifier = Modifier.size(28.dp),
                 )
             }
 
@@ -83,7 +88,7 @@ fun DownloadProgressIndicator(
                         painter = painterResource(id = R.drawable.ic_cloud_pause),
                         contentDescription = "Resume Download",
                         modifier = Modifier.size(16.dp),
-                        tint = MaterialTheme.colorScheme.primary
+                        tint = MaterialTheme.colorScheme.primary,
                     )
                 }
             }
@@ -93,7 +98,7 @@ fun DownloadProgressIndicator(
                     painter = painterResource(id = R.drawable.ic_delete),
                     contentDescription = "Delete Download",
                     tint = Color.Red,
-                    modifier = Modifier.size(28.dp)
+                    modifier = Modifier.size(28.dp),
                 )
             }
         }
diff --git a/app/src/main/java/com/makd/afinity/ui/item/components/EpisodeDetailOverlay.kt b/app/src/main/java/com/makd/afinity/ui/item/components/EpisodeDetailOverlay.kt
index 664cc7f50..6b6011bf3 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/components/EpisodeDetailOverlay.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/components/EpisodeDetailOverlay.kt
@@ -44,10 +44,10 @@ import com.makd.afinity.data.models.media.AfinityEpisode
 import com.makd.afinity.ui.components.AsyncImage
 import com.makd.afinity.ui.item.components.shared.PlaybackSelection
 import com.makd.afinity.ui.item.components.shared.PlaybackSelectionButton
-import org.jellyfin.sdk.model.api.MediaStreamType
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
 import java.util.Locale
+import org.jellyfin.sdk.model.api.MediaStreamType
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -64,11 +64,9 @@ fun EpisodeDetailOverlay(
     onPauseDownload: () -> Unit,
     onResumeDownload: () -> Unit,
     onCancelDownload: () -> Unit,
-    onGoToSeries: (() -> Unit)? = null
+    onGoToSeries: (() -> Unit)? = null,
 ) {
-    val sheetState = rememberModalBottomSheetState(
-        skipPartiallyExpanded = true
-    )
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
 
     ModalBottomSheet(
         onDismissRequest = onDismiss,
@@ -76,48 +74,49 @@ fun EpisodeDetailOverlay(
         containerColor = MaterialTheme.colorScheme.surface,
         dragHandle = {
             Box(
-                modifier = Modifier
-                    .padding(vertical = 12.dp)
-                    .width(32.dp)
-                    .height(4.dp)
-                    .clip(RoundedCornerShape(2.dp))
-                    .background(MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.4f))
+                modifier =
+                    Modifier.padding(vertical = 12.dp)
+                        .width(32.dp)
+                        .height(4.dp)
+                        .clip(RoundedCornerShape(2.dp))
+                        .background(MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.4f))
             )
-        }
+        },
     ) {
         Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .verticalScroll(rememberScrollState())
-                .padding(horizontal = 24.dp, vertical = 8.dp),
-            verticalArrangement = Arrangement.spacedBy(16.dp)
+            modifier =
+                Modifier.fillMaxWidth()
+                    .verticalScroll(rememberScrollState())
+                    .padding(horizontal = 24.dp, vertical = 8.dp),
+            verticalArrangement = Arrangement.spacedBy(16.dp),
         ) {
             Text(
                 text = episode.seriesName,
-                style = MaterialTheme.typography.titleLarge.copy(
-                    fontWeight = FontWeight.Bold
-                ),
-                color = MaterialTheme.colorScheme.onSurface
+                style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.Bold),
+                color = MaterialTheme.colorScheme.onSurface,
             )
 
             Text(
-                text = stringResource(
-                    R.string.episode_season_episode_fmt,
-                    episode.parentIndexNumber ?: 0,
-                    episode.indexNumber ?: 0,
-                    episode.name
-                ),
+                text =
+                    stringResource(
+                        R.string.episode_season_episode_fmt,
+                        episode.parentIndexNumber ?: 0,
+                        episode.indexNumber ?: 0,
+                        episode.name,
+                    ),
                 style = MaterialTheme.typography.titleMedium,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
             )
 
-            val imageUrl = remember(episode.id) {
-                episode.images.primaryImageUrl ?: episode.images.thumbImageUrl
-            }
+            val imageUrl =
+                remember(episode.id) {
+                    episode.images.primaryImageUrl ?: episode.images.thumbImageUrl
+                }
 
-            val blurHash = remember(episode.id) {
-                episode.images.primaryBlurHash ?: episode.images.thumbBlurHash
-            }
+            val blurHash =
+                remember(episode.id) {
+                    episode.images.primaryBlurHash ?: episode.images.thumbBlurHash
+                }
 
             AsyncImage(
                 imageUrl = imageUrl,
@@ -125,35 +124,34 @@ fun EpisodeDetailOverlay(
                 blurHash = blurHash,
                 targetWidth = 400.dp,
                 targetHeight = 225.dp,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .aspectRatio(16f / 9f)
-                    .clip(RoundedCornerShape(12.dp)),
-                contentScale = ContentScale.Crop
+                modifier =
+                    Modifier.fillMaxWidth().aspectRatio(16f / 9f).clip(RoundedCornerShape(12.dp)),
+                contentScale = ContentScale.Crop,
             )
 
             Row(
                 modifier = Modifier.fillMaxWidth(),
                 horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally),
-                verticalAlignment = Alignment.CenterVertically
+                verticalAlignment = Alignment.CenterVertically,
             ) {
                 var needsSeparator = false
 
                 episode.premiereDate?.let { date ->
                     Row(
                         horizontalArrangement = Arrangement.spacedBy(4.dp),
-                        verticalAlignment = Alignment.CenterVertically
+                        verticalAlignment = Alignment.CenterVertically,
                     ) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_calendar),
                             contentDescription = stringResource(R.string.cd_air_date),
                             tint = MaterialTheme.colorScheme.primary,
-                            modifier = Modifier.size(14.dp)
+                            modifier = Modifier.size(14.dp),
                         )
                         Text(
-                            text = date.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)),
+                            text =
+                                date.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)),
                             style = MaterialTheme.typography.bodyMedium,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
                     needsSeparator = true
@@ -164,19 +162,19 @@ fun EpisodeDetailOverlay(
 
                     Row(
                         horizontalArrangement = Arrangement.spacedBy(4.dp),
-                        verticalAlignment = Alignment.CenterVertically
+                        verticalAlignment = Alignment.CenterVertically,
                     ) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_clock),
                             contentDescription = stringResource(R.string.cd_duration),
                             tint = MaterialTheme.colorScheme.primary,
-                            modifier = Modifier.size(16.dp)
+                            modifier = Modifier.size(16.dp),
                         )
                         val minutes = (episode.runtimeTicks / 600000000).toInt()
                         Text(
                             text = stringResource(R.string.episode_duration_format, minutes),
                             style = MaterialTheme.typography.bodyMedium,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
                     needsSeparator = true
@@ -187,18 +185,18 @@ fun EpisodeDetailOverlay(
 
                     Row(
                         verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.spacedBy(2.dp)
+                        horizontalArrangement = Arrangement.spacedBy(2.dp),
                     ) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_imdb_logo),
                             contentDescription = stringResource(R.string.cd_imdb),
                             tint = Color.Unspecified,
-                            modifier = Modifier.size(22.dp)
+                            modifier = Modifier.size(22.dp),
                         )
                         Text(
                             text = String.format(Locale.US, "%.1f", rating),
                             style = MaterialTheme.typography.bodyMedium,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
                 }
@@ -206,92 +204,112 @@ fun EpisodeDetailOverlay(
 
             if (episode.sources.isNotEmpty()) {
                 FlowRow(
-                    horizontalArrangement = Arrangement.spacedBy(
-                        8.dp,
-                        Alignment.CenterHorizontally
-                    ),
+                    horizontalArrangement =
+                        Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally),
                     verticalArrangement = Arrangement.spacedBy(4.dp, Alignment.CenterVertically),
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier.fillMaxWidth(),
                 ) {
                     val source = episode.sources.firstOrNull()
 
-                    source?.mediaStreams?.firstOrNull { it.type == MediaStreamType.VIDEO }
+                    source
+                        ?.mediaStreams
+                        ?.firstOrNull { it.type == MediaStreamType.VIDEO }
                         ?.let { videoStream ->
-                            val resolution = when {
-                                (videoStream.height ?: 0) <= 2160 && (videoStream.width
-                                    ?: 0) <= 3840 &&
-                                        ((videoStream.height ?: 0) > 1080 || (videoStream.width
-                                            ?: 0) > 1920) -> stringResource(R.string.meta_res_4k)
-
-                                (videoStream.height ?: 0) <= 1080 && (videoStream.width
-                                    ?: 0) <= 1920 &&
-                                        ((videoStream.height ?: 0) > 720 || (videoStream.width
-                                            ?: 0) > 1280) -> stringResource(R.string.meta_res_hd)
-
-                                else -> stringResource(R.string.meta_res_sd)
-                            }
+                            val resolution =
+                                when {
+                                    (videoStream.height ?: 0) <= 2160 &&
+                                        (videoStream.width ?: 0) <= 3840 &&
+                                        ((videoStream.height ?: 0) > 1080 ||
+                                            (videoStream.width ?: 0) > 1920) ->
+                                        stringResource(R.string.meta_res_4k)
+
+                                    (videoStream.height ?: 0) <= 1080 &&
+                                        (videoStream.width ?: 0) <= 1920 &&
+                                        ((videoStream.height ?: 0) > 720 ||
+                                            (videoStream.width ?: 0) > 1280) ->
+                                        stringResource(R.string.meta_res_hd)
+
+                                    else -> stringResource(R.string.meta_res_sd)
+                                }
 
                             VideoMetadataChip(text = resolution)
                         }
 
-                    source?.mediaStreams?.firstOrNull { it.type == MediaStreamType.VIDEO }?.codec?.takeIf { it.isNotEmpty() }
-                        ?.let { codec ->
-                            VideoMetadataChip(text = codec.uppercase())
-                        }
+                    source
+                        ?.mediaStreams
+                        ?.firstOrNull { it.type == MediaStreamType.VIDEO }
+                        ?.codec
+                        ?.takeIf { it.isNotEmpty() }
+                        ?.let { codec -> VideoMetadataChip(text = codec.uppercase()) }
 
-                    source?.mediaStreams?.firstOrNull { it.type == MediaStreamType.VIDEO }
+                    source
+                        ?.mediaStreams
+                        ?.firstOrNull { it.type == MediaStreamType.VIDEO }
                         ?.let { videoStream ->
                             if (videoStream.videoDoViTitle != null) {
                                 VideoMetadataChipWithIcon(
                                     stringResource(R.string.meta_vision),
-                                    iconRes = R.drawable.ic_brand_dolby_digital
+                                    iconRes = R.drawable.ic_brand_dolby_digital,
                                 )
                             } else {
                                 videoStream.videoRangeType?.let { rangeType ->
-                                    val hdrType = when (rangeType.name) {
-                                        "HDR10" -> "HDR10"
-                                        "HDR10Plus" -> "HDR10+"
-                                        "HLG" -> "HLG"
-                                        else -> null
-                                    }
+                                    val hdrType =
+                                        when (rangeType.name) {
+                                            "HDR10" -> "HDR10"
+                                            "HDR10Plus" -> "HDR10+"
+                                            "HLG" -> "HLG"
+                                            else -> null
+                                        }
                                     hdrType?.let { VideoMetadataChip(text = it) }
                                 }
                             }
                         }
 
-                    source?.mediaStreams?.firstOrNull { it.type == MediaStreamType.AUDIO }?.codec?.takeIf { it.isNotEmpty() }
+                    source
+                        ?.mediaStreams
+                        ?.firstOrNull { it.type == MediaStreamType.AUDIO }
+                        ?.codec
+                        ?.takeIf { it.isNotEmpty() }
                         ?.let { codec ->
                             when (codec.lowercase()) {
-                                "ac3" -> VideoMetadataChipWithIcon(
-                                    text = stringResource(R.string.meta_digital),
-                                    iconRes = R.drawable.ic_brand_dolby_digital
-                                )
-
-                                "eac3" -> VideoMetadataChipWithIcon(
-                                    text = stringResource(R.string.meta_digital_plus),
-                                    iconRes = R.drawable.ic_brand_dolby_digital
-                                )
-
-                                "truehd" -> VideoMetadataChipWithIcon(
-                                    text = stringResource(R.string.meta_truehd),
-                                    iconRes = R.drawable.ic_brand_dolby_digital
-                                )
+                                "ac3" ->
+                                    VideoMetadataChipWithIcon(
+                                        text = stringResource(R.string.meta_digital),
+                                        iconRes = R.drawable.ic_brand_dolby_digital,
+                                    )
+
+                                "eac3" ->
+                                    VideoMetadataChipWithIcon(
+                                        text = stringResource(R.string.meta_digital_plus),
+                                        iconRes = R.drawable.ic_brand_dolby_digital,
+                                    )
+
+                                "truehd" ->
+                                    VideoMetadataChipWithIcon(
+                                        text = stringResource(R.string.meta_truehd),
+                                        iconRes = R.drawable.ic_brand_dolby_digital,
+                                    )
 
                                 "dts" -> VideoMetadataChip(text = "DTS")
                                 else -> VideoMetadataChip(text = codec.uppercase())
                             }
                         }
 
-                    source?.mediaStreams?.firstOrNull { it.type == MediaStreamType.AUDIO }?.channelLayout?.let { layout ->
-                        val channels = when {
-                            layout.contains("7.1") -> "7.1"
-                            layout.contains("5.1") -> "5.1"
-                            layout.contains("2.1") -> "2.1"
-                            layout.contains("2.0") || layout.contains("stereo") -> "2.0"
-                            else -> null
+                    source
+                        ?.mediaStreams
+                        ?.firstOrNull { it.type == MediaStreamType.AUDIO }
+                        ?.channelLayout
+                        ?.let { layout ->
+                            val channels =
+                                when {
+                                    layout.contains("7.1") -> "7.1"
+                                    layout.contains("5.1") -> "5.1"
+                                    layout.contains("2.1") -> "2.1"
+                                    layout.contains("2.0") || layout.contains("stereo") -> "2.0"
+                                    else -> null
+                                }
+                            channels?.let { VideoMetadataChip(text = it) }
                         }
-                        channels?.let { VideoMetadataChip(text = it) }
-                    }
 
                     val hasSubtitles =
                         source?.mediaStreams?.any { it.type == MediaStreamType.SUBTITLE } == true
@@ -309,7 +327,7 @@ fun EpisodeDetailOverlay(
                     color = MaterialTheme.colorScheme.onSurfaceVariant,
                     lineHeight = MaterialTheme.typography.bodyMedium.lineHeight,
                     maxLines = 4,
-                    overflow = TextOverflow.Ellipsis
+                    overflow = TextOverflow.Ellipsis,
                 )
             }
 
@@ -319,20 +337,18 @@ fun EpisodeDetailOverlay(
             ) {
                 PlaybackSelectionButton(
                     item = episode,
-                    buttonText = if (episode.playbackPositionTicks > 0)
-                        stringResource(R.string.episode_resume)
-                    else
-                        stringResource(R.string.episode_play),
+                    buttonText =
+                        if (episode.playbackPositionTicks > 0)
+                            stringResource(R.string.episode_resume)
+                        else stringResource(R.string.episode_play),
                     buttonIcon = painterResource(id = R.drawable.ic_play_arrow),
-                    onPlayClick = { selection ->
-                        onPlayClick(episode, selection)
-                    },
-                    modifier = Modifier.fillMaxWidth()
+                    onPlayClick = { selection -> onPlayClick(episode, selection) },
+                    modifier = Modifier.fillMaxWidth(),
                 )
 
                 Row(
                     modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceEvenly
+                    horizontalArrangement = Arrangement.SpaceEvenly,
                 ) {
                     onGoToSeries?.let { goToSeries ->
                         IconButton(onClick = goToSeries) {
@@ -340,40 +356,48 @@ fun EpisodeDetailOverlay(
                                 painter = painterResource(id = R.drawable.ic_info),
                                 contentDescription = stringResource(R.string.cd_go_to_series),
                                 tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                                modifier = Modifier.size(28.dp)
+                                modifier = Modifier.size(28.dp),
                             )
                         }
                     }
                     IconButton(onClick = onToggleWatchlist) {
                         Icon(
-                            painter = if (isInWatchlist) painterResource(id = R.drawable.ic_bookmark_filled) else painterResource(
-                                id = R.drawable.ic_bookmark
-                            ),
+                            painter =
+                                if (isInWatchlist)
+                                    painterResource(id = R.drawable.ic_bookmark_filled)
+                                else painterResource(id = R.drawable.ic_bookmark),
                             contentDescription = stringResource(R.string.cd_watchlist),
-                            tint = if (isInWatchlist) Color(0xFFFF9800) else MaterialTheme.colorScheme.onSurfaceVariant,
-                            modifier = Modifier.size(28.dp)
+                            tint =
+                                if (isInWatchlist) Color(0xFFFF9800)
+                                else MaterialTheme.colorScheme.onSurfaceVariant,
+                            modifier = Modifier.size(28.dp),
                         )
                     }
 
                     IconButton(onClick = onToggleFavorite) {
                         Icon(
-                            painter = if (episode.favorite) painterResource(id = R.drawable.ic_favorite_filled) else painterResource(
-                                id = R.drawable.ic_favorite
-                            ),
+                            painter =
+                                if (episode.favorite)
+                                    painterResource(id = R.drawable.ic_favorite_filled)
+                                else painterResource(id = R.drawable.ic_favorite),
                             contentDescription = stringResource(R.string.cd_favorite),
-                            tint = if (episode.favorite) Color.Red else MaterialTheme.colorScheme.onSurfaceVariant,
-                            modifier = Modifier.size(28.dp)
+                            tint =
+                                if (episode.favorite) Color.Red
+                                else MaterialTheme.colorScheme.onSurfaceVariant,
+                            modifier = Modifier.size(28.dp),
                         )
                     }
 
                     IconButton(onClick = onToggleWatched) {
                         Icon(
-                            painter = if (episode.played) painterResource(id = R.drawable.ic_circle_check) else painterResource(
-                                id = R.drawable.ic_circle_check_outline
-                            ),
+                            painter =
+                                if (episode.played) painterResource(id = R.drawable.ic_circle_check)
+                                else painterResource(id = R.drawable.ic_circle_check_outline),
                             contentDescription = stringResource(R.string.cd_toggle_watched),
-                            tint = if (episode.played) Color.Green else MaterialTheme.colorScheme.onSurfaceVariant,
-                            modifier = Modifier.size(28.dp)
+                            tint =
+                                if (episode.played) Color.Green
+                                else MaterialTheme.colorScheme.onSurfaceVariant,
+                            modifier = Modifier.size(28.dp),
                         )
                     }
 
@@ -382,7 +406,7 @@ fun EpisodeDetailOverlay(
                         onDownloadClick = onDownloadClick,
                         onPauseClick = onPauseDownload,
                         onResumeClick = onResumeDownload,
-                        onCancelClick = onCancelDownload
+                        onCancelClick = onCancelDownload,
                     )
                 }
             }
@@ -395,7 +419,7 @@ private fun MetadataDot() {
     Text(
         text = "•",
         style = MaterialTheme.typography.bodyMedium,
-        color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f)
+        color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f),
     )
 }
 
@@ -403,16 +427,14 @@ private fun MetadataDot() {
 private fun VideoMetadataChip(text: String) {
     Text(
         text = text,
-        style = MaterialTheme.typography.bodyMedium.copy(
-            fontWeight = FontWeight.SemiBold
-        ),
+        style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
         color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.8f),
-        modifier = Modifier
-            .background(
-                MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.8f),
-                RoundedCornerShape(4.dp)
-            )
-            .padding(horizontal = 6.dp, vertical = 2.dp)
+        modifier =
+            Modifier.background(
+                    MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.8f),
+                    RoundedCornerShape(4.dp),
+                )
+                .padding(horizontal = 6.dp, vertical = 2.dp),
     )
 }
 
@@ -421,27 +443,23 @@ private fun VideoMetadataChipWithIcon(text: String, iconRes: Int) {
     Row(
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.spacedBy(4.dp),
-        modifier = Modifier
-            .background(
-                MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.8f),
-                RoundedCornerShape(4.dp)
-            )
-            .padding(horizontal = 6.dp, vertical = 2.dp)
+        modifier =
+            Modifier.background(
+                    MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.8f),
+                    RoundedCornerShape(4.dp),
+                )
+                .padding(horizontal = 6.dp, vertical = 2.dp),
     ) {
         Icon(
             painter = painterResource(id = iconRes),
             contentDescription = null,
             tint = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier
-                .size(16.dp)
-                .padding(bottom = 1.dp)
+            modifier = Modifier.size(16.dp).padding(bottom = 1.dp),
         )
         Text(
             text = text,
-            style = MaterialTheme.typography.bodyMedium.copy(
-                fontWeight = FontWeight.SemiBold
-            ),
-            color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.8f)
+            style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
+            color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.8f),
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/item/components/MovieDetailContent.kt b/app/src/main/java/com/makd/afinity/ui/item/components/MovieDetailContent.kt
index ddda0afe5..b60b8d4ee 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/components/MovieDetailContent.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/components/MovieDetailContent.kt
@@ -55,11 +55,9 @@ fun MovieDetailContent(
     onSpecialFeatureClick: (AfinityItem) -> Unit,
     onPlayClick: (AfinityMovie, PlaybackSelection) -> Unit,
     navController: androidx.navigation.NavController,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
-    Column(
-        verticalArrangement = Arrangement.spacedBy(16.dp)
-    ) {
+    Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
         TaglineSection(item = item)
 
         OverviewSection(item = item)
@@ -82,21 +80,26 @@ fun MovieDetailContent(
                             mediaSourceId = item.sources.firstOrNull()?.id ?: "",
                             audioStreamIndex = null,
                             subtitleStreamIndex = null,
-                            videoStreamIndex = item.sources.firstOrNull()
-                                ?.mediaStreams?.firstOrNull { it.type == org.jellyfin.sdk.model.api.MediaStreamType.VIDEO }?.index
-                                ?: 0,
-                            startPositionMs = startPositionMs
-                        )
+                            videoStreamIndex =
+                                item.sources
+                                    .firstOrNull()
+                                    ?.mediaStreams
+                                    ?.firstOrNull {
+                                        it.type == org.jellyfin.sdk.model.api.MediaStreamType.VIDEO
+                                    }
+                                    ?.index ?: 0,
+                            startPositionMs = startPositionMs,
+                        ),
                     )
                 },
-                widthSizeClass = widthSizeClass
+                widthSizeClass = widthSizeClass,
             )
         }
 
         SpecialFeaturesSection(
             specialFeatures = specialFeatures,
             onItemClick = onSpecialFeatureClick,
-            widthSizeClass = widthSizeClass
+            widthSizeClass = widthSizeClass,
         )
 
         InCollectionsSection(
@@ -105,7 +108,7 @@ fun MovieDetailContent(
                 val route = Destination.createItemDetailRoute(boxSet.id.toString())
                 navController.navigate(route)
             },
-            widthSizeClass = widthSizeClass
+            widthSizeClass = widthSizeClass,
         )
 
         CastSection(
@@ -114,7 +117,7 @@ fun MovieDetailContent(
                 val route = Destination.createPersonRoute(personId.toString())
                 navController.navigate(route)
             },
-            widthSizeClass = widthSizeClass
+            widthSizeClass = widthSizeClass,
         )
     }
 }
@@ -125,24 +128,20 @@ internal fun ChaptersSection(
     itemId: UUID,
     baseUrl: String,
     onChapterClick: (Long) -> Unit,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val cardWidth = widthSizeClass.landscapeWidth
 
-    Column(
-        verticalArrangement = Arrangement.spacedBy(12.dp)
-    ) {
+    Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
         Text(
             text = stringResource(R.string.chapters_title),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
-            color = MaterialTheme.colorScheme.onBackground
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+            color = MaterialTheme.colorScheme.onBackground,
         )
 
         LazyRow(
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
             itemsIndexed(chapters) { index, chapter ->
                 ChapterCard(
@@ -151,7 +150,7 @@ internal fun ChaptersSection(
                     itemId = itemId,
                     baseUrl = baseUrl,
                     onClick = { onChapterClick(chapter.startPosition) },
-                    cardWidth = cardWidth
+                    cardWidth = cardWidth,
                 )
             }
         }
@@ -165,24 +164,18 @@ internal fun ChapterCard(
     itemId: UUID,
     baseUrl: String,
     onClick: () -> Unit,
-    cardWidth: Dp
+    cardWidth: Dp,
 ) {
-    Column(
-        modifier = Modifier.width(cardWidth),
-        verticalArrangement = Arrangement.spacedBy(8.dp)
-    ) {
+    Column(modifier = Modifier.width(cardWidth), verticalArrangement = Arrangement.spacedBy(8.dp)) {
         Card(
             onClick = onClick,
-            modifier = Modifier
-                .fillMaxWidth()
-                .aspectRatio(16f / 9f),
+            modifier = Modifier.fillMaxWidth().aspectRatio(16f / 9f),
             shape = RoundedCornerShape(8.dp),
-            elevation = CardDefaults.cardElevation(defaultElevation = 2.dp)
+            elevation = CardDefaults.cardElevation(defaultElevation = 2.dp),
         ) {
             Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .background(MaterialTheme.colorScheme.surfaceVariant)
+                modifier =
+                    Modifier.fillMaxSize().background(MaterialTheme.colorScheme.surfaceVariant)
             ) {
                 AsyncImage(
                     imageUrl = chapter.getChapterImageUrl(baseUrl, itemId),
@@ -190,23 +183,22 @@ internal fun ChapterCard(
                     targetWidth = cardWidth,
                     targetHeight = cardWidth * 9f / 16f,
                     modifier = Modifier.fillMaxSize(),
-                    contentScale = ContentScale.Crop
+                    contentScale = ContentScale.Crop,
                 )
 
                 Surface(
-                    modifier = Modifier
-                        .align(Alignment.BottomStart)
-                        .padding(8.dp),
+                    modifier = Modifier.align(Alignment.BottomStart).padding(8.dp),
                     color = Color.Black.copy(alpha = 0.75f),
-                    shape = RoundedCornerShape(4.dp)
+                    shape = RoundedCornerShape(4.dp),
                 ) {
                     Text(
                         text = formatTime(chapter.startPosition),
-                        style = MaterialTheme.typography.labelSmall.copy(
-                            fontWeight = FontWeight.Medium
-                        ),
+                        style =
+                            MaterialTheme.typography.labelSmall.copy(
+                                fontWeight = FontWeight.Medium
+                            ),
                         color = Color.White,
-                        modifier = Modifier.padding(horizontal = 6.dp, vertical = 3.dp)
+                        modifier = Modifier.padding(horizontal = 6.dp, vertical = 3.dp),
                     )
                 }
             }
@@ -214,12 +206,10 @@ internal fun ChapterCard(
 
         Text(
             text = chapter.name ?: "Chapter ${index + 1}",
-            style = MaterialTheme.typography.bodyMedium.copy(
-                fontWeight = FontWeight.Medium
-            ),
+            style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.Medium),
             color = MaterialTheme.colorScheme.onSurface,
             maxLines = 2,
-            overflow = TextOverflow.Ellipsis
+            overflow = TextOverflow.Ellipsis,
         )
     }
 }
@@ -235,4 +225,4 @@ internal fun formatTime(positionMs: Long): String {
     } else {
         String.format(Locale.US, "%d:%02d", minutes, seconds)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/item/components/QualitySelectionDialog.kt b/app/src/main/java/com/makd/afinity/ui/item/components/QualitySelectionDialog.kt
index 4547c4cb9..14855535f 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/components/QualitySelectionDialog.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/components/QualitySelectionDialog.kt
@@ -38,22 +38,17 @@ fun QualitySelectionDialog(
     sources: List<AfinitySource>,
     onSourceSelected: (AfinitySource) -> Unit,
     onDismiss: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     var selectedSource by remember { mutableStateOf<AfinitySource?>(null) }
 
     Dialog(onDismissRequest = onDismiss) {
-        Card(
-            modifier = modifier.fillMaxWidth(),
-            shape = RoundedCornerShape(16.dp)
-        ) {
-            Column(
-                modifier = Modifier.padding(24.dp)
-            ) {
+        Card(modifier = modifier.fillMaxWidth(), shape = RoundedCornerShape(16.dp)) {
+            Column(modifier = Modifier.padding(24.dp)) {
                 Text(
                     text = stringResource(R.string.quality_dialog_title),
                     style = MaterialTheme.typography.headlineSmall,
-                    fontWeight = FontWeight.Bold
+                    fontWeight = FontWeight.Bold,
                 )
 
                 Spacer(modifier = Modifier.height(8.dp))
@@ -61,32 +56,25 @@ fun QualitySelectionDialog(
                 Text(
                     text = stringResource(R.string.quality_dialog_subtitle),
                     style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
 
                 Spacer(modifier = Modifier.height(16.dp))
 
-                LazyColumn(
-                    verticalArrangement = Arrangement.spacedBy(8.dp)
-                ) {
+                LazyColumn(verticalArrangement = Arrangement.spacedBy(8.dp)) {
                     items(sources) { source ->
                         QualityOption(
                             source = source,
                             isSelected = selectedSource == source,
-                            onSelect = { selectedSource = source }
+                            onSelect = { selectedSource = source },
                         )
                     }
                 }
 
                 Spacer(modifier = Modifier.height(16.dp))
 
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.End
-                ) {
-                    TextButton(onClick = onDismiss) {
-                        Text(stringResource(R.string.action_cancel))
-                    }
+                Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) {
+                    TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) }
 
                     Spacer(modifier = Modifier.width(8.dp))
 
@@ -95,7 +83,7 @@ fun QualitySelectionDialog(
                             selectedSource?.let { onSourceSelected(it) }
                             onDismiss()
                         },
-                        enabled = selectedSource != null
+                        enabled = selectedSource != null,
                     ) {
                         Text(stringResource(R.string.action_download))
                     }
@@ -110,37 +98,33 @@ private fun QualityOption(
     source: AfinitySource,
     isSelected: Boolean,
     onSelect: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Surface(
-        modifier = modifier
-            .fillMaxWidth()
-            .clickable(onClick = onSelect),
+        modifier = modifier.fillMaxWidth().clickable(onClick = onSelect),
         shape = RoundedCornerShape(8.dp),
-        color = if (isSelected) {
-            MaterialTheme.colorScheme.primaryContainer
-        } else {
-            MaterialTheme.colorScheme.surfaceVariant
-        },
-        tonalElevation = if (isSelected) 4.dp else 0.dp
+        color =
+            if (isSelected) {
+                MaterialTheme.colorScheme.primaryContainer
+            } else {
+                MaterialTheme.colorScheme.surfaceVariant
+            },
+        tonalElevation = if (isSelected) 4.dp else 0.dp,
     ) {
-        Row(
-            modifier = Modifier.padding(16.dp),
-            verticalAlignment = Alignment.CenterVertically
-        ) {
+        Row(modifier = Modifier.padding(16.dp), verticalAlignment = Alignment.CenterVertically) {
             Icon(
-                painter = if (isSelected) painterResource(id = R.drawable.ic_radio_button_checked) else painterResource(
-                    id = R.drawable.ic_radio_button_unchecked
-                ),
-                contentDescription = if (isSelected)
-                    stringResource(R.string.cd_selected)
-                else
-                    stringResource(R.string.cd_not_selected),
-                tint = if (isSelected) {
-                    MaterialTheme.colorScheme.primary
-                } else {
-                    MaterialTheme.colorScheme.onSurfaceVariant
-                }
+                painter =
+                    if (isSelected) painterResource(id = R.drawable.ic_radio_button_checked)
+                    else painterResource(id = R.drawable.ic_radio_button_unchecked),
+                contentDescription =
+                    if (isSelected) stringResource(R.string.cd_selected)
+                    else stringResource(R.string.cd_not_selected),
+                tint =
+                    if (isSelected) {
+                        MaterialTheme.colorScheme.primary
+                    } else {
+                        MaterialTheme.colorScheme.onSurfaceVariant
+                    },
             )
 
             Spacer(modifier = Modifier.width(16.dp))
@@ -149,24 +133,25 @@ private fun QualityOption(
                 Text(
                     text = source.name,
                     style = MaterialTheme.typography.bodyLarge,
-                    fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Normal
+                    fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Normal,
                 )
 
                 Spacer(modifier = Modifier.height(4.dp))
 
                 val sizeInMB = source.size / (1024 * 1024)
-                val sizeText = if (sizeInMB > 1024) {
-                    stringResource(R.string.file_size_gb, sizeInMB / 1024.0)
-                } else {
-                    stringResource(R.string.file_size_mb, sizeInMB)
-                }
+                val sizeText =
+                    if (sizeInMB > 1024) {
+                        stringResource(R.string.file_size_gb, sizeInMB / 1024.0)
+                    } else {
+                        stringResource(R.string.file_size_mb, sizeInMB)
+                    }
 
                 Text(
                     text = sizeText,
                     style = MaterialTheme.typography.bodySmall,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/item/components/SeasonDetailContent.kt b/app/src/main/java/com/makd/afinity/ui/item/components/SeasonDetailContent.kt
index 7a03ad606..a2e5b72fe 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/components/SeasonDetailContent.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/components/SeasonDetailContent.kt
@@ -52,14 +52,14 @@ fun SeasonDetailContent(
     onSpecialFeatureClick: (AfinityItem) -> Unit,
     navController: NavController,
     preferencesRepository: PreferencesRepository,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
-    val episodeLayout by preferencesRepository.getEpisodeLayoutFlow()
-        .collectAsState(initial = EpisodeLayout.HORIZONTAL)
+    val episodeLayout by
+        preferencesRepository
+            .getEpisodeLayoutFlow()
+            .collectAsState(initial = EpisodeLayout.HORIZONTAL)
 
-    Column(
-        verticalArrangement = Arrangement.spacedBy(16.dp)
-    ) {
+    Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
         TaglineSection(item = season)
 
         OverviewSection(item = season)
@@ -71,14 +71,14 @@ fun SeasonDetailContent(
                 episodesPagingData = pagingData,
                 onEpisodeClick = onEpisodeClick,
                 layout = episodeLayout,
-                widthSizeClass = widthSizeClass
+                widthSizeClass = widthSizeClass,
             )
         }
 
         SpecialFeaturesSection(
             specialFeatures = specialFeatures,
             onItemClick = onSpecialFeatureClick,
-            widthSizeClass = widthSizeClass
+            widthSizeClass = widthSizeClass,
         )
 
         CastSection(
@@ -88,7 +88,7 @@ fun SeasonDetailContent(
                     com.makd.afinity.navigation.Destination.createPersonRoute(personId.toString())
                 navController.navigate(route)
             },
-            widthSizeClass = widthSizeClass
+            widthSizeClass = widthSizeClass,
         )
     }
 }
@@ -98,21 +98,17 @@ private fun EpisodesSection(
     episodesPagingData: Flow<PagingData<AfinityEpisode>>,
     onEpisodeClick: (AfinityEpisode) -> Unit,
     layout: EpisodeLayout,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val lazyEpisodeItems = episodesPagingData.collectAsLazyPagingItems()
 
     val cardWidth = widthSizeClass.landscapeWidth
 
-    Column(
-        verticalArrangement = Arrangement.spacedBy(12.dp)
-    ) {
+    Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
         Text(
             text = stringResource(R.string.season_episodes_title),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
-            color = MaterialTheme.colorScheme.onBackground
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+            color = MaterialTheme.colorScheme.onBackground,
         )
 
         when (layout) {
@@ -120,7 +116,7 @@ private fun EpisodesSection(
                 HorizontalEpisodesList(
                     lazyEpisodeItems = lazyEpisodeItems,
                     onEpisodeClick = onEpisodeClick,
-                    cardWidth = cardWidth
+                    cardWidth = cardWidth,
                 )
             }
 
@@ -128,17 +124,15 @@ private fun EpisodesSection(
                 VerticalEpisodesList(
                     lazyEpisodeItems = lazyEpisodeItems,
                     onEpisodeClick = onEpisodeClick,
-                    cardWidth = cardWidth
+                    cardWidth = cardWidth,
                 )
             }
         }
 
         if (lazyEpisodeItems.loadState.append is LoadState.Loading) {
             Box(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(16.dp),
-                contentAlignment = Alignment.Center
+                modifier = Modifier.fillMaxWidth().padding(16.dp),
+                contentAlignment = Alignment.Center,
             ) {
                 CircularProgressIndicator(modifier = Modifier.size(32.dp))
             }
@@ -150,7 +144,7 @@ private fun EpisodesSection(
 private fun HorizontalEpisodesList(
     lazyEpisodeItems: LazyPagingItems<AfinityEpisode>,
     onEpisodeClick: (AfinityEpisode) -> Unit,
-    cardWidth: Dp
+    cardWidth: Dp,
 ) {
     val cardHeight =
         CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_LANDSCAPE)
@@ -159,18 +153,18 @@ private fun HorizontalEpisodesList(
     LazyRow(
         modifier = Modifier.height(fixedRowHeight),
         horizontalArrangement = Arrangement.spacedBy(12.dp),
-        contentPadding = PaddingValues(horizontal = 0.dp)
+        contentPadding = PaddingValues(horizontal = 0.dp),
     ) {
         items(
             count = lazyEpisodeItems.itemCount,
-            key = { index -> lazyEpisodeItems[index]?.id ?: index }
+            key = { index -> lazyEpisodeItems[index]?.id ?: index },
         ) { index ->
             lazyEpisodeItems[index]?.let { episode ->
                 ContinueWatchingCard(
                     item = episode,
                     onClick = { onEpisodeClick(episode) },
                     modifier = Modifier.width(cardWidth),
-                    cardWidth = cardWidth
+                    cardWidth = cardWidth,
                 )
             }
         }
@@ -181,7 +175,7 @@ private fun HorizontalEpisodesList(
 private fun VerticalEpisodesList(
     lazyEpisodeItems: LazyPagingItems<AfinityEpisode>,
     onEpisodeClick: (AfinityEpisode) -> Unit,
-    cardWidth: Dp
+    cardWidth: Dp,
 ) {
     Column {
         repeat(lazyEpisodeItems.itemCount) { index ->
@@ -189,9 +183,9 @@ private fun VerticalEpisodesList(
                 EpisodeListCard(
                     item = episode,
                     onClick = { onEpisodeClick(episode) },
-                    thumbnailWidth = cardWidth
+                    thumbnailWidth = cardWidth,
                 )
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/item/components/SeriesDetailContent.kt b/app/src/main/java/com/makd/afinity/ui/item/components/SeriesDetailContent.kt
index 60f21da85..91ad1eb6f 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/components/SeriesDetailContent.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/components/SeriesDetailContent.kt
@@ -67,9 +67,7 @@ internal fun OverviewSection(item: AfinityItem) {
         Column {
             Text(
                 text = item.overview,
-                style = MaterialTheme.typography.bodyMedium.copy(
-                    fontWeight = FontWeight.SemiBold
-                ),
+                style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
                 color = MaterialTheme.colorScheme.onBackground,
                 maxLines = if (isExpanded) Int.MAX_VALUE else 3,
                 overflow = if (isExpanded) TextOverflow.Visible else TextOverflow.Ellipsis,
@@ -78,7 +76,7 @@ internal fun OverviewSection(item: AfinityItem) {
                     if (!isExpanded) {
                         isEllipsized = result.hasVisualOverflow
                     }
-                }
+                },
             )
 
             if (isEllipsized || isExpanded) {
@@ -86,34 +84,32 @@ internal fun OverviewSection(item: AfinityItem) {
 
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier
-                        .clickable(
-                            indication = null,
-                            interactionSource = remember { MutableInteractionSource() }
-                        ) {
-                            isExpanded = !isExpanded
-                        }
-                        .padding(vertical = 4.dp)
+                    modifier =
+                        Modifier.clickable(
+                                indication = null,
+                                interactionSource = remember { MutableInteractionSource() },
+                            ) {
+                                isExpanded = !isExpanded
+                            }
+                            .padding(vertical = 4.dp),
                 ) {
                     Text(
-                        text = if (isExpanded)
-                            stringResource(R.string.action_see_less)
-                        else
-                            stringResource(R.string.action_see_more),
+                        text =
+                            if (isExpanded) stringResource(R.string.action_see_less)
+                            else stringResource(R.string.action_see_more),
                         style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.primary
+                        color = MaterialTheme.colorScheme.primary,
                     )
 
                     Icon(
-                        painter = if (isExpanded) painterResource(id = R.drawable.ic_keyboard_arrow_up) else painterResource(
-                            id = R.drawable.ic_keyboard_arrow_down
-                        ),
-                        contentDescription = if (isExpanded)
-                            stringResource(R.string.cd_collapse)
-                        else
-                            stringResource(R.string.cd_expand),
+                        painter =
+                            if (isExpanded) painterResource(id = R.drawable.ic_keyboard_arrow_up)
+                            else painterResource(id = R.drawable.ic_keyboard_arrow_down),
+                        contentDescription =
+                            if (isExpanded) stringResource(R.string.cd_collapse)
+                            else stringResource(R.string.cd_expand),
                         tint = MaterialTheme.colorScheme.primary,
-                        modifier = Modifier.size(20.dp)
+                        modifier = Modifier.size(20.dp),
                     )
                 }
             }
@@ -123,59 +119,62 @@ internal fun OverviewSection(item: AfinityItem) {
 
 @Composable
 internal fun TaglineSection(item: AfinityItem) {
-    val tagline = when (item) {
-        is AfinityMovie -> item.tagline
-        is AfinityShow -> item.tagline
-        else -> null
-    }
+    val tagline =
+        when (item) {
+            is AfinityMovie -> item.tagline
+            is AfinityShow -> item.tagline
+            else -> null
+        }
 
-    tagline?.takeIf { it.isNotBlank() }?.let { taglineText ->
-        Text(
-            text = taglineText,
-            style = MaterialTheme.typography.bodyLarge.copy(
-                fontStyle = FontStyle.Italic,
-                fontWeight = FontWeight.Medium
-            ),
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
-            modifier = Modifier.padding(vertical = 4.dp)
-        )
-    }
+    tagline
+        ?.takeIf { it.isNotBlank() }
+        ?.let { taglineText ->
+            Text(
+                text = taglineText,
+                style =
+                    MaterialTheme.typography.bodyLarge.copy(
+                        fontStyle = FontStyle.Italic,
+                        fontWeight = FontWeight.Medium,
+                    ),
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                modifier = Modifier.padding(vertical = 4.dp),
+            )
+        }
 }
 
 @Composable
 internal fun DirectorSection(item: AfinityItem) {
-    val directors = when (item) {
-        is AfinityMovie -> item.people.filter { it.type == PersonKind.DIRECTOR }
-        is AfinityShow -> item.people.filter { it.type == PersonKind.DIRECTOR }
-        else -> emptyList()
-    }
+    val directors =
+        when (item) {
+            is AfinityMovie -> item.people.filter { it.type == PersonKind.DIRECTOR }
+            is AfinityShow -> item.people.filter { it.type == PersonKind.DIRECTOR }
+            else -> emptyList()
+        }
 
     if (directors.isNotEmpty()) {
         Text(
-            text = stringResource(R.string.director_prefix, directors.joinToString(", ") { it.name }),
-            style = MaterialTheme.typography.bodyMedium.copy(
-                fontWeight = FontWeight.SemiBold
-            ),
-            color = MaterialTheme.colorScheme.onSurfaceVariant
+            text =
+                stringResource(R.string.director_prefix, directors.joinToString(", ") { it.name }),
+            style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
         )
     }
 }
 
 @Composable
 internal fun WriterSection(item: AfinityItem) {
-    val writers = when (item) {
-        is AfinityMovie -> item.people.filter { it.type == PersonKind.WRITER }
-        is AfinityShow -> item.people.filter { it.type == PersonKind.WRITER }
-        else -> emptyList()
-    }
+    val writers =
+        when (item) {
+            is AfinityMovie -> item.people.filter { it.type == PersonKind.WRITER }
+            is AfinityShow -> item.people.filter { it.type == PersonKind.WRITER }
+            else -> emptyList()
+        }
 
     if (writers.isNotEmpty()) {
         Text(
             text = stringResource(R.string.writers_prefix, writers.joinToString(", ") { it.name }),
-            style = MaterialTheme.typography.bodyMedium.copy(
-                fontWeight = FontWeight.SemiBold
-            ),
-            color = MaterialTheme.colorScheme.onSurfaceVariant
+            style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
         )
     }
 }
@@ -184,24 +183,20 @@ internal fun WriterSection(item: AfinityItem) {
 internal fun SeasonsSection(
     seasons: List<AfinitySeason>,
     navController: NavController,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
-    Column(
-        verticalArrangement = Arrangement.spacedBy(12.dp)
-    ) {
+    Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
         Text(
             text = stringResource(R.string.seasons_title),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
-            color = MaterialTheme.colorScheme.onBackground
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+            color = MaterialTheme.colorScheme.onBackground,
         )
 
         val cardWidth = widthSizeClass.portraitWidth
 
         LazyRow(
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
             items(seasons) { season ->
                 SeasonCard(
@@ -210,33 +205,23 @@ internal fun SeasonsSection(
                         val route = Destination.createItemDetailRoute(season.id.toString())
                         navController.navigate(route)
                     },
-                    cardWidth = cardWidth
+                    cardWidth = cardWidth,
                 )
             }
         }
     }
 }
 
-
 @Composable
-internal fun SeasonCard(
-    season: AfinitySeason,
-    onClick: () -> Unit,
-    cardWidth: Dp
-) {
+internal fun SeasonCard(season: AfinitySeason, onClick: () -> Unit, cardWidth: Dp) {
 
-    Column(
-        modifier = Modifier.width(cardWidth)
-    ) {
+    Column(modifier = Modifier.width(cardWidth)) {
         Card(
             onClick = onClick,
-            modifier = Modifier
-                .fillMaxWidth()
-                .aspectRatio(CardDimensions.ASPECT_RATIO_PORTRAIT),
-            colors = CardDefaults.cardColors(
-                containerColor = MaterialTheme.colorScheme.surfaceVariant
-            ),
-            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+            modifier = Modifier.fillMaxWidth().aspectRatio(CardDimensions.ASPECT_RATIO_PORTRAIT),
+            colors =
+                CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
+            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
         ) {
             Box(modifier = Modifier.fillMaxSize()) {
                 AsyncImage(
@@ -246,48 +231,48 @@ internal fun SeasonCard(
                     targetWidth = cardWidth,
                     targetHeight = cardWidth * 3f / 2f,
                     modifier = Modifier.fillMaxSize(),
-                    contentScale = ContentScale.Crop
+                    contentScale = ContentScale.Crop,
                 )
 
                 if (season.played) {
                     Box(
-                        modifier = Modifier
-                            .align(Alignment.TopEnd)
-                            .padding(8.dp)
-                            .size(24.dp)
-                            .background(
-                                MaterialTheme.colorScheme.primary,
-                                CircleShape
-                            ),
-                        contentAlignment = Alignment.Center
+                        modifier =
+                            Modifier.align(Alignment.TopEnd)
+                                .padding(8.dp)
+                                .size(24.dp)
+                                .background(MaterialTheme.colorScheme.primary, CircleShape),
+                        contentAlignment = Alignment.Center,
                     ) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_check),
                             contentDescription = stringResource(R.string.cd_watched_status),
                             tint = MaterialTheme.colorScheme.onPrimary,
-                            modifier = Modifier.size(16.dp)
+                            modifier = Modifier.size(16.dp),
                         )
                     }
                 } else {
                     season.unplayedItemCount?.let { unwatchedCount ->
                         if (unwatchedCount > 0) {
                             Surface(
-                                modifier = Modifier
-                                    .align(Alignment.TopEnd)
-                                    .padding(8.dp),
+                                modifier = Modifier.align(Alignment.TopEnd).padding(8.dp),
                                 shape = RoundedCornerShape(4.dp),
-                                color = MaterialTheme.colorScheme.primary.copy(alpha = 0.9f)
+                                color = MaterialTheme.colorScheme.primary.copy(alpha = 0.9f),
                             ) {
                                 Text(
-                                    text = if (unwatchedCount > 99)
-                                        stringResource(R.string.home_episode_count_plus)
-                                    else
-                                        stringResource(R.string.home_episode_count_fmt, unwatchedCount),
-                                    style = MaterialTheme.typography.labelSmall.copy(
-                                        fontWeight = FontWeight.Bold
-                                    ),
+                                    text =
+                                        if (unwatchedCount > 99)
+                                            stringResource(R.string.home_episode_count_plus)
+                                        else
+                                            stringResource(
+                                                R.string.home_episode_count_fmt,
+                                                unwatchedCount,
+                                            ),
+                                    style =
+                                        MaterialTheme.typography.labelSmall.copy(
+                                            fontWeight = FontWeight.Bold
+                                        ),
                                     color = MaterialTheme.colorScheme.onPrimary,
-                                    modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp)
+                                    modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp),
                                 )
                             }
                         }
@@ -300,21 +285,19 @@ internal fun SeasonCard(
 
         Text(
             text = season.name,
-            style = MaterialTheme.typography.bodySmall.copy(
-                fontWeight = FontWeight.Medium
-            ),
+            style = MaterialTheme.typography.bodySmall.copy(fontWeight = FontWeight.Medium),
             color = MaterialTheme.colorScheme.onBackground,
             maxLines = 2,
             overflow = TextOverflow.Ellipsis,
-            textAlign = TextAlign.Start
+            textAlign = TextAlign.Start,
         )
 
         season.productionYear?.let { year ->
             Text(
                 text = year.toString(),
                 style = MaterialTheme.typography.bodySmall,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/item/components/shared/CastSection.kt b/app/src/main/java/com/makd/afinity/ui/item/components/shared/CastSection.kt
index 80e8d4c62..961b95ed6 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/components/shared/CastSection.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/components/shared/CastSection.kt
@@ -35,45 +35,42 @@ import com.makd.afinity.data.models.media.AfinitySeason
 import com.makd.afinity.data.models.media.AfinityShow
 import com.makd.afinity.ui.components.AsyncImage
 import com.makd.afinity.ui.theme.CardDimensions.portraitWidth
-import org.jellyfin.sdk.model.api.PersonKind
 import java.util.UUID
+import org.jellyfin.sdk.model.api.PersonKind
 
 @Composable
 fun CastSection(
     item: AfinityItem,
     onPersonClick: (UUID) -> Unit = {},
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
-    val cast = when (item) {
-        is AfinityMovie -> item.people.filter { it.type == PersonKind.ACTOR }
-        is AfinityShow -> item.people.filter { it.type == PersonKind.ACTOR }
-        is AfinitySeason -> item.people.filter { it.type == PersonKind.ACTOR }
-        else -> emptyList()
-    }
+    val cast =
+        when (item) {
+            is AfinityMovie -> item.people.filter { it.type == PersonKind.ACTOR }
+            is AfinityShow -> item.people.filter { it.type == PersonKind.ACTOR }
+            is AfinitySeason -> item.people.filter { it.type == PersonKind.ACTOR }
+            else -> emptyList()
+        }
 
     val cardWidth = widthSizeClass.portraitWidth
 
     if (cast.isNotEmpty()) {
-        Column(
-            verticalArrangement = Arrangement.spacedBy(12.dp)
-        ) {
+        Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
             Text(
                 text = stringResource(R.string.cast_section_title),
-                style = MaterialTheme.typography.headlineSmall.copy(
-                    fontWeight = FontWeight.Bold
-                ),
-                color = MaterialTheme.colorScheme.onBackground
+                style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+                color = MaterialTheme.colorScheme.onBackground,
             )
 
             LazyRow(
                 horizontalArrangement = Arrangement.spacedBy(12.dp),
-                contentPadding = PaddingValues(horizontal = 0.dp)
+                contentPadding = PaddingValues(horizontal = 0.dp),
             ) {
                 items(cast.take(10)) { person ->
                     CastMemberCard(
                         person = person,
                         onPersonClick = onPersonClick,
-                        cardWidth = cardWidth
+                        cardWidth = cardWidth,
                     )
                 }
             }
@@ -85,19 +82,18 @@ fun CastSection(
 private fun CastMemberCard(
     person: AfinityPerson,
     onPersonClick: (UUID) -> Unit = {},
-    cardWidth: Dp
+    cardWidth: Dp,
 ) {
     Column(
-        modifier = Modifier
-            .width(cardWidth)
-            .clickable(
+        modifier =
+            Modifier.width(cardWidth).clickable(
                 indication = null,
-                interactionSource = remember { MutableInteractionSource() }
+                interactionSource = remember { MutableInteractionSource() },
             ) {
                 onPersonClick(person.id)
             },
         horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.spacedBy(4.dp)
+        verticalArrangement = Arrangement.spacedBy(4.dp),
     ) {
         AsyncImage(
             imageUrl = person.image.uri?.toString(),
@@ -105,12 +101,10 @@ private fun CastMemberCard(
             blurHash = person.image.blurHash,
             targetWidth = cardWidth,
             targetHeight = cardWidth,
-            modifier = Modifier
-                .size(cardWidth)
-                .clip(CircleShape),
+            modifier = Modifier.size(cardWidth).clip(CircleShape),
             contentScale = ContentScale.Crop,
             placeholder = painterResource(id = R.drawable.ic_person_placeholder),
-            error = painterResource(id = R.drawable.ic_person_placeholder)
+            error = painterResource(id = R.drawable.ic_person_placeholder),
         )
 
         Text(
@@ -119,17 +113,19 @@ private fun CastMemberCard(
             color = MaterialTheme.colorScheme.onBackground,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
-            textAlign = TextAlign.Center
+            textAlign = TextAlign.Center,
         )
 
         Text(
-            text = if (person.role.isNotEmpty()) stringResource(R.string.cast_role_format, person.role) else "",
+            text =
+                if (person.role.isNotEmpty()) stringResource(R.string.cast_role_format, person.role)
+                else "",
             style = MaterialTheme.typography.bodySmall,
             color = MaterialTheme.colorScheme.onSurfaceVariant,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
             textAlign = TextAlign.Center,
-            modifier = Modifier.height(16.dp)
+            modifier = Modifier.height(16.dp),
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/item/components/shared/ExternalLinksSection.kt b/app/src/main/java/com/makd/afinity/ui/item/components/shared/ExternalLinksSection.kt
index 63a8ccbb8..630af3fea 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/components/shared/ExternalLinksSection.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/components/shared/ExternalLinksSection.kt
@@ -37,43 +37,38 @@ fun ExternalLinksSection(item: AfinityItem) {
     val externalLinks = remember(item) { getExternalLinks(item, defaultLinkName) }
 
     if (externalLinks.isNotEmpty()) {
-        Column(
-            verticalArrangement = Arrangement.spacedBy(12.dp)
-        ) {
+        Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
             Text(
                 text = stringResource(R.string.external_links_title),
-                style = MaterialTheme.typography.headlineSmall.copy(
-                    fontWeight = FontWeight.Bold
-                ),
-                color = MaterialTheme.colorScheme.onBackground
+                style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+                color = MaterialTheme.colorScheme.onBackground,
             )
 
             LazyRow(
                 horizontalArrangement = Arrangement.spacedBy(4.dp),
                 verticalAlignment = Alignment.CenterVertically,
-                contentPadding = PaddingValues(horizontal = 0.dp)
+                contentPadding = PaddingValues(horizontal = 0.dp),
             ) {
                 items(externalLinks) { link ->
                     Box(
-                        modifier = Modifier
-                            .clip(CircleShape)
-                            .clickable(
-                                interactionSource = remember { MutableInteractionSource() },
-                                indication = null,
-                                onClick = {
-                                    val intent = Intent(Intent.ACTION_VIEW, Uri.parse(link.url))
-                                    context.startActivity(intent)
-                                }
-                            )
-                            .padding(8.dp),
-                        contentAlignment = Alignment.Center
+                        modifier =
+                            Modifier.clip(CircleShape)
+                                .clickable(
+                                    interactionSource = remember { MutableInteractionSource() },
+                                    indication = null,
+                                    onClick = {
+                                        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(link.url))
+                                        context.startActivity(intent)
+                                    },
+                                )
+                                .padding(8.dp),
+                        contentAlignment = Alignment.Center,
                     ) {
                         Image(
                             painter = painterResource(id = link.iconRes),
                             contentDescription = link.name,
                             contentScale = ContentScale.Fit,
-                            modifier = Modifier
-                                .height(16.dp)
+                            modifier = Modifier.height(16.dp),
                         )
                     }
                 }
@@ -82,11 +77,7 @@ fun ExternalLinksSection(item: AfinityItem) {
     }
 }
 
-private data class ExternalLink(
-    val name: String,
-    val url: String,
-    val iconRes: Int
-)
+private data class ExternalLink(val name: String, val url: String, val iconRes: Int)
 
 private fun getExternalLinks(item: AfinityItem, defaultName: String): List<ExternalLink> {
     val links = mutableListOf<ExternalLink>()
@@ -97,25 +88,22 @@ private fun getExternalLinks(item: AfinityItem, defaultName: String): List<Exter
         val url = externalUrl.url ?: return@forEach
         val lowerUrl = url.lowercase()
 
-        val iconRes = when {
-            "imdb" in lowerUrl -> R.drawable.ic_imdb_logo
-            "themoviedb.org/collection" in lowerUrl -> R.drawable.ic_tmdb_collection
-            "themoviedb.org/movie" in lowerUrl -> R.drawable.ic_tmdb
-            "themoviedb.org" in lowerUrl -> R.drawable.ic_tmdb
-            "tvdb" in lowerUrl -> R.drawable.ic_tvdb
-            "trakt" in lowerUrl -> R.drawable.ic_trakt
-            "tvmaze" in lowerUrl -> R.drawable.ic_tvmaze
-            else -> R.drawable.ic_link
-        }
+        val iconRes =
+            when {
+                "imdb" in lowerUrl -> R.drawable.ic_imdb_logo
+                "themoviedb.org/collection" in lowerUrl -> R.drawable.ic_tmdb_collection
+                "themoviedb.org/movie" in lowerUrl -> R.drawable.ic_tmdb
+                "themoviedb.org" in lowerUrl -> R.drawable.ic_tmdb
+                "tvdb" in lowerUrl -> R.drawable.ic_tvdb
+                "trakt" in lowerUrl -> R.drawable.ic_trakt
+                "tvmaze" in lowerUrl -> R.drawable.ic_tvmaze
+                else -> R.drawable.ic_link
+            }
 
         links.add(
-            ExternalLink(
-                name = externalUrl.name ?: defaultName,
-                url = url,
-                iconRes = iconRes
-            )
+            ExternalLink(name = externalUrl.name ?: defaultName, url = url, iconRes = iconRes)
         )
     }
 
     return links
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/item/components/shared/HeroSection.kt b/app/src/main/java/com/makd/afinity/ui/item/components/shared/HeroSection.kt
index e5224a931..18ffd10de 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/components/shared/HeroSection.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/components/shared/HeroSection.kt
@@ -30,60 +30,55 @@ import com.makd.afinity.ui.components.AsyncImage
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun HeroSection(
-    item: AfinityItem,
-    onPlayClick: (AfinityItem, PlaybackSelection?) -> Unit
-) {
+fun HeroSection(item: AfinityItem, onPlayClick: (AfinityItem, PlaybackSelection?) -> Unit) {
     val context = LocalContext.current
     val configuration = LocalConfiguration.current
     val screenHeight = configuration.screenHeightDp.dp
     val isLandscape = configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
     val heightMultiplier = if (isLandscape) 0.9f else 0.5f
 
-    val backdropUrl = if (item is AfinitySeason) {
-        item.images.backdropImageUrl ?: item.images.showBackdropImageUrl
-        ?: item.images.primaryImageUrl
-    } else {
-        item.images.backdropImageUrl ?: item.images.primaryImageUrl
-    }
+    val backdropUrl =
+        if (item is AfinitySeason) {
+            item.images.backdropImageUrl
+                ?: item.images.showBackdropImageUrl
+                ?: item.images.primaryImageUrl
+        } else {
+            item.images.backdropImageUrl ?: item.images.primaryImageUrl
+        }
 
-    val backdropBlur = if (item is AfinitySeason) {
-        item.images.backdropBlurHash ?: item.images.showBackdropBlurHash
-        ?: item.images.primaryBlurHash
-    } else {
-        item.images.backdropBlurHash ?: item.images.primaryBlurHash
-    }
+    val backdropBlur =
+        if (item is AfinitySeason) {
+            item.images.backdropBlurHash
+                ?: item.images.showBackdropBlurHash
+                ?: item.images.primaryBlurHash
+        } else {
+            item.images.backdropBlurHash ?: item.images.primaryBlurHash
+        }
 
-    Box(
-        modifier = Modifier
-            .fillMaxWidth()
-            .height(screenHeight * heightMultiplier)
-    ) {
+    Box(modifier = Modifier.fillMaxWidth().height(screenHeight * heightMultiplier)) {
         AsyncImage(
             imageUrl = backdropUrl,
             contentDescription = null,
             blurHash = backdropBlur,
             targetWidth = configuration.screenWidthDp.dp,
             targetHeight = screenHeight * heightMultiplier,
-            modifier = Modifier
-                .fillMaxSize()
-                .graphicsLayer { alpha = 0.99f }
-                .drawWithCache {
-                    val gradient = Brush.verticalGradient(
-                        colors = listOf(
-                            Color.Black,
-                            Color.Transparent
-                        ),
-                        startY = size.height * 0.75f,
-                        endY = size.height
-                    )
-                    onDrawWithContent {
-                        drawContent()
-                        drawRect(gradient, blendMode = BlendMode.DstIn)
-                    }
-                },
+            modifier =
+                Modifier.fillMaxSize()
+                    .graphicsLayer { alpha = 0.99f }
+                    .drawWithCache {
+                        val gradient =
+                            Brush.verticalGradient(
+                                colors = listOf(Color.Black, Color.Transparent),
+                                startY = size.height * 0.75f,
+                                endY = size.height,
+                            )
+                        onDrawWithContent {
+                            drawContent()
+                            drawRect(gradient, blendMode = BlendMode.DstIn)
+                        }
+                    },
             contentScale = ContentScale.Crop,
-            alignment = Alignment.Center
+            alignment = Alignment.Center,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/item/components/shared/InCollectionsSection.kt b/app/src/main/java/com/makd/afinity/ui/item/components/shared/InCollectionsSection.kt
index ebc58cdd2..624439539 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/components/shared/InCollectionsSection.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/components/shared/InCollectionsSection.kt
@@ -21,34 +21,30 @@ import com.makd.afinity.ui.theme.CardDimensions.portraitWidth
 fun InCollectionsSection(
     boxSets: List<AfinityBoxSet>,
     onBoxSetClick: (AfinityBoxSet) -> Unit,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     if (boxSets.isEmpty()) return
 
     val cardWidth = widthSizeClass.portraitWidth
 
-    Column(
-        verticalArrangement = Arrangement.spacedBy(12.dp)
-    ) {
+    Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
         Text(
             text = stringResource(R.string.collections_included_in),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
-            color = MaterialTheme.colorScheme.onBackground
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+            color = MaterialTheme.colorScheme.onBackground,
         )
 
         LazyRow(
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
             items(boxSets) { boxSet ->
                 MediaItemCard(
                     item = boxSet,
                     onClick = { onBoxSetClick(boxSet) },
-                    cardWidth = cardWidth
+                    cardWidth = cardWidth,
                 )
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/item/components/shared/MetadataRow.kt b/app/src/main/java/com/makd/afinity/ui/item/components/shared/MetadataRow.kt
index 0d183aaa7..ab29845d5 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/components/shared/MetadataRow.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/components/shared/MetadataRow.kt
@@ -31,107 +31,124 @@ import com.makd.afinity.data.models.media.AfinityBoxSet
 import com.makd.afinity.data.models.media.AfinityItem
 import com.makd.afinity.data.models.media.AfinityMovie
 import com.makd.afinity.data.models.media.AfinityShow
-import org.jellyfin.sdk.model.api.MediaStreamType
 import java.util.Locale
+import org.jellyfin.sdk.model.api.MediaStreamType
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
-fun MetadataRow(
-    item: AfinityItem
-) {
+fun MetadataRow(item: AfinityItem) {
     val configuration = LocalConfiguration.current
     val isLandscape = configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
     val horizontalAlignment = if (isLandscape) Alignment.Start else Alignment.CenterHorizontally
 
-    Column(
-        verticalArrangement = Arrangement.spacedBy(8.dp),
-        modifier = Modifier.fillMaxWidth()
-    ) {
+    Column(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) {
         if (item !is AfinityBoxSet && item.sources.isNotEmpty()) {
             FlowRow(
                 horizontalArrangement = Arrangement.spacedBy(8.dp, horizontalAlignment),
                 verticalArrangement = Arrangement.spacedBy(4.dp, Alignment.CenterVertically),
-                modifier = Modifier.fillMaxWidth()
+                modifier = Modifier.fillMaxWidth(),
             ) {
                 val source = item.sources.firstOrNull()
 
-                source?.mediaStreams?.firstOrNull { it.type == MediaStreamType.VIDEO }
+                source
+                    ?.mediaStreams
+                    ?.firstOrNull { it.type == MediaStreamType.VIDEO }
                     ?.let { videoStream ->
-                        val resolution = when {
-                            (videoStream.height ?: 0) <= 2160 && (videoStream.width
-                                ?: 0) <= 3840 &&
-                                    ((videoStream.height ?: 0) > 1080 || (videoStream.width
-                                        ?: 0) > 1920) -> stringResource(R.string.meta_res_4k)
-
-                            (videoStream.height ?: 0) <= 1080 && (videoStream.width
-                                ?: 0) <= 1920 &&
-                                    ((videoStream.height ?: 0) > 720 || (videoStream.width
-                                        ?: 0) > 1280) -> stringResource(R.string.meta_res_hd)
-
-                            else -> stringResource(R.string.meta_res_sd)
-                        }
+                        val resolution =
+                            when {
+                                (videoStream.height ?: 0) <= 2160 &&
+                                    (videoStream.width ?: 0) <= 3840 &&
+                                    ((videoStream.height ?: 0) > 1080 ||
+                                        (videoStream.width ?: 0) > 1920) ->
+                                    stringResource(R.string.meta_res_4k)
+
+                                (videoStream.height ?: 0) <= 1080 &&
+                                    (videoStream.width ?: 0) <= 1920 &&
+                                    ((videoStream.height ?: 0) > 720 ||
+                                        (videoStream.width ?: 0) > 1280) ->
+                                    stringResource(R.string.meta_res_hd)
+
+                                else -> stringResource(R.string.meta_res_sd)
+                            }
 
                         VideoMetadataChip(text = resolution)
                     }
 
-                source?.mediaStreams?.firstOrNull { it.type == MediaStreamType.VIDEO }?.codec?.takeIf { it.isNotEmpty() }
-                    ?.let { codec ->
-                        VideoMetadataChip(text = codec.uppercase())
-                    }
+                source
+                    ?.mediaStreams
+                    ?.firstOrNull { it.type == MediaStreamType.VIDEO }
+                    ?.codec
+                    ?.takeIf { it.isNotEmpty() }
+                    ?.let { codec -> VideoMetadataChip(text = codec.uppercase()) }
 
-                source?.mediaStreams?.firstOrNull { it.type == MediaStreamType.VIDEO }
+                source
+                    ?.mediaStreams
+                    ?.firstOrNull { it.type == MediaStreamType.VIDEO }
                     ?.let { videoStream ->
                         if (videoStream.videoDoViTitle != null) {
                             VideoMetadataChipWithIcon(
                                 text = stringResource(R.string.meta_vision),
-                                iconRes = R.drawable.ic_brand_dolby_digital
+                                iconRes = R.drawable.ic_brand_dolby_digital,
                             )
                         } else {
                             videoStream.videoRangeType?.let { rangeType ->
-                                val hdrType = when (rangeType.name) {
-                                    "HDR10" -> "HDR10"
-                                    "HDR10Plus" -> "HDR10+"
-                                    "HLG" -> "HLG"
-                                    else -> null
-                                }
+                                val hdrType =
+                                    when (rangeType.name) {
+                                        "HDR10" -> "HDR10"
+                                        "HDR10Plus" -> "HDR10+"
+                                        "HLG" -> "HLG"
+                                        else -> null
+                                    }
                                 hdrType?.let { VideoMetadataChip(text = it) }
                             }
                         }
                     }
 
-                source?.mediaStreams?.firstOrNull { it.type == MediaStreamType.AUDIO }?.codec?.takeIf { it.isNotEmpty() }
+                source
+                    ?.mediaStreams
+                    ?.firstOrNull { it.type == MediaStreamType.AUDIO }
+                    ?.codec
+                    ?.takeIf { it.isNotEmpty() }
                     ?.let { codec ->
                         when (codec.lowercase()) {
-                            "ac3" -> VideoMetadataChipWithIcon(
-                                text = stringResource(R.string.meta_digital),
-                                iconRes = R.drawable.ic_brand_dolby_digital
-                            )
-
-                            "eac3" -> VideoMetadataChipWithIcon(
-                                text = stringResource(R.string.meta_digital_plus),
-                                iconRes = R.drawable.ic_brand_dolby_digital
-                            )
-
-                            "truehd" -> VideoMetadataChipWithIcon(
-                                text = stringResource(R.string.meta_truehd),
-                                iconRes = R.drawable.ic_brand_dolby_digital
-                            )
+                            "ac3" ->
+                                VideoMetadataChipWithIcon(
+                                    text = stringResource(R.string.meta_digital),
+                                    iconRes = R.drawable.ic_brand_dolby_digital,
+                                )
+
+                            "eac3" ->
+                                VideoMetadataChipWithIcon(
+                                    text = stringResource(R.string.meta_digital_plus),
+                                    iconRes = R.drawable.ic_brand_dolby_digital,
+                                )
+
+                            "truehd" ->
+                                VideoMetadataChipWithIcon(
+                                    text = stringResource(R.string.meta_truehd),
+                                    iconRes = R.drawable.ic_brand_dolby_digital,
+                                )
 
                             "dts" -> VideoMetadataChip(text = "DTS")
                             else -> VideoMetadataChip(text = codec.uppercase())
                         }
                     }
 
-                source?.mediaStreams?.firstOrNull { it.type == MediaStreamType.AUDIO }?.channelLayout?.let { layout ->
-                    val channels = when {
-                        layout.contains("7.1") -> "7.1"
-                        layout.contains("5.1") -> "5.1"
-                        layout.contains("2.1") -> "2.1"
-                        layout.contains("2.0") || layout.contains("stereo") -> "2.0"
-                        else -> null
+                source
+                    ?.mediaStreams
+                    ?.firstOrNull { it.type == MediaStreamType.AUDIO }
+                    ?.channelLayout
+                    ?.let { layout ->
+                        val channels =
+                            when {
+                                layout.contains("7.1") -> "7.1"
+                                layout.contains("5.1") -> "5.1"
+                                layout.contains("2.1") -> "2.1"
+                                layout.contains("2.0") || layout.contains("stereo") -> "2.0"
+                                else -> null
+                            }
+                        channels?.let { VideoMetadataChip(text = it) }
                     }
-                    channels?.let { VideoMetadataChip(text = it) }
-                }
 
                 val hasSubtitles =
                     source?.mediaStreams?.any { it.type == MediaStreamType.SUBTITLE } == true
@@ -147,45 +164,46 @@ fun MetadataRow(
         FlowRow(
             horizontalArrangement = Arrangement.spacedBy(8.dp, horizontalAlignment),
             verticalArrangement = Arrangement.spacedBy(4.dp, Alignment.CenterVertically),
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth(),
         ) {
             var needsSeparator = false
 
             if (item !is AfinityBoxSet && item.playbackPositionTicks > 0 && item.runtimeTicks > 0) {
-                val progress =
-                    item.playbackPositionTicks.toFloat() / item.runtimeTicks.toFloat()
+                val progress = item.playbackPositionTicks.toFloat() / item.runtimeTicks.toFloat()
                 val remainingTicks = item.runtimeTicks - item.playbackPositionTicks
                 val remainingHours = (remainingTicks / 10_000_000 / 3600).toInt()
                 val remainingMinutes = ((remainingTicks / 10_000_000 % 3600) / 60).toInt()
 
-                val remainingText = if (remainingHours > 0) {
-                    stringResource(
-                        R.string.meta_time_remaining_hours_minutes,
-                        remainingHours,
-                        remainingMinutes
-                    )
-                } else {
-                    stringResource(R.string.meta_time_remaining_minutes, remainingMinutes)
-                }
+                val remainingText =
+                    if (remainingHours > 0) {
+                        stringResource(
+                            R.string.meta_time_remaining_hours_minutes,
+                            remainingHours,
+                            remainingMinutes,
+                        )
+                    } else {
+                        stringResource(R.string.meta_time_remaining_minutes, remainingMinutes)
+                    }
 
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(4.dp)
+                    horizontalArrangement = Arrangement.spacedBy(4.dp),
                 ) {
                     CircularProgressIndicator(
                         progress = { progress },
                         modifier = Modifier.size(16.dp),
                         color = Color(0xFFFFC107),
                         strokeWidth = 2.dp,
-                        trackColor = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.3f)
+                        trackColor = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.3f),
                     )
 
                     Text(
                         text = remainingText,
-                        style = MaterialTheme.typography.bodyMedium.copy(
-                            fontWeight = FontWeight.SemiBold
-                        ),
-                        color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.9f)
+                        style =
+                            MaterialTheme.typography.bodyMedium.copy(
+                                fontWeight = FontWeight.SemiBold
+                            ),
+                        color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.9f),
                     )
                 }
                 needsSeparator = true
@@ -195,76 +213,83 @@ fun MetadataRow(
                 item.itemCount?.let { count ->
                     Text(
                         text = stringResource(R.string.meta_boxset_count, count),
-                        style = MaterialTheme.typography.bodyMedium.copy(
-                            fontWeight = FontWeight.SemiBold
-                        ),
-                        color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.9f)
+                        style =
+                            MaterialTheme.typography.bodyMedium.copy(
+                                fontWeight = FontWeight.SemiBold
+                            ),
+                        color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.9f),
                     )
                     needsSeparator = true
                 }
             }
 
-            val communityRating = when (item) {
-                is AfinityMovie -> item.communityRating
-                is AfinityShow -> item.communityRating
-                is AfinityBoxSet -> item.communityRating
-                else -> null
-            }
+            val communityRating =
+                when (item) {
+                    is AfinityMovie -> item.communityRating
+                    is AfinityShow -> item.communityRating
+                    is AfinityBoxSet -> item.communityRating
+                    else -> null
+                }
 
             communityRating?.let { imdbRating ->
                 if (needsSeparator) MetadataDot()
 
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(6.dp)
+                    horizontalArrangement = Arrangement.spacedBy(6.dp),
                 ) {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_imdb_logo),
                         contentDescription = stringResource(R.string.cd_imdb),
                         tint = Color.Unspecified,
-                        modifier = Modifier.size(18.dp)
+                        modifier = Modifier.size(18.dp),
                     )
                     Text(
                         text = String.format(Locale.US, "%.1f", imdbRating),
-                        style = MaterialTheme.typography.bodyMedium.copy(
-                            fontWeight = FontWeight.SemiBold
-                        ),
-                        color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.9f)
+                        style =
+                            MaterialTheme.typography.bodyMedium.copy(
+                                fontWeight = FontWeight.SemiBold
+                            ),
+                        color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.9f),
                     )
                 }
                 needsSeparator = true
             }
 
-            val criticRating = when (item) {
-                is AfinityMovie -> item.criticRating
-                else -> null
-            }
+            val criticRating =
+                when (item) {
+                    is AfinityMovie -> item.criticRating
+                    else -> null
+                }
 
             criticRating?.let { rtRating ->
                 if (needsSeparator) MetadataDot()
 
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(4.dp)
+                    horizontalArrangement = Arrangement.spacedBy(4.dp),
                 ) {
                     Icon(
-                        painter = painterResource(
-                            id = if (rtRating > 60) {
-                                R.drawable.ic_rotten_tomato_fresh
-                            } else {
-                                R.drawable.ic_rotten_tomato_rotten
-                            }
-                        ),
+                        painter =
+                            painterResource(
+                                id =
+                                    if (rtRating > 60) {
+                                        R.drawable.ic_rotten_tomato_fresh
+                                    } else {
+                                        R.drawable.ic_rotten_tomato_rotten
+                                    }
+                            ),
                         contentDescription = stringResource(R.string.cd_rotten_tomatoes),
                         tint = Color.Unspecified,
-                        modifier = Modifier.size(14.dp)
+                        modifier = Modifier.size(14.dp),
                     )
                     Text(
                         text = "${rtRating.toInt()}%",
-                        style = MaterialTheme.typography.bodyMedium.copy(
-                            fontWeight = FontWeight.SemiBold
-                        ),
-                        color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.9f)
+                        style =
+                            MaterialTheme.typography.bodyMedium.copy(
+                                fontWeight = FontWeight.SemiBold
+                            ),
+                        color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.9f),
                     )
                 }
                 needsSeparator = true
@@ -280,10 +305,9 @@ fun MetadataRow(
 
                 Text(
                     text = year,
-                    style = MaterialTheme.typography.bodyMedium.copy(
-                        fontWeight = FontWeight.SemiBold
-                    ),
-                    color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.9f)
+                    style =
+                        MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
+                    color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.9f),
                 )
                 needsSeparator = true
             }
@@ -292,19 +316,18 @@ fun MetadataRow(
                 val hours = (item.runtimeTicks / 10_000_000 / 3600).toInt()
                 val minutes = ((item.runtimeTicks / 10_000_000 % 3600) / 60).toInt()
 
-                val runtimeText = if (hours > 0)
-                    stringResource(R.string.meta_runtime_hours_minutes, hours, minutes)
-                else
-                    stringResource(R.string.meta_runtime_minutes, minutes)
+                val runtimeText =
+                    if (hours > 0)
+                        stringResource(R.string.meta_runtime_hours_minutes, hours, minutes)
+                    else stringResource(R.string.meta_runtime_minutes, minutes)
 
                 if (needsSeparator) MetadataDot()
 
                 Text(
                     text = runtimeText,
-                    style = MaterialTheme.typography.bodyMedium.copy(
-                        fontWeight = FontWeight.SemiBold
-                    ),
-                    color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.9f)
+                    style =
+                        MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
+                    color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.9f),
                 )
                 needsSeparator = true
             }
@@ -319,30 +342,29 @@ fun MetadataRow(
 
                 Text(
                     text = rating,
-                    style = MaterialTheme.typography.bodyMedium.copy(
-                        fontWeight = FontWeight.SemiBold
-                    ),
-                    color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.9f)
+                    style =
+                        MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
+                    color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.9f),
                 )
                 needsSeparator = true
             }
 
-            val genres = when (item) {
-                is AfinityMovie -> item.genres
-                is AfinityShow -> item.genres
-                is AfinityBoxSet -> item.genres
-                else -> emptyList()
-            }
+            val genres =
+                when (item) {
+                    is AfinityMovie -> item.genres
+                    is AfinityShow -> item.genres
+                    is AfinityBoxSet -> item.genres
+                    else -> emptyList()
+                }
 
             if (genres.isNotEmpty()) {
                 if (needsSeparator) MetadataDot()
 
                 Text(
                     text = genres.take(2).joinToString(", "),
-                    style = MaterialTheme.typography.bodyMedium.copy(
-                        fontWeight = FontWeight.SemiBold
-                    ),
-                    color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.9f)
+                    style =
+                        MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
+                    color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.9f),
                 )
             }
         }
@@ -353,10 +375,8 @@ fun MetadataRow(
 private fun MetadataDot() {
     Text(
         text = "•",
-        style = MaterialTheme.typography.bodyMedium.copy(
-            fontWeight = FontWeight.SemiBold
-        ),
-        color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.5f)
+        style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
+        color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.5f),
     )
 }
 
@@ -364,16 +384,14 @@ private fun MetadataDot() {
 private fun VideoMetadataChip(text: String) {
     Text(
         text = text,
-        style = MaterialTheme.typography.bodyMedium.copy(
-            fontWeight = FontWeight.SemiBold
-        ),
+        style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
         color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.8f),
-        modifier = Modifier
-            .background(
-                MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.8f),
-                RoundedCornerShape(4.dp)
-            )
-            .padding(horizontal = 6.dp, vertical = 2.dp)
+        modifier =
+            Modifier.background(
+                    MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.8f),
+                    RoundedCornerShape(4.dp),
+                )
+                .padding(horizontal = 6.dp, vertical = 2.dp),
     )
 }
 
@@ -382,27 +400,23 @@ private fun VideoMetadataChipWithIcon(text: String, iconRes: Int) {
     Row(
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.spacedBy(4.dp),
-        modifier = Modifier
-            .background(
-                MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.8f),
-                RoundedCornerShape(4.dp)
-            )
-            .padding(horizontal = 6.dp, vertical = 2.dp)
+        modifier =
+            Modifier.background(
+                    MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.8f),
+                    RoundedCornerShape(4.dp),
+                )
+                .padding(horizontal = 6.dp, vertical = 2.dp),
     ) {
         Icon(
             painter = painterResource(id = iconRes),
             contentDescription = null,
             tint = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier
-                .size(16.dp)
-                .padding(bottom = 1.dp)
+            modifier = Modifier.size(16.dp).padding(bottom = 1.dp),
         )
         Text(
             text = text,
-            style = MaterialTheme.typography.bodyMedium.copy(
-                fontWeight = FontWeight.SemiBold
-            ),
-            color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.8f)
+            style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
+            color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.8f),
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/item/components/shared/NextUpSection.kt b/app/src/main/java/com/makd/afinity/ui/item/components/shared/NextUpSection.kt
index 53d520a33..e5494b404 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/components/shared/NextUpSection.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/components/shared/NextUpSection.kt
@@ -18,31 +18,28 @@ import com.makd.afinity.ui.theme.CardDimensions.landscapeWidth
 fun NextUpSection(
     episode: AfinityEpisode,
     onEpisodeClick: (AfinityEpisode) -> Unit,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val isInProgress = episode.playbackPositionTicks > 0 && !episode.played
-    val sectionTitle = if (isInProgress) {
-        stringResource(R.string.home_continue_watching)
-    } else {
-        stringResource(R.string.home_next_up)
-    }
+    val sectionTitle =
+        if (isInProgress) {
+            stringResource(R.string.home_continue_watching)
+        } else {
+            stringResource(R.string.home_next_up)
+        }
 
     val cardWidth = widthSizeClass.landscapeWidth
 
-    Column(
-        verticalArrangement = Arrangement.spacedBy(12.dp)
-    ) {
+    Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
         Text(
             text = sectionTitle,
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
-            color = MaterialTheme.colorScheme.onBackground
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+            color = MaterialTheme.colorScheme.onBackground,
         )
         ContinueWatchingCard(
             item = episode,
             onClick = { onEpisodeClick(episode) },
-            cardWidth = cardWidth
+            cardWidth = cardWidth,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/item/components/shared/PlaybackSelectionButton.kt b/app/src/main/java/com/makd/afinity/ui/item/components/shared/PlaybackSelectionButton.kt
index baef66f69..dba5fd814 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/components/shared/PlaybackSelectionButton.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/components/shared/PlaybackSelectionButton.kt
@@ -23,7 +23,7 @@ data class PlaybackSelection(
     val audioStreamIndex: Int?,
     val subtitleStreamIndex: Int?,
     val videoStreamIndex: Int?,
-    val startPositionMs: Long = 0L
+    val startPositionMs: Long = 0L,
 )
 
 data class MediaSourceOption(
@@ -32,7 +32,7 @@ data class MediaSourceOption(
     val quality: String,
     val codec: String,
     val size: Long,
-    val isDefault: Boolean = false
+    val isDefault: Boolean = false,
 )
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -42,19 +42,21 @@ fun PlaybackSelectionButton(
     buttonText: String,
     buttonIcon: Painter,
     onPlayClick: (PlaybackSelection) -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Button(
         onClick = {
-            val startPositionMs = if (item.playbackPositionTicks > 0) {
-                item.playbackPositionTicks / 10000
-            } else {
-                0L
-            }
+            val startPositionMs =
+                if (item.playbackPositionTicks > 0) {
+                    item.playbackPositionTicks / 10000
+                } else {
+                    0L
+                }
 
-            val selectedSource = item.sources.firstOrNull {
-                it.type == com.makd.afinity.data.models.media.AfinitySourceType.LOCAL
-            } ?: item.sources.firstOrNull()
+            val selectedSource =
+                item.sources.firstOrNull {
+                    it.type == com.makd.afinity.data.models.media.AfinitySourceType.LOCAL
+                } ?: item.sources.firstOrNull()
 
             onPlayClick(
                 PlaybackSelection(
@@ -62,31 +64,24 @@ fun PlaybackSelectionButton(
                     audioStreamIndex = null,
                     subtitleStreamIndex = null,
                     videoStreamIndex = null,
-                    startPositionMs = startPositionMs
+                    startPositionMs = startPositionMs,
                 )
             )
         },
-        modifier = modifier
-            .fillMaxWidth()
-            .height(56.dp),
+        modifier = modifier.fillMaxWidth().height(56.dp),
         shape = RoundedCornerShape(28.dp),
-        colors = ButtonDefaults.buttonColors(
-            containerColor = MaterialTheme.colorScheme.primary,
-            contentColor = MaterialTheme.colorScheme.onPrimary
-        )
+        colors =
+            ButtonDefaults.buttonColors(
+                containerColor = MaterialTheme.colorScheme.primary,
+                contentColor = MaterialTheme.colorScheme.onPrimary,
+            ),
     ) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(8.dp)
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
         ) {
-            Icon(
-                painter = buttonIcon,
-                contentDescription = null
-            )
-            Text(
-                text = buttonText,
-                style = MaterialTheme.typography.labelLarge
-            )
+            Icon(painter = buttonIcon, contentDescription = null)
+            Text(text = buttonText, style = MaterialTheme.typography.labelLarge)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/item/components/shared/SimilarItemsSection.kt b/app/src/main/java/com/makd/afinity/ui/item/components/shared/SimilarItemsSection.kt
index 7af4dc199..6158cb7a2 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/components/shared/SimilarItemsSection.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/components/shared/SimilarItemsSection.kt
@@ -22,45 +22,29 @@ import com.makd.afinity.ui.theme.CardDimensions.portraitWidth
 fun SimilarItemsSection(
     items: List<AfinityItem>,
     onItemClick: (AfinityItem) -> Unit,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val cardWidth = widthSizeClass.portraitWidth
 
-    Column(
-        verticalArrangement = Arrangement.spacedBy(12.dp)
-    ) {
+    Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
         Text(
             text = stringResource(R.string.similar_items_title),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
-            color = MaterialTheme.colorScheme.onBackground
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+            color = MaterialTheme.colorScheme.onBackground,
         )
 
         LazyRow(
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
             items(items.take(10)) { item ->
-                SimilarItemCard(
-                    item = item,
-                    onClick = { onItemClick(item) },
-                    cardWidth = cardWidth
-                )
+                SimilarItemCard(item = item, onClick = { onItemClick(item) }, cardWidth = cardWidth)
             }
         }
     }
 }
 
 @Composable
-private fun SimilarItemCard(
-    item: AfinityItem,
-    onClick: () -> Unit,
-    cardWidth: Dp
-) {
-    MediaItemCard(
-        item = item,
-        onClick = onClick,
-        cardWidth = cardWidth
-    )
-}
\ No newline at end of file
+private fun SimilarItemCard(item: AfinityItem, onClick: () -> Unit, cardWidth: Dp) {
+    MediaItemCard(item = item, onClick = onClick, cardWidth = cardWidth)
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/item/components/shared/SpecialFeaturesSection.kt b/app/src/main/java/com/makd/afinity/ui/item/components/shared/SpecialFeaturesSection.kt
index 00433ef12..3accd0811 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/components/shared/SpecialFeaturesSection.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/components/shared/SpecialFeaturesSection.kt
@@ -37,31 +37,27 @@ import com.makd.afinity.ui.theme.CardDimensions.landscapeWidth
 fun SpecialFeaturesSection(
     specialFeatures: List<AfinityItem>,
     onItemClick: (AfinityItem) -> Unit,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val cardWidth = widthSizeClass.landscapeWidth
 
     if (specialFeatures.isNotEmpty()) {
-        Column(
-            verticalArrangement = Arrangement.spacedBy(12.dp)
-        ) {
+        Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
             Text(
                 text = stringResource(R.string.special_features_title),
-                style = MaterialTheme.typography.headlineSmall.copy(
-                    fontWeight = FontWeight.Bold
-                ),
-                color = MaterialTheme.colorScheme.onBackground
+                style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+                color = MaterialTheme.colorScheme.onBackground,
             )
 
             LazyRow(
                 horizontalArrangement = Arrangement.spacedBy(12.dp),
-                contentPadding = PaddingValues(horizontal = 0.dp)
+                contentPadding = PaddingValues(horizontal = 0.dp),
             ) {
                 items(specialFeatures) { feature ->
                     SpecialFeatureCard(
                         feature = feature,
                         onClick = { onItemClick(feature) },
-                        cardWidth = cardWidth
+                        cardWidth = cardWidth,
                     )
                 }
             }
@@ -70,23 +66,14 @@ fun SpecialFeaturesSection(
 }
 
 @Composable
-private fun SpecialFeatureCard(
-    feature: AfinityItem,
-    onClick: () -> Unit,
-    cardWidth: Dp
-) {
-    Column(
-        modifier = Modifier.width(cardWidth)
-    ) {
+private fun SpecialFeatureCard(feature: AfinityItem, onClick: () -> Unit, cardWidth: Dp) {
+    Column(modifier = Modifier.width(cardWidth)) {
         Card(
             onClick = onClick,
-            modifier = Modifier
-                .fillMaxWidth()
-                .aspectRatio(16f / 9f),
-            colors = CardDefaults.cardColors(
-                containerColor = MaterialTheme.colorScheme.surfaceVariant
-            ),
-            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+            modifier = Modifier.fillMaxWidth().aspectRatio(16f / 9f),
+            colors =
+                CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
+            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
         ) {
             Box(modifier = Modifier.fillMaxSize()) {
                 AsyncImage(
@@ -96,7 +83,7 @@ private fun SpecialFeatureCard(
                     targetWidth = cardWidth,
                     targetHeight = cardWidth * 9f / 16f,
                     modifier = Modifier.fillMaxSize(),
-                    contentScale = ContentScale.Crop
+                    contentScale = ContentScale.Crop,
                 )
             }
         }
@@ -105,13 +92,11 @@ private fun SpecialFeatureCard(
 
         Text(
             text = feature.name,
-            style = MaterialTheme.typography.bodySmall.copy(
-                fontWeight = FontWeight.Medium
-            ),
+            style = MaterialTheme.typography.bodySmall.copy(fontWeight = FontWeight.Medium),
             color = MaterialTheme.colorScheme.onBackground,
             maxLines = 2,
             overflow = TextOverflow.Ellipsis,
-            textAlign = TextAlign.Start
+            textAlign = TextAlign.Start,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/item/components/shared/VideoQualitySelection.kt b/app/src/main/java/com/makd/afinity/ui/item/components/shared/VideoQualitySelection.kt
index 4342f9fa3..6e78f272b 100644
--- a/app/src/main/java/com/makd/afinity/ui/item/components/shared/VideoQualitySelection.kt
+++ b/app/src/main/java/com/makd/afinity/ui/item/components/shared/VideoQualitySelection.kt
@@ -18,18 +18,15 @@ fun VideoQualitySelection(
     mediaSourceOptions: List<MediaSourceOption>,
     selectedSource: MediaSourceOption?,
     onSourceSelected: (MediaSourceOption) -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     if (mediaSourceOptions.size > 1) {
-        LazyRow(
-            horizontalArrangement = Arrangement.spacedBy(8.dp),
-            modifier = modifier
-        ) {
+        LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = modifier) {
             items(mediaSourceOptions) { source ->
                 QualityChip(
                     source = source,
                     isSelected = source == selectedSource,
-                    onClick = { onSourceSelected(source) }
+                    onClick = { onSourceSelected(source) },
                 )
             }
         }
@@ -37,29 +34,30 @@ fun VideoQualitySelection(
 }
 
 @Composable
-private fun QualityChip(
-    source: MediaSourceOption,
-    isSelected: Boolean,
-    onClick: () -> Unit
-) {
+private fun QualityChip(source: MediaSourceOption, isSelected: Boolean, onClick: () -> Unit) {
     OutlinedButton(
         onClick = onClick,
-        colors = ButtonDefaults.outlinedButtonColors(
-            containerColor = if (isSelected) MaterialTheme.colorScheme.primary
-            else Color.Transparent,
-            contentColor = if (isSelected) MaterialTheme.colorScheme.onPrimary
-            else MaterialTheme.colorScheme.onSurface
-        ),
-        border = BorderStroke(
-            1.dp,
-            if (isSelected) MaterialTheme.colorScheme.primary
-            else MaterialTheme.colorScheme.outline
-        )
+        colors =
+            ButtonDefaults.outlinedButtonColors(
+                containerColor =
+                    if (isSelected) MaterialTheme.colorScheme.primary else Color.Transparent,
+                contentColor =
+                    if (isSelected) MaterialTheme.colorScheme.onPrimary
+                    else MaterialTheme.colorScheme.onSurface,
+            ),
+        border =
+            BorderStroke(
+                1.dp,
+                if (isSelected) MaterialTheme.colorScheme.primary
+                else MaterialTheme.colorScheme.outline,
+            ),
     ) {
         Text(
             text =
-                if (source.name.contains("K") || source.name.contains("p") ||
-                    source.name.contains(source.codec, ignoreCase = true)
+                if (
+                    source.name.contains("K") ||
+                        source.name.contains("p") ||
+                        source.name.contains(source.codec, ignoreCase = true)
                 ) {
                     source.name
                 } else {
@@ -67,4 +65,4 @@ private fun QualityChip(
                 }
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/jellyseerr/JellyseerrLoginViewModel.kt b/app/src/main/java/com/makd/afinity/ui/jellyseerr/JellyseerrLoginViewModel.kt
index b13fbf048..61a9c33fe 100644
--- a/app/src/main/java/com/makd/afinity/ui/jellyseerr/JellyseerrLoginViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/jellyseerr/JellyseerrLoginViewModel.kt
@@ -5,18 +5,18 @@ import androidx.lifecycle.viewModelScope
 import com.makd.afinity.data.models.jellyseerr.JellyseerrUser
 import com.makd.afinity.data.repository.JellyseerrRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltViewModel
-class JellyseerrLoginViewModel @Inject constructor(
-    private val jellyseerrRepository: JellyseerrRepository
-) : ViewModel() {
+class JellyseerrLoginViewModel
+@Inject
+constructor(private val jellyseerrRepository: JellyseerrRepository) : ViewModel() {
 
     private val _uiState = MutableStateFlow(JellyseerrLoginUiState())
     val uiState: StateFlow<JellyseerrLoginUiState> = _uiState.asStateFlow()
@@ -31,15 +31,15 @@ class JellyseerrLoginViewModel @Inject constructor(
             try {
                 val isAuthenticated = jellyseerrRepository.isLoggedIn()
                 if (isAuthenticated) {
-                    jellyseerrRepository.getCurrentUser().fold(
-                        onSuccess = { user ->
-                            _uiState.update { it.copy(currentUser = user) }
-                        },
-                        onFailure = { error ->
-                            Timber.e(error, "Failed to load current user")
-                            _uiState.update { it.copy(currentUser = null) }
-                        }
-                    )
+                    jellyseerrRepository
+                        .getCurrentUser()
+                        .fold(
+                            onSuccess = { user -> _uiState.update { it.copy(currentUser = user) } },
+                            onFailure = { error ->
+                                Timber.e(error, "Failed to load current user")
+                                _uiState.update { it.copy(currentUser = null) }
+                            },
+                        )
                 }
             } catch (e: Exception) {
                 Timber.e(e, "Failed to check auth status")
@@ -81,7 +81,7 @@ class JellyseerrLoginViewModel @Inject constructor(
                 email = "",
                 password = "",
                 emailError = null,
-                passwordError = null
+                passwordError = null,
             )
         }
     }
@@ -97,38 +97,34 @@ class JellyseerrLoginViewModel @Inject constructor(
 
                 jellyseerrRepository.setServerUrl(_uiState.value.serverUrl.trim())
 
-                jellyseerrRepository.login(
-                    email = _uiState.value.email.trim(),
-                    password = _uiState.value.password,
-                    useJellyfinAuth = _uiState.value.useJellyfinAuth
-                ).fold(
-                    onSuccess = { user ->
-                        _uiState.update {
-                            it.copy(
-                                isLoading = false,
-                                loginSuccess = true,
-                                loggedInUser = user.displayName ?: user.username ?: user.email,
-                                currentUser = user
-                            )
-                        }
-                        Timber.d("Login successful for user: ${user.username}")
-                    },
-                    onFailure = { error ->
-                        _uiState.update {
-                            it.copy(
-                                isLoading = false,
-                                error = parseErrorMessage(error.message)
-                            )
-                        }
-                        Timber.e(error, "Login failed")
-                    }
-                )
+                jellyseerrRepository
+                    .login(
+                        email = _uiState.value.email.trim(),
+                        password = _uiState.value.password,
+                        useJellyfinAuth = _uiState.value.useJellyfinAuth,
+                    )
+                    .fold(
+                        onSuccess = { user ->
+                            _uiState.update {
+                                it.copy(
+                                    isLoading = false,
+                                    loginSuccess = true,
+                                    loggedInUser = user.displayName ?: user.username ?: user.email,
+                                    currentUser = user,
+                                )
+                            }
+                            Timber.d("Login successful for user: ${user.username}")
+                        },
+                        onFailure = { error ->
+                            _uiState.update {
+                                it.copy(isLoading = false, error = parseErrorMessage(error.message))
+                            }
+                            Timber.e(error, "Login failed")
+                        },
+                    )
             } catch (e: Exception) {
                 _uiState.update {
-                    it.copy(
-                        isLoading = false,
-                        error = "An unexpected error occurred: ${e.message}"
-                    )
+                    it.copy(isLoading = false, error = "An unexpected error occurred: ${e.message}")
                 }
                 Timber.e(e, "Error during login")
             }
@@ -180,15 +176,11 @@ class JellyseerrLoginViewModel @Inject constructor(
             message.contains("401") -> "Invalid email or password"
             message.contains("403") -> "Access forbidden. Check your permissions."
             message.contains("404") -> "Server not found. Check your server URL."
-            message.contains(
-                "network",
-                ignoreCase = true
-            ) -> "Network error. Check your connection."
+            message.contains("network", ignoreCase = true) ->
+                "Network error. Check your connection."
 
-            message.contains(
-                "timeout",
-                ignoreCase = true
-            ) -> "Connection timeout. Please try again."
+            message.contains("timeout", ignoreCase = true) ->
+                "Connection timeout. Please try again."
 
             else -> message
         }
@@ -207,34 +199,33 @@ class JellyseerrLoginViewModel @Inject constructor(
             try {
                 _uiState.update { it.copy(isLoading = true) }
 
-                jellyseerrRepository.logout().fold(
-                    onSuccess = {
-                        _uiState.update {
-                            it.copy(
-                                isLoading = false,
-                                currentUser = null,
-                                email = "",
-                                password = ""
-                            )
-                        }
-                        Timber.d("Logout successful")
-                    },
-                    onFailure = { error ->
-                        _uiState.update {
-                            it.copy(
-                                isLoading = false,
-                                error = "Logout failed: ${error.message}"
-                            )
-                        }
-                        Timber.e(error, "Logout failed")
-                    }
-                )
+                jellyseerrRepository
+                    .logout()
+                    .fold(
+                        onSuccess = {
+                            _uiState.update {
+                                it.copy(
+                                    isLoading = false,
+                                    currentUser = null,
+                                    email = "",
+                                    password = "",
+                                )
+                            }
+                            Timber.d("Logout successful")
+                        },
+                        onFailure = { error ->
+                            _uiState.update {
+                                it.copy(
+                                    isLoading = false,
+                                    error = "Logout failed: ${error.message}",
+                                )
+                            }
+                            Timber.e(error, "Logout failed")
+                        },
+                    )
             } catch (e: Exception) {
                 _uiState.update {
-                    it.copy(
-                        isLoading = false,
-                        error = "An unexpected error occurred: ${e.message}"
-                    )
+                    it.copy(isLoading = false, error = "An unexpected error occurred: ${e.message}")
                 }
                 Timber.e(e, "Error during logout")
             }
@@ -254,5 +245,5 @@ data class JellyseerrLoginUiState(
     val error: String? = null,
     val loginSuccess: Boolean = false,
     val loggedInUser: String? = null,
-    val currentUser: JellyseerrUser? = null
+    val currentUser: JellyseerrUser? = null,
 )
diff --git a/app/src/main/java/com/makd/afinity/ui/libraries/LibrariesScreen.kt b/app/src/main/java/com/makd/afinity/ui/libraries/LibrariesScreen.kt
index cf80f6e85..41d5d90af 100644
--- a/app/src/main/java/com/makd/afinity/ui/libraries/LibrariesScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/libraries/LibrariesScreen.kt
@@ -64,7 +64,7 @@ fun LibrariesScreen(
     modifier: Modifier = Modifier,
     navController: NavController,
     viewModel: LibrariesViewModel = hiltViewModel(),
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val lazyGridState = rememberLazyGridState()
@@ -77,58 +77,42 @@ fun LibrariesScreen(
         }
     }
 
-    Box(
-        modifier = modifier
-            .fillMaxSize()
-            .background(MaterialTheme.colorScheme.background)
-    ) {
+    Box(modifier = modifier.fillMaxSize().background(MaterialTheme.colorScheme.background)) {
         when {
             uiState.isLoading && uiState.libraries.isEmpty() -> {
-                Box(
-                    modifier = Modifier.fillMaxSize(),
-                    contentAlignment = Alignment.Center
-                ) {
+                Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                     CircularProgressIndicator()
                 }
             }
 
             uiState.error != null -> {
-                ErrorMessage(
-                    message = uiState.error!!,
-                    modifier = Modifier.fillMaxSize()
-                )
+                ErrorMessage(message = uiState.error!!, modifier = Modifier.fillMaxSize())
             }
 
             uiState.libraries.isEmpty() -> {
-                EmptyLibrariesMessage(
-                    modifier = Modifier.fillMaxSize()
-                )
+                EmptyLibrariesMessage(modifier = Modifier.fillMaxSize())
             }
 
             else -> {
                 LazyVerticalGrid(
                     columns = GridCells.Adaptive(widthSizeClass.gridMinSize),
                     state = lazyGridState,
-                    contentPadding = PaddingValues(
-                        start = 16.dp,
-                        end = 16.dp,
-                        top = 180.dp,
-                        bottom = 16.dp
-                    ),
+                    contentPadding =
+                        PaddingValues(start = 16.dp, end = 16.dp, top = 180.dp, bottom = 16.dp),
                     horizontalArrangement = Arrangement.spacedBy(16.dp),
                     verticalArrangement = Arrangement.spacedBy(16.dp),
-                    modifier = Modifier.fillMaxSize()
+                    modifier = Modifier.fillMaxSize(),
                 ) {
                     items(
                         items = sortLibraries(uiState.libraries),
-                        key = { library -> library.id }
+                        key = { library -> library.id },
                     ) { library ->
                         LibraryCard(
                             library = library,
                             onClick = {
                                 viewModel.onLibraryClick(library)
                                 onLibraryClick(library)
-                            }
+                            },
                         )
                     }
                 }
@@ -139,10 +123,9 @@ fun LibrariesScreen(
             title = {
                 Text(
                     text = stringResource(R.string.libraries_title),
-                    style = MaterialTheme.typography.headlineLarge.copy(
-                        fontWeight = FontWeight.Bold
-                    ),
-                    color = MaterialTheme.colorScheme.onBackground
+                    style =
+                        MaterialTheme.typography.headlineLarge.copy(fontWeight = FontWeight.Bold),
+                    color = MaterialTheme.colorScheme.onBackground,
                 )
             },
             backgroundOpacity = topBarOpacity,
@@ -151,7 +134,7 @@ fun LibrariesScreen(
                 navController.navigate(route)
             },
             onProfileClick = onProfileClick,
-            userProfileImageUrl = mainUiState.userProfileImageUrl
+            userProfileImageUrl = mainUiState.userProfileImageUrl,
         )
     }
 }
@@ -160,54 +143,47 @@ fun LibrariesScreen(
 private fun LibraryCard(
     library: AfinityCollection,
     onClick: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Column(
-        modifier = modifier
-            .fillMaxWidth()
-            .clickable(
-                interactionSource = remember { MutableInteractionSource() },
-                indication = null,
-                onClick = { onClick() }),
-        verticalArrangement = Arrangement.spacedBy(8.dp)
-    ) {
-        Box(
-            modifier = Modifier
+        modifier =
+            modifier
                 .fillMaxWidth()
-                .aspectRatio(16f / 9f)
-        ) {
+                .clickable(
+                    interactionSource = remember { MutableInteractionSource() },
+                    indication = null,
+                    onClick = { onClick() },
+                ),
+        verticalArrangement = Arrangement.spacedBy(8.dp),
+    ) {
+        Box(modifier = Modifier.fillMaxWidth().aspectRatio(16f / 9f)) {
             Card(
                 modifier = Modifier.fillMaxSize(),
                 shape = RoundedCornerShape(12.dp),
-                elevation = CardDefaults.cardElevation(defaultElevation = 6.dp)
+                elevation = CardDefaults.cardElevation(defaultElevation = 6.dp),
             ) {
                 Box(modifier = Modifier.fillMaxSize()) {
                     AsyncImage(
-                        imageUrl = library.images.primaryImageUrl
-                            ?: library.images.backdropImageUrl,
+                        imageUrl =
+                            library.images.primaryImageUrl ?: library.images.backdropImageUrl,
                         contentDescription = library.name,
-                        blurHash = library.images.primaryBlurHash
-                            ?: library.images.backdropBlurHash,
+                        blurHash =
+                            library.images.primaryBlurHash ?: library.images.backdropBlurHash,
                         targetWidth = 160.dp,
                         targetHeight = 90.dp,
                         modifier = Modifier.fillMaxSize(),
-                        contentScale = ContentScale.Crop
+                        contentScale = ContentScale.Crop,
                     )
-
                 }
             }
 
             if (library.type != CollectionType.Unknown) {
-                Box(
-                    modifier = Modifier
-                        .align(Alignment.BottomEnd)
-                        .padding(6.dp)
-                ) {
+                Box(modifier = Modifier.align(Alignment.BottomEnd).padding(6.dp)) {
                     Icon(
                         painter = getLibraryIcon(library.type),
                         contentDescription = null,
                         modifier = Modifier.size(20.dp),
-                        tint = Color.White
+                        tint = Color.White,
                     )
                 }
             }
@@ -215,75 +191,68 @@ private fun LibraryCard(
 
         Column(
             modifier = Modifier.padding(top = 8.dp),
-            verticalArrangement = Arrangement.spacedBy(4.dp)
+            verticalArrangement = Arrangement.spacedBy(4.dp),
         ) {
             Text(
                 text = library.name,
-                style = MaterialTheme.typography.titleMedium.copy(
-                    fontWeight = FontWeight.Bold
-                ),
+                style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),
                 color = MaterialTheme.colorScheme.onBackground,
                 maxLines = 2,
-                overflow = TextOverflow.Ellipsis
+                overflow = TextOverflow.Ellipsis,
             )
         }
     }
 }
 
 @Composable
-private fun ErrorMessage(
-    message: String,
-    modifier: Modifier = Modifier
-) {
+private fun ErrorMessage(message: String, modifier: Modifier = Modifier) {
     Column(
         modifier = modifier.padding(32.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.spacedBy(16.dp)
+        verticalArrangement = Arrangement.spacedBy(16.dp),
     ) {
         Text(
             text = stringResource(R.string.home_error_title),
             style = MaterialTheme.typography.headlineSmall,
             color = MaterialTheme.colorScheme.onBackground,
-            textAlign = TextAlign.Center
+            textAlign = TextAlign.Center,
         )
 
         Text(
             text = message,
             style = MaterialTheme.typography.bodyMedium,
             color = MaterialTheme.colorScheme.onSurfaceVariant,
-            textAlign = TextAlign.Center
+            textAlign = TextAlign.Center,
         )
 
         Text(
             text = stringResource(R.string.home_error_message),
             style = MaterialTheme.typography.bodySmall,
             color = MaterialTheme.colorScheme.onSurfaceVariant,
-            textAlign = TextAlign.Center
+            textAlign = TextAlign.Center,
         )
     }
 }
 
 @Composable
-private fun EmptyLibrariesMessage(
-    modifier: Modifier = Modifier
-) {
+private fun EmptyLibrariesMessage(modifier: Modifier = Modifier) {
     Column(
         modifier = modifier.padding(32.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.spacedBy(16.dp)
+        verticalArrangement = Arrangement.spacedBy(16.dp),
     ) {
         Text(
             text = stringResource(R.string.libraries_empty_title),
             style = MaterialTheme.typography.headlineSmall,
             color = MaterialTheme.colorScheme.onBackground,
-            textAlign = TextAlign.Center
+            textAlign = TextAlign.Center,
         )
 
         Text(
             text = stringResource(R.string.libraries_empty_message),
             style = MaterialTheme.typography.bodyMedium,
             color = MaterialTheme.colorScheme.onSurfaceVariant,
-            textAlign = TextAlign.Center
+            textAlign = TextAlign.Center,
         )
     }
 }
@@ -305,20 +274,19 @@ private fun getLibraryIcon(type: CollectionType): Painter {
 }
 
 private fun sortLibraries(libraries: List<AfinityCollection>): List<AfinityCollection> {
-    val sortOrder = mapOf(
-        CollectionType.BoxSets to 1,
-        CollectionType.Movies to 2,
-        CollectionType.TvShows to 3,
-        CollectionType.Music to 4,
-        CollectionType.HomeVideos to 5,
-        CollectionType.Books to 6,
-        CollectionType.Playlists to 7,
-        CollectionType.LiveTv to 8,
-        CollectionType.Mixed to 9,
-        CollectionType.Unknown to 10
-    )
+    val sortOrder =
+        mapOf(
+            CollectionType.BoxSets to 1,
+            CollectionType.Movies to 2,
+            CollectionType.TvShows to 3,
+            CollectionType.Music to 4,
+            CollectionType.HomeVideos to 5,
+            CollectionType.Books to 6,
+            CollectionType.Playlists to 7,
+            CollectionType.LiveTv to 8,
+            CollectionType.Mixed to 9,
+            CollectionType.Unknown to 10,
+        )
 
-    return libraries.sortedBy { library ->
-        sortOrder[library.type] ?: 999
-    }
-}
\ No newline at end of file
+    return libraries.sortedBy { library -> sortOrder[library.type] ?: 999 }
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/libraries/LibrariesViewModel.kt b/app/src/main/java/com/makd/afinity/ui/libraries/LibrariesViewModel.kt
index 6b303617a..29315b2f1 100644
--- a/app/src/main/java/com/makd/afinity/ui/libraries/LibrariesViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/libraries/LibrariesViewModel.kt
@@ -6,17 +6,19 @@ import com.makd.afinity.data.models.media.AfinityCollection
 import com.makd.afinity.data.repository.AppDataRepository
 import com.makd.afinity.data.repository.JellyfinRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltViewModel
-class LibrariesViewModel @Inject constructor(
+class LibrariesViewModel
+@Inject
+constructor(
     private val jellyfinRepository: JellyfinRepository,
-    private val appDataRepository: AppDataRepository
+    private val appDataRepository: AppDataRepository,
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(LibrariesUiState())
@@ -40,20 +42,17 @@ class LibrariesViewModel @Inject constructor(
 
             try {
                 val libraries = jellyfinRepository.getLibraries()
-                _uiState.value = _uiState.value.copy(
-                    libraries = libraries,
-                    isLoading = false,
-                    error = null
-                )
+                _uiState.value =
+                    _uiState.value.copy(libraries = libraries, isLoading = false, error = null)
 
                 Timber.d("Successfully loaded ${libraries.size} libraries")
-
             } catch (e: Exception) {
                 Timber.e(e, "Failed to load libraries")
-                _uiState.value = _uiState.value.copy(
-                    isLoading = false,
-                    error = "Failed to load libraries: ${e.message}"
-                )
+                _uiState.value =
+                    _uiState.value.copy(
+                        isLoading = false,
+                        error = "Failed to load libraries: ${e.message}",
+                    )
             }
         }
     }
@@ -66,5 +65,5 @@ class LibrariesViewModel @Inject constructor(
 data class LibrariesUiState(
     val libraries: List<AfinityCollection> = emptyList(),
     val isLoading: Boolean = false,
-    val error: String? = null
-)
\ No newline at end of file
+    val error: String? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/library/LibraryContentScreen.kt b/app/src/main/java/com/makd/afinity/ui/library/LibraryContentScreen.kt
index dc81fdd0c..31f2052f0 100644
--- a/app/src/main/java/com/makd/afinity/ui/library/LibraryContentScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/library/LibraryContentScreen.kt
@@ -82,8 +82,8 @@ import com.makd.afinity.data.models.media.AfinityShow
 import com.makd.afinity.navigation.Destination
 import com.makd.afinity.ui.components.AsyncImage
 import com.makd.afinity.ui.theme.CardDimensions.gridMinSize
-import timber.log.Timber
 import java.util.Locale
+import timber.log.Timber
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -93,7 +93,7 @@ fun LibraryContentScreen(
     modifier: Modifier = Modifier,
     navController: NavController,
     viewModel: LibraryContentViewModel = hiltViewModel(),
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val pagingDataFlow by viewModel.pagingData.collectAsStateWithLifecycle()
@@ -113,34 +113,31 @@ fun LibraryContentScreen(
     }
 
     Box(
-        modifier = modifier
-            .fillMaxSize()
-            .windowInsetsPadding(WindowInsets.displayCutout)
-            .background(MaterialTheme.colorScheme.background)
+        modifier =
+            modifier
+                .fillMaxSize()
+                .windowInsetsPadding(WindowInsets.displayCutout)
+                .background(MaterialTheme.colorScheme.background)
     ) {
-        Column(
-            modifier = Modifier.fillMaxSize()
-        ) {
+        Column(modifier = Modifier.fillMaxSize()) {
             LibraryContentTopBar(
                 title = uiState.libraryName,
                 backgroundOpacity = 1f,
                 userProfileImageUrl = uiState.userProfileImageUrl,
                 onProfileClick = onProfileClick,
-                navController = navController
+                navController = navController,
             )
 
             FilterRow(
                 currentFilter = uiState.currentFilter,
-                onFilterSelected = { viewModel.updateFilter(it) }
+                onFilterSelected = { viewModel.updateFilter(it) },
             )
 
             when {
                 uiState.isLoading -> {
                     Box(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .padding(top = 16.dp),
-                        contentAlignment = Alignment.Center
+                        modifier = Modifier.fillMaxSize().padding(top = 16.dp),
+                        contentAlignment = Alignment.Center,
                     ) {
                         CircularProgressIndicator()
                     }
@@ -148,37 +145,31 @@ fun LibraryContentScreen(
 
                 uiState.error != null -> {
                     Box(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .padding(top = 16.dp),
-                        contentAlignment = Alignment.Center
+                        modifier = Modifier.fillMaxSize().padding(top = 16.dp),
+                        contentAlignment = Alignment.Center,
                     ) {
-                        ErrorMessage(
-                            message = uiState.error!!
-                        )
+                        ErrorMessage(message = uiState.error!!)
                     }
                 }
 
-                lazyPagingItems.itemCount == 0 && lazyPagingItems.loadState.refresh !is LoadState.Loading -> {
+                lazyPagingItems.itemCount == 0 &&
+                    lazyPagingItems.loadState.refresh !is LoadState.Loading -> {
                     val selectedLetter = uiState.selectedLetter
                     if (selectedLetter != null) {
                         Row(modifier = Modifier.fillMaxSize()) {
                             Box(
-                                modifier = Modifier
-                                    .weight(1f)
-                                    .fillMaxSize()
-                                    .padding(top = 16.dp),
-                                contentAlignment = Alignment.Center
+                                modifier = Modifier.weight(1f).fillMaxSize().padding(top = 16.dp),
+                                contentAlignment = Alignment.Center,
                             ) {
                                 EmptyLetterFilterMessage(
                                     letter = selectedLetter,
-                                    onClearFilter = { viewModel.clearLetterFilter() }
+                                    onClearFilter = { viewModel.clearLetterFilter() },
                                 )
                             }
 
                             Box(
                                 modifier = Modifier.fillMaxHeight(),
-                                contentAlignment = Alignment.Center
+                                contentAlignment = Alignment.Center,
                             ) {
                                 AlphabetScroller(
                                     onLetterSelected = { letter ->
@@ -186,29 +177,27 @@ fun LibraryContentScreen(
                                         viewModel.scrollToLetter(letter)
                                     },
                                     selectedLetter = uiState.selectedLetter,
-                                    modifier = Modifier
-                                        .background(MaterialTheme.colorScheme.surface.copy(alpha = 0.8f))
+                                    modifier =
+                                        Modifier.background(
+                                            MaterialTheme.colorScheme.surface.copy(alpha = 0.8f)
+                                        ),
                                 )
                             }
                         }
                     } else if (uiState.currentFilter != FilterType.ALL) {
                         Box(
-                            modifier = Modifier
-                                .fillMaxSize()
-                                .padding(top = 16.dp),
-                            contentAlignment = Alignment.Center
+                            modifier = Modifier.fillMaxSize().padding(top = 16.dp),
+                            contentAlignment = Alignment.Center,
                         ) {
                             EmptyFilterMessage(
                                 filterType = uiState.currentFilter,
-                                onClearFilter = { viewModel.updateFilter(FilterType.ALL) }
+                                onClearFilter = { viewModel.updateFilter(FilterType.ALL) },
                             )
                         }
                     } else {
                         Box(
-                            modifier = Modifier
-                                .fillMaxSize()
-                                .padding(top = 16.dp),
-                            contentAlignment = Alignment.Center
+                            modifier = Modifier.fillMaxSize().padding(top = 16.dp),
+                            contentAlignment = Alignment.Center,
                         ) {
                             EmptyLibraryMessage()
                         }
@@ -220,19 +209,20 @@ fun LibraryContentScreen(
                         LazyVerticalGrid(
                             columns = GridCells.Adaptive(widthSizeClass.gridMinSize),
                             state = gridState,
-                            contentPadding = PaddingValues(
-                                start = 16.dp,
-                                end = 16.dp,
-                                top = 16.dp,
-                                bottom = 80.dp
-                            ),
+                            contentPadding =
+                                PaddingValues(
+                                    start = 16.dp,
+                                    end = 16.dp,
+                                    top = 16.dp,
+                                    bottom = 80.dp,
+                                ),
                             horizontalArrangement = Arrangement.spacedBy(12.dp),
                             verticalArrangement = Arrangement.spacedBy(12.dp),
-                            modifier = Modifier.weight(1f)
+                            modifier = Modifier.weight(1f),
                         ) {
                             items(
                                 count = lazyPagingItems.itemCount,
-                                key = { index -> lazyPagingItems[index]?.id ?: index }
+                                key = { index -> lazyPagingItems[index]?.id ?: index },
                             ) { index ->
                                 lazyPagingItems[index]?.let { item ->
                                     MediaItemGridCard(
@@ -240,7 +230,7 @@ fun LibraryContentScreen(
                                         onClick = {
                                             viewModel.onItemClick(item)
                                             onItemClick(item)
-                                        }
+                                        },
                                     )
                                 }
                             }
@@ -250,10 +240,8 @@ fun LibraryContentScreen(
                                     loadState.append is LoadState.Loading -> {
                                         item {
                                             Box(
-                                                modifier = Modifier
-                                                    .fillMaxWidth()
-                                                    .padding(16.dp),
-                                                contentAlignment = Alignment.Center
+                                                modifier = Modifier.fillMaxWidth().padding(16.dp),
+                                                contentAlignment = Alignment.Center,
                                             ) {
                                                 CircularProgressIndicator(
                                                     modifier = Modifier.size(32.dp)
@@ -265,14 +253,10 @@ fun LibraryContentScreen(
                                     loadState.append is LoadState.Error -> {
                                         item {
                                             Box(
-                                                modifier = Modifier
-                                                    .fillMaxWidth()
-                                                    .padding(16.dp),
-                                                contentAlignment = Alignment.Center
+                                                modifier = Modifier.fillMaxWidth().padding(16.dp),
+                                                contentAlignment = Alignment.Center,
                                             ) {
-                                                Button(onClick = { retry() }) {
-                                                    Text("Retry")
-                                                }
+                                                Button(onClick = { retry() }) { Text("Retry") }
                                             }
                                         }
                                     }
@@ -282,7 +266,7 @@ fun LibraryContentScreen(
 
                         Box(
                             modifier = Modifier.fillMaxHeight(),
-                            contentAlignment = Alignment.Center
+                            contentAlignment = Alignment.Center,
                         ) {
                             AlphabetScroller(
                                 onLetterSelected = { letter ->
@@ -290,8 +274,10 @@ fun LibraryContentScreen(
                                     viewModel.scrollToLetter(letter)
                                 },
                                 selectedLetter = uiState.selectedLetter,
-                                modifier = Modifier
-                                    .background(MaterialTheme.colorScheme.surface.copy(alpha = 0.8f))
+                                modifier =
+                                    Modifier.background(
+                                        MaterialTheme.colorScheme.surface.copy(alpha = 0.8f)
+                                    ),
                             )
                         }
                     }
@@ -301,14 +287,11 @@ fun LibraryContentScreen(
 
         FloatingActionButton(
             onClick = { showSortDialog = true },
-            modifier = Modifier
-                .align(Alignment.BottomEnd)
-                .padding(16.dp)
-                .padding(end = 24.dp)
+            modifier = Modifier.align(Alignment.BottomEnd).padding(16.dp).padding(end = 24.dp),
         ) {
             Icon(
                 painter = painterResource(id = R.drawable.ic_arrows_sort),
-                contentDescription = stringResource(R.string.cd_sort_fab)
+                contentDescription = stringResource(R.string.cd_sort_fab),
             )
         }
     }
@@ -319,7 +302,7 @@ fun LibraryContentScreen(
             onSortSelected = { sortBy, descending ->
                 viewModel.updateSort(sortBy, descending)
                 showSortDialog = false
-            }
+            },
         )
     }
 }
@@ -331,16 +314,14 @@ private fun LibraryContentTopBar(
     backgroundOpacity: Float = 0f,
     navController: NavController,
     userProfileImageUrl: String? = null,
-    onProfileClick: () -> Unit
+    onProfileClick: () -> Unit,
 ) {
     TopAppBar(
         title = {
             Text(
                 text = title,
-                style = MaterialTheme.typography.headlineLarge.copy(
-                    fontWeight = FontWeight.Bold
-                ),
-                color = MaterialTheme.colorScheme.onBackground
+                style = MaterialTheme.typography.headlineLarge.copy(fontWeight = FontWeight.Bold),
+                color = MaterialTheme.colorScheme.onBackground,
             )
         },
         actions = {
@@ -349,35 +330,31 @@ private fun LibraryContentTopBar(
                     val route = Destination.createSearchRoute()
                     navController.navigate(route)
                 },
-                modifier = Modifier
-                    .height(48.dp)
-                    .width(120.dp),
-                colors = ButtonDefaults.buttonColors(
-                    containerColor = MaterialTheme.colorScheme.surfaceVariant
-                ),
+                modifier = Modifier.height(48.dp).width(120.dp),
+                colors =
+                    ButtonDefaults.buttonColors(
+                        containerColor = MaterialTheme.colorScheme.surfaceVariant
+                    ),
                 shape = RoundedCornerShape(24.dp),
-                contentPadding = PaddingValues(0.dp)
+                contentPadding = PaddingValues(0.dp),
             ) {
-                Box(
-                    modifier = Modifier.fillMaxSize(),
-                    contentAlignment = Alignment.Center
-                ) {
+                Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                     Row(
                         verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.spacedBy(6.dp)
+                        horizontalArrangement = Arrangement.spacedBy(6.dp),
                     ) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_search),
                             contentDescription = stringResource(R.string.action_search),
                             tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                            modifier = Modifier.size(20.dp)
+                            modifier = Modifier.size(20.dp),
                         )
                         Text(
                             text = stringResource(R.string.action_search),
                             color = MaterialTheme.colorScheme.onSurfaceVariant,
                             style = MaterialTheme.typography.bodyMedium,
                             fontSize = 20.sp,
-                            fontWeight = FontWeight.Medium
+                            fontWeight = FontWeight.Medium,
                         )
                     }
                 }
@@ -385,19 +362,13 @@ private fun LibraryContentTopBar(
 
             Spacer(modifier = Modifier.width(8.dp))
 
-            IconButton(
-                onClick = onProfileClick,
-                modifier = Modifier.size(48.dp)
-            ) {
+            IconButton(onClick = onProfileClick, modifier = Modifier.size(48.dp)) {
                 Box(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .background(
-                            MaterialTheme.colorScheme.surfaceVariant,
-                            CircleShape
-                        )
-                        .clip(CircleShape),
-                    contentAlignment = Alignment.Center
+                    modifier =
+                        Modifier.fillMaxSize()
+                            .background(MaterialTheme.colorScheme.surfaceVariant, CircleShape)
+                            .clip(CircleShape),
+                    contentAlignment = Alignment.Center,
                 ) {
                     if (userProfileImageUrl != null) {
                         AsyncImage(
@@ -406,23 +377,25 @@ private fun LibraryContentTopBar(
                             targetWidth = 48.dp,
                             targetHeight = 48.dp,
                             modifier = Modifier.fillMaxSize(),
-                            contentScale = ContentScale.Crop
+                            contentScale = ContentScale.Crop,
                         )
                     } else {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_user_circle),
                             contentDescription = stringResource(R.string.cd_profile),
                             tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                            modifier = Modifier.size(32.dp)
+                            modifier = Modifier.size(32.dp),
                         )
                     }
                 }
             }
             Spacer(modifier = Modifier.width(16.dp))
         },
-        colors = TopAppBarDefaults.topAppBarColors(
-            containerColor = MaterialTheme.colorScheme.background.copy(alpha = backgroundOpacity)
-        )
+        colors =
+            TopAppBarDefaults.topAppBarColors(
+                containerColor =
+                    MaterialTheme.colorScheme.background.copy(alpha = backgroundOpacity)
+            ),
     )
 }
 
@@ -430,20 +403,16 @@ private fun LibraryContentTopBar(
 private fun MediaItemGridCard(
     item: AfinityItem,
     onClick: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Column(
-        modifier = modifier
-            .fillMaxWidth()
-            .clickable { onClick() },
-        verticalArrangement = Arrangement.spacedBy(8.dp)
+        modifier = modifier.fillMaxWidth().clickable { onClick() },
+        verticalArrangement = Arrangement.spacedBy(8.dp),
     ) {
         Card(
-            modifier = Modifier
-                .fillMaxWidth()
-                .aspectRatio(2f / 3f),
+            modifier = Modifier.fillMaxWidth().aspectRatio(2f / 3f),
             shape = RoundedCornerShape(12.dp),
-            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
         ) {
             Box {
                 AsyncImage(
@@ -453,60 +422,61 @@ private fun MediaItemGridCard(
                     targetWidth = 160.dp,
                     targetHeight = 240.dp,
                     modifier = Modifier.fillMaxSize(),
-                    contentScale = ContentScale.Crop
+                    contentScale = ContentScale.Crop,
                 )
 
                 when {
                     item.played -> {
                         Box(
-                            modifier = Modifier
-                                .align(Alignment.TopEnd)
-                                .padding(8.dp)
-                                .size(24.dp)
-                                .background(
-                                    MaterialTheme.colorScheme.primary,
-                                    CircleShape
-                                ),
-                            contentAlignment = Alignment.Center
+                            modifier =
+                                Modifier.align(Alignment.TopEnd)
+                                    .padding(8.dp)
+                                    .size(24.dp)
+                                    .background(MaterialTheme.colorScheme.primary, CircleShape),
+                            contentAlignment = Alignment.Center,
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_check),
                                 contentDescription = stringResource(R.string.cd_watched_status),
                                 tint = MaterialTheme.colorScheme.onPrimary,
-                                modifier = Modifier.size(16.dp)
+                                modifier = Modifier.size(16.dp),
                             )
                         }
                     }
 
                     item is AfinityShow -> {
-                        val episodeText = when {
-                            item.unplayedItemCount != null && item.unplayedItemCount > 0 ->
-                                "${item.unplayedItemCount}"
+                        val episodeText =
+                            when {
+                                item.unplayedItemCount != null && item.unplayedItemCount > 0 ->
+                                    "${item.unplayedItemCount}"
 
-                            item.episodeCount != null && item.episodeCount > 0 ->
-                                "${item.episodeCount}"
+                                item.episodeCount != null && item.episodeCount > 0 ->
+                                    "${item.episodeCount}"
 
-                            else -> null
-                        }
+                                else -> null
+                            }
 
                         episodeText?.let { text ->
                             Surface(
-                                modifier = Modifier
-                                    .align(Alignment.TopEnd)
-                                    .padding(8.dp),
+                                modifier = Modifier.align(Alignment.TopEnd).padding(8.dp),
                                 shape = RoundedCornerShape(4.dp),
-                                color = MaterialTheme.colorScheme.primary.copy(alpha = 0.9f)
+                                color = MaterialTheme.colorScheme.primary.copy(alpha = 0.9f),
                             ) {
                                 Text(
-                                    text = if (text.toIntOrNull() != null && text.toInt() > 99)
-                                        stringResource(R.string.home_episode_count_plus)
-                                    else
-                                        stringResource(R.string.home_episode_count_fmt, text.toIntOrNull() ?: 0),
-                                    style = MaterialTheme.typography.labelSmall.copy(
-                                        fontWeight = FontWeight.Bold
-                                    ),
+                                    text =
+                                        if (text.toIntOrNull() != null && text.toInt() > 99)
+                                            stringResource(R.string.home_episode_count_plus)
+                                        else
+                                            stringResource(
+                                                R.string.home_episode_count_fmt,
+                                                text.toIntOrNull() ?: 0,
+                                            ),
+                                    style =
+                                        MaterialTheme.typography.labelSmall.copy(
+                                            fontWeight = FontWeight.Bold
+                                        ),
                                     color = MaterialTheme.colorScheme.onPrimary,
-                                    modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp)
+                                    modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp),
                                 )
                             }
                         }
@@ -517,44 +487,42 @@ private fun MediaItemGridCard(
 
         Text(
             text = item.name,
-            style = MaterialTheme.typography.bodyMedium.copy(
-                fontWeight = FontWeight.Medium
-            ),
+            style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.Medium),
             color = MaterialTheme.colorScheme.onBackground,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
-            textAlign = TextAlign.Start
+            textAlign = TextAlign.Start,
         )
 
         when (item) {
             is AfinityMovie -> {
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(6.dp)
+                    horizontalArrangement = Arrangement.spacedBy(6.dp),
                 ) {
                     item.productionYear?.let { year ->
                         Text(
                             text = year.toString(),
                             style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
 
                     item.communityRating?.let { rating ->
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(2.dp)
+                            horizontalArrangement = Arrangement.spacedBy(2.dp),
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_imdb_logo),
                                 contentDescription = stringResource(R.string.cd_imdb),
                                 tint = Color.Unspecified,
-                                modifier = Modifier.size(18.dp)
+                                modifier = Modifier.size(18.dp),
                             )
                             Text(
                                 text = String.format(Locale.US, "%.1f", rating),
                                 style = MaterialTheme.typography.bodySmall,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                         }
                     }
@@ -562,24 +530,26 @@ private fun MediaItemGridCard(
                     item.criticRating?.let { rtRating ->
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(2.dp)
+                            horizontalArrangement = Arrangement.spacedBy(2.dp),
                         ) {
                             Icon(
-                                painter = painterResource(
-                                    id = if (rtRating > 60) {
-                                        R.drawable.ic_rotten_tomato_fresh
-                                    } else {
-                                        R.drawable.ic_rotten_tomato_rotten
-                                    }
-                                ),
+                                painter =
+                                    painterResource(
+                                        id =
+                                            if (rtRating > 60) {
+                                                R.drawable.ic_rotten_tomato_fresh
+                                            } else {
+                                                R.drawable.ic_rotten_tomato_rotten
+                                            }
+                                    ),
                                 contentDescription = stringResource(R.string.cd_rotten_tomatoes),
                                 tint = Color.Unspecified,
-                                modifier = Modifier.size(12.dp)
+                                modifier = Modifier.size(12.dp),
                             )
                             Text(
                                 text = "${rtRating.toInt()}%",
                                 style = MaterialTheme.typography.bodySmall,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                         }
                     }
@@ -589,31 +559,31 @@ private fun MediaItemGridCard(
             is AfinityShow -> {
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(6.dp)
+                    horizontalArrangement = Arrangement.spacedBy(6.dp),
                 ) {
                     item.productionYear?.let { year ->
                         Text(
                             text = year.toString(),
                             style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
 
                     item.communityRating?.let { rating ->
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(2.dp)
+                            horizontalArrangement = Arrangement.spacedBy(2.dp),
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_imdb_logo),
                                 contentDescription = stringResource(R.string.cd_imdb),
                                 tint = Color.Unspecified,
-                                modifier = Modifier.size(18.dp)
+                                modifier = Modifier.size(18.dp),
                             )
                             Text(
                                 text = String.format(Locale.US, "%.1f", rating),
                                 style = MaterialTheme.typography.bodySmall,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                         }
                     }
@@ -624,52 +594,47 @@ private fun MediaItemGridCard(
 }
 
 @Composable
-private fun ErrorMessage(
-    message: String,
-    modifier: Modifier = Modifier
-) {
+private fun ErrorMessage(message: String, modifier: Modifier = Modifier) {
     Column(
         modifier = modifier.padding(32.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.spacedBy(16.dp)
+        verticalArrangement = Arrangement.spacedBy(16.dp),
     ) {
         Text(
             text = stringResource(R.string.home_error_title),
             style = MaterialTheme.typography.headlineSmall,
             color = MaterialTheme.colorScheme.onBackground,
-            textAlign = TextAlign.Center
+            textAlign = TextAlign.Center,
         )
 
         Text(
             text = message,
             style = MaterialTheme.typography.bodyMedium,
             color = MaterialTheme.colorScheme.onSurfaceVariant,
-            textAlign = TextAlign.Center
+            textAlign = TextAlign.Center,
         )
     }
 }
 
 @Composable
-private fun EmptyLibraryMessage(
-    modifier: Modifier = Modifier
-) {
+private fun EmptyLibraryMessage(modifier: Modifier = Modifier) {
     Column(
         modifier = modifier.padding(32.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.spacedBy(16.dp)
+        verticalArrangement = Arrangement.spacedBy(16.dp),
     ) {
         Text(
             text = stringResource(R.string.library_empty_title),
             style = MaterialTheme.typography.headlineSmall,
             color = MaterialTheme.colorScheme.onBackground,
-            textAlign = TextAlign.Center
+            textAlign = TextAlign.Center,
         )
 
         Text(
             text = stringResource(R.string.library_empty_message),
             style = MaterialTheme.typography.bodyMedium,
             color = MaterialTheme.colorScheme.onSurfaceVariant,
-            textAlign = TextAlign.Center
+            textAlign = TextAlign.Center,
         )
     }
 }
@@ -678,30 +643,28 @@ private fun EmptyLibraryMessage(
 private fun EmptyLetterFilterMessage(
     letter: String,
     onClearFilter: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Column(
         modifier = modifier.padding(32.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.spacedBy(16.dp)
+        verticalArrangement = Arrangement.spacedBy(16.dp),
     ) {
         Text(
             text = stringResource(R.string.library_empty_title),
             style = MaterialTheme.typography.headlineSmall,
             color = MaterialTheme.colorScheme.onBackground,
-            textAlign = TextAlign.Center
+            textAlign = TextAlign.Center,
         )
 
         Text(
             text = stringResource(R.string.library_empty_letter_fmt, letter),
             style = MaterialTheme.typography.bodyMedium,
             color = MaterialTheme.colorScheme.onSurfaceVariant,
-            textAlign = TextAlign.Center
+            textAlign = TextAlign.Center,
         )
 
-        Button(onClick = onClearFilter) {
-            Text(stringResource(R.string.action_show_all))
-        }
+        Button(onClick = onClearFilter) { Text(stringResource(R.string.action_show_all)) }
     }
 }
 
@@ -709,65 +672,55 @@ private fun EmptyLetterFilterMessage(
 private fun EmptyFilterMessage(
     filterType: FilterType,
     onClearFilter: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
-    val filterMessage = when (filterType) {
-        FilterType.WATCHED -> stringResource(R.string.filter_empty_watched)
-        FilterType.UNWATCHED -> stringResource(R.string.filter_empty_unwatched)
-        FilterType.WATCHLIST -> stringResource(R.string.filter_empty_watchlist)
-        FilterType.FAVORITES -> stringResource(R.string.filter_empty_favorites)
-        FilterType.ALL -> stringResource(R.string.filter_empty_all)
-    }
+    val filterMessage =
+        when (filterType) {
+            FilterType.WATCHED -> stringResource(R.string.filter_empty_watched)
+            FilterType.UNWATCHED -> stringResource(R.string.filter_empty_unwatched)
+            FilterType.WATCHLIST -> stringResource(R.string.filter_empty_watchlist)
+            FilterType.FAVORITES -> stringResource(R.string.filter_empty_favorites)
+            FilterType.ALL -> stringResource(R.string.filter_empty_all)
+        }
 
     Column(
         modifier = modifier.padding(32.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.spacedBy(16.dp)
+        verticalArrangement = Arrangement.spacedBy(16.dp),
     ) {
         Text(
             text = stringResource(R.string.library_empty_title),
             style = MaterialTheme.typography.headlineSmall,
             color = MaterialTheme.colorScheme.onBackground,
-            textAlign = TextAlign.Center
+            textAlign = TextAlign.Center,
         )
 
         Text(
             text = filterMessage,
             style = MaterialTheme.typography.bodyMedium,
             color = MaterialTheme.colorScheme.onSurfaceVariant,
-            textAlign = TextAlign.Center
+            textAlign = TextAlign.Center,
         )
 
-        Button(onClick = onClearFilter) {
-            Text(stringResource(R.string.action_clear_filter))
-        }
+        Button(onClick = onClearFilter) { Text(stringResource(R.string.action_clear_filter)) }
     }
 }
 
 @Composable
-private fun SortDialog(
-    onDismiss: () -> Unit,
-    onSortSelected: (SortBy, Boolean) -> Unit
-) {
+private fun SortDialog(onDismiss: () -> Unit, onSortSelected: (SortBy, Boolean) -> Unit) {
     var isAscending by remember { mutableStateOf(true) }
     var selectedSort by remember { mutableStateOf(SortBy.NAME) }
 
     AlertDialog(
         onDismissRequest = onDismiss,
-        title = {
-            Text(stringResource(R.string.sort_title))
-        },
+        title = { Text(stringResource(R.string.sort_title)) },
         text = {
-            Column(
-                verticalArrangement = Arrangement.spacedBy(12.dp)
-            ) {
-                SingleChoiceSegmentedButtonRow(
-                    modifier = Modifier.fillMaxWidth()
-                ) {
+            Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
+                SingleChoiceSegmentedButtonRow(modifier = Modifier.fillMaxWidth()) {
                     SegmentedButton(
                         selected = isAscending,
                         onClick = { isAscending = true },
-                        shape = SegmentedButtonDefaults.itemShape(index = 0, count = 2)
+                        shape = SegmentedButtonDefaults.itemShape(index = 0, count = 2),
                     ) {
                         Spacer(Modifier.width(4.dp))
                         Text(stringResource(R.string.sort_ascending))
@@ -776,7 +729,7 @@ private fun SortDialog(
                     SegmentedButton(
                         selected = !isAscending,
                         onClick = { isAscending = false },
-                        shape = SegmentedButtonDefaults.itemShape(index = 1, count = 2)
+                        shape = SegmentedButtonDefaults.itemShape(index = 1, count = 2),
                     ) {
                         Spacer(Modifier.width(4.dp))
                         Text(stringResource(R.string.sort_descending))
@@ -787,33 +740,45 @@ private fun SortDialog(
                     SortOptionRow(
                         stringResource(R.string.sort_option_title),
                         SortBy.NAME,
-                        selectedSort
-                    ) { selectedSort = it }
+                        selectedSort,
+                    ) {
+                        selectedSort = it
+                    }
                     SortOptionRow(
                         stringResource(R.string.sort_option_imdb),
                         SortBy.IMDB_RATING,
-                        selectedSort
-                    ) { selectedSort = it }
+                        selectedSort,
+                    ) {
+                        selectedSort = it
+                    }
                     SortOptionRow(
                         stringResource(R.string.sort_option_parental),
                         SortBy.PARENTAL_RATING,
-                        selectedSort
-                    ) { selectedSort = it }
+                        selectedSort,
+                    ) {
+                        selectedSort = it
+                    }
                     SortOptionRow(
                         stringResource(R.string.sort_option_date_added),
                         SortBy.DATE_ADDED,
-                        selectedSort
-                    ) { selectedSort = it }
+                        selectedSort,
+                    ) {
+                        selectedSort = it
+                    }
                     SortOptionRow(
                         stringResource(R.string.sort_option_date_played),
                         SortBy.DATE_PLAYED,
-                        selectedSort
-                    ) { selectedSort = it }
+                        selectedSort,
+                    ) {
+                        selectedSort = it
+                    }
                     SortOptionRow(
                         stringResource(R.string.sort_option_release_date),
                         SortBy.RELEASE_DATE,
-                        selectedSort
-                    ) { selectedSort = it }
+                        selectedSort,
+                    ) {
+                        selectedSort = it
+                    }
                 }
             }
         },
@@ -828,10 +793,8 @@ private fun SortDialog(
             }
         },
         dismissButton = {
-            TextButton(onClick = onDismiss) {
-                Text(stringResource(R.string.action_cancel))
-            }
-        }
+            TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) }
+        },
     )
 }
 
@@ -840,24 +803,15 @@ private fun SortOptionRow(
     label: String,
     sortBy: SortBy,
     selectedSort: SortBy,
-    onSelect: (SortBy) -> Unit
+    onSelect: (SortBy) -> Unit,
 ) {
     Row(
-        modifier = Modifier
-            .fillMaxWidth()
-            .clickable { onSelect(sortBy) }
-            .padding(vertical = 4.dp),
-        verticalAlignment = Alignment.CenterVertically
+        modifier = Modifier.fillMaxWidth().clickable { onSelect(sortBy) }.padding(vertical = 4.dp),
+        verticalAlignment = Alignment.CenterVertically,
     ) {
-        RadioButton(
-            selected = selectedSort == sortBy,
-            onClick = { onSelect(sortBy) }
-        )
+        RadioButton(selected = selectedSort == sortBy, onClick = { onSelect(sortBy) })
         Spacer(modifier = Modifier.width(12.dp))
-        Text(
-            text = label,
-            style = MaterialTheme.typography.bodyLarge
-        )
+        Text(text = label, style = MaterialTheme.typography.bodyLarge)
     }
 }
 
@@ -865,65 +819,66 @@ private fun SortOptionRow(
 private fun FilterRow(
     currentFilter: FilterType,
     onFilterSelected: (FilterType) -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
-    val filters = listOf(
-        FilterType.ALL to stringResource(R.string.filter_all),
-        FilterType.WATCHED to stringResource(R.string.filter_watched),
-        FilterType.UNWATCHED to stringResource(R.string.filter_unwatched),
-        FilterType.WATCHLIST to stringResource(R.string.filter_watchlist),
-        FilterType.FAVORITES to stringResource(R.string.filter_favorites)
-    )
+    val filters =
+        listOf(
+            FilterType.ALL to stringResource(R.string.filter_all),
+            FilterType.WATCHED to stringResource(R.string.filter_watched),
+            FilterType.UNWATCHED to stringResource(R.string.filter_unwatched),
+            FilterType.WATCHLIST to stringResource(R.string.filter_watchlist),
+            FilterType.FAVORITES to stringResource(R.string.filter_favorites),
+        )
 
     LazyRow(
-        modifier = modifier
-            .fillMaxWidth()
-            .background(MaterialTheme.colorScheme.background)
-            .padding(vertical = 8.dp),
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .background(MaterialTheme.colorScheme.background)
+                .padding(vertical = 8.dp),
         horizontalArrangement = Arrangement.spacedBy(8.dp),
-        contentPadding = PaddingValues(horizontal = 16.dp)
+        contentPadding = PaddingValues(horizontal = 16.dp),
     ) {
         items(filters) { (filterType, label) ->
             FilterChip(
                 selected = currentFilter == filterType,
-                onClick = {
-                    onFilterSelected(filterType)
-                },
+                onClick = { onFilterSelected(filterType) },
                 label = { Text(label) },
-                leadingIcon = if (currentFilter == filterType) {
-                    when (filterType) {
-                        FilterType.FAVORITES -> {
-                            {
-                                Icon(
-                                    painterResource(id = R.drawable.ic_favorite_filled),
-                                    contentDescription = null,
-                                    modifier = Modifier.size(18.dp)
-                                )
+                leadingIcon =
+                    if (currentFilter == filterType) {
+                        when (filterType) {
+                            FilterType.FAVORITES -> {
+                                {
+                                    Icon(
+                                        painterResource(id = R.drawable.ic_favorite_filled),
+                                        contentDescription = null,
+                                        modifier = Modifier.size(18.dp),
+                                    )
+                                }
                             }
-                        }
 
-                        FilterType.WATCHLIST -> {
-                            {
-                                Icon(
-                                    painterResource(id = R.drawable.ic_bookmark_filled),
-                                    contentDescription = null,
-                                    modifier = Modifier.size(18.dp)
-                                )
+                            FilterType.WATCHLIST -> {
+                                {
+                                    Icon(
+                                        painterResource(id = R.drawable.ic_bookmark_filled),
+                                        contentDescription = null,
+                                        modifier = Modifier.size(18.dp),
+                                    )
+                                }
                             }
-                        }
 
-                        else -> {
-                            {
-                                Icon(
-                                    painterResource(id = R.drawable.ic_circle_check),
-                                    contentDescription = null,
-                                    modifier = Modifier.size(18.dp)
-                                )
+                            else -> {
+                                {
+                                    Icon(
+                                        painterResource(id = R.drawable.ic_circle_check),
+                                        contentDescription = null,
+                                        modifier = Modifier.size(18.dp),
+                                    )
+                                }
                             }
                         }
-                    }
-                } else null,
-                shape = RoundedCornerShape(50)
+                    } else null,
+                shape = RoundedCornerShape(50),
             )
         }
     }
@@ -933,37 +888,32 @@ private fun FilterRow(
 private fun AlphabetScroller(
     selectedLetter: String?,
     onLetterSelected: (String) -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val letters = listOf("#") + ('A'..'Z').map { it.toString() }
 
     LazyColumn(
-        modifier = modifier
-            .width(32.dp)
-            .padding(vertical = 8.dp),
+        modifier = modifier.width(32.dp).padding(vertical = 8.dp),
         verticalArrangement = Arrangement.spacedBy(2.dp),
-        horizontalAlignment = Alignment.CenterHorizontally
+        horizontalAlignment = Alignment.CenterHorizontally,
     ) {
-        items(
-            items = letters,
-            key = { letter -> letter }
-        ) { letter ->
+        items(items = letters, key = { letter -> letter }) { letter ->
             val isSelected = selectedLetter == letter
             Text(
                 text = letter,
-                style = MaterialTheme.typography.labelSmall.copy(
-                    fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Medium
-                ),
-                color = if (isSelected)
-                    MaterialTheme.colorScheme.primary
-                else
-                    MaterialTheme.colorScheme.onSurfaceVariant,
+                style =
+                    MaterialTheme.typography.labelSmall.copy(
+                        fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Medium
+                    ),
+                color =
+                    if (isSelected) MaterialTheme.colorScheme.primary
+                    else MaterialTheme.colorScheme.onSurfaceVariant,
                 textAlign = TextAlign.Center,
-                modifier = Modifier
-                    .clickable { onLetterSelected(letter) }
-                    .padding(horizontal = 4.dp, vertical = 2.dp)
-                    .fillMaxWidth()
+                modifier =
+                    Modifier.clickable { onLetterSelected(letter) }
+                        .padding(horizontal = 4.dp, vertical = 2.dp)
+                        .fillMaxWidth(),
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/library/LibraryContentViewModel.kt b/app/src/main/java/com/makd/afinity/ui/library/LibraryContentViewModel.kt
index 32d4f465f..b5e13418a 100644
--- a/app/src/main/java/com/makd/afinity/ui/library/LibraryContentViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/library/LibraryContentViewModel.kt
@@ -13,6 +13,8 @@ import com.makd.afinity.data.models.media.AfinityItem
 import com.makd.afinity.data.repository.AppDataRepository
 import com.makd.afinity.data.repository.JellyfinRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
+import java.util.UUID
+import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -21,32 +23,37 @@ import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import java.util.UUID
-import javax.inject.Inject
 
 enum class FilterType {
-    ALL, WATCHED, UNWATCHED, WATCHLIST, FAVORITES
+    ALL,
+    WATCHED,
+    UNWATCHED,
+    WATCHLIST,
+    FAVORITES,
 }
 
 @HiltViewModel
-class LibraryContentViewModel @Inject constructor(
+class LibraryContentViewModel
+@Inject
+constructor(
     private val jellyfinRepository: JellyfinRepository,
     private val appDataRepository: AppDataRepository,
     private val playbackStateManager: PlaybackStateManager,
-    savedStateHandle: SavedStateHandle
+    savedStateHandle: SavedStateHandle,
 ) : ViewModel() {
 
     private val libraryId: String? = savedStateHandle["libraryId"]
     private val libraryName: String? = savedStateHandle["libraryName"]
     private val studioName: String? = savedStateHandle["studioName"]
 
-    private val _uiState = MutableStateFlow(
-        LibraryContentUiState(
-            libraryId = libraryId?.let { UUID.fromString(it) },
-            libraryName = (libraryName ?: studioName ?: "Content").replace("%2F", "/"),
-            isStudioMode = studioName != null
+    private val _uiState =
+        MutableStateFlow(
+            LibraryContentUiState(
+                libraryId = libraryId?.let { UUID.fromString(it) },
+                libraryName = (libraryName ?: studioName ?: "Content").replace("%2F", "/"),
+                isStudioMode = studioName != null,
+            )
         )
-    )
     val uiState: StateFlow<LibraryContentUiState> = _uiState.asStateFlow()
 
     private val _pagingData = MutableStateFlow<Flow<PagingData<AfinityItem>>>(emptyFlow())
@@ -70,11 +77,7 @@ class LibraryContentViewModel @Inject constructor(
                     loadLibraryContent()
                 } else {
                     _uiState.update {
-                        it.copy(
-                            isLoading = true,
-                            error = null,
-                            userProfileImageUrl = null
-                        )
+                        it.copy(isLoading = true, error = null, userProfileImageUrl = null)
                     }
                     _pagingData.value = emptyFlow()
                 }
@@ -114,8 +117,8 @@ class LibraryContentViewModel @Inject constructor(
             val name = libraryName ?: ""
             when {
                 name.contains("TV", ignoreCase = true) ||
-                        name.contains("Shows", ignoreCase = true) ||
-                        name.contains("Series", ignoreCase = true) -> CollectionType.TvShows
+                    name.contains("Shows", ignoreCase = true) ||
+                    name.contains("Series", ignoreCase = true) -> CollectionType.TvShows
 
                 name.contains("Movie", ignoreCase = true) -> CollectionType.Movies
                 else -> CollectionType.Mixed
@@ -126,15 +129,18 @@ class LibraryContentViewModel @Inject constructor(
     private fun loadItems() {
         val type = libraryType ?: return
 
-        _pagingData.value = jellyfinRepository.getItemsPaging(
-            parentId = libraryId?.let { UUID.fromString(it) },
-            libraryType = type,
-            sortBy = currentSortBy,
-            sortDescending = currentSortDescending,
-            filter = currentFilter,
-            nameStartsWith = null,
-            studioName = studioName
-        ).cachedIn(viewModelScope)
+        _pagingData.value =
+            jellyfinRepository
+                .getItemsPaging(
+                    parentId = libraryId?.let { UUID.fromString(it) },
+                    libraryType = type,
+                    sortBy = currentSortBy,
+                    sortDescending = currentSortDescending,
+                    filter = currentFilter,
+                    nameStartsWith = null,
+                    studioName = studioName,
+                )
+                .cachedIn(viewModelScope)
     }
 
     private fun loadLibraryContent() {
@@ -146,22 +152,24 @@ class LibraryContentViewModel @Inject constructor(
                 val type = determineLibraryType()
                 libraryType = type
 
-                _uiState.value = _uiState.value.copy(
-                    libraryType = type,
-                    userProfileImageUrl = userProfileImageUrl,
-                    currentSortBy = currentSortBy,
-                    currentSortDescending = currentSortDescending,
-                    currentFilter = currentFilter,
-                    isLoading = false
-                )
+                _uiState.value =
+                    _uiState.value.copy(
+                        libraryType = type,
+                        userProfileImageUrl = userProfileImageUrl,
+                        currentSortBy = currentSortBy,
+                        currentSortDescending = currentSortDescending,
+                        currentFilter = currentFilter,
+                        isLoading = false,
+                    )
 
                 loadItems()
             } catch (e: Exception) {
                 Timber.e(e, "Failed to load library content")
-                _uiState.value = _uiState.value.copy(
-                    isLoading = false,
-                    error = "Content not available on this server"
-                )
+                _uiState.value =
+                    _uiState.value.copy(
+                        isLoading = false,
+                        error = "Content not available on this server",
+                    )
             }
         }
     }
@@ -178,10 +186,11 @@ class LibraryContentViewModel @Inject constructor(
         if (currentSortBy != sortBy || currentSortDescending != descending) {
             currentSortBy = sortBy
             currentSortDescending = descending
-            _uiState.value = _uiState.value.copy(
-                currentSortBy = currentSortBy,
-                currentSortDescending = currentSortDescending
-            )
+            _uiState.value =
+                _uiState.value.copy(
+                    currentSortBy = currentSortBy,
+                    currentSortDescending = currentSortDescending,
+                )
             loadItems()
         }
     }
@@ -205,25 +214,28 @@ class LibraryContentViewModel @Inject constructor(
             try {
                 val type = libraryType ?: return@launch
 
-                val letterFilter = when (letter) {
-                    "#" -> "0"
-                    else -> letter
-                }
+                val letterFilter =
+                    when (letter) {
+                        "#" -> "0"
+                        else -> letter
+                    }
 
                 _uiState.value = _uiState.value.copy(selectedLetter = letter)
 
-                _pagingData.value = jellyfinRepository.getItemsPaging(
-                    parentId = libraryId?.let { UUID.fromString(it) },
-                    libraryType = type,
-                    sortBy = currentSortBy,
-                    sortDescending = currentSortDescending,
-                    filter = currentFilter,
-                    nameStartsWith = letterFilter,
-                    studioName = studioName
-                ).cachedIn(viewModelScope)
+                _pagingData.value =
+                    jellyfinRepository
+                        .getItemsPaging(
+                            parentId = libraryId?.let { UUID.fromString(it) },
+                            libraryType = type,
+                            sortBy = currentSortBy,
+                            sortDescending = currentSortDescending,
+                            filter = currentFilter,
+                            nameStartsWith = letterFilter,
+                            studioName = studioName,
+                        )
+                        .cachedIn(viewModelScope)
 
                 Timber.d("Alphabet scroll: Created new paging source for letter '$letter'")
-
             } catch (e: Exception) {
                 Timber.e(e, "Failed to scroll to letter $letter")
             }
@@ -247,5 +259,5 @@ data class LibraryContentUiState(
     val currentSortDescending: Boolean = false,
     val currentFilter: FilterType = FilterType.ALL,
     val isStudioMode: Boolean = false,
-    val selectedLetter: String? = null
-)
\ No newline at end of file
+    val selectedLetter: String? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/livetv/LiveTvScreen.kt b/app/src/main/java/com/makd/afinity/ui/livetv/LiveTvScreen.kt
index 0841b3433..351e5cd7a 100644
--- a/app/src/main/java/com/makd/afinity/ui/livetv/LiveTvScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/livetv/LiveTvScreen.kt
@@ -28,9 +28,6 @@ import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleEventObserver
-import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -40,6 +37,9 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.media3.common.util.UnstableApi
 import androidx.navigation.NavController
@@ -60,7 +60,7 @@ fun LiveTvScreen(
     mainUiState: MainUiState,
     modifier: Modifier = Modifier,
     widthSizeClass: WindowWidthSizeClass = WindowWidthSizeClass.Compact,
-    viewModel: LiveTvViewModel = hiltViewModel()
+    viewModel: LiveTvViewModel = hiltViewModel(),
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val selectedLetter by viewModel.selectedLetter.collectAsStateWithLifecycle()
@@ -77,18 +77,17 @@ fun LiveTvScreen(
             }
         }
         lifecycleOwner.lifecycle.addObserver(observer)
-        onDispose {
-            lifecycleOwner.lifecycle.removeObserver(observer)
-        }
+        onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }
     }
 
     LaunchedEffect(pagerState.currentPage) {
-        val tab = when (pagerState.currentPage) {
-            0 -> LiveTvTab.HOME
-            1 -> LiveTvTab.GUIDE
-            2 -> LiveTvTab.CHANNELS
-            else -> LiveTvTab.HOME
-        }
+        val tab =
+            when (pagerState.currentPage) {
+                0 -> LiveTvTab.HOME
+                1 -> LiveTvTab.GUIDE
+                2 -> LiveTvTab.CHANNELS
+                else -> LiveTvTab.HOME
+            }
         viewModel.selectTab(tab)
     }
 
@@ -98,31 +97,26 @@ fun LiveTvScreen(
                 title = {
                     Text(
                         text = stringResource(R.string.livetv_title),
-                        style = MaterialTheme.typography.headlineLarge.copy(
-                            fontWeight = FontWeight.Bold
-                        ),
-                        color = MaterialTheme.colorScheme.onBackground
+                        style =
+                            MaterialTheme.typography.headlineLarge.copy(
+                                fontWeight = FontWeight.Bold
+                            ),
+                        color = MaterialTheme.colorScheme.onBackground,
                     )
                 },
-                onSearchClick = {
-                    navController.navigate(Destination.createSearchRoute())
-                },
-                onProfileClick = {
-                    navController.navigate(Destination.createSettingsRoute())
-                },
+                onSearchClick = { navController.navigate(Destination.createSearchRoute()) },
+                onProfileClick = { navController.navigate(Destination.createSettingsRoute()) },
                 userProfileImageUrl = mainUiState.userProfileImageUrl,
-                backgroundOpacity = 1f
+                backgroundOpacity = 1f,
             )
         },
-        modifier = modifier
+        modifier = modifier,
     ) { paddingValues ->
         when {
             uiState.isLoading -> {
                 Box(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(paddingValues),
-                    contentAlignment = Alignment.Center
+                    modifier = Modifier.fillMaxSize().padding(paddingValues),
+                    contentAlignment = Alignment.Center,
                 ) {
                     CircularProgressIndicator()
                 }
@@ -130,47 +124,39 @@ fun LiveTvScreen(
 
             !uiState.hasLiveTvAccess -> {
                 Box(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(paddingValues),
-                    contentAlignment = Alignment.Center
+                    modifier = Modifier.fillMaxSize().padding(paddingValues),
+                    contentAlignment = Alignment.Center,
                 ) {
                     Column(
                         horizontalAlignment = Alignment.CenterHorizontally,
-                        verticalArrangement = Arrangement.Center
+                        verticalArrangement = Arrangement.Center,
                     ) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_live_tv_nav),
                             contentDescription = null,
                             modifier = Modifier.padding(16.dp),
-                            tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.4f)
+                            tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.4f),
                         )
                         Text(
                             text = stringResource(R.string.livetv_error_not_available_title),
                             style = MaterialTheme.typography.titleMedium,
-                            color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f)
+                            color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f),
                         )
                         Text(
                             text = stringResource(R.string.livetv_error_not_available_message),
                             style = MaterialTheme.typography.bodyMedium,
-                            color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.4f)
+                            color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.4f),
                         )
                     }
                 }
             }
 
             else -> {
-                Column(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(paddingValues)
-                ) {
+                Column(modifier = Modifier.fillMaxSize().padding(paddingValues)) {
                     LazyRow(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(bottom = 12.dp),
+                        modifier = Modifier.fillMaxWidth().padding(bottom = 12.dp),
                         contentPadding = PaddingValues(horizontal = 16.dp),
-                        horizontalArrangement = Arrangement.spacedBy(8.dp)
+                        horizontalArrangement = Arrangement.spacedBy(8.dp),
                     ) {
                         item {
                             NavigationChip(
@@ -179,7 +165,7 @@ fun LiveTvScreen(
                                 iconResId = R.drawable.ic_tv_prog,
                                 onClick = {
                                     coroutineScope.launch { pagerState.animateScrollToPage(0) }
-                                }
+                                },
                             )
                         }
                         item {
@@ -189,7 +175,7 @@ fun LiveTvScreen(
                                 iconResId = R.drawable.ic_epg,
                                 onClick = {
                                     coroutineScope.launch { pagerState.animateScrollToPage(1) }
-                                }
+                                },
                             )
                         }
                         item {
@@ -199,58 +185,58 @@ fun LiveTvScreen(
                                 iconResId = R.drawable.ic_channels,
                                 onClick = {
                                     coroutineScope.launch { pagerState.animateScrollToPage(2) }
-                                }
+                                },
                             )
                         }
                     }
 
-                    HorizontalPager(
-                        state = pagerState,
-                        modifier = Modifier.fillMaxSize()
-                    ) { page ->
+                    HorizontalPager(state = pagerState, modifier = Modifier.fillMaxSize()) { page ->
                         when (page) {
-                            0 -> LiveTvHomeTab(
-                                uiState = uiState,
-                                onProgramClick = { programWithChannel ->
-                                    PlayerLauncher.launchLiveChannel(
-                                        context = context,
-                                        channelId = programWithChannel.channel.id,
-                                        channelName = programWithChannel.channel.name
-                                    )
-                                },
-                                widthSizeClass = widthSizeClass
-                            )
+                            0 ->
+                                LiveTvHomeTab(
+                                    uiState = uiState,
+                                    onProgramClick = { programWithChannel ->
+                                        PlayerLauncher.launchLiveChannel(
+                                            context = context,
+                                            channelId = programWithChannel.channel.id,
+                                            channelName = programWithChannel.channel.name,
+                                        )
+                                    },
+                                    widthSizeClass = widthSizeClass,
+                                )
 
-                            1 -> LiveTvGuideTab(
-                                uiState = uiState,
-                                onChannelClick = { channel ->
-                                    PlayerLauncher.launchLiveChannel(
-                                        context = context,
-                                        channelId = channel.id,
-                                        channelName = channel.name
-                                    )
-                                },
-                                onJumpToNow = viewModel::jumpToNow,
-                                onNavigateTime = viewModel::navigateEpgTime,
-                                widthSizeClass = widthSizeClass
-                            )
+                            1 ->
+                                LiveTvGuideTab(
+                                    uiState = uiState,
+                                    onChannelClick = { channel ->
+                                        PlayerLauncher.launchLiveChannel(
+                                            context = context,
+                                            channelId = channel.id,
+                                            channelName = channel.name,
+                                        )
+                                    },
+                                    onJumpToNow = viewModel::jumpToNow,
+                                    onNavigateTime = viewModel::navigateEpgTime,
+                                    widthSizeClass = widthSizeClass,
+                                )
 
-                            2 -> LiveTvChannelsTab(
-                                uiState = uiState,
-                                onChannelClick = { channel ->
-                                    PlayerLauncher.launchLiveChannel(
-                                        context = context,
-                                        channelId = channel.id,
-                                        channelName = channel.name
-                                    )
-                                },
-                                onFavoriteClick = { channel ->
-                                    viewModel.toggleFavorite(channel.id)
-                                },
-                                selectedLetter = selectedLetter,
-                                onLetterSelected = viewModel::onLetterSelected,
-                                onClearFilter = viewModel::clearLetterFilter
-                            )
+                            2 ->
+                                LiveTvChannelsTab(
+                                    uiState = uiState,
+                                    onChannelClick = { channel ->
+                                        PlayerLauncher.launchLiveChannel(
+                                            context = context,
+                                            channelId = channel.id,
+                                            channelName = channel.name,
+                                        )
+                                    },
+                                    onFavoriteClick = { channel ->
+                                        viewModel.toggleFavorite(channel.id)
+                                    },
+                                    selectedLetter = selectedLetter,
+                                    onLetterSelected = viewModel::onLetterSelected,
+                                    onClearFilter = viewModel::clearLetterFilter,
+                                )
                         }
                     }
                 }
@@ -261,44 +247,44 @@ fun LiveTvScreen(
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-private fun NavigationChip(
-    selected: Boolean,
-    label: String,
-    iconResId: Int,
-    onClick: () -> Unit
-) {
+private fun NavigationChip(selected: Boolean, label: String, iconResId: Int, onClick: () -> Unit) {
     FilterChip(
         selected = selected,
         onClick = onClick,
         label = {
             Text(
                 text = label,
-                style = MaterialTheme.typography.labelLarge.copy(
-                    fontWeight = if (selected) FontWeight.Bold else FontWeight.Medium
-                )
+                style =
+                    MaterialTheme.typography.labelLarge.copy(
+                        fontWeight = if (selected) FontWeight.Bold else FontWeight.Medium
+                    ),
             )
         },
         leadingIcon = {
             Icon(
                 painter = painterResource(id = iconResId),
                 contentDescription = null,
-                modifier = Modifier.size(18.dp)
+                modifier = Modifier.size(18.dp),
             )
         },
         shape = CircleShape,
-        border = FilterChipDefaults.filterChipBorder(
-            enabled = true,
-            selected = selected,
-            borderColor = if (selected) Color.Transparent else MaterialTheme.colorScheme.outline.copy(alpha = 0.3f),
-            selectedBorderColor = Color.Transparent
-        ),
-        colors = FilterChipDefaults.filterChipColors(
-            containerColor = Color.Transparent,
-            labelColor = MaterialTheme.colorScheme.onSurfaceVariant,
-            iconColor = MaterialTheme.colorScheme.onSurfaceVariant,
-            selectedContainerColor = MaterialTheme.colorScheme.secondaryContainer,
-            selectedLabelColor = MaterialTheme.colorScheme.onSecondaryContainer,
-            selectedLeadingIconColor = MaterialTheme.colorScheme.onSecondaryContainer
-        )
+        border =
+            FilterChipDefaults.filterChipBorder(
+                enabled = true,
+                selected = selected,
+                borderColor =
+                    if (selected) Color.Transparent
+                    else MaterialTheme.colorScheme.outline.copy(alpha = 0.3f),
+                selectedBorderColor = Color.Transparent,
+            ),
+        colors =
+            FilterChipDefaults.filterChipColors(
+                containerColor = Color.Transparent,
+                labelColor = MaterialTheme.colorScheme.onSurfaceVariant,
+                iconColor = MaterialTheme.colorScheme.onSurfaceVariant,
+                selectedContainerColor = MaterialTheme.colorScheme.secondaryContainer,
+                selectedLabelColor = MaterialTheme.colorScheme.onSecondaryContainer,
+                selectedLeadingIconColor = MaterialTheme.colorScheme.onSecondaryContainer,
+            ),
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/livetv/LiveTvUiState.kt b/app/src/main/java/com/makd/afinity/ui/livetv/LiveTvUiState.kt
index f8f559d2b..96c45fe78 100644
--- a/app/src/main/java/com/makd/afinity/ui/livetv/LiveTvUiState.kt
+++ b/app/src/main/java/com/makd/afinity/ui/livetv/LiveTvUiState.kt
@@ -13,23 +13,19 @@ data class LiveTvUiState(
     val hasLiveTvAccess: Boolean = false,
     val error: String? = null,
     val isRefreshing: Boolean = false,
-
     val selectedTab: LiveTvTab = LiveTvTab.HOME,
-
     val categorizedPrograms: Map<LiveTvCategory, List<ProgramWithChannel>> = emptyMap(),
     val isCategoriesLoading: Boolean = false,
-
     val epgChannels: List<AfinityChannel> = emptyList(),
     val epgPrograms: Map<UUID, List<AfinityProgram>> = emptyMap(),
     val epgStartTime: LocalDateTime = LocalDateTime.now().truncatedTo(ChronoUnit.HOURS),
     val epgVisibleHours: Int = 3,
     val isEpgLoading: Boolean = false,
-
-    val channels: List<AfinityChannel> = emptyList()
+    val channels: List<AfinityChannel> = emptyList(),
 )
 
 enum class LiveTvTab {
     HOME,
     GUIDE,
-    CHANNELS
-}
\ No newline at end of file
+    CHANNELS,
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/livetv/LiveTvViewModel.kt b/app/src/main/java/com/makd/afinity/ui/livetv/LiveTvViewModel.kt
index 9864cb163..9fad9a4c8 100644
--- a/app/src/main/java/com/makd/afinity/ui/livetv/LiveTvViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/livetv/LiveTvViewModel.kt
@@ -7,6 +7,10 @@ import com.makd.afinity.data.repository.livetv.LiveTvRepository
 import com.makd.afinity.ui.livetv.models.LiveTvCategory
 import com.makd.afinity.ui.livetv.models.ProgramWithChannel
 import dagger.hilt.android.lifecycle.HiltViewModel
+import java.time.LocalDateTime
+import java.time.temporal.ChronoUnit
+import java.util.UUID
+import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
@@ -19,15 +23,10 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import java.time.LocalDateTime
-import java.time.temporal.ChronoUnit
-import java.util.UUID
-import javax.inject.Inject
 
 @HiltViewModel
-class LiveTvViewModel @Inject constructor(
-    private val liveTvRepository: LiveTvRepository
-) : ViewModel() {
+class LiveTvViewModel @Inject constructor(private val liveTvRepository: LiveTvRepository) :
+    ViewModel() {
 
     private val _uiState = MutableStateFlow(LiveTvUiState())
     val uiState: StateFlow<LiveTvUiState> = _uiState.asStateFlow()
@@ -58,18 +57,19 @@ class LiveTvViewModel @Inject constructor(
         viewModelScope.launch(Dispatchers.Default) {
             val currentCache = allChannelsCache
 
-            val filteredList = if (letter == null) {
-                currentCache
-            } else {
-                currentCache.filter { channel ->
-                    val firstChar = channel.name.firstOrNull()?.uppercase() ?: ""
-                    if (letter == "#") {
-                        firstChar.isNotEmpty() && !firstChar[0].isLetter()
-                    } else {
-                        firstChar == letter
+            val filteredList =
+                if (letter == null) {
+                    currentCache
+                } else {
+                    currentCache.filter { channel ->
+                        val firstChar = channel.name.firstOrNull()?.uppercase() ?: ""
+                        if (letter == "#") {
+                            firstChar.isNotEmpty() && !firstChar[0].isLetter()
+                        } else {
+                            firstChar == letter
+                        }
                     }
                 }
-            }
 
             _uiState.update { it.copy(channels = filteredList) }
         }
@@ -103,17 +103,10 @@ class LiveTvViewModel @Inject constructor(
                 allChannelsCache = channels
                 applyFilterToCache(_selectedLetter.value)
 
-                _uiState.update {
-                    it.copy(
-                        epgChannels = channels,
-                        isLoading = false
-                    )
-                }
+                _uiState.update { it.copy(epgChannels = channels, isLoading = false) }
             } catch (e: Exception) {
                 Timber.e(e, "Failed to load channels")
-                _uiState.update {
-                    it.copy(isLoading = false, error = "Failed to load channels")
-                }
+                _uiState.update { it.copy(isLoading = false, error = "Failed to load channels") }
             }
         }
     }
@@ -124,37 +117,66 @@ class LiveTvViewModel @Inject constructor(
                 _uiState.update { it.copy(isCategoriesLoading = true) }
                 val channels = liveTvRepository.getChannels()
                 val channelsMap = channels.associateBy { it.id }
-                val categorizedPrograms = awaitAll(
-                    async(Dispatchers.IO) {
-                        LiveTvCategory.ON_NOW to liveTvRepository.getPrograms(hasAired = false, limit = 20)
-                    },
-                    async(Dispatchers.IO) {
-                        LiveTvCategory.MOVIES to liveTvRepository.getPrograms(hasAired = false, isMovie = true, limit = 20)
-                    },
-                    async(Dispatchers.IO) {
-                        LiveTvCategory.SHOWS to liveTvRepository.getPrograms(hasAired = false, isSeries = true, limit = 20)
-                    },
-                    async(Dispatchers.IO) {
-                        LiveTvCategory.SPORTS to liveTvRepository.getPrograms(hasAired = false, isSports = true, limit = 20)
-                    },
-                    async(Dispatchers.IO) {
-                        LiveTvCategory.KIDS to liveTvRepository.getPrograms(hasAired = false, isKids = true, limit = 20)
-                    },
-                    async(Dispatchers.IO) {
-                        LiveTvCategory.NEWS to liveTvRepository.getPrograms(hasAired = false, isNews = true, limit = 20)
-                    }
-                )
+                val categorizedPrograms =
+                    awaitAll(
+                        async(Dispatchers.IO) {
+                            LiveTvCategory.ON_NOW to
+                                liveTvRepository.getPrograms(hasAired = false, limit = 20)
+                        },
+                        async(Dispatchers.IO) {
+                            LiveTvCategory.MOVIES to
+                                liveTvRepository.getPrograms(
+                                    hasAired = false,
+                                    isMovie = true,
+                                    limit = 20,
+                                )
+                        },
+                        async(Dispatchers.IO) {
+                            LiveTvCategory.SHOWS to
+                                liveTvRepository.getPrograms(
+                                    hasAired = false,
+                                    isSeries = true,
+                                    limit = 20,
+                                )
+                        },
+                        async(Dispatchers.IO) {
+                            LiveTvCategory.SPORTS to
+                                liveTvRepository.getPrograms(
+                                    hasAired = false,
+                                    isSports = true,
+                                    limit = 20,
+                                )
+                        },
+                        async(Dispatchers.IO) {
+                            LiveTvCategory.KIDS to
+                                liveTvRepository.getPrograms(
+                                    hasAired = false,
+                                    isKids = true,
+                                    limit = 20,
+                                )
+                        },
+                        async(Dispatchers.IO) {
+                            LiveTvCategory.NEWS to
+                                liveTvRepository.getPrograms(
+                                    hasAired = false,
+                                    isNews = true,
+                                    limit = 20,
+                                )
+                        },
+                    )
                 val categorized = mutableMapOf<LiveTvCategory, MutableList<ProgramWithChannel>>()
 
                 categorizedPrograms.forEach { (category, programs) ->
-                    val programsWithChannel = programs
-                        .filter { program ->
-                            program.isCurrentlyAiring() && channelsMap.containsKey(program.channelId)
-                        }
-                        .map { program ->
-                            ProgramWithChannel(program, channelsMap[program.channelId]!!)
-                        }
-                        .toMutableList()
+                    val programsWithChannel =
+                        programs
+                            .filter { program ->
+                                program.isCurrentlyAiring() &&
+                                    channelsMap.containsKey(program.channelId)
+                            }
+                            .map { program ->
+                                ProgramWithChannel(program, channelsMap[program.channelId]!!)
+                            }
+                            .toMutableList()
 
                     when (category) {
                         LiveTvCategory.ON_NOW -> {
@@ -169,15 +191,13 @@ class LiveTvViewModel @Inject constructor(
 
                     categorized[category] = programsWithChannel
                 }
-                val filteredCategories = categorized.filter { (category, programs) ->
-                    category == LiveTvCategory.ON_NOW || programs.isNotEmpty()
-                }
+                val filteredCategories =
+                    categorized.filter { (category, programs) ->
+                        category == LiveTvCategory.ON_NOW || programs.isNotEmpty()
+                    }
 
                 _uiState.update {
-                    it.copy(
-                        categorizedPrograms = filteredCategories,
-                        isCategoriesLoading = false
-                    )
+                    it.copy(categorizedPrograms = filteredCategories, isCategoriesLoading = false)
                 }
             } catch (e: Exception) {
                 Timber.e(e, "Failed to load categorized programs")
@@ -192,7 +212,8 @@ class LiveTvViewModel @Inject constructor(
                 _uiState.update { it.copy(isEpgLoading = true) }
 
                 val channels =
-                    if (allChannelsCache.isNotEmpty()) allChannelsCache else liveTvRepository.getChannels()
+                    if (allChannelsCache.isNotEmpty()) allChannelsCache
+                    else liveTvRepository.getChannels()
 
                 if (channels.isEmpty()) {
                     Timber.w("EPG: No channels found.")
@@ -203,19 +224,24 @@ class LiveTvViewModel @Inject constructor(
                 val startTime = _uiState.value.epgStartTime
                 val endTime = startTime.plusHours(_uiState.value.epgVisibleHours.toLong() + 1)
 
-                val allPrograms = channels.chunked(100).map { batch ->
-                    async(Dispatchers.IO) {
-                        try {
-                            liveTvRepository.getPrograms(
-                                channelIds = batch.map { it.id },
-                                minStartDate = startTime,
-                                maxEndDate = endTime
-                            )
-                        } catch (e: Exception) {
-                            emptyList()
+                val allPrograms =
+                    channels
+                        .chunked(100)
+                        .map { batch ->
+                            async(Dispatchers.IO) {
+                                try {
+                                    liveTvRepository.getPrograms(
+                                        channelIds = batch.map { it.id },
+                                        minStartDate = startTime,
+                                        maxEndDate = endTime,
+                                    )
+                                } catch (e: Exception) {
+                                    emptyList()
+                                }
+                            }
                         }
-                    }
-                }.awaitAll().flatten()
+                        .awaitAll()
+                        .flatten()
 
                 val programsByChannel = allPrograms.groupBy { it.channelId }
 
@@ -223,7 +249,7 @@ class LiveTvViewModel @Inject constructor(
                     it.copy(
                         epgChannels = channels,
                         epgPrograms = programsByChannel,
-                        isEpgLoading = false
+                        isEpgLoading = false,
                     )
                 }
             } catch (e: Exception) {
@@ -263,12 +289,13 @@ class LiveTvViewModel @Inject constructor(
 
     private fun startPeriodicRefresh() {
         refreshJob?.cancel()
-        refreshJob = viewModelScope.launch {
-            while (isActive) {
-                delay(60000L)
-                refreshCurrentTabData()
+        refreshJob =
+            viewModelScope.launch {
+                while (isActive) {
+                    delay(60000L)
+                    refreshCurrentTabData()
+                }
             }
-        }
     }
 
     private suspend fun refreshCurrentTabData() {
@@ -292,9 +319,11 @@ class LiveTvViewModel @Inject constructor(
             try {
                 val success = liveTvRepository.toggleChannelFavorite(channelId)
                 if (success) {
-                    allChannelsCache = allChannelsCache.map { channel ->
-                        if (channel.id == channelId) channel.copy(favorite = !channel.favorite) else channel
-                    }
+                    allChannelsCache =
+                        allChannelsCache.map { channel ->
+                            if (channel.id == channelId) channel.copy(favorite = !channel.favorite)
+                            else channel
+                        }
                     applyFilterToCache(_selectedLetter.value)
                 }
             } catch (e: Exception) {
@@ -334,4 +363,4 @@ class LiveTvViewModel @Inject constructor(
         super.onCleared()
         refreshJob?.cancel()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/livetv/components/ChannelCard.kt b/app/src/main/java/com/makd/afinity/ui/livetv/components/ChannelCard.kt
index b0259dd5f..9f4cd0d9d 100644
--- a/app/src/main/java/com/makd/afinity/ui/livetv/components/ChannelCard.kt
+++ b/app/src/main/java/com/makd/afinity/ui/livetv/components/ChannelCard.kt
@@ -24,7 +24,6 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -41,119 +40,103 @@ fun ChannelCard(
     onClick: () -> Unit,
     onFavoriteClick: () -> Unit,
     modifier: Modifier = Modifier,
-    showProgramOverlays: Boolean = true
+    showProgramOverlays: Boolean = true,
 ) {
     val currentProgram = channel.currentProgram
 
-    val showProgramImage = showProgramOverlays &&
+    val showProgramImage =
+        showProgramOverlays &&
             (currentProgram?.images?.primary != null || currentProgram?.images?.thumb != null)
-    val displayImageUrl = if (showProgramImage) {
-        currentProgram?.images?.thumb ?: currentProgram?.images?.primary
-    } else {
-        channel.images.primary ?: channel.images.thumb
-    }
+    val displayImageUrl =
+        if (showProgramImage) {
+            currentProgram?.images?.thumb ?: currentProgram?.images?.primary
+        } else {
+            channel.images.primary ?: channel.images.thumb
+        }
 
-    Column(
-        modifier = modifier
-            .fillMaxWidth()
-            .clickable(onClick = onClick)
-    ) {
+    Column(modifier = modifier.fillMaxWidth().clickable(onClick = onClick)) {
         Card(
-            modifier = Modifier
-                .fillMaxWidth()
-                .aspectRatio(16f / 9f),
-            colors = CardDefaults.cardColors(
-                containerColor = MaterialTheme.colorScheme.surfaceVariant
-            ),
+            modifier = Modifier.fillMaxWidth().aspectRatio(16f / 9f),
+            colors =
+                CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
             elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
-            shape = MaterialTheme.shapes.medium
+            shape = MaterialTheme.shapes.medium,
         ) {
             Box(modifier = Modifier.fillMaxSize()) {
                 if (displayImageUrl != null) {
-                    val imageMod = if (!showProgramImage) {
-                        Modifier
-                            .fillMaxSize()
-                            .padding(16.dp)
-                    } else {
-                        Modifier.fillMaxSize()
-                    }
+                    val imageMod =
+                        if (!showProgramImage) {
+                            Modifier.fillMaxSize().padding(16.dp)
+                        } else {
+                            Modifier.fillMaxSize()
+                        }
 
                     AsyncImage(
                         imageUrl = displayImageUrl.toString(),
                         contentDescription = channel.name,
                         modifier = imageMod,
-                        contentScale = if (showProgramImage) ContentScale.Crop else ContentScale.Fit
+                        contentScale = if (showProgramImage) ContentScale.Crop else ContentScale.Fit,
                     )
                 } else {
-                    Box(
-                        modifier = Modifier.fillMaxSize(),
-                        contentAlignment = Alignment.Center
-                    ) {
+                    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_live_tv_nav),
                             contentDescription = null,
                             modifier = Modifier.size(48.dp),
-                            tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.2f)
+                            tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.2f),
                         )
                     }
                 }
 
                 if (showProgramImage && channel.images.primary != null) {
                     Box(
-                        modifier = Modifier
-                            .align(Alignment.BottomStart)
-                            .padding(6.dp)
-                            .background(
-                                MaterialTheme.colorScheme.surface.copy(alpha = 0.9f),
-                                RoundedCornerShape(6.dp)
-                            )
-                            .padding(4.dp)
+                        modifier =
+                            Modifier.align(Alignment.BottomStart)
+                                .padding(6.dp)
+                                .background(
+                                    MaterialTheme.colorScheme.surface.copy(alpha = 0.9f),
+                                    RoundedCornerShape(6.dp),
+                                )
+                                .padding(4.dp)
                     ) {
                         AsyncImage(
                             imageUrl = channel.images.primary.toString(),
                             contentDescription = null,
                             modifier = Modifier.size(28.dp),
-                            contentScale = ContentScale.Fit
+                            contentScale = ContentScale.Fit,
                         )
                     }
                 }
 
                 IconButton(
                     onClick = onFavoriteClick,
-                    modifier = Modifier
-                        .align(Alignment.TopEnd)
-                        .padding(4.dp)
-                        .size(28.dp),
-                    colors = IconButtonDefaults.iconButtonColors(
-                        containerColor = androidx.compose.ui.graphics.Color.Transparent,
-                        contentColor = if (channel.favorite) androidx.compose.ui.graphics.Color.Red else MaterialTheme.colorScheme.onSurface
-                    )
+                    modifier = Modifier.align(Alignment.TopEnd).padding(4.dp).size(28.dp),
+                    colors =
+                        IconButtonDefaults.iconButtonColors(
+                            containerColor = androidx.compose.ui.graphics.Color.Transparent,
+                            contentColor =
+                                if (channel.favorite) androidx.compose.ui.graphics.Color.Red
+                                else MaterialTheme.colorScheme.onSurface,
+                        ),
                 ) {
                     Icon(
-                        painter = painterResource(
-                            id = if (channel.favorite) R.drawable.ic_favorite_filled else R.drawable.ic_favorite
-                        ),
+                        painter =
+                            painterResource(
+                                id =
+                                    if (channel.favorite) R.drawable.ic_favorite_filled
+                                    else R.drawable.ic_favorite
+                            ),
                         contentDescription = stringResource(R.string.cd_favorite),
-                        modifier = Modifier.size(16.dp)
+                        modifier = Modifier.size(16.dp),
                     )
                 }
 
                 if (showProgramOverlays && currentProgram?.isCurrentlyAiring() == true) {
-                    Box(
-                        modifier = Modifier
-                            .align(Alignment.TopStart)
-                            .padding(6.dp)
-                    ) {
-                        LiveBadge()
-                    }
+                    Box(modifier = Modifier.align(Alignment.TopStart).padding(6.dp)) { LiveBadge() }
                 }
 
                 if (showProgramOverlays && currentProgram?.isCurrentlyAiring() == true) {
-                    Box(
-                        modifier = Modifier
-                            .align(Alignment.BottomCenter)
-                            .fillMaxWidth()
-                    ) {
+                    Box(modifier = Modifier.align(Alignment.BottomCenter).fillMaxWidth()) {
                         ProgramProgressBar(program = currentProgram)
                     }
                 }
@@ -168,18 +151,16 @@ fun ChannelCard(
                     text = number,
                     style = MaterialTheme.typography.labelSmall,
                     color = MaterialTheme.colorScheme.primary,
-                    fontWeight = FontWeight.Bold
+                    fontWeight = FontWeight.Bold,
                 )
                 Spacer(modifier = Modifier.width(6.dp))
             }
             Text(
                 text = channel.name,
-                style = MaterialTheme.typography.bodyMedium.copy(
-                    fontWeight = FontWeight.SemiBold
-                ),
+                style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
                 color = MaterialTheme.colorScheme.onBackground,
                 maxLines = 1,
-                overflow = TextOverflow.Ellipsis
+                overflow = TextOverflow.Ellipsis,
             )
         }
 
@@ -190,24 +171,25 @@ fun ChannelCard(
         val start = currentProgram?.startDate
         val end = currentProgram?.endDate
 
-        val text = if (start != null && end != null) {
-            val formatter = java.time.format.DateTimeFormatter.ofPattern(timePattern)
-            stringResource(
-                R.string.livetv_program_time_fmt,
-                programName,
-                start.format(formatter),
-                end.format(formatter)
-            )
-        } else {
-            programName
-        }
+        val text =
+            if (start != null && end != null) {
+                val formatter = java.time.format.DateTimeFormatter.ofPattern(timePattern)
+                stringResource(
+                    R.string.livetv_program_time_fmt,
+                    programName,
+                    start.format(formatter),
+                    end.format(formatter),
+                )
+            } else {
+                programName
+            }
 
         Text(
             text = text,
             style = MaterialTheme.typography.bodySmall,
             color = MaterialTheme.colorScheme.onSurfaceVariant,
             maxLines = 1,
-            overflow = TextOverflow.Ellipsis
+            overflow = TextOverflow.Ellipsis,
         )
     }
 }
diff --git a/app/src/main/java/com/makd/afinity/ui/livetv/components/EpgChannelCell.kt b/app/src/main/java/com/makd/afinity/ui/livetv/components/EpgChannelCell.kt
index 037f6775c..38e86be4f 100644
--- a/app/src/main/java/com/makd/afinity/ui/livetv/components/EpgChannelCell.kt
+++ b/app/src/main/java/com/makd/afinity/ui/livetv/components/EpgChannelCell.kt
@@ -4,21 +4,18 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
@@ -35,36 +32,32 @@ fun EpgChannelCell(
     onClick: () -> Unit,
     cellWidth: Dp,
     cellHeight: Dp,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Column(
-        modifier = modifier
-            .width(cellWidth)
-            .height(cellHeight)
-            .background(MaterialTheme.colorScheme.surfaceVariant)
-            .clickable(onClick = onClick)
-            .padding(horizontal = 8.dp, vertical = 4.dp),
-        horizontalAlignment = Alignment.CenterHorizontally
+        modifier =
+            modifier
+                .width(cellWidth)
+                .height(cellHeight)
+                .background(MaterialTheme.colorScheme.surfaceVariant)
+                .clickable(onClick = onClick)
+                .padding(horizontal = 8.dp, vertical = 4.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
     ) {
-        Box(
-            modifier = Modifier
-                .weight(1f)
-                .padding(4.dp),
-            contentAlignment = Alignment.Center
-        ) {
+        Box(modifier = Modifier.weight(1f).padding(4.dp), contentAlignment = Alignment.Center) {
             if (channel.images.primary != null) {
                 AsyncImage(
                     imageUrl = channel.images.primary.toString(),
                     contentDescription = channel.name,
                     modifier = Modifier.fillMaxSize(),
-                    contentScale = ContentScale.Fit
+                    contentScale = ContentScale.Fit,
                 )
             } else {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_live_tv_nav),
                     contentDescription = null,
                     modifier = Modifier.size(24.dp),
-                    tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f)
+                    tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f),
                 )
             }
         }
@@ -72,15 +65,16 @@ fun EpgChannelCell(
         Spacer(modifier = Modifier.height(4.dp))
 
         Text(
-            text = buildString {
-                channel.channelNumber?.let { append("$it ") }
-                append(channel.name)
-            },
+            text =
+                buildString {
+                    channel.channelNumber?.let { append("$it ") }
+                    append(channel.name)
+                },
             style = MaterialTheme.typography.labelSmall,
             fontWeight = FontWeight.Medium,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
-            color = MaterialTheme.colorScheme.onSurfaceVariant
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/livetv/components/EpgProgramCell.kt b/app/src/main/java/com/makd/afinity/ui/livetv/components/EpgProgramCell.kt
index e54c5638d..8761fb748 100644
--- a/app/src/main/java/com/makd/afinity/ui/livetv/components/EpgProgramCell.kt
+++ b/app/src/main/java/com/makd/afinity/ui/livetv/components/EpgProgramCell.kt
@@ -37,7 +37,7 @@ fun EpgProgramCell(
     hourWidth: Dp,
     cellHeight: Dp,
     onClick: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val timePattern = stringResource(R.string.livetv_time_pattern)
     val timeFormatter = DateTimeFormatter.ofPattern(timePattern)
@@ -58,28 +58,27 @@ fun EpgProgramCell(
     val widthDp = (visibleDurationMinutes.toFloat() / 60f * hourWidth.value).dp.coerceAtLeast(50.dp)
 
     Box(
-        modifier = modifier
-            .offset(x = offsetDp)
-            .width(widthDp - 2.dp)
-            .height(cellHeight - 2.dp)
-            .padding(1.dp)
-            .clip(MaterialTheme.shapes.small)
-            .background(
-                if (isLive) MaterialTheme.colorScheme.primaryContainer
-                else MaterialTheme.colorScheme.surfaceVariant
-            )
-            .border(
-                width = 1.dp,
-                color = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f),
-                shape = MaterialTheme.shapes.small
-            )
-            .clickable(onClick = onClick)
-            .padding(horizontal = 8.dp, vertical = 4.dp)
+        modifier =
+            modifier
+                .offset(x = offsetDp)
+                .width(widthDp - 2.dp)
+                .height(cellHeight - 2.dp)
+                .padding(1.dp)
+                .clip(MaterialTheme.shapes.small)
+                .background(
+                    if (isLive) MaterialTheme.colorScheme.primaryContainer
+                    else MaterialTheme.colorScheme.surfaceVariant
+                )
+                .border(
+                    width = 1.dp,
+                    color = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f),
+                    shape = MaterialTheme.shapes.small,
+                )
+                .clickable(onClick = onClick)
+                .padding(horizontal = 8.dp, vertical = 4.dp)
     ) {
         Column {
-            Row(
-                verticalAlignment = Alignment.CenterVertically
-            ) {
+            Row(verticalAlignment = Alignment.CenterVertically) {
                 if (isLive) {
                     LiveBadge()
                     Spacer(modifier = Modifier.width(4.dp))
@@ -90,30 +89,29 @@ fun EpgProgramCell(
                     fontWeight = if (isLive) FontWeight.Bold else FontWeight.Medium,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
-                    color = if (isLive) MaterialTheme.colorScheme.onPrimaryContainer
-                    else MaterialTheme.colorScheme.onSurfaceVariant
+                    color =
+                        if (isLive) MaterialTheme.colorScheme.onPrimaryContainer
+                        else MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
 
             Text(
-                text = stringResource(
-                    R.string.livetv_epg_time_range,
-                    programStart.format(timeFormatter),
-                    programEnd.format(timeFormatter)
-                ),
+                text =
+                    stringResource(
+                        R.string.livetv_epg_time_range,
+                        programStart.format(timeFormatter),
+                        programEnd.format(timeFormatter),
+                    ),
                 style = MaterialTheme.typography.labelSmall,
-                color = if (isLive) MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.7f)
-                else MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f),
-                maxLines = 1
+                color =
+                    if (isLive) MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.7f)
+                    else MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f),
+                maxLines = 1,
             )
 
             if (isLive) {
                 Spacer(modifier = Modifier.height(2.dp))
-                Box(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(3.dp)
-                ) {
+                Box(modifier = Modifier.fillMaxWidth().height(3.dp)) {
                     ProgramProgressBar(program = program)
                 }
             }
@@ -122,4 +120,5 @@ fun EpgProgramCell(
 }
 
 private fun maxOf(a: LocalDateTime, b: LocalDateTime): LocalDateTime = if (a.isAfter(b)) a else b
-private fun minOf(a: LocalDateTime, b: LocalDateTime): LocalDateTime = if (a.isBefore(b)) a else b
\ No newline at end of file
+
+private fun minOf(a: LocalDateTime, b: LocalDateTime): LocalDateTime = if (a.isBefore(b)) a else b
diff --git a/app/src/main/java/com/makd/afinity/ui/livetv/components/EpgProgramRow.kt b/app/src/main/java/com/makd/afinity/ui/livetv/components/EpgProgramRow.kt
index 5d51271d4..3586ad79c 100644
--- a/app/src/main/java/com/makd/afinity/ui/livetv/components/EpgProgramRow.kt
+++ b/app/src/main/java/com/makd/afinity/ui/livetv/components/EpgProgramRow.kt
@@ -21,22 +21,26 @@ fun EpgProgramRow(
     hourWidth: Dp,
     cellHeight: Dp,
     onProgramClick: (AfinityProgram) -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val totalWidth = hourWidth * (visibleHours + 1)
     val epgEndTime = epgStartTime.plusHours(visibleHours.toLong() + 1)
 
     Box(
-        modifier = modifier
-            .width(totalWidth)
-            .height(cellHeight)
-            .background(MaterialTheme.colorScheme.surface)
+        modifier =
+            modifier
+                .width(totalWidth)
+                .height(cellHeight)
+                .background(MaterialTheme.colorScheme.surface)
     ) {
-        val visiblePrograms = programs.filter { program ->
-            val programStart = program.startDate ?: return@filter false
-            val programEnd = program.endDate ?: return@filter false
-            programStart.isBefore(epgEndTime) && programEnd.isAfter(epgStartTime)
-        }.sortedBy { it.startDate }
+        val visiblePrograms =
+            programs
+                .filter { program ->
+                    val programStart = program.startDate ?: return@filter false
+                    val programEnd = program.endDate ?: return@filter false
+                    programStart.isBefore(epgEndTime) && programEnd.isAfter(epgStartTime)
+                }
+                .sortedBy { it.startDate }
 
         visiblePrograms.forEach { program ->
             EpgProgramCell(
@@ -45,8 +49,8 @@ fun EpgProgramRow(
                 epgEndTime = epgEndTime,
                 hourWidth = hourWidth,
                 cellHeight = cellHeight,
-                onClick = { onProgramClick(program) }
+                onClick = { onProgramClick(program) },
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/livetv/components/EpgTimeHeader.kt b/app/src/main/java/com/makd/afinity/ui/livetv/components/EpgTimeHeader.kt
index 114ccacb9..64462715e 100644
--- a/app/src/main/java/com/makd/afinity/ui/livetv/components/EpgTimeHeader.kt
+++ b/app/src/main/java/com/makd/afinity/ui/livetv/components/EpgTimeHeader.kt
@@ -3,7 +3,6 @@ package com.makd.afinity.ui.livetv.components
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
@@ -25,40 +24,38 @@ fun EpgTimeHeader(
     startTime: LocalDateTime,
     visibleHours: Int,
     hourWidth: Dp,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val timePattern = stringResource(R.string.livetv_time_header_pattern)
     val timeFormatter = DateTimeFormatter.ofPattern(timePattern)
 
-    Row(
-        modifier = modifier
-            .background(MaterialTheme.colorScheme.surface)
-            .height(40.dp)
-    ) {
+    Row(modifier = modifier.background(MaterialTheme.colorScheme.surface).height(40.dp)) {
         repeat(visibleHours + 1) { hourOffset ->
             val time = startTime.plusHours(hourOffset.toLong())
-            val isNow = LocalDateTime.now().hour == time.hour &&
+            val isNow =
+                LocalDateTime.now().hour == time.hour &&
                     LocalDateTime.now().toLocalDate() == time.toLocalDate()
 
             Box(
-                modifier = Modifier
-                    .width(hourWidth)
-                    .height(40.dp)
-                    .background(
-                        if (isNow) MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.3f)
-                        else MaterialTheme.colorScheme.surface
-                    )
-                    .padding(horizontal = 8.dp),
-                contentAlignment = Alignment.CenterStart
+                modifier =
+                    Modifier.width(hourWidth)
+                        .height(40.dp)
+                        .background(
+                            if (isNow) MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.3f)
+                            else MaterialTheme.colorScheme.surface
+                        )
+                        .padding(horizontal = 8.dp),
+                contentAlignment = Alignment.CenterStart,
             ) {
                 Text(
                     text = time.format(timeFormatter),
                     style = MaterialTheme.typography.labelMedium,
                     fontWeight = if (isNow) FontWeight.Bold else FontWeight.Normal,
-                    color = if (isNow) MaterialTheme.colorScheme.primary
-                    else MaterialTheme.colorScheme.onSurfaceVariant
+                    color =
+                        if (isNow) MaterialTheme.colorScheme.primary
+                        else MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/livetv/components/LiveBadge.kt b/app/src/main/java/com/makd/afinity/ui/livetv/components/LiveBadge.kt
index a3eb99000..3e2de6bde 100644
--- a/app/src/main/java/com/makd/afinity/ui/livetv/components/LiveBadge.kt
+++ b/app/src/main/java/com/makd/afinity/ui/livetv/components/LiveBadge.kt
@@ -17,21 +17,20 @@ import androidx.compose.ui.unit.sp
 import com.makd.afinity.R
 
 @Composable
-fun LiveBadge(
-    modifier: Modifier = Modifier
-) {
+fun LiveBadge(modifier: Modifier = Modifier) {
     Box(
-        modifier = modifier
-            .clip(RoundedCornerShape(4.dp))
-            .background(Color.Red)
-            .padding(horizontal = 6.dp, vertical = 2.dp)
+        modifier =
+            modifier
+                .clip(RoundedCornerShape(4.dp))
+                .background(Color.Red)
+                .padding(horizontal = 6.dp, vertical = 2.dp)
     ) {
         Text(
             text = stringResource(R.string.livetv_live_badge),
             color = Color.White,
             fontSize = 10.sp,
             fontWeight = FontWeight.Bold,
-            style = MaterialTheme.typography.labelSmall
+            style = MaterialTheme.typography.labelSmall,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/livetv/components/ProgramCard.kt b/app/src/main/java/com/makd/afinity/ui/livetv/components/ProgramCard.kt
index d495077ae..ef922625c 100644
--- a/app/src/main/java/com/makd/afinity/ui/livetv/components/ProgramCard.kt
+++ b/app/src/main/java/com/makd/afinity/ui/livetv/components/ProgramCard.kt
@@ -1,7 +1,6 @@
 package com.makd.afinity.ui.livetv.components
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -25,7 +24,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
@@ -47,7 +45,7 @@ fun ProgramCard(
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
     now: LocalDateTime = LocalDateTime.now(),
-    cardWidth: Dp = 200.dp
+    cardWidth: Dp = 200.dp,
 ) {
     val timePattern = stringResource(R.string.livetv_time_pattern)
     val timeFormatter = remember(timePattern) { DateTimeFormatter.ofPattern(timePattern) }
@@ -55,37 +53,34 @@ fun ProgramCard(
     val program = programWithChannel.program
     val channel = programWithChannel.channel
 
-    val isLive = remember(program, now) {
-        program.startDate != null &&
+    val isLive =
+        remember(program, now) {
+            program.startDate != null &&
                 program.endDate != null &&
                 now.isAfter(program.startDate) &&
                 now.isBefore(program.endDate)
-    }
+        }
 
-    val progressPercentage = remember(program, now) {
-        if (isLive && program.startDate != null && program.endDate != null) {
-            val totalSeconds =
-                ChronoUnit.SECONDS.between(program.startDate, program.endDate).toFloat()
-            val elapsedSeconds = ChronoUnit.SECONDS.between(program.startDate, now).toFloat()
-            if (totalSeconds > 0) (elapsedSeconds / totalSeconds).coerceIn(0f, 1f) else 0f
-        } else {
-            0f
+    val progressPercentage =
+        remember(program, now) {
+            if (isLive && program.startDate != null && program.endDate != null) {
+                val totalSeconds =
+                    ChronoUnit.SECONDS.between(program.startDate, program.endDate).toFloat()
+                val elapsedSeconds = ChronoUnit.SECONDS.between(program.startDate, now).toFloat()
+                if (totalSeconds > 0) (elapsedSeconds / totalSeconds).coerceIn(0f, 1f) else 0f
+            } else {
+                0f
+            }
         }
-    }
 
-    Column(
-        modifier = modifier.width(cardWidth)
-    ) {
+    Column(modifier = modifier.width(cardWidth)) {
         Card(
             onClick = onClick,
-            modifier = Modifier
-                .fillMaxWidth()
-                .aspectRatio(16f / 9f),
-            colors = CardDefaults.cardColors(
-                containerColor = MaterialTheme.colorScheme.surfaceVariant
-            ),
+            modifier = Modifier.fillMaxWidth().aspectRatio(16f / 9f),
+            colors =
+                CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
             elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
-            shape = MaterialTheme.shapes.medium
+            shape = MaterialTheme.shapes.medium,
         ) {
             Box(modifier = Modifier.fillMaxSize()) {
                 val programImage = program.images.thumb ?: program.images.primary
@@ -99,48 +94,39 @@ fun ProgramCard(
                         imageUrl = imageUrl.toString(),
                         contentDescription = program.name,
                         modifier = Modifier.fillMaxSize(),
-                        contentScale = ContentScale.Crop
+                        contentScale = ContentScale.Crop,
                     )
                 } else {
-                    Box(
-                        modifier = Modifier.fillMaxSize(),
-                        contentAlignment = Alignment.Center
-                    ) {
+                    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_live_tv_nav),
                             contentDescription = null,
                             modifier = Modifier.size(48.dp),
-                            tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.4f)
+                            tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.4f),
                         )
                     }
                 }
 
                 if (isLive) {
-                    Box(
-                        modifier = Modifier
-                            .align(Alignment.TopEnd)
-                            .padding(8.dp)
-                    ) {
-                        LiveBadge()
-                    }
+                    Box(modifier = Modifier.align(Alignment.TopEnd).padding(8.dp)) { LiveBadge() }
                 }
 
                 if (showChannelOverlay) {
                     Box(
-                        modifier = Modifier
-                            .align(Alignment.BottomStart)
-                            .padding(8.dp)
-                            .background(
-                                MaterialTheme.colorScheme.surface.copy(alpha = 0.9f),
-                                RoundedCornerShape(6.dp)
-                            )
-                            .padding(4.dp)
+                        modifier =
+                            Modifier.align(Alignment.BottomStart)
+                                .padding(8.dp)
+                                .background(
+                                    MaterialTheme.colorScheme.surface.copy(alpha = 0.9f),
+                                    RoundedCornerShape(6.dp),
+                                )
+                                .padding(4.dp)
                     ) {
                         AsyncImage(
                             imageUrl = channel.images.primary.toString(),
                             contentDescription = channel.name,
                             modifier = Modifier.size(28.dp),
-                            contentScale = ContentScale.Fit
+                            contentScale = ContentScale.Fit,
                         )
                     }
                 }
@@ -148,12 +134,10 @@ fun ProgramCard(
                 if (isLive) {
                     LinearProgressIndicator(
                         progress = { progressPercentage },
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(4.dp)
-                            .align(Alignment.BottomCenter),
+                        modifier =
+                            Modifier.fillMaxWidth().height(4.dp).align(Alignment.BottomCenter),
                         color = MaterialTheme.colorScheme.primary,
-                        trackColor = Color.Black.copy(alpha = 0.3f)
+                        trackColor = Color.Black.copy(alpha = 0.3f),
                     )
                 }
             }
@@ -163,29 +147,27 @@ fun ProgramCard(
 
         Text(
             text = program.name,
-            style = MaterialTheme.typography.bodyMedium.copy(
-                fontWeight = FontWeight.SemiBold
-            ),
+            style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
             color = MaterialTheme.colorScheme.onBackground,
             maxLines = 1,
-            overflow = TextOverflow.Ellipsis
+            overflow = TextOverflow.Ellipsis,
         )
 
         Row(
             verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(4.dp)
+            horizontalArrangement = Arrangement.spacedBy(4.dp),
         ) {
             channel.channelNumber?.let { number ->
                 Text(
                     text = number,
                     style = MaterialTheme.typography.bodySmall,
                     color = MaterialTheme.colorScheme.primary,
-                    fontWeight = FontWeight.Bold
+                    fontWeight = FontWeight.Bold,
                 )
                 Text(
                     text = "•",
                     style = MaterialTheme.typography.bodySmall,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
 
@@ -194,28 +176,29 @@ fun ProgramCard(
                 style = MaterialTheme.typography.bodySmall,
                 color = MaterialTheme.colorScheme.onSurfaceVariant,
                 maxLines = 1,
-                overflow = TextOverflow.Ellipsis
+                overflow = TextOverflow.Ellipsis,
             )
         }
 
         val timeRangeFmt = stringResource(R.string.livetv_epg_time_range)
 
-        val timeText = remember(program.startDate, program.endDate, timeFormatter, timeRangeFmt) {
-            val start = program.startDate
-            val end = program.endDate
+        val timeText =
+            remember(program.startDate, program.endDate, timeFormatter, timeRangeFmt) {
+                val start = program.startDate
+                val end = program.endDate
 
-            if (start != null && end != null) {
-                String.format(
-                    timeRangeFmt,
-                    start.format(timeFormatter),
-                    end.format(timeFormatter)
-                )
-            } else if (start != null) {
-                start.format(timeFormatter)
-            } else {
-                ""
+                if (start != null && end != null) {
+                    String.format(
+                        timeRangeFmt,
+                        start.format(timeFormatter),
+                        end.format(timeFormatter),
+                    )
+                } else if (start != null) {
+                    start.format(timeFormatter)
+                } else {
+                    ""
+                }
             }
-        }
 
         if (timeText.isNotEmpty()) {
             Text(
@@ -223,8 +206,8 @@ fun ProgramCard(
                 style = MaterialTheme.typography.bodySmall,
                 color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f),
                 maxLines = 1,
-                overflow = TextOverflow.Ellipsis
+                overflow = TextOverflow.Ellipsis,
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/livetv/components/ProgramCategoryRow.kt b/app/src/main/java/com/makd/afinity/ui/livetv/components/ProgramCategoryRow.kt
index f219e416b..f7dff2cae 100644
--- a/app/src/main/java/com/makd/afinity/ui/livetv/components/ProgramCategoryRow.kt
+++ b/app/src/main/java/com/makd/afinity/ui/livetv/components/ProgramCategoryRow.kt
@@ -28,7 +28,7 @@ fun ProgramCategoryRow(
     onProgramClick: (ProgramWithChannel) -> Unit,
     modifier: Modifier = Modifier,
     widthSizeClass: WindowWidthSizeClass = WindowWidthSizeClass.Compact,
-    now: LocalDateTime
+    now: LocalDateTime,
 ) {
     if (programs.isEmpty()) return
 
@@ -37,34 +37,28 @@ fun ProgramCategoryRow(
         CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_LANDSCAPE)
     val fixedRowHeight = cardHeight + 8.dp + 20.dp + 22.dp
 
-    Column(
-        modifier = modifier.padding(horizontal = 14.dp)
-    ) {
+    Column(modifier = modifier.padding(horizontal = 14.dp)) {
         Text(
             text = stringResource(category.displayNameRes),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             color = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         LazyRow(
             modifier = Modifier.height(fixedRowHeight),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
-            items(
-                items = programs,
-                key = { "${it.program.id}_${it.channel.id}" }
-            ) { programWithChannel ->
+            items(items = programs, key = { "${it.program.id}_${it.channel.id}" }) {
+                programWithChannel ->
                 ProgramCard(
                     programWithChannel = programWithChannel,
                     onClick = { onProgramClick(programWithChannel) },
                     cardWidth = cardWidth,
-                    now = now
+                    now = now,
                 )
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/livetv/components/ProgramProgressBar.kt b/app/src/main/java/com/makd/afinity/ui/livetv/components/ProgramProgressBar.kt
index b5f99d613..ee2f94c24 100644
--- a/app/src/main/java/com/makd/afinity/ui/livetv/components/ProgramProgressBar.kt
+++ b/app/src/main/java/com/makd/afinity/ui/livetv/components/ProgramProgressBar.kt
@@ -12,20 +12,14 @@ import androidx.compose.ui.unit.dp
 import com.makd.afinity.data.models.livetv.AfinityProgram
 
 @Composable
-fun ProgramProgressBar(
-    program: AfinityProgram,
-    modifier: Modifier = Modifier
-) {
+fun ProgramProgressBar(program: AfinityProgram, modifier: Modifier = Modifier) {
     val progress = program.getProgressPercent() / 100f
 
     LinearProgressIndicator(
         progress = { progress },
-        modifier = modifier
-            .fillMaxWidth()
-            .height(3.dp)
-            .clip(MaterialTheme.shapes.small),
+        modifier = modifier.fillMaxWidth().height(3.dp).clip(MaterialTheme.shapes.small),
         color = MaterialTheme.colorScheme.primary,
         trackColor = MaterialTheme.colorScheme.surfaceVariant,
-        strokeCap = StrokeCap.Round
+        strokeCap = StrokeCap.Round,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/livetv/models/LiveTvCategory.kt b/app/src/main/java/com/makd/afinity/ui/livetv/models/LiveTvCategory.kt
index 6e7cc2ed4..ea4888d5e 100644
--- a/app/src/main/java/com/makd/afinity/ui/livetv/models/LiveTvCategory.kt
+++ b/app/src/main/java/com/makd/afinity/ui/livetv/models/LiveTvCategory.kt
@@ -9,5 +9,5 @@ enum class LiveTvCategory(@StringRes val displayNameRes: Int) {
     SHOWS(R.string.livetv_cat_shows),
     SPORTS(R.string.livetv_cat_sports),
     KIDS(R.string.livetv_cat_kids),
-    NEWS(R.string.livetv_cat_news)
-}
\ No newline at end of file
+    NEWS(R.string.livetv_cat_news),
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/livetv/models/ProgramWithChannel.kt b/app/src/main/java/com/makd/afinity/ui/livetv/models/ProgramWithChannel.kt
index 1abe30ebf..2c8890337 100644
--- a/app/src/main/java/com/makd/afinity/ui/livetv/models/ProgramWithChannel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/livetv/models/ProgramWithChannel.kt
@@ -3,7 +3,4 @@ package com.makd.afinity.ui.livetv.models
 import com.makd.afinity.data.models.livetv.AfinityChannel
 import com.makd.afinity.data.models.livetv.AfinityProgram
 
-data class ProgramWithChannel(
-    val program: AfinityProgram,
-    val channel: AfinityChannel
-)
\ No newline at end of file
+data class ProgramWithChannel(val program: AfinityProgram, val channel: AfinityChannel)
diff --git a/app/src/main/java/com/makd/afinity/ui/livetv/tabs/LiveTvChannelsTab.kt b/app/src/main/java/com/makd/afinity/ui/livetv/tabs/LiveTvChannelsTab.kt
index 0643bceac..c644340f4 100644
--- a/app/src/main/java/com/makd/afinity/ui/livetv/tabs/LiveTvChannelsTab.kt
+++ b/app/src/main/java/com/makd/afinity/ui/livetv/tabs/LiveTvChannelsTab.kt
@@ -51,13 +51,10 @@ fun LiveTvChannelsTab(
     selectedLetter: String? = null,
     onLetterSelected: (String) -> Unit = {},
     onClearFilter: () -> Unit = {},
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     if (uiState.isLoading) {
-        Box(
-            modifier = modifier.fillMaxSize(),
-            contentAlignment = Alignment.Center
-        ) {
+        Box(modifier = modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
             CircularProgressIndicator()
         }
         return
@@ -71,80 +68,83 @@ fun LiveTvChannelsTab(
 
     Box(modifier = modifier.fillMaxSize()) {
         Row(modifier = Modifier.fillMaxSize()) {
-
             Column(modifier = Modifier.weight(1f)) {
                 if (uiState.channels.isEmpty() && selectedLetter != null) {
-                    Box(
-                        modifier = Modifier.fillMaxSize(),
-                        contentAlignment = Alignment.Center
-                    ) {
+                    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                         Column(horizontalAlignment = Alignment.CenterHorizontally) {
                             Text(
-                                text = stringResource(R.string.livetv_empty_letter_fmt, selectedLetter ?: ""),
+                                text =
+                                    stringResource(
+                                        R.string.livetv_empty_letter_fmt,
+                                        selectedLetter ?: "",
+                                    ),
                                 style = MaterialTheme.typography.bodyLarge,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                             Button(
                                 onClick = onClearFilter,
-                                modifier = Modifier.padding(top = 16.dp)
+                                modifier = Modifier.padding(top = 16.dp),
                             ) {
                                 Text(stringResource(R.string.action_show_all_channels))
                             }
                         }
                     }
                 } else if (uiState.channels.isEmpty()) {
-                    Box(
-                        modifier = Modifier.fillMaxSize(),
-                        contentAlignment = Alignment.Center
-                    ) {
+                    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                         Text(
                             text = stringResource(R.string.livetv_empty_generic),
                             style = MaterialTheme.typography.bodyLarge,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
                 } else {
                     LazyVerticalGrid(
                         columns = GridCells.Adaptive(minSize = 160.dp),
                         modifier = Modifier.fillMaxSize(),
-                        contentPadding = PaddingValues(
-                            start = 16.dp + safeStart,
-                            end = 16.dp,
-                            top = 16.dp,
-                            bottom = 16.dp + safeBottom
-                        ),
+                        contentPadding =
+                            PaddingValues(
+                                start = 16.dp + safeStart,
+                                end = 16.dp,
+                                top = 16.dp,
+                                bottom = 16.dp + safeBottom,
+                            ),
                         horizontalArrangement = Arrangement.spacedBy(12.dp),
-                        verticalArrangement = Arrangement.spacedBy(12.dp)
+                        verticalArrangement = Arrangement.spacedBy(12.dp),
                     ) {
                         item(span = { GridItemSpan(maxLineSpan) }) {
                             Column(modifier = Modifier.padding(bottom = 8.dp)) {
                                 Text(
-                                    text = if (selectedLetter != null)
-                                        stringResource(R.string.livetv_header_letter_fmt, selectedLetter)
-                                    else
-                                        stringResource(R.string.livetv_header_all),
-                                    style = MaterialTheme.typography.headlineSmall.copy(
-                                        fontWeight = FontWeight.Bold
-                                    ),
-                                    color = MaterialTheme.colorScheme.onBackground
+                                    text =
+                                        if (selectedLetter != null)
+                                            stringResource(
+                                                R.string.livetv_header_letter_fmt,
+                                                selectedLetter,
+                                            )
+                                        else stringResource(R.string.livetv_header_all),
+                                    style =
+                                        MaterialTheme.typography.headlineSmall.copy(
+                                            fontWeight = FontWeight.Bold
+                                        ),
+                                    color = MaterialTheme.colorScheme.onBackground,
                                 )
                                 Text(
-                                    text = stringResource(R.string.livetv_count_fmt, uiState.channels.size),
+                                    text =
+                                        stringResource(
+                                            R.string.livetv_count_fmt,
+                                            uiState.channels.size,
+                                        ),
                                     style = MaterialTheme.typography.bodyMedium,
-                                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                                 )
                             }
                         }
 
-                        items(
-                            items = uiState.channels,
-                            key = { it.id }
-                        ) { channel ->
+                        items(items = uiState.channels, key = { it.id }) { channel ->
                             ChannelCard(
                                 channel = channel,
                                 onClick = { onChannelClick(channel) },
                                 onFavoriteClick = { onFavoriteClick(channel) },
-                                showProgramOverlays = false
+                                showProgramOverlays = false,
                             )
                         }
                     }
@@ -152,20 +152,20 @@ fun LiveTvChannelsTab(
             }
 
             Box(
-                modifier = Modifier
-                    .fillMaxHeight()
-                    .padding(top = 16.dp, bottom = safeBottom)
-                    .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.End)),
-                contentAlignment = Alignment.Center
+                modifier =
+                    Modifier.fillMaxHeight()
+                        .padding(top = 16.dp, bottom = safeBottom)
+                        .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.End)),
+                contentAlignment = Alignment.Center,
             ) {
                 AlphabetScroller(
                     selectedLetter = selectedLetter,
                     onLetterSelected = onLetterSelected,
-                    modifier = Modifier
-                        .background(
+                    modifier =
+                        Modifier.background(
                             MaterialTheme.colorScheme.surface.copy(alpha = 0.8f),
-                            shape = MaterialTheme.shapes.small
-                        )
+                            shape = MaterialTheme.shapes.small,
+                        ),
                 )
             }
         }
@@ -176,34 +176,32 @@ fun LiveTvChannelsTab(
 private fun AlphabetScroller(
     selectedLetter: String?,
     onLetterSelected: (String) -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val letters = listOf("#") + ('A'..'Z').map { it.toString() }
 
     LazyColumn(
-        modifier = modifier
-            .width(32.dp)
-            .padding(vertical = 8.dp),
+        modifier = modifier.width(32.dp).padding(vertical = 8.dp),
         verticalArrangement = Arrangement.spacedBy(2.dp),
-        horizontalAlignment = Alignment.CenterHorizontally
+        horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         items(letters) { letter ->
             val isSelected = selectedLetter == letter
             Text(
                 text = letter,
-                style = MaterialTheme.typography.labelSmall.copy(
-                    fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Medium
-                ),
-                color = if (isSelected)
-                    MaterialTheme.colorScheme.primary
-                else
-                    MaterialTheme.colorScheme.onSurfaceVariant,
+                style =
+                    MaterialTheme.typography.labelSmall.copy(
+                        fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Medium
+                    ),
+                color =
+                    if (isSelected) MaterialTheme.colorScheme.primary
+                    else MaterialTheme.colorScheme.onSurfaceVariant,
                 textAlign = TextAlign.Center,
-                modifier = Modifier
-                    .clickable { onLetterSelected(letter) }
-                    .padding(horizontal = 4.dp, vertical = 2.dp)
-                    .fillMaxWidth()
+                modifier =
+                    Modifier.clickable { onLetterSelected(letter) }
+                        .padding(horizontal = 4.dp, vertical = 2.dp)
+                        .fillMaxWidth(),
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/livetv/tabs/LiveTvGuideTab.kt b/app/src/main/java/com/makd/afinity/ui/livetv/tabs/LiveTvGuideTab.kt
index 9de8ff450..2e9a773f8 100644
--- a/app/src/main/java/com/makd/afinity/ui/livetv/tabs/LiveTvGuideTab.kt
+++ b/app/src/main/java/com/makd/afinity/ui/livetv/tabs/LiveTvGuideTab.kt
@@ -48,21 +48,23 @@ fun LiveTvGuideTab(
     onJumpToNow: () -> Unit,
     onNavigateTime: (Int) -> Unit,
     modifier: Modifier = Modifier,
-    widthSizeClass: WindowWidthSizeClass = WindowWidthSizeClass.Compact
+    widthSizeClass: WindowWidthSizeClass = WindowWidthSizeClass.Compact,
 ) {
-    val channelCellWidth: Dp = when (widthSizeClass) {
-        WindowWidthSizeClass.Compact -> 100.dp
-        WindowWidthSizeClass.Medium -> 120.dp
-        WindowWidthSizeClass.Expanded -> 150.dp
-        else -> 100.dp
-    }
+    val channelCellWidth: Dp =
+        when (widthSizeClass) {
+            WindowWidthSizeClass.Compact -> 100.dp
+            WindowWidthSizeClass.Medium -> 120.dp
+            WindowWidthSizeClass.Expanded -> 150.dp
+            else -> 100.dp
+        }
 
-    val hourWidth: Dp = when (widthSizeClass) {
-        WindowWidthSizeClass.Compact -> 180.dp
-        WindowWidthSizeClass.Medium -> 200.dp
-        WindowWidthSizeClass.Expanded -> 240.dp
-        else -> 180.dp
-    }
+    val hourWidth: Dp =
+        when (widthSizeClass) {
+            WindowWidthSizeClass.Compact -> 180.dp
+            WindowWidthSizeClass.Medium -> 200.dp
+            WindowWidthSizeClass.Expanded -> 240.dp
+            else -> 180.dp
+        }
 
     val rowHeight: Dp = 70.dp
     val headerHeight: Dp = 40.dp
@@ -72,10 +74,7 @@ fun LiveTvGuideTab(
     val dateFormatter = remember(datePattern) { DateTimeFormatter.ofPattern(datePattern) }
 
     if (uiState.isEpgLoading && uiState.epgChannels.isEmpty()) {
-        Box(
-            modifier = modifier.fillMaxSize(),
-            contentAlignment = Alignment.Center
-        ) {
+        Box(modifier = modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
             CircularProgressIndicator()
         }
         return
@@ -83,42 +82,39 @@ fun LiveTvGuideTab(
 
     Column(modifier = modifier.fillMaxSize()) {
         Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .background(MaterialTheme.colorScheme.surface)
-                .padding(horizontal = 8.dp, vertical = 8.dp),
+            modifier =
+                Modifier.fillMaxWidth()
+                    .background(MaterialTheme.colorScheme.surface)
+                    .padding(horizontal = 8.dp, vertical = 8.dp),
             verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceBetween
+            horizontalArrangement = Arrangement.SpaceBetween,
         ) {
             IconButton(onClick = { onNavigateTime(-3) }) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_chevron_left),
-                    contentDescription = stringResource(R.string.cd_guide_previous_time)
+                    contentDescription = stringResource(R.string.cd_guide_previous_time),
                 )
             }
 
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally
-            ) {
+            Column(horizontalAlignment = Alignment.CenterHorizontally) {
                 Text(
                     text = uiState.epgStartTime.format(dateFormatter),
                     style = MaterialTheme.typography.titleSmall,
-                    fontWeight = FontWeight.Bold
+                    fontWeight = FontWeight.Bold,
                 )
                 val startHour = uiState.epgStartTime.hour
                 val endHour = uiState.epgStartTime.plusHours(uiState.epgVisibleHours.toLong()).hour
                 Text(
                     text = stringResource(R.string.livetv_guide_time_range_fmt, startHour, endHour),
                     style = MaterialTheme.typography.bodySmall,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
 
             Button(
                 onClick = onJumpToNow,
-                colors = ButtonDefaults.buttonColors(
-                    containerColor = MaterialTheme.colorScheme.primary
-                )
+                colors =
+                    ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.primary),
             ) {
                 Text(stringResource(R.string.action_now))
             }
@@ -126,63 +122,46 @@ fun LiveTvGuideTab(
             IconButton(onClick = { onNavigateTime(3) }) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_chevron_right),
-                    contentDescription = stringResource(R.string.cd_guide_next_time)
+                    contentDescription = stringResource(R.string.cd_guide_next_time),
                 )
             }
         }
 
-        LazyColumn(
-            modifier = Modifier.fillMaxSize()
-        ) {
+        LazyColumn(modifier = Modifier.fillMaxSize()) {
             stickyHeader {
                 Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(headerHeight)
-                        .background(MaterialTheme.colorScheme.surface)
-                ) {
-                    Box(
-                        modifier = Modifier
-                            .width(channelCellWidth)
+                    modifier =
+                        Modifier.fillMaxWidth()
                             .height(headerHeight)
                             .background(MaterialTheme.colorScheme.surface)
-                    )
+                ) {
                     Box(
-                        modifier = Modifier
-                            .weight(1f)
-                            .horizontalScroll(horizontalScrollState)
-                    ) {
+                        modifier =
+                            Modifier.width(channelCellWidth)
+                                .height(headerHeight)
+                                .background(MaterialTheme.colorScheme.surface)
+                    )
+                    Box(modifier = Modifier.weight(1f).horizontalScroll(horizontalScrollState)) {
                         EpgTimeHeader(
                             startTime = uiState.epgStartTime,
                             visibleHours = uiState.epgVisibleHours,
-                            hourWidth = hourWidth
+                            hourWidth = hourWidth,
                         )
                     }
                 }
             }
 
-            items(
-                items = uiState.epgChannels,
-                key = { it.id }
-            ) { channel ->
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(rowHeight)
-                ) {
+            items(items = uiState.epgChannels, key = { it.id }) { channel ->
+                Row(modifier = Modifier.fillMaxWidth().height(rowHeight)) {
                     EpgChannelCell(
                         channel = channel,
                         onClick = { onChannelClick(channel) },
                         cellWidth = channelCellWidth,
-                        cellHeight = rowHeight
+                        cellHeight = rowHeight,
                     )
 
                     val channelPrograms = uiState.epgPrograms[channel.id] ?: emptyList()
-                    Box(
-                        modifier = Modifier
-                            .weight(1f)
-                            .horizontalScroll(horizontalScrollState)
-                    ) {
+                    Box(modifier = Modifier.weight(1f).horizontalScroll(horizontalScrollState)) {
                         EpgProgramRow(
                             channel = channel,
                             programs = channelPrograms,
@@ -190,13 +169,11 @@ fun LiveTvGuideTab(
                             visibleHours = uiState.epgVisibleHours,
                             hourWidth = hourWidth,
                             cellHeight = rowHeight,
-                            onProgramClick = {
-                                onChannelClick(channel)
-                            }
+                            onProgramClick = { onChannelClick(channel) },
                         )
                     }
                 }
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/livetv/tabs/LiveTvHomeTab.kt b/app/src/main/java/com/makd/afinity/ui/livetv/tabs/LiveTvHomeTab.kt
index 8943df68a..6f3f8c18e 100644
--- a/app/src/main/java/com/makd/afinity/ui/livetv/tabs/LiveTvHomeTab.kt
+++ b/app/src/main/java/com/makd/afinity/ui/livetv/tabs/LiveTvHomeTab.kt
@@ -31,15 +31,15 @@ import com.makd.afinity.ui.livetv.LiveTvUiState
 import com.makd.afinity.ui.livetv.components.ProgramCategoryRow
 import com.makd.afinity.ui.livetv.models.LiveTvCategory
 import com.makd.afinity.ui.livetv.models.ProgramWithChannel
-import kotlinx.coroutines.delay
 import java.time.LocalDateTime
+import kotlinx.coroutines.delay
 
 @Composable
 fun LiveTvHomeTab(
     uiState: LiveTvUiState,
     onProgramClick: (ProgramWithChannel) -> Unit,
     modifier: Modifier = Modifier,
-    widthSizeClass: WindowWidthSizeClass = WindowWidthSizeClass.Compact
+    widthSizeClass: WindowWidthSizeClass = WindowWidthSizeClass.Compact,
 ) {
     var currentTime by remember { mutableStateOf(LocalDateTime.now()) }
 
@@ -50,54 +50,50 @@ fun LiveTvHomeTab(
         }
     }
     if (uiState.isCategoriesLoading && uiState.categorizedPrograms.isEmpty()) {
-        Box(
-            modifier = modifier.fillMaxSize(),
-            contentAlignment = Alignment.Center
-        ) {
+        Box(modifier = modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
             CircularProgressIndicator()
         }
         return
     }
 
-    val orderedCategories = listOf(
-        LiveTvCategory.ON_NOW,
-        LiveTvCategory.MOVIES,
-        LiveTvCategory.SHOWS,
-        LiveTvCategory.SPORTS,
-        LiveTvCategory.KIDS,
-        LiveTvCategory.NEWS
-    )
+    val orderedCategories =
+        listOf(
+            LiveTvCategory.ON_NOW,
+            LiveTvCategory.MOVIES,
+            LiveTvCategory.SHOWS,
+            LiveTvCategory.SPORTS,
+            LiveTvCategory.KIDS,
+            LiveTvCategory.NEWS,
+        )
 
-    val categoriesWithPrograms = orderedCategories.mapNotNull { category ->
-        uiState.categorizedPrograms[category]?.takeIf { it.isNotEmpty() }?.let { programs ->
-            category to programs
+    val categoriesWithPrograms =
+        orderedCategories.mapNotNull { category ->
+            uiState.categorizedPrograms[category]
+                ?.takeIf { it.isNotEmpty() }
+                ?.let { programs -> category to programs }
         }
-    }
 
     if (categoriesWithPrograms.isEmpty()) {
-        Box(
-            modifier = modifier.fillMaxSize(),
-            contentAlignment = Alignment.Center
-        ) {
+        Box(modifier = modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
             Column(
                 horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.Center
+                verticalArrangement = Arrangement.Center,
             ) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_live_tv_nav),
                     contentDescription = null,
                     modifier = Modifier.padding(16.dp),
-                    tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.4f)
+                    tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.4f),
                 )
                 Text(
                     text = stringResource(R.string.livetv_home_empty_title),
                     style = MaterialTheme.typography.titleMedium,
-                    color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f)
+                    color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f),
                 )
                 Text(
                     text = stringResource(R.string.livetv_home_empty_message),
                     style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.4f)
+                    color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.4f),
                 )
             }
         }
@@ -106,20 +102,17 @@ fun LiveTvHomeTab(
 
     LazyColumn(
         modifier = modifier.fillMaxSize(),
-        contentPadding = PaddingValues(vertical = 16.dp)
+        contentPadding = PaddingValues(vertical = 16.dp),
     ) {
-        items(
-            items = categoriesWithPrograms,
-            key = { it.first.name }
-        ) { (category, programs) ->
+        items(items = categoriesWithPrograms, key = { it.first.name }) { (category, programs) ->
             ProgramCategoryRow(
                 category = category,
                 programs = programs,
                 now = currentTime,
                 onProgramClick = onProgramClick,
-                widthSizeClass = widthSizeClass
+                widthSizeClass = widthSizeClass,
             )
             Spacer(modifier = Modifier.height(24.dp))
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/login/LoginScreen.kt b/app/src/main/java/com/makd/afinity/ui/login/LoginScreen.kt
index b19d85f4f..c7773c143 100644
--- a/app/src/main/java/com/makd/afinity/ui/login/LoginScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/login/LoginScreen.kt
@@ -89,7 +89,7 @@ import com.makd.afinity.data.models.user.User
 
 enum class LoginMethod {
     PASSWORD,
-    QUICK_CONNECT
+    QUICK_CONNECT,
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -98,25 +98,25 @@ fun LoginScreen(
     onLoginSuccess: () -> Unit,
     modifier: Modifier = Modifier,
     viewModel: LoginViewModel = hiltViewModel(),
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
-    val loginState by viewModel.loginState.collectAsStateWithLifecycle(
-        initialValue = LoginState(
-            uiState = LoginUiState(),
-            serverUrl = "",
-            publicUsers = emptyList(),
-            hasServerUrl = false,
-            isConnectedToServer = false
+    val loginState by
+        viewModel.loginState.collectAsStateWithLifecycle(
+            initialValue =
+                LoginState(
+                    uiState = LoginUiState(),
+                    serverUrl = "",
+                    publicUsers = emptyList(),
+                    hasServerUrl = false,
+                    isConnectedToServer = false,
+                )
         )
-    )
     val savedServers by viewModel.savedServers.collectAsStateWithLifecycle()
     val savedUsers by viewModel.savedUsers.collectAsStateWithLifecycle()
 
     var selectedLoginMethod by remember { mutableStateOf(LoginMethod.PASSWORD) }
 
-    LaunchedEffect(Unit) {
-        viewModel.discoverServers()
-    }
+    LaunchedEffect(Unit) { viewModel.discoverServers() }
 
     LaunchedEffect(loginState.uiState.isLoggedIn) {
         if (loginState.uiState.isLoggedIn) {
@@ -126,27 +126,25 @@ fun LoginScreen(
 
     Scaffold(
         modifier = modifier.fillMaxSize(),
-        containerColor = MaterialTheme.colorScheme.surface
+        containerColor = MaterialTheme.colorScheme.surface,
     ) { innerPadding ->
         Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(innerPadding),
-            contentAlignment = Alignment.TopCenter
+            modifier = Modifier.fillMaxSize().padding(innerPadding),
+            contentAlignment = Alignment.TopCenter,
         ) {
             Column(
-                modifier = Modifier
-                    .widthIn(max = 550.dp)
-                    .fillMaxSize()
-                    .verticalScroll(rememberScrollState())
-                    .padding(horizontal = 24.dp, vertical = 16.dp),
-                horizontalAlignment = Alignment.CenterHorizontally
+                modifier =
+                    Modifier.widthIn(max = 550.dp)
+                        .fillMaxSize()
+                        .verticalScroll(rememberScrollState())
+                        .padding(horizontal = 24.dp, vertical = 16.dp),
+                horizontalAlignment = Alignment.CenterHorizontally,
             ) {
                 Spacer(modifier = Modifier.height(48.dp))
 
                 LoginHeader(
                     isConnected = loginState.uiState.isConnectedToServer,
-                    serverUrl = loginState.serverUrl
+                    serverUrl = loginState.serverUrl,
                 )
 
                 Spacer(modifier = Modifier.height(48.dp))
@@ -158,7 +156,7 @@ fun LoginScreen(
                             slideOutVertically { height -> -height } + fadeOut()
                         ) using SizeTransform(clip = false)
                     },
-                    label = "LoginStateTransition"
+                    label = "LoginStateTransition",
                 ) { isConnected ->
                     if (!isConnected) {
                         ServerConnectionContent(
@@ -172,15 +170,13 @@ fun LoginScreen(
                             onConnectToServer = viewModel::connectToServer,
                             onSavedServerSelect = viewModel::selectServer,
                             onDiscoveredServerSelect = { server ->
-                                val url = server.address.ifBlank {
-                                    "http://${server.name}:8096"
-                                }
+                                val url = server.address.ifBlank { "http://${server.name}:8096" }
                                 viewModel.setServerUrl(url)
                                 viewModel.connectToServer()
                             },
                             onDiscoverServers = viewModel::discoverServers,
                             onAddNewServer = viewModel::showAddNewServer,
-                            onCancelAddServer = viewModel::cancelAddServer
+                            onCancelAddServer = viewModel::cancelAddServer,
                         )
                     } else {
                         UserLoginContent(
@@ -197,7 +193,7 @@ fun LoginScreen(
                             onLogin = viewModel::login,
                             onQuickConnectStart = viewModel::startQuickConnect,
                             onQuickConnectCancel = viewModel::cancelQuickConnect,
-                            onChangeServer = { viewModel.setServerUrl("") }
+                            onChangeServer = { viewModel.setServerUrl("") },
                         )
                     }
                 }
@@ -207,29 +203,29 @@ fun LoginScreen(
                 AnimatedVisibility(
                     visible = loginState.uiState.error != null,
                     enter = fadeIn() + slideInVertically { it },
-                    exit = fadeOut() + slideOutVertically { it }
+                    exit = fadeOut() + slideOutVertically { it },
                 ) {
                     Surface(
                         color = MaterialTheme.colorScheme.errorContainer,
                         shape = RoundedCornerShape(16.dp),
-                        modifier = Modifier.padding(bottom = 16.dp)
+                        modifier = Modifier.padding(bottom = 16.dp),
                     ) {
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp)
+                            modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp),
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_info),
                                 contentDescription = null,
                                 tint = MaterialTheme.colorScheme.error,
-                                modifier = Modifier.size(20.dp)
+                                modifier = Modifier.size(20.dp),
                             )
                             Spacer(modifier = Modifier.width(12.dp))
                             Text(
                                 text = loginState.uiState.error ?: "",
                                 color = MaterialTheme.colorScheme.onErrorContainer,
                                 style = MaterialTheme.typography.bodyMedium,
-                                textAlign = TextAlign.Center
+                                textAlign = TextAlign.Center,
                             )
                         }
                     }
@@ -240,30 +236,28 @@ fun LoginScreen(
 }
 
 @Composable
-private fun LoginHeader(
-    isConnected: Boolean,
-    serverUrl: String
-) {
+private fun LoginHeader(isConnected: Boolean, serverUrl: String) {
     Column(horizontalAlignment = Alignment.CenterHorizontally) {
         if (!isConnected) {
             Row(
                 verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.Center
+                horizontalArrangement = Arrangement.Center,
             ) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_launcher_monochrome),
                     contentDescription = null,
                     tint = MaterialTheme.colorScheme.primary,
-                    modifier = Modifier.size(64.dp)
+                    modifier = Modifier.size(64.dp),
                 )
                 Spacer(modifier = Modifier.width(6.dp))
                 Text(
                     text = stringResource(R.string.app_name),
-                    style = MaterialTheme.typography.displayMedium.copy(
-                        fontWeight = FontWeight.Bold,
-                        letterSpacing = (-1).sp
-                    ),
-                    color = MaterialTheme.colorScheme.primary
+                    style =
+                        MaterialTheme.typography.displayMedium.copy(
+                            fontWeight = FontWeight.Bold,
+                            letterSpacing = (-1).sp,
+                        ),
+                    color = MaterialTheme.colorScheme.primary,
                 )
             }
             Spacer(modifier = Modifier.height(8.dp))
@@ -271,29 +265,29 @@ private fun LoginHeader(
                 text = stringResource(R.string.login_connect_to_jellyfin),
                 style = MaterialTheme.typography.titleMedium,
                 color = MaterialTheme.colorScheme.onSurfaceVariant,
-                textAlign = TextAlign.Center
+                textAlign = TextAlign.Center,
             )
         } else {
             Surface(
                 shape = RoundedCornerShape(50),
                 color = MaterialTheme.colorScheme.surfaceContainerHigh,
-                modifier = Modifier.padding(bottom = 16.dp)
+                modifier = Modifier.padding(bottom = 16.dp),
             ) {
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)
+                    modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
                 ) {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_server),
                         contentDescription = stringResource(R.string.cd_server_icon),
                         modifier = Modifier.size(16.dp),
-                        tint = MaterialTheme.colorScheme.primary
+                        tint = MaterialTheme.colorScheme.primary,
                     )
                     Spacer(modifier = Modifier.width(8.dp))
                     Text(
                         text = serverUrl.removePrefix("http://").removePrefix("https://"),
                         style = MaterialTheme.typography.labelLarge,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
                 }
             }
@@ -301,7 +295,7 @@ private fun LoginHeader(
                 text = stringResource(R.string.login_welcome_back),
                 style = MaterialTheme.typography.headlineMedium.copy(fontWeight = FontWeight.Bold),
                 color = MaterialTheme.colorScheme.onSurface,
-                textAlign = TextAlign.Center
+                textAlign = TextAlign.Center,
             )
         }
     }
@@ -321,32 +315,29 @@ private fun ServerConnectionContent(
     onDiscoveredServerSelect: (Server) -> Unit,
     onDiscoverServers: () -> Unit,
     onAddNewServer: () -> Unit,
-    onCancelAddServer: () -> Unit
+    onCancelAddServer: () -> Unit,
 ) {
     val showSavedServers = savedServers.isNotEmpty() && !showAddServerInput
 
     Column(verticalArrangement = Arrangement.spacedBy(24.dp)) {
-
         if (showSavedServers) {
             Column {
                 Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(bottom = 8.dp),
+                    modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp),
                     horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically
+                    verticalAlignment = Alignment.CenterVertically,
                 ) {
                     Text(
                         text = stringResource(R.string.login_saved_servers),
                         style = MaterialTheme.typography.titleMedium,
-                        color = MaterialTheme.colorScheme.onSurface
+                        color = MaterialTheme.colorScheme.onSurface,
                     )
                     TextButton(onClick = onAddNewServer) {
                         Row(verticalAlignment = Alignment.CenterVertically) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_plus),
                                 contentDescription = null,
-                                modifier = Modifier.size(16.dp)
+                                modifier = Modifier.size(16.dp),
                             )
                             Spacer(modifier = Modifier.width(4.dp))
                             Text(stringResource(R.string.login_add_new_server))
@@ -356,14 +347,14 @@ private fun ServerConnectionContent(
 
                 LazyColumn(
                     modifier = Modifier.heightIn(max = 240.dp),
-                    verticalArrangement = Arrangement.spacedBy(8.dp)
+                    verticalArrangement = Arrangement.spacedBy(8.dp),
                 ) {
                     items(savedServers) { server ->
                         SavedServerCard(
                             server = server,
                             isSelected = false,
                             isConnecting = false,
-                            onClick = { onSavedServerSelect(server) }
+                            onClick = { onSavedServerSelect(server) },
                         )
                     }
                 }
@@ -378,55 +369,52 @@ private fun ServerConnectionContent(
                     leadingIcon = {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_link_rotated),
-                            contentDescription = null
+                            contentDescription = null,
                         )
                     },
                     singleLine = true,
                     shape = RoundedCornerShape(16.dp),
-                    keyboardOptions = KeyboardOptions(
-                        keyboardType = KeyboardType.Uri,
-                        imeAction = ImeAction.Done
-                    ),
+                    keyboardOptions =
+                        KeyboardOptions(
+                            keyboardType = KeyboardType.Uri,
+                            imeAction = ImeAction.Done,
+                        ),
                     keyboardActions = KeyboardActions(onDone = { onConnectToServer() }),
                     modifier = Modifier.fillMaxWidth(),
-                    colors = OutlinedTextFieldDefaults.colors(
-                        focusedContainerColor = MaterialTheme.colorScheme.surfaceContainer,
-                        unfocusedContainerColor = MaterialTheme.colorScheme.surfaceContainer,
-                        focusedBorderColor = Color.Transparent,
-                        unfocusedBorderColor = Color.Transparent
-                    )
+                    colors =
+                        OutlinedTextFieldDefaults.colors(
+                            focusedContainerColor = MaterialTheme.colorScheme.surfaceContainer,
+                            unfocusedContainerColor = MaterialTheme.colorScheme.surfaceContainer,
+                            focusedBorderColor = Color.Transparent,
+                            unfocusedBorderColor = Color.Transparent,
+                        ),
                 )
 
                 Spacer(modifier = Modifier.height(16.dp))
 
                 Button(
                     onClick = onConnectToServer,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(56.dp),
+                    modifier = Modifier.fillMaxWidth().height(56.dp),
                     enabled = serverUrl.isNotBlank() && !isConnecting,
-                    shape = RoundedCornerShape(16.dp)
+                    shape = RoundedCornerShape(16.dp),
                 ) {
                     if (isConnecting) {
                         CircularProgressIndicator(
                             color = MaterialTheme.colorScheme.onPrimary,
                             modifier = Modifier.size(24.dp),
-                            strokeWidth = 3.dp
+                            strokeWidth = 3.dp,
                         )
                     } else {
                         Text(
                             stringResource(R.string.login_btn_connect),
-                            style = MaterialTheme.typography.titleMedium
+                            style = MaterialTheme.typography.titleMedium,
                         )
                     }
                 }
 
                 if (savedServers.isNotEmpty()) {
                     Spacer(modifier = Modifier.height(8.dp))
-                    TextButton(
-                        onClick = onCancelAddServer,
-                        modifier = Modifier.fillMaxWidth()
-                    ) {
+                    TextButton(onClick = onCancelAddServer, modifier = Modifier.fillMaxWidth()) {
                         Text(stringResource(R.string.login_btn_cancel))
                     }
                 }
@@ -437,27 +425,24 @@ private fun ServerConnectionContent(
             Row(
                 modifier = Modifier.fillMaxWidth(),
                 horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically
+                verticalAlignment = Alignment.CenterVertically,
             ) {
                 Text(
                     text = stringResource(R.string.login_local_network),
                     style = MaterialTheme.typography.titleMedium,
-                    color = MaterialTheme.colorScheme.onSurface
+                    color = MaterialTheme.colorScheme.onSurface,
                 )
-                Box(
-                    modifier = Modifier.size(48.dp),
-                    contentAlignment = Alignment.Center
-                ) {
+                Box(modifier = Modifier.size(48.dp), contentAlignment = Alignment.Center) {
                     if (isDiscovering) {
                         CircularProgressIndicator(
                             modifier = Modifier.size(20.dp),
-                            strokeWidth = 2.dp
+                            strokeWidth = 2.dp,
                         )
                     } else {
                         IconButton(onClick = onDiscoverServers) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_refresh),
-                                contentDescription = stringResource(R.string.login_refresh)
+                                contentDescription = stringResource(R.string.login_refresh),
                             )
                         }
                     }
@@ -472,30 +457,28 @@ private fun ServerConnectionContent(
                         onClick = { onDiscoveredServerSelect(server) },
                         shape = RoundedCornerShape(16.dp),
                         color = MaterialTheme.colorScheme.surfaceContainerLow,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(bottom = 8.dp)
+                        modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp),
                     ) {
                         Row(
                             modifier = Modifier.padding(16.dp),
-                            verticalAlignment = Alignment.CenterVertically
+                            verticalAlignment = Alignment.CenterVertically,
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_server),
                                 contentDescription = stringResource(R.string.cd_server_icon),
-                                tint = MaterialTheme.colorScheme.onSurfaceVariant
+                                tint = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                             Spacer(modifier = Modifier.width(16.dp))
                             Column {
                                 Text(
                                     server.name,
                                     style = MaterialTheme.typography.bodyMedium,
-                                    fontWeight = FontWeight.Medium
+                                    fontWeight = FontWeight.Medium,
                                 )
                                 Text(
                                     server.address,
                                     style = MaterialTheme.typography.bodySmall,
-                                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                                 )
                             }
                         }
@@ -503,15 +486,13 @@ private fun ServerConnectionContent(
                 }
             } else if (!isDiscovering) {
                 Box(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(vertical = 16.dp),
-                    contentAlignment = Alignment.Center
+                    modifier = Modifier.fillMaxWidth().padding(vertical = 16.dp),
+                    contentAlignment = Alignment.Center,
                 ) {
                     Text(
                         stringResource(R.string.login_no_servers_found),
                         style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.outline
+                        color = MaterialTheme.colorScheme.outline,
                     )
                 }
             }
@@ -524,28 +505,25 @@ private fun SavedServerCard(
     server: Server,
     isSelected: Boolean,
     isConnecting: Boolean,
-    onClick: () -> Unit
+    onClick: () -> Unit,
 ) {
     Surface(
         onClick = onClick,
         shape = RoundedCornerShape(16.dp),
         color = MaterialTheme.colorScheme.surfaceContainerHigh,
-        modifier = Modifier.fillMaxWidth()
+        modifier = Modifier.fillMaxWidth(),
     ) {
-        Row(
-            modifier = Modifier.padding(16.dp),
-            verticalAlignment = Alignment.CenterVertically
-        ) {
+        Row(modifier = Modifier.padding(16.dp), verticalAlignment = Alignment.CenterVertically) {
             Box(
-                modifier = Modifier
-                    .size(40.dp)
-                    .background(MaterialTheme.colorScheme.primaryContainer, CircleShape),
-                contentAlignment = Alignment.Center
+                modifier =
+                    Modifier.size(40.dp)
+                        .background(MaterialTheme.colorScheme.primaryContainer, CircleShape),
+                contentAlignment = Alignment.Center,
             ) {
                 Text(
                     text = server.name.take(1).uppercase(),
                     style = MaterialTheme.typography.titleMedium,
-                    color = MaterialTheme.colorScheme.onPrimaryContainer
+                    color = MaterialTheme.colorScheme.onPrimaryContainer,
                 )
             }
             Spacer(modifier = Modifier.width(16.dp))
@@ -553,12 +531,12 @@ private fun SavedServerCard(
                 Text(
                     server.name,
                     style = MaterialTheme.typography.bodyLarge,
-                    fontWeight = FontWeight.SemiBold
+                    fontWeight = FontWeight.SemiBold,
                 )
                 Text(
                     server.address,
                     style = MaterialTheme.typography.bodySmall,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
 
@@ -584,14 +562,14 @@ private fun UserLoginContent(
     onLogin: () -> Unit,
     onQuickConnectStart: () -> Unit,
     onQuickConnectCancel: () -> Unit,
-    onChangeServer: () -> Unit
+    onChangeServer: () -> Unit,
 ) {
     var tabIndex by remember { mutableIntStateOf(0) }
 
     Column {
         TextButton(
             onClick = onChangeServer,
-            modifier = Modifier.align(Alignment.CenterHorizontally)
+            modifier = Modifier.align(Alignment.CenterHorizontally),
         ) {
             Text(stringResource(R.string.login_switch_server))
         }
@@ -604,7 +582,7 @@ private fun UserLoginContent(
             LazyRow(
                 horizontalArrangement = Arrangement.spacedBy(16.dp),
                 contentPadding = PaddingValues(horizontal = 4.dp, vertical = 8.dp),
-                modifier = Modifier.fillMaxWidth()
+                modifier = Modifier.fillMaxWidth(),
             ) {
                 items(allUsers) { user ->
                     val isSelected = uiState.selectedUser?.id == user.id
@@ -618,7 +596,7 @@ private fun UserLoginContent(
                             } else {
                                 onUserSelect(user)
                             }
-                        }
+                        },
                     )
                 }
             }
@@ -629,7 +607,7 @@ private fun UserLoginContent(
             selectedTabIndex = tabIndex,
             containerColor = Color.Transparent,
             divider = {},
-            indicator = { }
+            indicator = {},
         ) {
             Tab(
                 selected = tabIndex == 0,
@@ -637,7 +615,7 @@ private fun UserLoginContent(
                     tabIndex = 0
                     onMethodChange(LoginMethod.PASSWORD)
                 },
-                text = { Text(stringResource(R.string.login_method_password)) }
+                text = { Text(stringResource(R.string.login_method_password)) },
             )
             Tab(
                 selected = tabIndex == 1,
@@ -645,7 +623,7 @@ private fun UserLoginContent(
                     tabIndex = 1
                     onMethodChange(LoginMethod.QUICK_CONNECT)
                 },
-                text = { Text(stringResource(R.string.login_method_quick_connect)) }
+                text = { Text(stringResource(R.string.login_method_quick_connect)) },
             )
         }
 
@@ -657,13 +635,13 @@ private fun UserLoginContent(
                     uiState = uiState,
                     onUsernameChange = onUsernameChange,
                     onPasswordChange = onPasswordChange,
-                    onLogin = onLogin
+                    onLogin = onLogin,
                 )
             } else {
                 QuickConnectView(
                     uiState = uiState,
                     onStart = onQuickConnectStart,
-                    onCancel = onQuickConnectCancel
+                    onCancel = onQuickConnectCancel,
                 )
             }
         }
@@ -675,61 +653,63 @@ private fun UserAvatarItem(
     user: User,
     isSelected: Boolean,
     serverUrl: String,
-    onClick: () -> Unit
+    onClick: () -> Unit,
 ) {
-    val imageUrl = user.primaryImageTag?.let {
-        "$serverUrl/Users/${user.id}/Images/Primary?tag=$it"
-    }
+    val imageUrl =
+        user.primaryImageTag?.let { "$serverUrl/Users/${user.id}/Images/Primary?tag=$it" }
 
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
-        modifier = Modifier
-            .width(84.dp)
-            .clickable(
-                interactionSource = null,
-                indication = null,
-                onClick = onClick
-            )
+        modifier =
+            Modifier.width(84.dp)
+                .clickable(interactionSource = null, indication = null, onClick = onClick),
     ) {
         Box(
-            modifier = Modifier
-                .size(if (isSelected) 84.dp else 72.dp)
-                .border(
-                    width = if (isSelected) 3.dp else 0.dp,
-                    color = if (isSelected) MaterialTheme.colorScheme.primary else Color.Transparent,
-                    shape = CircleShape
-                )
-                .padding(4.dp)
-                .clip(CircleShape)
-                .background(MaterialTheme.colorScheme.surfaceContainerHigh),
-            contentAlignment = Alignment.Center
+            modifier =
+                Modifier.size(if (isSelected) 84.dp else 72.dp)
+                    .border(
+                        width = if (isSelected) 3.dp else 0.dp,
+                        color =
+                            if (isSelected) MaterialTheme.colorScheme.primary
+                            else Color.Transparent,
+                        shape = CircleShape,
+                    )
+                    .padding(4.dp)
+                    .clip(CircleShape)
+                    .background(MaterialTheme.colorScheme.surfaceContainerHigh),
+            contentAlignment = Alignment.Center,
         ) {
             if (imageUrl != null) {
                 AsyncImage(
-                    model = ImageRequest.Builder(LocalContext.current)
-                        .data(imageUrl)
-                        .crossfade(true)
-                        .build(),
+                    model =
+                        ImageRequest.Builder(LocalContext.current)
+                            .data(imageUrl)
+                            .crossfade(true)
+                            .build(),
                     contentDescription = stringResource(R.string.cd_user_avatar),
                     contentScale = ContentScale.Crop,
-                    modifier = Modifier.fillMaxSize()
+                    modifier = Modifier.fillMaxSize(),
                 )
             } else {
                 Text(
                     text = user.name.first().uppercase(),
                     style = MaterialTheme.typography.headlineMedium,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
         }
         Spacer(modifier = Modifier.height(8.dp))
         Text(
             text = user.name,
-            style = if (isSelected) MaterialTheme.typography.labelLarge else MaterialTheme.typography.bodyMedium,
-            color = if (isSelected) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurface,
+            style =
+                if (isSelected) MaterialTheme.typography.labelLarge
+                else MaterialTheme.typography.bodyMedium,
+            color =
+                if (isSelected) MaterialTheme.colorScheme.primary
+                else MaterialTheme.colorScheme.onSurface,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
-            textAlign = TextAlign.Center
+            textAlign = TextAlign.Center,
         )
     }
 }
@@ -739,7 +719,7 @@ private fun PasswordForm(
     uiState: LoginUiState,
     onUsernameChange: (String) -> Unit,
     onPasswordChange: (String) -> Unit,
-    onLogin: () -> Unit
+    onLogin: () -> Unit,
 ) {
     val focusManager = LocalFocusManager.current
     var passwordVisible by remember { mutableStateOf(false) }
@@ -751,22 +731,21 @@ private fun PasswordForm(
             onValueChange = onUsernameChange,
             label = { Text(stringResource(R.string.login_username_label)) },
             leadingIcon = {
-                Icon(
-                    painter = painterResource(id = R.drawable.ic_user),
-                    contentDescription = null
-                )
+                Icon(painter = painterResource(id = R.drawable.ic_user), contentDescription = null)
             },
             singleLine = true,
             shape = RoundedCornerShape(16.dp),
             keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
-            keyboardActions = KeyboardActions(onNext = { focusManager.moveFocus(FocusDirection.Down) }),
+            keyboardActions =
+                KeyboardActions(onNext = { focusManager.moveFocus(FocusDirection.Down) }),
             modifier = Modifier.fillMaxWidth(),
-            colors = OutlinedTextFieldDefaults.colors(
-                focusedContainerColor = MaterialTheme.colorScheme.surfaceContainer,
-                unfocusedContainerColor = MaterialTheme.colorScheme.surfaceContainer,
-                focusedBorderColor = Color.Transparent,
-                unfocusedBorderColor = Color.Transparent
-            )
+            colors =
+                OutlinedTextFieldDefaults.colors(
+                    focusedContainerColor = MaterialTheme.colorScheme.surfaceContainer,
+                    unfocusedContainerColor = MaterialTheme.colorScheme.surfaceContainer,
+                    focusedBorderColor = Color.Transparent,
+                    unfocusedBorderColor = Color.Transparent,
+                ),
         )
 
         OutlinedTextField(
@@ -776,65 +755,65 @@ private fun PasswordForm(
             leadingIcon = {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_lock_filled),
-                    contentDescription = null
+                    contentDescription = null,
                 )
             },
             trailingIcon = {
                 IconButton(onClick = { passwordVisible = !passwordVisible }) {
                     Icon(
-                        painter = if (passwordVisible) painterResource(id = R.drawable.ic_visibility_off) else painterResource(
-                            id = R.drawable.ic_visibility
-                        ),
-                        contentDescription = null
+                        painter =
+                            if (passwordVisible) painterResource(id = R.drawable.ic_visibility_off)
+                            else painterResource(id = R.drawable.ic_visibility),
+                        contentDescription = null,
                     )
                 }
             },
-            visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(),
+            visualTransformation =
+                if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(),
             singleLine = true,
             shape = RoundedCornerShape(16.dp),
-            keyboardOptions = KeyboardOptions(
-                keyboardType = KeyboardType.Password,
-                imeAction = ImeAction.Done
-            ),
-            keyboardActions = KeyboardActions(onDone = {
-                focusManager.clearFocus()
-                onLogin()
-            }),
-            modifier = Modifier
-                .fillMaxWidth()
-                .focusRequester(passwordFocusRequester),
-            colors = OutlinedTextFieldDefaults.colors(
-                focusedContainerColor = MaterialTheme.colorScheme.surfaceContainer,
-                unfocusedContainerColor = MaterialTheme.colorScheme.surfaceContainer,
-                focusedBorderColor = Color.Transparent,
-                unfocusedBorderColor = Color.Transparent
-            )
+            keyboardOptions =
+                KeyboardOptions(keyboardType = KeyboardType.Password, imeAction = ImeAction.Done),
+            keyboardActions =
+                KeyboardActions(
+                    onDone = {
+                        focusManager.clearFocus()
+                        onLogin()
+                    }
+                ),
+            modifier = Modifier.fillMaxWidth().focusRequester(passwordFocusRequester),
+            colors =
+                OutlinedTextFieldDefaults.colors(
+                    focusedContainerColor = MaterialTheme.colorScheme.surfaceContainer,
+                    unfocusedContainerColor = MaterialTheme.colorScheme.surfaceContainer,
+                    focusedBorderColor = Color.Transparent,
+                    unfocusedBorderColor = Color.Transparent,
+                ),
         )
 
         Spacer(modifier = Modifier.height(8.dp))
 
         Button(
             onClick = onLogin,
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(56.dp),
+            modifier = Modifier.fillMaxWidth().height(56.dp),
             enabled = !uiState.isLoggingIn && uiState.username.isNotBlank(),
             shape = RoundedCornerShape(16.dp),
-            colors = ButtonDefaults.buttonColors(
-                containerColor = MaterialTheme.colorScheme.primary,
-                contentColor = MaterialTheme.colorScheme.onPrimary
-            )
+            colors =
+                ButtonDefaults.buttonColors(
+                    containerColor = MaterialTheme.colorScheme.primary,
+                    contentColor = MaterialTheme.colorScheme.onPrimary,
+                ),
         ) {
             if (uiState.isLoggingIn) {
                 CircularProgressIndicator(
                     color = MaterialTheme.colorScheme.onPrimary,
                     modifier = Modifier.size(24.dp),
-                    strokeWidth = 3.dp
+                    strokeWidth = 3.dp,
                 )
             } else {
                 Text(
                     stringResource(R.string.login_btn_sign_in),
-                    style = MaterialTheme.typography.titleMedium
+                    style = MaterialTheme.typography.titleMedium,
                 )
             }
         }
@@ -842,53 +821,51 @@ private fun PasswordForm(
 }
 
 @Composable
-private fun QuickConnectView(
-    uiState: LoginUiState,
-    onStart: () -> Unit,
-    onCancel: () -> Unit
-) {
+private fun QuickConnectView(uiState: LoginUiState, onStart: () -> Unit, onCancel: () -> Unit) {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.spacedBy(24.dp),
-        modifier = Modifier
-            .fillMaxWidth()
-            .background(MaterialTheme.colorScheme.surfaceContainerLow, RoundedCornerShape(24.dp))
-            .padding(24.dp)
+        modifier =
+            Modifier.fillMaxWidth()
+                .background(
+                    MaterialTheme.colorScheme.surfaceContainerLow,
+                    RoundedCornerShape(24.dp),
+                )
+                .padding(24.dp),
     ) {
         if (uiState.quickConnectCode == null && !uiState.isLoggingIn) {
             Icon(
                 painter = painterResource(id = R.drawable.ic_qrcode),
                 contentDescription = null,
                 modifier = Modifier.size(64.dp),
-                tint = MaterialTheme.colorScheme.primary
+                tint = MaterialTheme.colorScheme.primary,
             )
             Text(
                 stringResource(R.string.login_quick_connect_description),
                 textAlign = TextAlign.Center,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
             )
             Button(
                 onClick = onStart,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(50.dp),
-                shape = RoundedCornerShape(12.dp)
+                modifier = Modifier.fillMaxWidth().height(50.dp),
+                shape = RoundedCornerShape(12.dp),
             ) {
                 Text(stringResource(R.string.login_btn_generate_code))
             }
         } else if (uiState.quickConnectCode != null) {
             Text(
                 text = uiState.quickConnectCode,
-                style = MaterialTheme.typography.displayMedium.copy(
-                    fontWeight = FontWeight.Black,
-                    letterSpacing = 4.sp
-                ),
-                color = MaterialTheme.colorScheme.primary
+                style =
+                    MaterialTheme.typography.displayMedium.copy(
+                        fontWeight = FontWeight.Black,
+                        letterSpacing = 4.sp,
+                    ),
+                color = MaterialTheme.colorScheme.primary,
             )
             Text(
                 stringResource(R.string.login_quick_connect_instructions),
                 style = MaterialTheme.typography.labelLarge,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
             )
             TextButton(onClick = onCancel) {
                 Icon(painter = painterResource(id = R.drawable.ic_close), contentDescription = null)
@@ -899,4 +876,4 @@ private fun QuickConnectView(
             CircularProgressIndicator()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/login/LoginViewModel.kt b/app/src/main/java/com/makd/afinity/ui/login/LoginViewModel.kt
index d3c2d739c..524852e4b 100644
--- a/app/src/main/java/com/makd/afinity/ui/login/LoginViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/login/LoginViewModel.kt
@@ -13,6 +13,7 @@ import com.makd.afinity.data.repository.auth.AuthRepository
 import com.makd.afinity.data.repository.auth.JellyfinAuthRepository
 import com.makd.afinity.data.repository.server.JellyfinServerRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -22,16 +23,17 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltViewModel
-class LoginViewModel @Inject constructor(
+class LoginViewModel
+@Inject
+constructor(
     private val savedStateHandle: SavedStateHandle,
     private val jellyfinRepository: JellyfinRepository,
     private val authRepository: AuthRepository,
     private val databaseRepository: DatabaseRepository,
     private val sessionManager: SessionManager,
-    private val securePreferencesRepository: SecurePreferencesRepository
+    private val securePreferencesRepository: SecurePreferencesRepository,
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(LoginUiState())
@@ -53,19 +55,17 @@ class LoginViewModel @Inject constructor(
 
     private var quickConnectJob: Job? = null
 
-    val loginState = combine(
-        uiState,
-        serverUrl,
-        publicUsers
-    ) { ui, server, users ->
-        LoginState(
-            uiState = ui,
-            serverUrl = server,
-            publicUsers = users,
-            hasServerUrl = server.isNotBlank(),
-            isConnectedToServer = server.isNotBlank() && !ui.isConnecting && ui.isConnectedToServer
-        )
-    }
+    val loginState =
+        combine(uiState, serverUrl, publicUsers) { ui, server, users ->
+            LoginState(
+                uiState = ui,
+                serverUrl = server,
+                publicUsers = users,
+                hasServerUrl = server.isNotBlank(),
+                isConnectedToServer =
+                    server.isNotBlank() && !ui.isConnecting && ui.isConnectedToServer,
+            )
+        }
 
     init {
         viewModelScope.launch {
@@ -100,10 +100,7 @@ class LoginViewModel @Inject constructor(
             viewModelScope.launch {
                 authRepository.isAuthenticated.collect { isAuthenticated ->
                     if (isAuthenticated) {
-                        _uiState.value = _uiState.value.copy(
-                            isLoggedIn = true,
-                            isLoggingIn = false
-                        )
+                        _uiState.value = _uiState.value.copy(isLoggedIn = true, isLoggingIn = false)
                     }
                 }
             }
@@ -125,22 +122,18 @@ class LoginViewModel @Inject constructor(
 
     private fun isValidUrl(url: String): Boolean {
         return (url.startsWith("http://") || url.startsWith("https://")) &&
-                url.length > 8 &&
-                (url.contains(".") ||
-                        url.contains(":")) &&
-                !url.endsWith("://") &&
-                !url.contains(" ")
+            url.length > 8 &&
+            (url.contains(".") || url.contains(":")) &&
+            !url.endsWith("://") &&
+            !url.contains(" ")
     }
 
     fun connectToServer() {
         val url = _serverUrl.value.trim()
         if (url.isBlank()) return
         viewModelScope.launch {
-            _uiState.value = _uiState.value.copy(
-                isConnecting = true,
-                isConnectedToServer = false,
-                error = null
-            )
+            _uiState.value =
+                _uiState.value.copy(isConnecting = true, isConnectedToServer = false, error = null)
 
             try {
                 Timber.d("Validating Jellyfin server at: $url")
@@ -154,48 +147,49 @@ class LoginViewModel @Inject constructor(
 
                         try {
                             databaseRepository.insertServer(validationResult.server)
-                            Timber.d("Saved server to database: ${validationResult.server.name} (${validationResult.server.id})")
+                            Timber.d(
+                                "Saved server to database: ${validationResult.server.name} (${validationResult.server.id})"
+                            )
                         } catch (e: Exception) {
                             Timber.w(e, "Failed to save server to database, continuing anyway")
                         }
 
                         loadPublicUsers()
 
-                        _uiState.value = _uiState.value.copy(
-                            isConnecting = false,
-                            isConnectedToServer = true
-                        )
+                        _uiState.value =
+                            _uiState.value.copy(isConnecting = false, isConnectedToServer = true)
 
-                        Timber.d("Successfully connected to Jellyfin server: $url (${validationResult.server.name})")
+                        Timber.d(
+                            "Successfully connected to Jellyfin server: $url (${validationResult.server.name})"
+                        )
                     }
 
                     is JellyfinServerRepository.ServerConnectionResult.Error -> {
                         Timber.w("Server validation failed for: $url - ${validationResult.message}")
 
-                        _uiState.value = _uiState.value.copy(
-                            isConnecting = false,
-                            isConnectedToServer = false,
-                            error = "Not a valid Jellyfin server: ${validationResult.message}"
-                        )
+                        _uiState.value =
+                            _uiState.value.copy(
+                                isConnecting = false,
+                                isConnectedToServer = false,
+                                error = "Not a valid Jellyfin server: ${validationResult.message}",
+                            )
                     }
                 }
             } catch (e: Exception) {
-                _uiState.value = _uiState.value.copy(
-                    isConnecting = false,
-                    isConnectedToServer = false,
-                    error = "Failed to connect to server: ${e.message ?: "Unknown error"}"
-                )
+                _uiState.value =
+                    _uiState.value.copy(
+                        isConnecting = false,
+                        isConnectedToServer = false,
+                        error = "Failed to connect to server: ${e.message ?: "Unknown error"}",
+                    )
                 Timber.e(e, "Failed to connect to server: $url")
             }
         }
     }
 
     private fun clearServerConnection() {
-        _uiState.value = _uiState.value.copy(
-            isConnecting = false,
-            isConnectedToServer = false,
-            error = null
-        )
+        _uiState.value =
+            _uiState.value.copy(isConnecting = false, isConnectedToServer = false, error = null)
         _publicUsers.value = emptyList()
         _connectedServerUrl.value = ""
     }
@@ -211,36 +205,28 @@ class LoginViewModel @Inject constructor(
     }
 
     fun updateUsername(username: String) {
-        _uiState.value = _uiState.value.copy(
-            username = username,
-            error = null
-        )
+        _uiState.value = _uiState.value.copy(username = username, error = null)
     }
 
     fun updatePassword(password: String) {
-        _uiState.value = _uiState.value.copy(
-            password = password,
-            error = null
-        )
+        _uiState.value = _uiState.value.copy(password = password, error = null)
     }
 
     fun selectUser(user: User) {
-        _uiState.value = _uiState.value.copy(
-            selectedUser = user,
-            username = user.name,
-            error = null
-        )
+        _uiState.value =
+            _uiState.value.copy(selectedUser = user, username = user.name, error = null)
     }
 
     fun selectServer(server: Server) {
         viewModelScope.launch {
             try {
-                _uiState.value = _uiState.value.copy(
-                    selectedServer = server,
-                    showAddServerInput = false,
-                    isConnecting = true,
-                    error = null
-                )
+                _uiState.value =
+                    _uiState.value.copy(
+                        selectedServer = server,
+                        showAddServerInput = false,
+                        isConnecting = true,
+                        error = null,
+                    )
 
                 Timber.d("Selecting server: ${server.name} (${server.address})")
 
@@ -253,19 +239,18 @@ class LoginViewModel @Inject constructor(
 
                 loadPublicUsers()
 
-                _uiState.value = _uiState.value.copy(
-                    isConnecting = false,
-                    isConnectedToServer = true
-                )
+                _uiState.value =
+                    _uiState.value.copy(isConnecting = false, isConnectedToServer = true)
 
                 Timber.d("Successfully connected to saved server: ${server.name}")
             } catch (e: Exception) {
                 Timber.e(e, "Failed to connect to saved server: ${server.name}")
-                _uiState.value = _uiState.value.copy(
-                    isConnecting = false,
-                    isConnectedToServer = false,
-                    error = "Failed to connect to ${server.name}: ${e.message}"
-                )
+                _uiState.value =
+                    _uiState.value.copy(
+                        isConnecting = false,
+                        isConnectedToServer = false,
+                        error = "Failed to connect to ${server.name}: ${e.message}",
+                    )
             }
         }
     }
@@ -273,16 +258,19 @@ class LoginViewModel @Inject constructor(
     private suspend fun loadSavedUsers(serverId: String) {
         try {
             val allUsers = databaseRepository.getUsersForServer(serverId)
-            val usersWithTokens = allUsers.filter { user ->
-                val hasToken =
-                    securePreferencesRepository.getServerUserToken(serverId, user.id) != null
-                if (!hasToken) {
-                    Timber.d("Excluding user ${user.name} from saved users (no token)")
+            val usersWithTokens =
+                allUsers.filter { user ->
+                    val hasToken =
+                        securePreferencesRepository.getServerUserToken(serverId, user.id) != null
+                    if (!hasToken) {
+                        Timber.d("Excluding user ${user.name} from saved users (no token)")
+                    }
+                    hasToken
                 }
-                hasToken
-            }
             _savedUsers.value = usersWithTokens
-            Timber.d("Loaded ${usersWithTokens.size} saved users with tokens for server $serverId (${allUsers.size} total users)")
+            Timber.d(
+                "Loaded ${usersWithTokens.size} saved users with tokens for server $serverId (${allUsers.size} total users)"
+            )
         } catch (e: Exception) {
             Timber.e(e, "Failed to load saved users for server $serverId")
             _savedUsers.value = emptyList()
@@ -291,10 +279,7 @@ class LoginViewModel @Inject constructor(
 
     fun loginWithSavedUser(user: User) {
         viewModelScope.launch {
-            _uiState.value = _uiState.value.copy(
-                isLoggingIn = true,
-                error = null
-            )
+            _uiState.value = _uiState.value.copy(isLoggingIn = true, error = null)
 
             try {
                 Timber.d("Attempting 1-tap login for saved user: ${user.name}")
@@ -304,23 +289,27 @@ class LoginViewModel @Inject constructor(
                 if (token != null) {
                     val server = databaseRepository.getServer(user.serverId)
                     if (server == null) {
-                        _uiState.value = _uiState.value.copy(
-                            isLoggingIn = false,
-                            error = "Server not found. Please login again."
+                        _uiState.value =
+                            _uiState.value.copy(
+                                isLoggingIn = false,
+                                error = "Server not found. Please login again.",
+                            )
+                        Timber.w(
+                            "Server ${user.serverId} not found in database for user ${user.name}"
                         )
-                        Timber.w("Server ${user.serverId} not found in database for user ${user.name}")
                         return@launch
                     }
 
                     val serverUrl = server.address
                     Timber.d("Using server URL from database: $serverUrl")
 
-                    val result = sessionManager.startSession(
-                        serverUrl = serverUrl,
-                        serverId = user.serverId,
-                        userId = user.id,
-                        accessToken = token
-                    )
+                    val result =
+                        sessionManager.startSession(
+                            serverUrl = serverUrl,
+                            serverId = user.serverId,
+                            userId = user.id,
+                            accessToken = token,
+                        )
 
                     if (result.isSuccess) {
                         securePreferencesRepository.saveAuthenticationData(
@@ -328,49 +317,47 @@ class LoginViewModel @Inject constructor(
                             userId = user.id,
                             serverId = user.serverId,
                             serverUrl = serverUrl,
-                            username = user.name
+                            username = user.name,
                         )
                         Timber.d("Updated active session persistence for: ${user.name}")
 
                         (authRepository as? JellyfinAuthRepository)?.setSessionActive(user)
 
-                        _uiState.value = _uiState.value.copy(
-                            isLoggingIn = false,
-                            isLoggedIn = true
-                        )
+                        _uiState.value = _uiState.value.copy(isLoggingIn = false, isLoggedIn = true)
                         Timber.d("Successfully logged in with saved user: ${user.name}")
                     } else {
-                        _uiState.value = _uiState.value.copy(
-                            isLoggingIn = false,
-                            error = "Failed to start session: ${result.exceptionOrNull()?.message}"
-                        )
+                        _uiState.value =
+                            _uiState.value.copy(
+                                isLoggingIn = false,
+                                error =
+                                    "Failed to start session: ${result.exceptionOrNull()?.message}",
+                            )
                         Timber.e(
                             result.exceptionOrNull(),
-                            "Failed to start session for user: ${user.name}"
+                            "Failed to start session for user: ${user.name}",
                         )
                     }
                 } else {
-                    _uiState.value = _uiState.value.copy(
-                        isLoggingIn = false,
-                        error = "Saved session expired. Please login again."
-                    )
+                    _uiState.value =
+                        _uiState.value.copy(
+                            isLoggingIn = false,
+                            error = "Saved session expired. Please login again.",
+                        )
                     Timber.w("No saved token found for user: ${user.name}")
                 }
             } catch (e: Exception) {
-                _uiState.value = _uiState.value.copy(
-                    isLoggingIn = false,
-                    error = "Login failed: ${e.message ?: "Unknown error"}"
-                )
+                _uiState.value =
+                    _uiState.value.copy(
+                        isLoggingIn = false,
+                        error = "Login failed: ${e.message ?: "Unknown error"}",
+                    )
                 Timber.e(e, "1-tap login failed for user: ${user.name}")
             }
         }
     }
 
     fun showAddNewServer() {
-        _uiState.value = _uiState.value.copy(
-            showAddServerInput = true,
-            selectedServer = null
-        )
+        _uiState.value = _uiState.value.copy(showAddServerInput = true, selectedServer = null)
         clearServerConnection()
     }
 
@@ -383,16 +370,14 @@ class LoginViewModel @Inject constructor(
         }
 
         viewModelScope.launch {
-            _uiState.value = currentState.copy(
-                isLoggingIn = true,
-                error = null
-            )
+            _uiState.value = currentState.copy(isLoggingIn = true, error = null)
 
             try {
-                val result = authRepository.authenticateByName(
-                    username = currentState.username,
-                    password = currentState.password
-                )
+                val result =
+                    authRepository.authenticateByName(
+                        username = currentState.username,
+                        password = currentState.password,
+                    )
 
                 when (result) {
                     is AuthRepository.AuthResult.Success -> {
@@ -400,50 +385,53 @@ class LoginViewModel @Inject constructor(
 
                         val token = sdkAuthResult.accessToken
                         val userId = sdkAuthResult.user?.id
-                        val serverId = sdkAuthResult.serverId
-                            ?: _savedServers.value.find { it.address == _serverUrl.value }?.id ?: ""
+                        val serverId =
+                            sdkAuthResult.serverId
+                                ?: _savedServers.value.find { it.address == _serverUrl.value }?.id
+                                ?: ""
 
                         if (token != null && userId != null) {
-                            val sessionResult = sessionManager.startSession(
-                                serverUrl = _serverUrl.value,
-                                serverId = serverId,
-                                userId = userId,
-                                accessToken = token
-                            )
+                            val sessionResult =
+                                sessionManager.startSession(
+                                    serverUrl = _serverUrl.value,
+                                    serverId = serverId,
+                                    userId = userId,
+                                    accessToken = token,
+                                )
 
                             if (sessionResult.isSuccess) {
-                                _uiState.value = _uiState.value.copy(
-                                    isLoggingIn = false,
-                                    isLoggedIn = true
-                                )
+                                _uiState.value =
+                                    _uiState.value.copy(isLoggingIn = false, isLoggedIn = true)
                                 Timber.d("Successfully logged in user: ${currentState.username}")
                             } else {
-                                _uiState.value = _uiState.value.copy(
-                                    isLoggingIn = false,
-                                    error = "Session start failed: ${sessionResult.exceptionOrNull()?.message}"
-                                )
+                                _uiState.value =
+                                    _uiState.value.copy(
+                                        isLoggingIn = false,
+                                        error =
+                                            "Session start failed: ${sessionResult.exceptionOrNull()?.message}",
+                                    )
                             }
                         } else {
-                            _uiState.value = _uiState.value.copy(
-                                isLoggingIn = false,
-                                error = "Login succeeded but user ID or token was missing."
-                            )
+                            _uiState.value =
+                                _uiState.value.copy(
+                                    isLoggingIn = false,
+                                    error = "Login succeeded but user ID or token was missing.",
+                                )
                         }
                     }
 
                     is AuthRepository.AuthResult.Error -> {
-                        _uiState.value = _uiState.value.copy(
-                            isLoggingIn = false,
-                            error = result.message
-                        )
+                        _uiState.value =
+                            _uiState.value.copy(isLoggingIn = false, error = result.message)
                         Timber.e("Login failed: ${result.message}")
                     }
                 }
             } catch (e: Exception) {
-                _uiState.value = _uiState.value.copy(
-                    isLoggingIn = false,
-                    error = "Login failed: ${e.message ?: "Unknown error"}"
-                )
+                _uiState.value =
+                    _uiState.value.copy(
+                        isLoggingIn = false,
+                        error = "Login failed: ${e.message ?: "Unknown error"}",
+                    )
                 Timber.e(e, "Login failed for user: ${currentState.username}")
             }
         }
@@ -451,38 +439,39 @@ class LoginViewModel @Inject constructor(
 
     fun startQuickConnect() {
         quickConnectJob?.cancel()
-        quickConnectJob = viewModelScope.launch {
-            _uiState.value = _uiState.value.copy(
-                isLoggingIn = true,
-                quickConnectCode = null,
-                error = null
-            )
+        quickConnectJob =
+            viewModelScope.launch {
+                _uiState.value =
+                    _uiState.value.copy(isLoggingIn = true, quickConnectCode = null, error = null)
 
-            try {
-                val quickConnectState = authRepository.initiateQuickConnect()
+                try {
+                    val quickConnectState = authRepository.initiateQuickConnect()
 
-                if (quickConnectState != null) {
-                    _uiState.value = _uiState.value.copy(
-                        isLoggingIn = false,
-                        quickConnectCode = quickConnectState.code,
-                        quickConnectSecret = quickConnectState.secret
-                    )
+                    if (quickConnectState != null) {
+                        _uiState.value =
+                            _uiState.value.copy(
+                                isLoggingIn = false,
+                                quickConnectCode = quickConnectState.code,
+                                quickConnectSecret = quickConnectState.secret,
+                            )
 
-                    pollQuickConnectStatus(quickConnectState.secret)
-                } else {
-                    _uiState.value = _uiState.value.copy(
-                        isLoggingIn = false,
-                        error = "Failed to start Quick Connect. Please try again."
-                    )
+                        pollQuickConnectStatus(quickConnectState.secret)
+                    } else {
+                        _uiState.value =
+                            _uiState.value.copy(
+                                isLoggingIn = false,
+                                error = "Failed to start Quick Connect. Please try again.",
+                            )
+                    }
+                } catch (e: Exception) {
+                    _uiState.value =
+                        _uiState.value.copy(
+                            isLoggingIn = false,
+                            error = "Quick Connect error: ${e.message ?: "Unknown error"}",
+                        )
+                    Timber.e(e, "Failed to start QuickConnect")
                 }
-            } catch (e: Exception) {
-                _uiState.value = _uiState.value.copy(
-                    isLoggingIn = false,
-                    error = "Quick Connect error: ${e.message ?: "Unknown error"}"
-                )
-                Timber.e(e, "Failed to start QuickConnect")
             }
-        }
     }
 
     private suspend fun pollQuickConnectStatus(secret: String) {
@@ -498,116 +487,122 @@ class LoginViewModel @Inject constructor(
 
                             val token = sdkAuthResult.accessToken
                             val userId = sdkAuthResult.user?.id
-                            val serverId = sdkAuthResult.serverId
-                                ?: _savedServers.value.find { it.address == _serverUrl.value }?.id
-                                ?: ""
+                            val serverId =
+                                sdkAuthResult.serverId
+                                    ?: _savedServers.value
+                                        .find { it.address == _serverUrl.value }
+                                        ?.id
+                                    ?: ""
 
                             if (token != null && userId != null) {
-                                val sessionResult = sessionManager.startSession(
-                                    serverUrl = _serverUrl.value,
-                                    serverId = serverId,
-                                    userId = userId,
-                                    accessToken = token
-                                )
+                                val sessionResult =
+                                    sessionManager.startSession(
+                                        serverUrl = _serverUrl.value,
+                                        serverId = serverId,
+                                        userId = userId,
+                                        accessToken = token,
+                                    )
 
                                 if (sessionResult.isSuccess) {
-                                    _uiState.value = _uiState.value.copy(
-                                        isLoggingIn = false,
-                                        isLoggedIn = true,
-                                        quickConnectCode = null,
-                                        quickConnectSecret = null
-                                    )
+                                    _uiState.value =
+                                        _uiState.value.copy(
+                                            isLoggingIn = false,
+                                            isLoggedIn = true,
+                                            quickConnectCode = null,
+                                            quickConnectSecret = null,
+                                        )
                                     Timber.d("Successfully authenticated with QuickConnect")
                                     return
                                 } else {
-                                    _uiState.value = _uiState.value.copy(
-                                        isLoggingIn = false,
-                                        error = "Session start failed: ${sessionResult.exceptionOrNull()?.message}"
-                                    )
+                                    _uiState.value =
+                                        _uiState.value.copy(
+                                            isLoggingIn = false,
+                                            error =
+                                                "Session start failed: ${sessionResult.exceptionOrNull()?.message}",
+                                        )
                                     return
                                 }
                             } else {
-                                _uiState.value = _uiState.value.copy(
-                                    isLoggingIn = false,
-                                    error = "QuickConnect succeeded but user ID or token was missing."
-                                )
+                                _uiState.value =
+                                    _uiState.value.copy(
+                                        isLoggingIn = false,
+                                        error =
+                                            "QuickConnect succeeded but user ID or token was missing.",
+                                    )
                                 return
                             }
                         }
 
                         is AuthRepository.AuthResult.Error -> {
-                            _uiState.value = _uiState.value.copy(
-                                isLoggingIn = false,
-                                error = "QuickConnect authentication failed: ${result.message}",
-                                quickConnectCode = null,
-                                quickConnectSecret = null
-                            )
+                            _uiState.value =
+                                _uiState.value.copy(
+                                    isLoggingIn = false,
+                                    error = "QuickConnect authentication failed: ${result.message}",
+                                    quickConnectCode = null,
+                                    quickConnectSecret = null,
+                                )
                             return
                         }
                     }
                 }
             }
 
-            _uiState.value = _uiState.value.copy(
-                isLoggingIn = false,
-                error = "QuickConnect timed out. Please try again.",
-                quickConnectCode = null,
-                quickConnectSecret = null
-            )
+            _uiState.value =
+                _uiState.value.copy(
+                    isLoggingIn = false,
+                    error = "QuickConnect timed out. Please try again.",
+                    quickConnectCode = null,
+                    quickConnectSecret = null,
+                )
         } catch (e: Exception) {
-            _uiState.value = _uiState.value.copy(
-                isLoggingIn = false,
-                error = "QuickConnect error: ${e.message ?: "Unknown error"}",
-                quickConnectCode = null,
-                quickConnectSecret = null
-            )
+            _uiState.value =
+                _uiState.value.copy(
+                    isLoggingIn = false,
+                    error = "QuickConnect error: ${e.message ?: "Unknown error"}",
+                    quickConnectCode = null,
+                    quickConnectSecret = null,
+                )
             Timber.e(e, "QuickConnect polling failed")
         }
     }
 
     fun cancelAddServer() {
-        _uiState.update {
-            it.copy(
-                showAddServerInput = false,
-                error = null,
-                isConnecting = false
-            )
-        }
+        _uiState.update { it.copy(showAddServerInput = false, error = null, isConnecting = false) }
         _serverUrl.value = ""
         clearServerConnection()
     }
 
     fun cancelQuickConnect() {
         quickConnectJob?.cancel()
-        _uiState.value = _uiState.value.copy(
-            isLoggingIn = false,
-            quickConnectCode = null,
-            quickConnectSecret = null,
-            error = null
-        )
+        _uiState.value =
+            _uiState.value.copy(
+                isLoggingIn = false,
+                quickConnectCode = null,
+                quickConnectSecret = null,
+                error = null,
+            )
     }
 
     fun discoverServers() {
         viewModelScope.launch {
-            _uiState.value = _uiState.value.copy(
-                isDiscovering = true,
-                error = null,
-                discoveredServers = emptyList()
-            )
+            _uiState.value =
+                _uiState.value.copy(
+                    isDiscovering = true,
+                    error = null,
+                    discoveredServers = emptyList(),
+                )
 
             try {
                 jellyfinRepository.discoverServersFlow().collect { servers ->
-                    _uiState.value = _uiState.value.copy(
-                        discoveredServers = servers,
-                        isDiscovering = servers.isEmpty()
-                    )
+                    _uiState.value =
+                        _uiState.value.copy(
+                            discoveredServers = servers,
+                            isDiscovering = servers.isEmpty(),
+                        )
                     Timber.d("Updated UI with ${servers.size} discovered servers")
                 }
             } catch (e: Exception) {
-                _uiState.value = _uiState.value.copy(
-                    isDiscovering = false,
-                    error = null
-                )
+                _uiState.value = _uiState.value.copy(isDiscovering = false, error = null)
                 Timber.e(e, "Server discovery failed")
             } finally {
                 _uiState.value = _uiState.value.copy(isDiscovering = false)
@@ -662,7 +657,7 @@ data class LoginUiState(
     val discoveredServers: List<Server> = emptyList(),
     val error: String? = null,
     val quickConnectCode: String? = null,
-    val quickConnectSecret: String? = null
+    val quickConnectSecret: String? = null,
 )
 
 data class LoginState(
@@ -670,5 +665,5 @@ data class LoginState(
     val serverUrl: String,
     val publicUsers: List<User>,
     val hasServerUrl: Boolean,
-    val isConnectedToServer: Boolean
-)
\ No newline at end of file
+    val isConnectedToServer: Boolean,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/main/MainUiState.kt b/app/src/main/java/com/makd/afinity/ui/main/MainUiState.kt
index 1963c54a0..20b3234db 100644
--- a/app/src/main/java/com/makd/afinity/ui/main/MainUiState.kt
+++ b/app/src/main/java/com/makd/afinity/ui/main/MainUiState.kt
@@ -1,5 +1,3 @@
 package com.makd.afinity.ui.main
 
-data class MainUiState(
-    val userProfileImageUrl: String? = null
-)
\ No newline at end of file
+data class MainUiState(val userProfileImageUrl: String? = null)
diff --git a/app/src/main/java/com/makd/afinity/ui/main/MainViewModel.kt b/app/src/main/java/com/makd/afinity/ui/main/MainViewModel.kt
index db91270ad..bc05b50e4 100644
--- a/app/src/main/java/com/makd/afinity/ui/main/MainViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/main/MainViewModel.kt
@@ -4,22 +4,22 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.makd.afinity.data.repository.AppDataRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
-import javax.inject.Inject
 
 @HiltViewModel
-class MainViewModel @Inject constructor(
-    private val appDataRepository: AppDataRepository
-) : ViewModel() {
+class MainViewModel @Inject constructor(private val appDataRepository: AppDataRepository) :
+    ViewModel() {
 
-    val uiState: StateFlow<MainUiState> = appDataRepository.userProfileImageUrl.map {
-        MainUiState(userProfileImageUrl = it)
-    }.stateIn(
-        scope = viewModelScope,
-        started = SharingStarted.WhileSubscribed(5_000),
-        initialValue = MainUiState()
-    )
-}
\ No newline at end of file
+    val uiState: StateFlow<MainUiState> =
+        appDataRepository.userProfileImageUrl
+            .map { MainUiState(userProfileImageUrl = it) }
+            .stateIn(
+                scope = viewModelScope,
+                started = SharingStarted.WhileSubscribed(5_000),
+                initialValue = MainUiState(),
+            )
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/person/PersonScreen.kt b/app/src/main/java/com/makd/afinity/ui/person/PersonScreen.kt
index 60fe6cc93..9749d2690 100644
--- a/app/src/main/java/com/makd/afinity/ui/person/PersonScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/person/PersonScreen.kt
@@ -27,41 +27,33 @@ fun PersonScreen(
     navController: NavController,
     modifier: Modifier = Modifier,
     viewModel: PersonViewModel = hiltViewModel(),
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
-    Box(
-        modifier = modifier.fillMaxSize()
-    ) {
+    Box(modifier = modifier.fillMaxSize()) {
         when {
             uiState.isLoading -> {
-                Box(
-                    modifier = Modifier
-                        .fillMaxSize(),
-                    contentAlignment = Alignment.Center
-                ) {
+                Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                     CircularProgressIndicator()
                 }
             }
 
             uiState.error != null -> {
                 Column(
-                    modifier = Modifier
-                        .align(Alignment.Center)
-                        .padding(32.dp),
+                    modifier = Modifier.align(Alignment.Center).padding(32.dp),
                     horizontalAlignment = Alignment.CenterHorizontally,
-                    verticalArrangement = Arrangement.spacedBy(16.dp)
+                    verticalArrangement = Arrangement.spacedBy(16.dp),
                 ) {
                     Text(
                         text = stringResource(R.string.home_error_title),
                         style = MaterialTheme.typography.headlineSmall,
-                        color = MaterialTheme.colorScheme.onBackground
+                        color = MaterialTheme.colorScheme.onBackground,
                     )
                     Text(
                         text = uiState.error!!,
                         style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
                     Button(onClick = { viewModel.retry() }) {
                         Text(stringResource(R.string.action_retry))
@@ -74,12 +66,10 @@ fun PersonScreen(
                     person = uiState.person!!,
                     movies = uiState.movies,
                     shows = uiState.shows,
-                    onItemClick = { item ->
-                        navController.navigate("item_detail/${item.id}")
-                    },
-                    widthSizeClass = widthSizeClass
+                    onItemClick = { item -> navController.navigate("item_detail/${item.id}") },
+                    widthSizeClass = widthSizeClass,
                 )
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/person/PersonViewModel.kt b/app/src/main/java/com/makd/afinity/ui/person/PersonViewModel.kt
index ca96191ac..cb91c8506 100644
--- a/app/src/main/java/com/makd/afinity/ui/person/PersonViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/person/PersonViewModel.kt
@@ -9,25 +9,28 @@ import com.makd.afinity.data.models.media.AfinityShow
 import com.makd.afinity.data.repository.AppDataRepository
 import com.makd.afinity.data.repository.JellyfinRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
+import java.util.UUID
+import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import java.util.UUID
-import javax.inject.Inject
 
 @HiltViewModel
-class PersonViewModel @Inject constructor(
+class PersonViewModel
+@Inject
+constructor(
     private val jellyfinRepository: JellyfinRepository,
     private val appDataRepository: AppDataRepository,
-    savedStateHandle: SavedStateHandle
+    savedStateHandle: SavedStateHandle,
 ) : ViewModel() {
 
-    private val personId: UUID = UUID.fromString(
-        savedStateHandle.get<String>("personId")
-            ?: throw IllegalArgumentException("personId is required")
-    )
+    private val personId: UUID =
+        UUID.fromString(
+            savedStateHandle.get<String>("personId")
+                ?: throw IllegalArgumentException("personId is required")
+        )
 
     private val _uiState = MutableStateFlow(PersonUiState())
     val uiState: StateFlow<PersonUiState> = _uiState.asStateFlow()
@@ -51,34 +54,34 @@ class PersonViewModel @Inject constructor(
 
                 val person = jellyfinRepository.getPersonDetail(personId)
                 if (person == null) {
-                    _uiState.value = _uiState.value.copy(
-                        isLoading = false,
-                        error = "Person not found"
-                    )
+                    _uiState.value =
+                        _uiState.value.copy(isLoading = false, error = "Person not found")
                     return@launch
                 }
 
-                val personItems = jellyfinRepository.getPersonItems(
-                    personId = personId,
-                    includeItemTypes = listOf("Movie", "Series")
-                )
+                val personItems =
+                    jellyfinRepository.getPersonItems(
+                        personId = personId,
+                        includeItemTypes = listOf("Movie", "Series"),
+                    )
 
                 val movies = personItems.filterIsInstance<AfinityMovie>()
                 val shows = personItems.filterIsInstance<AfinityShow>()
 
-                _uiState.value = _uiState.value.copy(
-                    person = person,
-                    movies = movies,
-                    shows = shows,
-                    isLoading = false
-                )
-
+                _uiState.value =
+                    _uiState.value.copy(
+                        person = person,
+                        movies = movies,
+                        shows = shows,
+                        isLoading = false,
+                    )
             } catch (e: Exception) {
                 Timber.e(e, "Failed to load person details: $personId")
-                _uiState.value = _uiState.value.copy(
-                    isLoading = false,
-                    error = "Failed to load person details: ${e.message}"
-                )
+                _uiState.value =
+                    _uiState.value.copy(
+                        isLoading = false,
+                        error = "Failed to load person details: ${e.message}",
+                    )
             }
         }
     }
@@ -93,5 +96,5 @@ data class PersonUiState(
     val movies: List<AfinityMovie> = emptyList(),
     val shows: List<AfinityShow> = emptyList(),
     val isLoading: Boolean = false,
-    val error: String? = null
-)
\ No newline at end of file
+    val error: String? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/person/components/PersonDetailContent.kt b/app/src/main/java/com/makd/afinity/ui/person/components/PersonDetailContent.kt
index a9f9cbcd2..7b81b78bc 100644
--- a/app/src/main/java/com/makd/afinity/ui/person/components/PersonDetailContent.kt
+++ b/app/src/main/java/com/makd/afinity/ui/person/components/PersonDetailContent.kt
@@ -54,8 +54,8 @@ import com.makd.afinity.data.models.media.AfinityItem
 import com.makd.afinity.data.models.media.AfinityMovie
 import com.makd.afinity.data.models.media.AfinityPersonDetail
 import com.makd.afinity.data.models.media.AfinityShow
-import com.makd.afinity.ui.components.MediaItemCard
 import com.makd.afinity.ui.components.AsyncImage
+import com.makd.afinity.ui.components.MediaItemCard
 import com.makd.afinity.ui.theme.CardDimensions.portraitWidth
 import com.makd.afinity.ui.utils.htmlToAnnotatedString
 
@@ -67,36 +67,31 @@ fun PersonDetailContent(
     shows: List<AfinityShow>,
     onItemClick: (AfinityItem) -> Unit,
     widthSizeClass: WindowWidthSizeClass,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val cardWidth = widthSizeClass.portraitWidth
 
-    LazyColumn(
-        modifier = modifier.fillMaxSize()
-    ) {
-        item {
-            PersonHeroSection(
-                person = person,
-            )
-        }
+    LazyColumn(modifier = modifier.fillMaxSize()) {
+        item { PersonHeroSection(person = person) }
 
         item {
             Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .offset(y = (-110).dp)
-                    .padding(start = 16.dp, end = 16.dp, top = 0.dp, bottom = 16.dp),
-                verticalArrangement = Arrangement.spacedBy(16.dp)
+                modifier =
+                    Modifier.fillMaxWidth()
+                        .offset(y = (-110).dp)
+                        .padding(start = 16.dp, end = 16.dp, top = 0.dp, bottom = 16.dp),
+                verticalArrangement = Arrangement.spacedBy(16.dp),
             ) {
                 Text(
                     text = person.name,
-                    style = MaterialTheme.typography.headlineLarge.copy(
-                        fontWeight = FontWeight.Bold,
-                        fontSize = 32.sp
-                    ),
+                    style =
+                        MaterialTheme.typography.headlineLarge.copy(
+                            fontWeight = FontWeight.Bold,
+                            fontSize = 32.sp,
+                        ),
                     color = MaterialTheme.colorScheme.onBackground,
                     maxLines = 2,
-                    overflow = TextOverflow.Ellipsis
+                    overflow = TextOverflow.Ellipsis,
                 )
 
                 PersonMetadataSection(person = person)
@@ -110,7 +105,7 @@ fun PersonDetailContent(
                         title = stringResource(R.string.person_movies_fmt, movies.size),
                         items = movies,
                         onItemClick = onItemClick,
-                        cardWidth = cardWidth
+                        cardWidth = cardWidth,
                     )
                 }
 
@@ -119,7 +114,7 @@ fun PersonDetailContent(
                         title = stringResource(R.string.person_shows_fmt, shows.size),
                         items = shows,
                         onItemClick = onItemClick,
-                        cardWidth = cardWidth
+                        cardWidth = cardWidth,
                     )
                 }
             }
@@ -129,75 +124,61 @@ fun PersonDetailContent(
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-private fun PersonHeroSection(
-    person: AfinityPersonDetail
-) {
+private fun PersonHeroSection(person: AfinityPersonDetail) {
     val configuration = LocalConfiguration.current
     val screenHeight = configuration.screenHeightDp.dp
 
-    Box(
-        modifier = Modifier
-            .fillMaxWidth()
-            .height(screenHeight * 0.6f)
-    ) {
+    Box(modifier = Modifier.fillMaxWidth().height(screenHeight * 0.6f)) {
         AsyncImage(
             imageUrl = person.images.primaryImageUrl,
             contentDescription = stringResource(R.string.cd_person_image_fmt, person.name),
             blurHash = person.images.primaryBlurHash,
             targetWidth = LocalConfiguration.current.screenWidthDp.dp,
             targetHeight = screenHeight * 0.6f,
-            modifier = Modifier
-                .fillMaxSize()
-                .graphicsLayer { alpha = 0.99f }
-                .drawWithCache {
-                    val gradient = Brush.verticalGradient(
-                        colors = listOf(
-                            Color.Black,
-                            Color.Transparent
-                        ),
-                        startY = size.height * 0.75f,
-                        endY = size.height
-                    )
-                    onDrawWithContent {
-                        drawContent()
-                        drawRect(gradient, blendMode = BlendMode.DstIn)
-                    }
-                },
+            modifier =
+                Modifier.fillMaxSize()
+                    .graphicsLayer { alpha = 0.99f }
+                    .drawWithCache {
+                        val gradient =
+                            Brush.verticalGradient(
+                                colors = listOf(Color.Black, Color.Transparent),
+                                startY = size.height * 0.75f,
+                                endY = size.height,
+                            )
+                        onDrawWithContent {
+                            drawContent()
+                            drawRect(gradient, blendMode = BlendMode.DstIn)
+                        }
+                    },
             contentScale = ContentScale.Crop,
-            alignment = Alignment.Center
+            alignment = Alignment.Center,
         )
     }
 }
 
 @Composable
-private fun PersonOverviewSection(
-    overview: String,
-    modifier: Modifier = Modifier
-) {
+private fun PersonOverviewSection(overview: String, modifier: Modifier = Modifier) {
     var isExpanded by remember { mutableStateOf(false) }
     var isEllipsized by remember { mutableStateOf(false) }
 
-    val containsHtml = remember(overview) {
-        overview.contains("<a ", ignoreCase = true) ||
+    val containsHtml =
+        remember(overview) {
+            overview.contains("<a ", ignoreCase = true) ||
                 overview.contains("</a>", ignoreCase = true) ||
                 overview.contains("<br", ignoreCase = true)
-    }
+        }
 
     val linkColor = MaterialTheme.colorScheme.primary
-    val annotatedText = remember(overview, linkColor) {
-        if (containsHtml) htmlToAnnotatedString(overview, linkColor) else null
-    }
+    val annotatedText =
+        remember(overview, linkColor) {
+            if (containsHtml) htmlToAnnotatedString(overview, linkColor) else null
+        }
 
-    Column(
-        modifier = modifier,
-        verticalArrangement = Arrangement.spacedBy(8.dp)
-    ) {
+    Column(modifier = modifier, verticalArrangement = Arrangement.spacedBy(8.dp)) {
         Text(
             text = stringResource(R.string.person_biography),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
-            color = MaterialTheme.colorScheme.onBackground
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+            color = MaterialTheme.colorScheme.onBackground,
         )
 
         if (containsHtml && annotatedText != null) {
@@ -213,7 +194,7 @@ private fun PersonOverviewSection(
                     if (!isExpanded) {
                         isEllipsized = result.hasVisualOverflow
                     }
-                }
+                },
             )
         } else {
             Text(
@@ -228,22 +209,24 @@ private fun PersonOverviewSection(
                     if (!isExpanded) {
                         isEllipsized = result.hasVisualOverflow
                     }
-                }
+                },
             )
         }
 
         if (isEllipsized || isExpanded) {
             Text(
-                text = if (isExpanded) stringResource(R.string.action_show_less) else stringResource(R.string.action_show_more),
+                text =
+                    if (isExpanded) stringResource(R.string.action_show_less)
+                    else stringResource(R.string.action_show_more),
                 style = MaterialTheme.typography.bodyMedium,
                 color = MaterialTheme.colorScheme.primary,
-                modifier = Modifier
-                    .clickable(
+                modifier =
+                    Modifier.clickable(
                         indication = null,
-                        interactionSource = remember { MutableInteractionSource() }
+                        interactionSource = remember { MutableInteractionSource() },
                     ) {
                         isExpanded = !isExpanded
-                    }
+                    },
             )
         }
     }
@@ -255,32 +238,24 @@ private fun PersonFilmographySection(
     items: List<AfinityItem>,
     onItemClick: (AfinityItem) -> Unit,
     cardWidth: Dp,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
-    Column(
-        modifier = modifier,
-        verticalArrangement = Arrangement.spacedBy(12.dp)
-    ) {
+    Column(modifier = modifier, verticalArrangement = Arrangement.spacedBy(12.dp)) {
         Text(
             text = title,
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
-            color = MaterialTheme.colorScheme.onBackground
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+            color = MaterialTheme.colorScheme.onBackground,
         )
 
         LazyRow(
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
-            items(
-                items = items,
-                key = { item -> item.id }
-            ) { item ->
+            items(items = items, key = { item -> item.id }) { item ->
                 FilmographyItemCard(
                     item = item,
                     onClick = { onItemClick(item) },
-                    cardWidth = cardWidth
+                    cardWidth = cardWidth,
                 )
             }
         }
@@ -292,47 +267,44 @@ private fun FilmographyItemCard(
     item: AfinityItem,
     onClick: () -> Unit,
     cardWidth: Dp,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
-    MediaItemCard(
-        item = item,
-        onClick = onClick,
-        modifier = modifier,
-        cardWidth = cardWidth
-    )
+    MediaItemCard(item = item, onClick = onClick, modifier = modifier, cardWidth = cardWidth)
 }
 
 @Composable
-private fun PersonMetadataSection(
-    person: AfinityPersonDetail,
-    modifier: Modifier = Modifier
-) {
+private fun PersonMetadataSection(person: AfinityPersonDetail, modifier: Modifier = Modifier) {
     val hasBirthday = person.premiereDate != null
     val hasBirthplace = person.productionLocations.isNotEmpty()
     val hasExternalLinks = !person.externalUrls.isNullOrEmpty()
 
     if (hasBirthday || hasBirthplace || hasExternalLinks) {
-        Column(
-            modifier = modifier,
-            verticalArrangement = Arrangement.spacedBy(8.dp)
-        ) {
+        Column(modifier = modifier, verticalArrangement = Arrangement.spacedBy(8.dp)) {
             person.premiereDate?.let { birthday ->
                 val datePattern = stringResource(R.string.person_date_fmt)
-                val formatter = remember(datePattern) { java.time.format.DateTimeFormatter.ofPattern(datePattern) }
+                val formatter =
+                    remember(datePattern) {
+                        java.time.format.DateTimeFormatter.ofPattern(datePattern)
+                    }
                 val now = java.time.LocalDateTime.now()
                 val age = java.time.Period.between(birthday.toLocalDate(), now.toLocalDate()).years
                 Text(
-                    text = stringResource(R.string.person_born_fmt, birthday.format(formatter), age),
+                    text =
+                        stringResource(R.string.person_born_fmt, birthday.format(formatter), age),
                     style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
 
             if (person.productionLocations.isNotEmpty()) {
                 Text(
-                    text = stringResource(R.string.person_birthplace_fmt, person.productionLocations.first()),
+                    text =
+                        stringResource(
+                            R.string.person_birthplace_fmt,
+                            person.productionLocations.first(),
+                        ),
                     style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
 
@@ -344,52 +316,51 @@ private fun PersonMetadataSection(
 }
 
 @Composable
-private fun PersonExternalLinksSection(
-    person: AfinityPersonDetail,
-    modifier: Modifier = Modifier
-) {
+private fun PersonExternalLinksSection(person: AfinityPersonDetail, modifier: Modifier = Modifier) {
     val context = LocalContext.current
     val externalUrls = person.externalUrls ?: return
 
     Row(
         modifier = modifier.offset(x = (-8).dp),
         horizontalArrangement = Arrangement.spacedBy(4.dp),
-        verticalAlignment = Alignment.CenterVertically
+        verticalAlignment = Alignment.CenterVertically,
     ) {
         externalUrls.forEach { externalUrl ->
             val url = externalUrl.url ?: return@forEach
             val lowerUrl = url.lowercase()
 
-            val iconRes = when {
-                "imdb" in lowerUrl -> R.drawable.ic_imdb_logo
-                "themoviedb.org" in lowerUrl -> R.drawable.ic_tmdb
-                "tvdb" in lowerUrl -> R.drawable.ic_tvdb
-                "trakt" in lowerUrl -> R.drawable.ic_trakt
-                "tvmaze" in lowerUrl -> R.drawable.ic_tvmaze
-                else -> R.drawable.ic_link
-            }
+            val iconRes =
+                when {
+                    "imdb" in lowerUrl -> R.drawable.ic_imdb_logo
+                    "themoviedb.org" in lowerUrl -> R.drawable.ic_tmdb
+                    "tvdb" in lowerUrl -> R.drawable.ic_tvdb
+                    "trakt" in lowerUrl -> R.drawable.ic_trakt
+                    "tvmaze" in lowerUrl -> R.drawable.ic_tvmaze
+                    else -> R.drawable.ic_link
+                }
 
             Box(
-                modifier = Modifier
-                    .clip(CircleShape)
-                    .clickable(
-                        interactionSource = remember { MutableInteractionSource() },
-                        indication = null,
-                        onClick = {
-                            val intent = Intent(Intent.ACTION_VIEW, url.toUri())
-                            context.startActivity(intent)
-                        }
-                    )
-                    .padding(8.dp),
-                contentAlignment = Alignment.Center
+                modifier =
+                    Modifier.clip(CircleShape)
+                        .clickable(
+                            interactionSource = remember { MutableInteractionSource() },
+                            indication = null,
+                            onClick = {
+                                val intent = Intent(Intent.ACTION_VIEW, url.toUri())
+                                context.startActivity(intent)
+                            },
+                        )
+                        .padding(8.dp),
+                contentAlignment = Alignment.Center,
             ) {
                 Image(
                     painter = painterResource(id = iconRes),
-                    contentDescription = externalUrl.name ?: stringResource(R.string.cd_external_link),
+                    contentDescription =
+                        externalUrl.name ?: stringResource(R.string.cd_external_link),
                     contentScale = ContentScale.Fit,
-                    modifier = Modifier.height(16.dp)
+                    modifier = Modifier.height(16.dp),
                 )
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/Extensions.kt b/app/src/main/java/com/makd/afinity/ui/player/Extensions.kt
index 136d41576..7326899f1 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/Extensions.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/Extensions.kt
@@ -7,22 +7,22 @@ import java.util.Locale
 @androidx.media3.common.util.UnstableApi
 fun List<Tracks.Group>.getTrackNames(): Array<String> {
     return this.map { group ->
-        val nameParts: MutableList<String?> = mutableListOf()
-        val format = group.mediaTrackGroup.getFormat(0)
-        nameParts.run {
-            add(format.label)
-            add(
-                format.language?.let {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                        Locale(it.split("-").last()).displayLanguage
-                    } else {
-                        @Suppress("DEPRECATION")
-                        Locale(it.split("-").last()).displayLanguage
+            val nameParts: MutableList<String?> = mutableListOf()
+            val format = group.mediaTrackGroup.getFormat(0)
+            nameParts.run {
+                add(format.label)
+                add(
+                    format.language?.let {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                            Locale(it.split("-").last()).displayLanguage
+                        } else {
+                            @Suppress("DEPRECATION") Locale(it.split("-").last()).displayLanguage
+                        }
                     }
-                },
-            )
-            add(format.codecs)
-            filterNotNull().joinToString(separator = " - ")
+                )
+                add(format.codecs)
+                filterNotNull().joinToString(separator = " - ")
+            }
         }
-    }.toTypedArray()
-}
\ No newline at end of file
+        .toTypedArray()
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/PlayerActivity.kt b/app/src/main/java/com/makd/afinity/ui/player/PlayerActivity.kt
index 5ec2281fd..3d51dc30c 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/PlayerActivity.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/PlayerActivity.kt
@@ -32,10 +32,9 @@ import com.makd.afinity.data.models.player.PlayerEvent
 import com.makd.afinity.data.repository.PreferencesRepository
 import com.makd.afinity.ui.theme.AFinityTheme
 import dagger.hilt.android.AndroidEntryPoint
-import timber.log.Timber
 import java.util.UUID
 import javax.inject.Inject
-
+import timber.log.Timber
 
 @UnstableApi
 @AndroidEntryPoint
@@ -43,8 +42,7 @@ class PlayerActivity : ComponentActivity() {
 
     private val viewModel: PlayerViewModel by viewModels()
 
-    @Inject
-    lateinit var preferencesRepository: PreferencesRepository
+    @Inject lateinit var preferencesRepository: PreferencesRepository
 
     private var wasPip: Boolean = false
     private var isResumed: Boolean = false
@@ -54,29 +52,30 @@ class PlayerActivity : ComponentActivity() {
         private const val REQUEST_PLAY_PAUSE = 1001
     }
 
-    private val pipReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context?, intent: Intent?) {
-            Timber.d("PIP Receiver - Action received: ${intent?.action}")
-
-            when (intent?.action) {
-                ACTION_PLAY_PAUSE -> {
-                    Timber.d("PIP Control: Play/Pause clicked")
-                    if (viewModel.player.isPlaying) {
-                        viewModel.handlePlayerEvent(PlayerEvent.Pause)
-                    } else {
-                        viewModel.handlePlayerEvent(PlayerEvent.Play)
-                    }
-                    if (isInPictureInPictureMode) {
-                        setPictureInPictureParams(buildPipParams())
+    private val pipReceiver =
+        object : BroadcastReceiver() {
+            override fun onReceive(context: Context?, intent: Intent?) {
+                Timber.d("PIP Receiver - Action received: ${intent?.action}")
+
+                when (intent?.action) {
+                    ACTION_PLAY_PAUSE -> {
+                        Timber.d("PIP Control: Play/Pause clicked")
+                        if (viewModel.player.isPlaying) {
+                            viewModel.handlePlayerEvent(PlayerEvent.Pause)
+                        } else {
+                            viewModel.handlePlayerEvent(PlayerEvent.Play)
+                        }
+                        if (isInPictureInPictureMode) {
+                            setPictureInPictureParams(buildPipParams())
+                        }
                     }
-                }
 
-                else -> {
-                    Timber.w("PIP Receiver - Unknown action: ${intent?.action}")
+                    else -> {
+                        Timber.w("PIP Receiver - Unknown action: ${intent?.action}")
+                    }
                 }
             }
         }
-    }
 
     private val isPipSupported by lazy {
         if (!packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
@@ -91,13 +90,10 @@ class PlayerActivity : ComponentActivity() {
         ) == AppOpsManager.MODE_ALLOWED
     }
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val filter = IntentFilter().apply {
-            addAction(ACTION_PLAY_PAUSE)
-        }
+        val filter = IntentFilter().apply { addAction(ACTION_PLAY_PAUSE) }
 
         try {
             registerReceiver(pipReceiver, filter, RECEIVER_EXPORTED)
@@ -109,11 +105,13 @@ class PlayerActivity : ComponentActivity() {
         WindowCompat.setDecorFitsSystemWindows(window, false)
         hideSystemUI()
 
-        val itemId = intent.getStringExtra("itemId")?.let { UUID.fromString(it) } ?: run {
-            Timber.e("PlayerActivity: No itemId provided")
-            finish()
-            return
-        }
+        val itemId =
+            intent.getStringExtra("itemId")?.let { UUID.fromString(it) }
+                ?: run {
+                    Timber.e("PlayerActivity: No itemId provided")
+                    finish()
+                    return
+                }
         val mediaSourceId = intent.getStringExtra("mediaSourceId") ?: ""
         val audioStreamIndex = intent.getIntExtra("audioStreamIndex", -1).takeIf { it != -1 }
         val subtitleStreamIndex = intent.getIntExtra("subtitleStreamIndex", -1).takeIf { it != -1 }
@@ -124,18 +122,18 @@ class PlayerActivity : ComponentActivity() {
         val channelName = intent.getStringExtra("channelName")
         val liveStreamUrl = intent.getStringExtra("liveStreamUrl")
 
-        Timber.d("PlayerActivity: Starting playback for item $itemId, seasonId=$seasonId, shuffle=$shuffle, isLive=$isLiveChannel")
+        Timber.d(
+            "PlayerActivity: Starting playback for item $itemId, seasonId=$seasonId, shuffle=$shuffle, isLive=$isLiveChannel"
+        )
 
         setContent {
-            val themeMode by preferencesRepository.getThemeModeFlow()
-                .collectAsState(initial = "SYSTEM")
-            val dynamicColors by preferencesRepository.getDynamicColorsFlow()
-                .collectAsState(initial = true)
+            val themeMode by
+                preferencesRepository.getThemeModeFlow().collectAsState(initial = "SYSTEM")
+            val dynamicColors by
+                preferencesRepository.getDynamicColorsFlow().collectAsState(initial = true)
 
             LaunchedEffect(Unit) {
-                viewModel.enterPictureInPicture = {
-                    enterPictureInPicture()
-                }
+                viewModel.enterPictureInPicture = { enterPictureInPicture() }
                 viewModel.updatePipParams = {
                     if (isPipSupported) {
                         setPictureInPictureParams(buildPipParams())
@@ -143,10 +141,7 @@ class PlayerActivity : ComponentActivity() {
                 }
             }
 
-            AFinityTheme(
-                themeMode = themeMode,
-                dynamicColor = dynamicColors
-            ) {
+            AFinityTheme(themeMode = themeMode, dynamicColor = dynamicColors) {
                 PlayerScreenWrapper(
                     itemId = itemId,
                     mediaSourceId = mediaSourceId,
@@ -159,7 +154,7 @@ class PlayerActivity : ComponentActivity() {
                     channelName = channelName,
                     liveStreamUrl = liveStreamUrl,
                     onBackPressed = { finish() },
-                    modifier = Modifier.fillMaxSize()
+                    modifier = Modifier.fillMaxSize(),
                 )
             }
         }
@@ -195,34 +190,36 @@ class PlayerActivity : ComponentActivity() {
         val displayAspectRatio = Rational(viewWidth, viewHeight)
 
         val videoSize = viewModel.player.videoSize
-        val aspectRatio = if (videoSize.width > 0 && videoSize.height > 0) {
-            Rational(
-                videoSize.width.coerceAtMost((videoSize.height * 2.39f).toInt()),
-                videoSize.height.coerceAtMost((videoSize.width * 2.39f).toInt())
-            )
-        } else {
-            Rational(16, 9)
-        }
+        val aspectRatio =
+            if (videoSize.width > 0 && videoSize.height > 0) {
+                Rational(
+                    videoSize.width.coerceAtMost((videoSize.height * 2.39f).toInt()),
+                    videoSize.height.coerceAtMost((videoSize.width * 2.39f).toInt()),
+                )
+            } else {
+                Rational(16, 9)
+            }
 
-        val sourceRectHint = if (displayAspectRatio < aspectRatio) {
-            val space = ((viewHeight -
-                    (viewWidth.toFloat() / aspectRatio.toFloat())) / 2).toInt()
-            android.graphics.Rect(
-                0,
-                space,
-                viewWidth,
-                (viewWidth.toFloat() / aspectRatio.toFloat()).toInt() + space
-            )
-        } else {
-            val space = ((viewWidth -
-                    (viewHeight.toFloat() * aspectRatio.toFloat())) / 2).toInt()
-            android.graphics.Rect(
-                space,
-                0,
-                (viewHeight.toFloat() * aspectRatio.toFloat()).toInt() + space,
-                viewHeight
-            )
-        }
+        val sourceRectHint =
+            if (displayAspectRatio < aspectRatio) {
+                val space =
+                    ((viewHeight - (viewWidth.toFloat() / aspectRatio.toFloat())) / 2).toInt()
+                android.graphics.Rect(
+                    0,
+                    space,
+                    viewWidth,
+                    (viewWidth.toFloat() / aspectRatio.toFloat()).toInt() + space,
+                )
+            } else {
+                val space =
+                    ((viewWidth - (viewHeight.toFloat() * aspectRatio.toFloat())) / 2).toInt()
+                android.graphics.Rect(
+                    space,
+                    0,
+                    (viewHeight.toFloat() * aspectRatio.toFloat()).toInt() + space,
+                    viewHeight,
+                )
+            }
 
         val actions = buildPipActions()
 
@@ -236,19 +233,22 @@ class PlayerActivity : ComponentActivity() {
 
     override fun onPictureInPictureModeChanged(
         isInPictureInPictureMode: Boolean,
-        newConfig: Configuration
+        newConfig: Configuration,
     ) {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
 
         viewModel.onPipModeChanged(isInPictureInPictureMode)
 
         if (!isInPictureInPictureMode) {
-            window.decorView.postDelayed({
-                if (!isResumed) {
-                    viewModel.stopPlayback()
-                    finish()
-                }
-            }, 100)
+            window.decorView.postDelayed(
+                {
+                    if (!isResumed) {
+                        viewModel.stopPlayback()
+                        finish()
+                    }
+                },
+                100,
+            )
         }
     }
 
@@ -319,29 +319,26 @@ class PlayerActivity : ComponentActivity() {
     private fun buildPipActions(): List<RemoteAction> {
         val actions = mutableListOf<RemoteAction>()
 
-        val playPauseIntent = Intent(ACTION_PLAY_PAUSE).apply {
-            setPackage(packageName)
-        }
-        val playPausePendingIntent = PendingIntent.getBroadcast(
-            this,
-            REQUEST_PLAY_PAUSE,
-            playPauseIntent,
-            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-        )
-        val playPauseIcon = if (viewModel.player.isPlaying) {
-            Icon.createWithResource(this, R.drawable.ic_player_pause_filled)
-        } else {
-            Icon.createWithResource(this, R.drawable.ic_player_play_filled)
-        }
-        val title = if (viewModel.player.isPlaying) getString(R.string.cd_pause) else getString(R.string.cd_play)
-        val playPauseAction = RemoteAction(
-            playPauseIcon,
-            title,
-            title,
-            playPausePendingIntent
-        )
+        val playPauseIntent = Intent(ACTION_PLAY_PAUSE).apply { setPackage(packageName) }
+        val playPausePendingIntent =
+            PendingIntent.getBroadcast(
+                this,
+                REQUEST_PLAY_PAUSE,
+                playPauseIntent,
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
+            )
+        val playPauseIcon =
+            if (viewModel.player.isPlaying) {
+                Icon.createWithResource(this, R.drawable.ic_player_pause_filled)
+            } else {
+                Icon.createWithResource(this, R.drawable.ic_player_play_filled)
+            }
+        val title =
+            if (viewModel.player.isPlaying) getString(R.string.cd_pause)
+            else getString(R.string.cd_play)
+        val playPauseAction = RemoteAction(playPauseIcon, title, title, playPausePendingIntent)
         actions.add(playPauseAction)
 
         return actions
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/PlayerLauncher.kt b/app/src/main/java/com/makd/afinity/ui/player/PlayerLauncher.kt
index cffeb9855..f6d9d9170 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/PlayerLauncher.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/PlayerLauncher.kt
@@ -3,8 +3,8 @@ package com.makd.afinity.ui.player
 import android.content.Context
 import android.content.Intent
 import androidx.media3.common.util.UnstableApi
-import timber.log.Timber
 import java.util.UUID
+import timber.log.Timber
 
 object PlayerLauncher {
 
@@ -17,41 +17,41 @@ object PlayerLauncher {
         subtitleStreamIndex: Int? = null,
         startPositionMs: Long = 0L,
         seasonId: UUID? = null,
-        shuffle: Boolean = false
+        shuffle: Boolean = false,
     ) {
-        Timber.d("PlayerLauncher: Launching player for item $itemId, seasonId=$seasonId, shuffle=$shuffle")
-
-        val intent = Intent(context, PlayerActivity::class.java).apply {
-            putExtra("itemId", itemId.toString())
-            putExtra("mediaSourceId", mediaSourceId)
-            audioStreamIndex?.let { putExtra("audioStreamIndex", it) }
-            subtitleStreamIndex?.let { putExtra("subtitleStreamIndex", it) }
-            putExtra("startPositionMs", startPositionMs)
-            seasonId?.let { putExtra("seasonId", it.toString()) }
-            putExtra("shuffle", shuffle)
-
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK
-        }
+        Timber.d(
+            "PlayerLauncher: Launching player for item $itemId, seasonId=$seasonId, shuffle=$shuffle"
+        )
+
+        val intent =
+            Intent(context, PlayerActivity::class.java).apply {
+                putExtra("itemId", itemId.toString())
+                putExtra("mediaSourceId", mediaSourceId)
+                audioStreamIndex?.let { putExtra("audioStreamIndex", it) }
+                subtitleStreamIndex?.let { putExtra("subtitleStreamIndex", it) }
+                putExtra("startPositionMs", startPositionMs)
+                seasonId?.let { putExtra("seasonId", it.toString()) }
+                putExtra("shuffle", shuffle)
+
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            }
 
         context.startActivity(intent)
     }
 
     @UnstableApi
-    fun launchLiveChannel(
-        context: Context,
-        channelId: UUID,
-        channelName: String
-    ) {
+    fun launchLiveChannel(context: Context, channelId: UUID, channelName: String) {
         Timber.d("PlayerLauncher: Launching live channel $channelName ($channelId)")
 
-        val intent = Intent(context, PlayerActivity::class.java).apply {
-            putExtra("itemId", channelId.toString())
-            putExtra("mediaSourceId", channelId.toString())
-            putExtra("isLiveChannel", true)
-            putExtra("channelName", channelName)
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK
-        }
+        val intent =
+            Intent(context, PlayerActivity::class.java).apply {
+                putExtra("itemId", channelId.toString())
+                putExtra("mediaSourceId", channelId.toString())
+                putExtra("isLiveChannel", true)
+                putExtra("channelName", channelName)
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            }
 
         context.startActivity(intent)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/PlayerScreen.kt b/app/src/main/java/com/makd/afinity/ui/player/PlayerScreen.kt
index cf400a1c0..b076b1146 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/PlayerScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/PlayerScreen.kt
@@ -43,8 +43,8 @@ import com.makd.afinity.ui.player.components.TrickplayPreview
 import com.makd.afinity.ui.player.utils.KeepScreenOn
 import com.makd.afinity.ui.player.utils.PlayerSystemBarsController
 import com.makd.afinity.ui.player.utils.ScreenBrightnessController
-import timber.log.Timber
 import java.util.UUID
+import timber.log.Timber
 
 @UnstableApi
 @Composable
@@ -61,24 +61,24 @@ fun PlayerScreen(
     onBackPressed: () -> Unit,
     navController: NavController? = null,
     modifier: Modifier = Modifier,
-    viewModel: PlayerViewModel = hiltViewModel()
+    viewModel: PlayerViewModel = hiltViewModel(),
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
-    val playlistState by viewModel.playlistState.collectAsStateWithLifecycle(
-        initialValue = PlaylistState()
-    )
+    val playlistState by
+        viewModel.playlistState.collectAsStateWithLifecycle(initialValue = PlaylistState())
 
     val context = androidx.compose.ui.platform.LocalContext.current
     val preferencesRepository = remember {
         dagger.hilt.android.EntryPointAccessors.fromApplication(
-            context.applicationContext,
-            com.makd.afinity.di.PreferencesEntryPoint::class.java
-        ).preferencesRepository()
+                context.applicationContext,
+                com.makd.afinity.di.PreferencesEntryPoint::class.java,
+            )
+            .preferencesRepository()
     }
-    val subtitlePrefs by preferencesRepository.getSubtitlePreferencesFlow()
-        .collectAsStateWithLifecycle(
-            initialValue = SubtitlePreferences.DEFAULT
-        )
+    val subtitlePrefs by
+        preferencesRepository
+            .getSubtitlePreferencesFlow()
+            .collectAsStateWithLifecycle(initialValue = SubtitlePreferences.DEFAULT)
     var seekOriginTime by remember { mutableLongStateOf(0L) }
     var dragStartVolume by remember { mutableStateOf(-1) }
     var dragStartBrightness by remember { mutableFloatStateOf(-1f) }
@@ -91,7 +91,7 @@ fun PlayerScreen(
                 PlayerEvent.LoadLiveChannel(
                     channelId = item.id,
                     channelName = item.name,
-                    streamUrl = liveStreamUrl
+                    streamUrl = liveStreamUrl,
                 )
             )
         } else {
@@ -102,7 +102,7 @@ fun PlayerScreen(
                     mediaSourceId = mediaSourceId,
                     audioStreamIndex = audioStreamIndex,
                     subtitleStreamIndex = subtitleStreamIndex,
-                    startPositionMs = startPositionMs
+                    startPositionMs = startPositionMs,
                 )
             )
         }
@@ -110,7 +110,9 @@ fun PlayerScreen(
 
     LaunchedEffect(item, seasonId, shuffle, isLiveChannel) {
         if (!isLiveChannel) {
-            Timber.d("Initializing playlist for item: ${item.name} (${item.id}), seasonId=$seasonId, shuffle=$shuffle")
+            Timber.d(
+                "Initializing playlist for item: ${item.name} (${item.id}), seasonId=$seasonId, shuffle=$shuffle"
+            )
             viewModel.initializePlaylist(item, seasonId, shuffle)
         }
     }
@@ -134,7 +136,7 @@ fun PlayerScreen(
                         mediaSourceId = mediaSourceId,
                         audioStreamIndex = null,
                         subtitleStreamIndex = null,
-                        startPositionMs = 0L
+                        startPositionMs = 0L,
                     )
                 )
             } catch (e: Exception) {
@@ -152,11 +154,7 @@ fun PlayerScreen(
             onBackPressed()
         }
     }
-    Box(
-        modifier = modifier
-            .fillMaxSize()
-            .background(Color.Black)
-    ) {
+    Box(modifier = modifier.fillMaxSize().background(Color.Black)) {
         GestureHandler(
             onSingleTap = { viewModel.onSingleTap() },
             onDoubleTap = { isForward ->
@@ -208,7 +206,7 @@ fun PlayerScreen(
                     viewModel.updateTrickplayPreview(targetTime)
                 }
             },
-            modifier = Modifier.fillMaxSize()
+            modifier = Modifier.fillMaxSize(),
         ) {
             when (val player = viewModel.player) {
                 is ExoPlayer -> {
@@ -222,7 +220,7 @@ fun PlayerScreen(
                                     viewModel.setPlayerView(this)
                                 }
                             },
-                            modifier = Modifier.fillMaxSize()
+                            modifier = Modifier.fillMaxSize(),
                         )
                     }
                 }
@@ -231,12 +229,8 @@ fun PlayerScreen(
                     MpvSurface(
                         modifier = Modifier.fillMaxSize(),
                         videoOutput = viewModel.mpvVideoOutputValue,
-                        onSurfaceCreated = {
-                            Timber.d("MPV surface created in player screen")
-                        },
-                        onSurfaceDestroyed = {
-                            Timber.d("MPV surface destroyed in player screen")
-                        }
+                        onSurfaceCreated = { Timber.d("MPV surface created in player screen") },
+                        onSurfaceDestroyed = { Timber.d("MPV surface destroyed in player screen") },
                     )
                 }
             }
@@ -246,7 +240,7 @@ fun PlayerScreen(
             ExoPlayerSubtitles(
                 player = viewModel.player as ExoPlayer,
                 subtitlePrefs = subtitlePrefs,
-                modifier = Modifier.fillMaxSize()
+                modifier = Modifier.fillMaxSize(),
             )
         }
 
@@ -263,12 +257,10 @@ fun PlayerScreen(
             },
             onNextClick = viewModel::onNextChapterOrEpisode,
             onPreviousClick = viewModel::onPreviousChapterOrEpisode,
-            onPipToggle = {
-                viewModel.handlePlayerEvent(PlayerEvent.EnterPictureInPicture)
-            },
+            onPipToggle = { viewModel.handlePlayerEvent(PlayerEvent.EnterPictureInPicture) },
             playlistQueue = playlistState.queue,
             currentPlaylistIndex = playlistState.currentIndex,
-            onJumpToEpisode = viewModel::jumpToEpisode
+            onJumpToEpisode = viewModel::jumpToEpisode,
         )
 
         TrickplayPreview(
@@ -277,13 +269,10 @@ fun PlayerScreen(
             positionMs = uiState.trickplayPreviewPosition,
             durationMs = uiState.duration,
             chapters = uiState.chapters,
-            modifier = Modifier.fillMaxSize()
+            modifier = Modifier.fillMaxSize(),
         )
 
-        PlayerIndicators(
-            uiState = uiState,
-            modifier = Modifier.fillMaxSize()
-        )
+        PlayerIndicators(uiState = uiState, modifier = Modifier.fillMaxSize())
 
         ErrorIndicator(
             isVisible = uiState.showError,
@@ -295,11 +284,11 @@ fun PlayerScreen(
                         mediaSourceId = mediaSourceId,
                         audioStreamIndex = audioStreamIndex,
                         subtitleStreamIndex = subtitleStreamIndex,
-                        startPositionMs = startPositionMs
+                        startPositionMs = startPositionMs,
                     )
                 )
             },
-            modifier = Modifier.align(Alignment.Center)
+            modifier = Modifier.align(Alignment.Center),
         )
     }
 
@@ -313,11 +302,9 @@ fun PlayerScreen(
 private fun ExoPlayerSubtitles(
     player: ExoPlayer,
     subtitlePrefs: SubtitlePreferences,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
-    var subtitleView: SubtitleView? by remember {
-        mutableStateOf(null)
-    }
+    var subtitleView: SubtitleView? by remember { mutableStateOf(null) }
     AndroidView(
         factory = { ctx ->
             SubtitleView(ctx).apply {
@@ -328,34 +315,35 @@ private fun ExoPlayerSubtitles(
         },
         update = { view ->
             val baseTypeface = Typeface.SANS_SERIF
-            val typeface = if (subtitlePrefs.bold) {
-                Typeface.create(baseTypeface, Typeface.BOLD)
-            } else {
-                baseTypeface
-            }
+            val typeface =
+                if (subtitlePrefs.bold) {
+                    Typeface.create(baseTypeface, Typeface.BOLD)
+                } else {
+                    baseTypeface
+                }
 
-            val customStyle = CaptionStyleCompat(
-                subtitlePrefs.textColor,
-                subtitlePrefs.backgroundColor,
-                subtitlePrefs.windowColor,
-                subtitlePrefs.outlineStyle.toExoPlayerEdgeType(),
-                subtitlePrefs.outlineColor,
-                typeface
-            )
+            val customStyle =
+                CaptionStyleCompat(
+                    subtitlePrefs.textColor,
+                    subtitlePrefs.backgroundColor,
+                    subtitlePrefs.windowColor,
+                    subtitlePrefs.outlineStyle.toExoPlayerEdgeType(),
+                    subtitlePrefs.outlineColor,
+                    typeface,
+                )
             view.setStyle(customStyle)
             view.setFractionalTextSize(subtitlePrefs.toExoPlayerFractionalSize())
         },
-        modifier = modifier
+        modifier = modifier,
     )
 
     DisposableEffect(player) {
-        val listener = object : Player.Listener {
-            override fun onCues(
-                cueGroup: CueGroup
-            ) {
-                subtitleView?.setCues(cueGroup.cues)
+        val listener =
+            object : Player.Listener {
+                override fun onCues(cueGroup: CueGroup) {
+                    subtitleView?.setCues(cueGroup.cues)
+                }
             }
-        }
 
         player.addListener(listener)
 
@@ -364,4 +352,4 @@ private fun ExoPlayerSubtitles(
             subtitleView?.setCues(emptyList())
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/PlayerScreenWrapper.kt b/app/src/main/java/com/makd/afinity/ui/player/PlayerScreenWrapper.kt
index 56d933102..3e29c3971 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/PlayerScreenWrapper.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/PlayerScreenWrapper.kt
@@ -37,7 +37,7 @@ fun PlayerScreenWrapper(
     navController: androidx.navigation.NavController? = null,
     onBackPressed: () -> Unit,
     modifier: Modifier = Modifier,
-    viewModel: PlayerWrapperViewModel = hiltViewModel()
+    viewModel: PlayerWrapperViewModel = hiltViewModel(),
 ) {
     val item by viewModel.item.collectAsState()
     val isLoading by viewModel.isLoading.collectAsState()
@@ -58,21 +58,23 @@ fun PlayerScreenWrapper(
     when {
         isLoading || (isLiveChannel && effectiveStreamUrl == null && streamError == null) -> {
             Box(
-                modifier = modifier
-                    .fillMaxSize()
-                    .background(Color.Black),
-                contentAlignment = Alignment.Center
+                modifier = modifier.fillMaxSize().background(Color.Black),
+                contentAlignment = Alignment.Center,
             ) {
                 Column(
                     horizontalAlignment = Alignment.CenterHorizontally,
-                    verticalArrangement = Arrangement.spacedBy(16.dp)
+                    verticalArrangement = Arrangement.spacedBy(16.dp),
                 ) {
                     CircularProgressIndicator(color = Color.White)
                     if (isLiveChannel && item != null) {
                         Text(
-                            text = stringResource(R.string.player_live_tuning_fmt, item?.name ?: channelName ?: ""),
+                            text =
+                                stringResource(
+                                    R.string.player_live_tuning_fmt,
+                                    item?.name ?: channelName ?: "",
+                                ),
                             color = Color.White,
-                            style = MaterialTheme.typography.bodyMedium
+                            style = MaterialTheme.typography.bodyMedium,
                         )
                     }
                 }
@@ -81,14 +83,12 @@ fun PlayerScreenWrapper(
 
         streamError != null -> {
             Box(
-                modifier = modifier
-                    .fillMaxSize()
-                    .background(Color.Black),
-                contentAlignment = Alignment.Center
+                modifier = modifier.fillMaxSize().background(Color.Black),
+                contentAlignment = Alignment.Center,
             ) {
                 Text(
                     text = streamError ?: stringResource(R.string.player_error_stream_load),
-                    color = Color.White
+                    color = Color.White,
                 )
             }
         }
@@ -106,22 +106,17 @@ fun PlayerScreenWrapper(
                 liveStreamUrl = effectiveStreamUrl,
                 navController = navController,
                 onBackPressed = onBackPressed,
-                modifier = modifier
+                modifier = modifier,
             )
         }
 
         else -> {
             Box(
-                modifier = modifier
-                    .fillMaxSize()
-                    .background(Color.Black),
-                contentAlignment = Alignment.Center
+                modifier = modifier.fillMaxSize().background(Color.Black),
+                contentAlignment = Alignment.Center,
             ) {
-                Text(
-                    text = stringResource(R.string.player_error_media_load),
-                    color = Color.White
-                )
+                Text(text = stringResource(R.string.player_error_media_load), color = Color.White)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/PlayerViewModel.kt b/app/src/main/java/com/makd/afinity/ui/player/PlayerViewModel.kt
index 3f0270375..1bed34c2e 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/PlayerViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/PlayerViewModel.kt
@@ -18,7 +18,6 @@ import androidx.media3.common.MimeTypes
 import androidx.media3.common.Player
 import androidx.media3.common.TrackSelectionOverride
 import androidx.media3.common.Tracks
-import androidx.media3.exoplayer.DefaultLoadControl
 import androidx.media3.exoplayer.DefaultRenderersFactory
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.exoplayer.trackselection.DefaultTrackSelector
@@ -47,10 +46,13 @@ import com.makd.afinity.data.repository.download.JellyfinDownloadRepository
 import com.makd.afinity.data.repository.media.MediaRepository
 import com.makd.afinity.data.repository.playback.PlaybackRepository
 import com.makd.afinity.data.repository.segments.SegmentsRepository
+import com.makd.afinity.player.audiobookshelf.AudiobookshelfPlayer
 import com.makd.afinity.player.mpv.MPVPlayer
 import com.makd.afinity.ui.player.utils.VolumeManager
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import java.util.UUID
+import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
@@ -65,12 +67,12 @@ import kotlinx.coroutines.withContext
 import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.model.api.MediaStreamType
 import timber.log.Timber
-import java.util.UUID
-import javax.inject.Inject
 
 @androidx.media3.common.util.UnstableApi
 @HiltViewModel
-class PlayerViewModel @Inject constructor(
+class PlayerViewModel
+@Inject
+constructor(
     @ApplicationContext private val context: Context,
     private val application: Application,
     private val playbackRepository: PlaybackRepository,
@@ -82,7 +84,8 @@ class PlayerViewModel @Inject constructor(
     private val playlistManager: PlaylistManager,
     private val downloadRepository: JellyfinDownloadRepository,
     private val appDataRepository: AppDataRepository,
-    private val apiClient: ApiClient
+    private val apiClient: ApiClient,
+    private val audiobookshelfPlayer: AudiobookshelfPlayer,
 ) : ViewModel(), Player.Listener {
 
     lateinit var player: Player
@@ -170,19 +173,21 @@ class PlayerViewModel @Inject constructor(
 
     private fun getSystemBrightness(): Float {
         return try {
-            val brightnessMode = Settings.System.getInt(
-                context.contentResolver,
-                Settings.System.SCREEN_BRIGHTNESS_MODE
-            )
+            val brightnessMode =
+                Settings.System.getInt(
+                    context.contentResolver,
+                    Settings.System.SCREEN_BRIGHTNESS_MODE,
+                )
 
             if (brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
                 Timber.d("System brightness is in automatic mode. Returning default brightness.")
                 0.5f
             } else {
-                val brightness = Settings.System.getInt(
-                    context.contentResolver,
-                    Settings.System.SCREEN_BRIGHTNESS
-                )
+                val brightness =
+                    Settings.System.getInt(
+                        context.contentResolver,
+                        Settings.System.SCREEN_BRIGHTNESS,
+                    )
                 brightness / 255.0f
             }
         } catch (e: Settings.SettingNotFoundException) {
@@ -208,82 +213,88 @@ class PlayerViewModel @Inject constructor(
 
     private fun startProgressReporting() {
         progressReportingJob?.cancel()
-        progressReportingJob = viewModelScope.launch {
-            while (true) {
-                delay(5000L)
-                if (_uiState.value.isLiveChannel) continue
-
-                currentItem?.let { item ->
-                    currentSessionId?.let { sessionId ->
-                        try {
-                            val positionTicks = player.currentPosition * 10000
-                            val isPaused = !player.isPlaying
-
-                            playbackStateManager.updatePlaybackPosition(player.currentPosition)
-
-                            playbackRepository.reportPlaybackProgress(
-                                itemId = item.id,
-                                sessionId = sessionId,
-                                positionTicks = positionTicks,
-                                isPaused = isPaused,
-                                playMethod = "DirectPlay"
-                            )
-                            Timber.d("Reported progress: ${player.currentPosition}ms, paused: $isPaused")
-                        } catch (e: Exception) {
-                            Timber.e(e, "Failed to report periodic progress")
+        progressReportingJob =
+            viewModelScope.launch {
+                while (true) {
+                    delay(5000L)
+                    if (_uiState.value.isLiveChannel) continue
+
+                    currentItem?.let { item ->
+                        currentSessionId?.let { sessionId ->
+                            try {
+                                val positionTicks = player.currentPosition * 10000
+                                val isPaused = !player.isPlaying
+
+                                playbackStateManager.updatePlaybackPosition(player.currentPosition)
+
+                                playbackRepository.reportPlaybackProgress(
+                                    itemId = item.id,
+                                    sessionId = sessionId,
+                                    positionTicks = positionTicks,
+                                    isPaused = isPaused,
+                                    playMethod = "DirectPlay",
+                                )
+                                Timber.d(
+                                    "Reported progress: ${player.currentPosition}ms, paused: $isPaused"
+                                )
+                            } catch (e: Exception) {
+                                Timber.e(e, "Failed to report periodic progress")
+                            }
                         }
                     }
                 }
             }
-        }
     }
 
     private fun initializePlayer() {
-        val useExoPlayer = kotlinx.coroutines.runBlocking {
-            preferencesRepository.useExoPlayer.first()
-        }
+        val useExoPlayer =
+            kotlinx.coroutines.runBlocking { preferencesRepository.useExoPlayer.first() }
 
-        player = if (useExoPlayer) {
-            createExoPlayer()
-        } else {
-            createMPVPlayer()
-        }
+        player =
+            if (useExoPlayer) {
+                createExoPlayer()
+            } else {
+                createMPVPlayer()
+            }
 
         player.addListener(this@PlayerViewModel)
         Timber.d("Player initialized: ${player.javaClass.simpleName}")
     }
 
     private fun createExoPlayer(): ExoPlayer {
-        val audioAttributes = AudioAttributes.Builder()
-            .setContentType(C.AUDIO_CONTENT_TYPE_MOVIE)
-            .setUsage(C.USAGE_MEDIA)
-            .build()
+        val audioAttributes =
+            AudioAttributes.Builder()
+                .setContentType(C.AUDIO_CONTENT_TYPE_MOVIE)
+                .setUsage(C.USAGE_MEDIA)
+                .build()
 
-        val (preferredAudioLang, preferredSubLang) = kotlinx.coroutines.runBlocking {
-            Pair(
-                preferencesRepository.getPreferredAudioLanguage(),
-                preferencesRepository.getPreferredSubtitleLanguage()
-            )
-        }
+        val (preferredAudioLang, preferredSubLang) =
+            kotlinx.coroutines.runBlocking {
+                Pair(
+                    preferencesRepository.getPreferredAudioLanguage(),
+                    preferencesRepository.getPreferredSubtitleLanguage(),
+                )
+            }
 
         val trackSelector = DefaultTrackSelector(context)
         trackSelector.setParameters(
-            trackSelector.buildUponParameters()
-                .setTunnelingEnabled(true)
-                .apply {
-                    if (preferredAudioLang.isNotEmpty()) {
-                        setPreferredAudioLanguage(preferredAudioLang)
-                    }
-                    if (preferredSubLang.isNotEmpty()) {
-                        setPreferredTextLanguage(preferredSubLang)
-                    }
+            trackSelector.buildUponParameters().setTunnelingEnabled(true).apply {
+                if (preferredAudioLang.isNotEmpty()) {
+                    setPreferredAudioLanguage(preferredAudioLang)
+                }
+                if (preferredSubLang.isNotEmpty()) {
+                    setPreferredTextLanguage(preferredSubLang)
                 }
+            }
         )
 
-        Timber.d("ExoPlayer preferences: preferredAudioLang=$preferredAudioLang, preferredSubLang=$preferredSubLang")
+        Timber.d(
+            "ExoPlayer preferences: preferredAudioLang=$preferredAudioLang, preferredSubLang=$preferredSubLang"
+        )
 
-        val renderersFactory = DefaultRenderersFactory(context)
-            .setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON)
+        val renderersFactory =
+            DefaultRenderersFactory(context)
+                .setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON)
 
         return ExoPlayer.Builder(context, renderersFactory)
             .setAudioAttributes(audioAttributes, true)
@@ -298,34 +309,45 @@ class PlayerViewModel @Inject constructor(
         private set
 
     private fun createMPVPlayer(): MPVPlayer {
-        val audioAttributes = AudioAttributes.Builder()
-            .setContentType(C.AUDIO_CONTENT_TYPE_MOVIE)
-            .setUsage(C.USAGE_MEDIA)
-            .build()
+        val audioAttributes =
+            AudioAttributes.Builder()
+                .setContentType(C.AUDIO_CONTENT_TYPE_MOVIE)
+                .setUsage(C.USAGE_MEDIA)
+                .build()
 
-        val (mpvHwDec, mpvVideoOutput, mpvAudioOutput, subtitlePrefs, preferredAudioLang, preferredSubLang) = kotlinx.coroutines.runBlocking {
-            val hwDec = preferencesRepository.getMpvHwDec()
-            val vo = preferencesRepository.getMpvVideoOutput()
-            val ao = preferencesRepository.getMpvAudioOutput()
-            val subs = preferencesRepository.getSubtitlePreferences()
-            val audioLang = preferencesRepository.getPreferredAudioLanguage()
-            val subLang = preferencesRepository.getPreferredSubtitleLanguage()
-            MpvPrefsSnapshot(hwDec.value, vo.value, ao.value, subs, audioLang, subLang)
-        }
+        val (
+            mpvHwDec,
+            mpvVideoOutput,
+            mpvAudioOutput,
+            subtitlePrefs,
+            preferredAudioLang,
+            preferredSubLang) =
+            kotlinx.coroutines.runBlocking {
+                val hwDec = preferencesRepository.getMpvHwDec()
+                val vo = preferencesRepository.getMpvVideoOutput()
+                val ao = preferencesRepository.getMpvAudioOutput()
+                val subs = preferencesRepository.getSubtitlePreferences()
+                val audioLang = preferencesRepository.getPreferredAudioLanguage()
+                val subLang = preferencesRepository.getPreferredSubtitleLanguage()
+                MpvPrefsSnapshot(hwDec.value, vo.value, ao.value, subs, audioLang, subLang)
+            }
 
         mpvVideoOutputValue = mpvVideoOutput
 
-        Timber.d("MPV preferences: hwdec=$mpvHwDec, vo=$mpvVideoOutput, ao=$mpvAudioOutput, alang=$preferredAudioLang, slang=$preferredSubLang")
+        Timber.d(
+            "MPV preferences: hwdec=$mpvHwDec, vo=$mpvVideoOutput, ao=$mpvAudioOutput, alang=$preferredAudioLang, slang=$preferredSubLang"
+        )
 
-        val mpvPlayer = MPVPlayer.Builder(application)
-            .setAudioAttributes(audioAttributes, true)
-            .setSeekBackIncrementMs(10000)
-            .setSeekForwardIncrementMs(10000)
-            .setPauseAtEndOfMediaItems(true)
-            .setVideoOutput(mpvVideoOutput)
-            .setAudioOutput(mpvAudioOutput)
-            .setHwDec(mpvHwDec)
-            .build()
+        val mpvPlayer =
+            MPVPlayer.Builder(application)
+                .setAudioAttributes(audioAttributes, true)
+                .setSeekBackIncrementMs(10000)
+                .setSeekForwardIncrementMs(10000)
+                .setPauseAtEndOfMediaItems(true)
+                .setVideoOutput(mpvVideoOutput)
+                .setAudioOutput(mpvAudioOutput)
+                .setHwDec(mpvHwDec)
+                .build()
 
         mpvPlayer.setOption("sub-ass-override", "strip")
         mpvPlayer.setOption("sub-use-margins", "yes")
@@ -340,7 +362,7 @@ class PlayerViewModel @Inject constructor(
                 mpvPlayer.setOption("sub-border-size", subtitlePrefs.outlineSize.toString())
                 mpvPlayer.setOption(
                     "sub-border-color",
-                    SubtitlePreferences.colorToMpvHex(subtitlePrefs.outlineColor)
+                    SubtitlePreferences.colorToMpvHex(subtitlePrefs.outlineColor),
                 )
                 mpvPlayer.setOption("sub-shadow-offset", "0")
                 mpvPlayer.setOption("sub-shadow-color", "#00000000")
@@ -353,7 +375,7 @@ class PlayerViewModel @Inject constructor(
                 mpvPlayer.setOption("sub-shadow-offset", subtitlePrefs.outlineSize.toString())
                 mpvPlayer.setOption(
                     "sub-shadow-color",
-                    SubtitlePreferences.colorToMpvHex(subtitlePrefs.outlineColor)
+                    SubtitlePreferences.colorToMpvHex(subtitlePrefs.outlineColor),
                 )
             }
 
@@ -361,7 +383,7 @@ class PlayerViewModel @Inject constructor(
                 mpvPlayer.setOption("sub-border-style", "background-box")
                 mpvPlayer.setOption(
                     "sub-back-color",
-                    SubtitlePreferences.colorToMpvHex(subtitlePrefs.backgroundColor)
+                    SubtitlePreferences.colorToMpvHex(subtitlePrefs.backgroundColor),
                 )
                 mpvPlayer.setOption("sub-spacing", "0.5")
             }
@@ -432,23 +454,30 @@ class PlayerViewModel @Inject constructor(
         val isMpv = player is MPVPlayer
         val wasActuallyPlaying = _uiState.value.isPlaying
 
-        val isActuallyPlaying = if (isMpv && isLiveChannel) {
-            val positionAdvancing = position > lastKnownPosition && position > 0
-            val durationAdvancing = duration > lastKnownDuration && duration > 0
-            val streamActive = positionAdvancing || durationAdvancing
+        val isActuallyPlaying =
+            if (isMpv && isLiveChannel) {
+                val positionAdvancing = position > lastKnownPosition && position > 0
+                val durationAdvancing = duration > lastKnownDuration && duration > 0
+                val streamActive = positionAdvancing || durationAdvancing
 
-            if (streamActive || isPlaying) {
-                mpvStreamActiveTime = System.currentTimeMillis()
-                true
+                if (streamActive || isPlaying) {
+                    mpvStreamActiveTime = System.currentTimeMillis()
+                    true
+                } else {
+                    val recentlyActive = System.currentTimeMillis() - mpvStreamActiveTime < 10000
+                    recentlyActive && duration > 0
+                }
             } else {
-                val recentlyActive = System.currentTimeMillis() - mpvStreamActiveTime < 10000
-                recentlyActive && duration > 0
+                isPlaying
             }
-        } else {
-            isPlaying
-        }
 
-        if (isMpv && isLiveChannel && isActuallyPlaying && !wasActuallyPlaying && !mpvLiveAutoHideTriggered) {
+        if (
+            isMpv &&
+                isLiveChannel &&
+                isActuallyPlaying &&
+                !wasActuallyPlaying &&
+                !mpvLiveAutoHideTriggered
+        ) {
             mpvLiveAutoHideTriggered = true
             if (_uiState.value.showControls) {
                 startControlsAutoHide()
@@ -460,13 +489,14 @@ class PlayerViewModel @Inject constructor(
         lastKnownPosition = position
         lastKnownDuration = duration
 
-        _uiState.value = _uiState.value.copy(
-            isPlaying = isActuallyPlaying,
-            isPaused = !isActuallyPlaying && playbackState == Player.STATE_READY,
-            isBuffering = isBuffering,
-            currentPosition = position,
-            duration = duration
-        )
+        _uiState.value =
+            _uiState.value.copy(
+                isPlaying = isActuallyPlaying,
+                isPaused = !isActuallyPlaying && playbackState == Player.STATE_READY,
+                isBuffering = isBuffering,
+                currentPosition = position,
+                duration = duration,
+            )
     }
 
     fun handlePlayerEvent(event: PlayerEvent) {
@@ -486,20 +516,19 @@ class PlayerViewModel @Inject constructor(
                     volumeManager.setVolume(event.volume)
 
                     updateUiState {
-                        it.copy(
-                            showVolumeIndicator = true,
-                            volumeLevel = event.volume
-                        )
+                        it.copy(showVolumeIndicator = true, volumeLevel = event.volume)
                     }
 
                     volumeHideJob?.cancel()
-                    volumeHideJob = viewModelScope.launch {
-                        delay(2000)
-                        updateUiState { it.copy(showVolumeIndicator = false) }
-                    }
+                    volumeHideJob =
+                        viewModelScope.launch {
+                            delay(2000)
+                            updateUiState { it.copy(showVolumeIndicator = false) }
+                        }
                 }
 
-                is PlayerEvent.SetBrightness -> { /* Handle at UI level */
+                is PlayerEvent.SetBrightness -> {
+                    /* Handle at UI level */
                 }
 
                 is PlayerEvent.SetPlaybackSpeed -> {
@@ -510,7 +539,8 @@ class PlayerViewModel @Inject constructor(
                 is PlayerEvent.SwitchToTrack -> switchToTrack(event.trackType, event.index)
                 is PlayerEvent.ToggleControls -> toggleControls()
                 is PlayerEvent.ToggleLock -> onLockToggle()
-                is PlayerEvent.ToggleFullscreen -> { /* Handled at UI level */
+                is PlayerEvent.ToggleFullscreen -> {
+                    /* Handled at UI level */
                 }
 
                 is PlayerEvent.EnterPictureInPicture -> enterPictureInPicture()
@@ -521,17 +551,13 @@ class PlayerViewModel @Inject constructor(
                         event.mediaSourceId,
                         event.audioStreamIndex,
                         event.subtitleStreamIndex,
-                        event.startPositionMs
+                        event.startPositionMs,
                     )
                 }
 
                 is PlayerEvent.LoadLiveChannel -> {
                     updateUiState { it.copy(isLoading = true, isLiveChannel = true) }
-                    loadLiveChannel(
-                        event.channelId,
-                        event.channelName,
-                        event.streamUrl
-                    )
+                    loadLiveChannel(event.channelId, event.channelName, event.streamUrl)
                 }
 
                 is PlayerEvent.SkipSegment -> {
@@ -552,11 +578,7 @@ class PlayerViewModel @Inject constructor(
 
                 is PlayerEvent.Stop -> player.stop()
                 is PlayerEvent.OnSeekBarDragStart -> {
-                    updateUiState {
-                        it.copy(
-                            isSeeking = true,
-                        )
-                    }
+                    updateUiState { it.copy(isSeeking = true) }
                     onSeekBarPreview(player.currentPosition, true)
                 }
 
@@ -574,7 +596,7 @@ class PlayerViewModel @Inject constructor(
                             showTrickplayPreview = false,
                             trickplayPreviewImage = null,
                             trickplayPreviewPosition = 0L,
-                            currentPosition = finalPos
+                            currentPosition = finalPos,
                         )
                     }
                     onSeekBarPreview(0, false)
@@ -643,33 +665,44 @@ class PlayerViewModel @Inject constructor(
 
     fun getPlayerView(): PlayerView? = playerView
 
+    private fun stopAudiobookshelfIfPlaying() {
+        if (audiobookshelfPlayer.isPlaying()) {
+            Timber.d("Stopping Audiobookshelf playback before starting Jellyfin playback")
+            audiobookshelfPlayer.pause()
+            viewModelScope.launch { audiobookshelfPlayer.closeSession() }
+        }
+    }
+
     private suspend fun loadMedia(
         item: AfinityItem,
         mediaSourceId: String,
         audioStreamIndex: Int?,
         subtitleStreamIndex: Int?,
-        startPositionMs: Long
+        startPositionMs: Long,
     ) {
+        stopAudiobookshelfIfPlaying()
         try {
-            val fullItem: AfinityItem = if (item.sources.isEmpty()) {
-                Timber.d("Item ${item.name} has no sources, fetching full details...")
-                try {
-                    (jellyfinRepository.getItemById(item.id) as? AfinityItem) ?: item
-                } catch (e: Exception) {
-                    Timber.e(e, "Failed to fetch full item details")
+            val fullItem: AfinityItem =
+                if (item.sources.isEmpty()) {
+                    Timber.d("Item ${item.name} has no sources, fetching full details...")
+                    try {
+                        (jellyfinRepository.getItemById(item.id) as? AfinityItem) ?: item
+                    } catch (e: Exception) {
+                        Timber.e(e, "Failed to fetch full item details")
+                        item
+                    }
+                } else {
                     item
                 }
-            } else {
-                item
-            }
 
             currentItem = fullItem
 
             val chapters = fullItem.chapters
             updateUiState { it.copy(chapters = chapters) }
-            val mediaSource = fullItem.sources.firstOrNull {
-                if (mediaSourceId.isBlank()) true else it.id == mediaSourceId
-            } ?: fullItem.sources.firstOrNull()
+            val mediaSource =
+                fullItem.sources.firstOrNull {
+                    if (mediaSourceId.isBlank()) true else it.id == mediaSourceId
+                } ?: fullItem.sources.firstOrNull()
 
             val actualMediaSourceId = mediaSource?.id
 
@@ -679,27 +712,25 @@ class PlayerViewModel @Inject constructor(
                     it.copy(
                         isLoading = false,
                         showError = true,
-                        errorMessage = context.getString(R.string.error_no_media_sources)
+                        errorMessage = context.getString(R.string.error_no_media_sources),
                     )
                 }
                 return
             }
 
-            val audioStreams = mediaSource.mediaStreams.filter {
-                it.type == MediaStreamType.AUDIO
-            }
-            val audioPosition = if (audioStreamIndex != null) {
-                audioStreams.indexOfFirst { it.index == audioStreamIndex }
-                    .takeIf { it >= 0 }
-            } else {
-                null
-            }
+            val audioStreams = mediaSource.mediaStreams.filter { it.type == MediaStreamType.AUDIO }
+            val audioPosition =
+                if (audioStreamIndex != null) {
+                    audioStreams.indexOfFirst { it.index == audioStreamIndex }.takeIf { it >= 0 }
+                } else {
+                    null
+                }
 
             updateUiState {
                 it.copy(
                     currentItem = fullItem,
                     audioStreamIndex = audioPosition,
-                    subtitleStreamIndex = subtitleStreamIndex
+                    subtitleStreamIndex = subtitleStreamIndex,
                 )
             }
             currentSessionId = UUID.randomUUID().toString()
@@ -707,36 +738,38 @@ class PlayerViewModel @Inject constructor(
             playbackStateManager.trackPlaybackSession(
                 sessionId = currentSessionId!!,
                 itemId = fullItem.id,
-                mediaSourceId = actualMediaSourceId
+                mediaSourceId = actualMediaSourceId,
             )
             playbackStateManager.trackCurrentItem(fullItem.id)
 
             coroutineScope {
                 val useLocalSource = mediaSource.type == AfinitySourceType.LOCAL
 
-                val streamUrlDeferred = async(Dispatchers.IO) {
-                    if (useLocalSource) {
-                        mediaSource.path?.let { "file://$it" }
-                    } else {
-                        playbackRepository.getStreamUrl(
-                            itemId = fullItem.id,
-                            mediaSourceId = actualMediaSourceId,
-                            audioStreamIndex = audioStreamIndex,
-                            subtitleStreamIndex = null,
-                            videoStreamIndex = null,
-                            maxStreamingBitrate = null,
-                            startTimeTicks = null
-                        )
+                val streamUrlDeferred =
+                    async(Dispatchers.IO) {
+                        if (useLocalSource) {
+                            mediaSource.path?.let { "file://$it" }
+                        } else {
+                            playbackRepository.getStreamUrl(
+                                itemId = fullItem.id,
+                                mediaSourceId = actualMediaSourceId,
+                                audioStreamIndex = audioStreamIndex,
+                                subtitleStreamIndex = null,
+                                videoStreamIndex = null,
+                                maxStreamingBitrate = null,
+                                startTimeTicks = null,
+                            )
+                        }
                     }
-                }
 
                 val segmentsJob = launch(Dispatchers.IO) { loadSegments(fullItem.id) }
                 val trickplayJob = launch(Dispatchers.IO) { loadTrickplayData() }
-                val reportStartJob = launch(Dispatchers.IO) {
-                    if (!useLocalSource) {
-                        reportPlaybackStart(fullItem)
+                val reportStartJob =
+                    launch(Dispatchers.IO) {
+                        if (!useLocalSource) {
+                            reportPlaybackStart(fullItem)
+                        }
                     }
-                }
 
                 val streamUrl = streamUrlDeferred.await()
                 if (streamUrl.isNullOrBlank()) {
@@ -745,79 +778,82 @@ class PlayerViewModel @Inject constructor(
                         it.copy(
                             isLoading = false,
                             showError = true,
-                            errorMessage = context.getString(R.string.error_load_stream)
+                            errorMessage = context.getString(R.string.error_load_stream),
                         )
                     }
                     return@coroutineScope
                 }
 
-                val externalSubtitles = if (useLocalSource) {
-                    val itemDir = downloadRepository.getItemDownloadDirectory(fullItem.id)
-                    val subtitlesDir = java.io.File(itemDir, "subtitles")
-                    if (subtitlesDir.exists()) {
-                        val files = subtitlesDir.listFiles()
-                        files?.mapNotNull { subtitleFile ->
-                            try {
-                                val extension = subtitleFile.extension
-                                val mimeType = when (extension.lowercase()) {
-                                    "srt" -> MimeTypes.APPLICATION_SUBRIP
-                                    "vtt" -> MimeTypes.TEXT_VTT
-                                    "ass", "ssa" -> MimeTypes.TEXT_SSA
-                                    else -> MimeTypes.TEXT_UNKNOWN
-                                }
+                val externalSubtitles =
+                    if (useLocalSource) {
+                        val itemDir = downloadRepository.getItemDownloadDirectory(fullItem.id)
+                        val subtitlesDir = java.io.File(itemDir, "subtitles")
+                        if (subtitlesDir.exists()) {
+                            val files = subtitlesDir.listFiles()
+                            files?.mapNotNull { subtitleFile ->
+                                try {
+                                    val extension = subtitleFile.extension
+                                    val mimeType =
+                                        when (extension.lowercase()) {
+                                            "srt" -> MimeTypes.APPLICATION_SUBRIP
+                                            "vtt" -> MimeTypes.TEXT_VTT
+                                            "ass",
+                                            "ssa" -> MimeTypes.TEXT_SSA
+                                            else -> MimeTypes.TEXT_UNKNOWN
+                                        }
 
-                                val language =
-                                    subtitleFile.nameWithoutExtension.split("_").firstOrNull()
-                                        ?: context.getString(R.string.track_unknown)
-
-                                MediaItem.SubtitleConfiguration.Builder("file://${subtitleFile.absolutePath}".toUri())
-                                    .setLabel(language)
-                                    .setMimeType(mimeType)
-                                    .setLanguage(language)
-                                    .build()
-                            } catch (_: Exception) {
-                                null
-                            }
-                        } ?: emptyList()
-                    } else {
-                        emptyList()
-                    }
-                } else {
-                    mediaSource.mediaStreams
-                        .filter { stream ->
-                            stream.type == MediaStreamType.SUBTITLE && stream.isExternal
+                                    val language =
+                                        subtitleFile.nameWithoutExtension.split("_").firstOrNull()
+                                            ?: context.getString(R.string.track_unknown)
+
+                                    MediaItem.SubtitleConfiguration.Builder(
+                                            "file://${subtitleFile.absolutePath}".toUri()
+                                        )
+                                        .setLabel(language)
+                                        .setMimeType(mimeType)
+                                        .setLanguage(language)
+                                        .build()
+                                } catch (_: Exception) {
+                                    null
+                                }
+                            } ?: emptyList()
+                        } else {
+                            emptyList()
                         }
-                        .mapNotNull { stream ->
-                            try {
-                                val subtitleUrl =
-                                    "${apiClient.baseUrl}/Videos/${fullItem.id}/${actualMediaSourceId}/Subtitles/${stream.index}/Stream.srt"
-                                MediaItem.SubtitleConfiguration.Builder(subtitleUrl.toUri())
-                                    .setLabel(
-                                        stream.displayTitle ?: stream.language
-                                        ?: context.getString(
-                                            R.string.track_number_fmt,
-                                            stream.index
+                    } else {
+                        mediaSource.mediaStreams
+                            .filter { stream ->
+                                stream.type == MediaStreamType.SUBTITLE && stream.isExternal
+                            }
+                            .mapNotNull { stream ->
+                                try {
+                                    val subtitleUrl =
+                                        "${apiClient.baseUrl}/Videos/${fullItem.id}/${actualMediaSourceId}/Subtitles/${stream.index}/Stream.srt"
+                                    MediaItem.SubtitleConfiguration.Builder(subtitleUrl.toUri())
+                                        .setLabel(
+                                            stream.displayTitle
+                                                ?: stream.language
+                                                ?: context.getString(
+                                                    R.string.track_number_fmt,
+                                                    stream.index,
+                                                )
                                         )
-                                    )
-                                    .setMimeType(MimeTypes.APPLICATION_SUBRIP)
-                                    .setLanguage(stream.language ?: "eng")
-                                    .build()
-                            } catch (_: Exception) {
-                                null
+                                        .setMimeType(MimeTypes.APPLICATION_SUBRIP)
+                                        .setLanguage(stream.language ?: "eng")
+                                        .build()
+                                } catch (_: Exception) {
+                                    null
+                                }
                             }
-                        }
-                }
+                    }
 
-                val mediaItem = MediaItem.Builder()
-                    .setMediaId(fullItem.id.toString())
-                    .setUri(streamUrl)
-                    .setMediaMetadata(
-                        MediaMetadata.Builder()
-                            .setTitle(fullItem.name)
-                            .build()
-                    )
-                    .setSubtitleConfigurations(externalSubtitles)
-                    .build()
+                val mediaItem =
+                    MediaItem.Builder()
+                        .setMediaId(fullItem.id.toString())
+                        .setUri(streamUrl)
+                        .setMediaMetadata(MediaMetadata.Builder().setTitle(fullItem.name).build())
+                        .setSubtitleConfigurations(externalSubtitles)
+                        .build()
 
                 withContext(Dispatchers.Main) {
                     player.setMediaItems(listOf(mediaItem), 0, startPositionMs)
@@ -836,18 +872,15 @@ class PlayerViewModel @Inject constructor(
                 it.copy(
                     isLoading = false,
                     showError = true,
-                    errorMessage = context.getString(R.string.error_unexpected)
+                    errorMessage = context.getString(R.string.error_unexpected),
                 )
             }
         }
         updateCurrentTrackSelections()
     }
 
-    private suspend fun loadLiveChannel(
-        channelId: UUID,
-        channelName: String,
-        streamUrl: String
-    ) {
+    private suspend fun loadLiveChannel(channelId: UUID, channelName: String, streamUrl: String) {
+        stopAudiobookshelfIfPlaying()
         mpvLiveAutoHideTriggered = false
 
         try {
@@ -862,11 +895,12 @@ class PlayerViewModel @Inject constructor(
                 mpv.setOption("http-header-fields", "allow-cross-protocol-redirects: true")
 
                 withContext(Dispatchers.Main) {
-                    val mediaItem = MediaItem.Builder()
-                        .setMediaId(channelId.toString())
-                        .setUri(streamUrl)
-                        .setMediaMetadata(MediaMetadata.Builder().setTitle(channelName).build())
-                        .build()
+                    val mediaItem =
+                        MediaItem.Builder()
+                            .setMediaId(channelId.toString())
+                            .setUri(streamUrl)
+                            .setMediaMetadata(MediaMetadata.Builder().setTitle(channelName).build())
+                            .build()
 
                     player.setMediaItem(mediaItem)
                     player.prepare()
@@ -874,19 +908,21 @@ class PlayerViewModel @Inject constructor(
                     showControls()
                 }
             } else if (player is ExoPlayer) {
-                val dataSourceFactory = androidx.media3.datasource.DefaultHttpDataSource.Factory()
-                    .setUserAgent(userAgent)
-                    .setAllowCrossProtocolRedirects(true)
-                    .setKeepPostFor302Redirects(true)
-                    .setConnectTimeoutMs(15000)
-                    .setReadTimeoutMs(15000)
-
-                val mediaItem = MediaItem.Builder()
-                    .setMediaId(channelId.toString())
-                    .setUri(streamUrl)
-                    .setMimeType(MimeTypes.APPLICATION_M3U8)
-                    .setMediaMetadata(MediaMetadata.Builder().setTitle(channelName).build())
-                    .build()
+                val dataSourceFactory =
+                    androidx.media3.datasource.DefaultHttpDataSource.Factory()
+                        .setUserAgent(userAgent)
+                        .setAllowCrossProtocolRedirects(true)
+                        .setKeepPostFor302Redirects(true)
+                        .setConnectTimeoutMs(15000)
+                        .setReadTimeoutMs(15000)
+
+                val mediaItem =
+                    MediaItem.Builder()
+                        .setMediaId(channelId.toString())
+                        .setUri(streamUrl)
+                        .setMimeType(MimeTypes.APPLICATION_M3U8)
+                        .setMediaMetadata(MediaMetadata.Builder().setTitle(channelName).build())
+                        .build()
 
                 val hlsMediaSource =
                     androidx.media3.exoplayer.hls.HlsMediaSource.Factory(dataSourceFactory)
@@ -901,23 +937,20 @@ class PlayerViewModel @Inject constructor(
                 }
             }
 
-            val channelItem = AfinityChannel(
-                id = channelId,
-                name = channelName,
-                images = AfinityImages(),
-                channelType = ChannelType.TV,
-                channelNumber = null,
-                serviceName = null
-            )
+            val channelItem =
+                AfinityChannel(
+                    id = channelId,
+                    name = channelName,
+                    images = AfinityImages(),
+                    channelType = ChannelType.TV,
+                    channelNumber = null,
+                    serviceName = null,
+                )
 
             currentItem = channelItem
 
             updateUiState {
-                it.copy(
-                    isLoading = false,
-                    isLiveChannel = true,
-                    currentItem = channelItem
-                )
+                it.copy(isLoading = false, isLiveChannel = true, currentItem = channelItem)
             }
         } catch (e: Exception) {
             Timber.e(e, "Failed to load live channel")
@@ -925,7 +958,7 @@ class PlayerViewModel @Inject constructor(
                 it.copy(
                     isLoading = false,
                     showError = true,
-                    errorMessage = context.getString(R.string.error_load_live_channel)
+                    errorMessage = context.getString(R.string.error_load_live_channel),
                 )
             }
         }
@@ -934,23 +967,24 @@ class PlayerViewModel @Inject constructor(
     private fun loadTrickplayData() {
         val currentItem = uiState.value.currentItem ?: return
 
-        val trickplayInfo = when (currentItem) {
-            is AfinityEpisode -> {
-                currentItem.trickplayInfo?.values?.firstOrNull()
-            }
-
-            is com.makd.afinity.data.models.media.AfinityMovie -> {
-                currentItem.trickplayInfo?.values?.firstOrNull()
-            }
+        val trickplayInfo =
+            when (currentItem) {
+                is AfinityEpisode -> {
+                    currentItem.trickplayInfo?.values?.firstOrNull()
+                }
 
-            else -> {
-                if (currentItem is com.makd.afinity.data.models.media.AfinitySources) {
+                is com.makd.afinity.data.models.media.AfinityMovie -> {
                     currentItem.trickplayInfo?.values?.firstOrNull()
-                } else {
-                    null
+                }
+
+                else -> {
+                    if (currentItem is com.makd.afinity.data.models.media.AfinitySources) {
+                        currentItem.trickplayInfo?.values?.firstOrNull()
+                    } else {
+                        null
+                    }
                 }
             }
-        }
 
         trickplayInfo?.let { info ->
             viewModelScope.launch {
@@ -958,34 +992,42 @@ class PlayerViewModel @Inject constructor(
                     withContext(Dispatchers.Default) {
                         val thumbnailsPerTile = info.tileWidth * info.tileHeight
                         val maxTileIndex =
-                            kotlin.math.ceil(info.thumbnailCount.toDouble() / thumbnailsPerTile)
+                            kotlin.math
+                                .ceil(info.thumbnailCount.toDouble() / thumbnailsPerTile)
                                 .toInt()
 
                         val individualThumbnails = mutableListOf<ImageBitmap>()
 
                         for (tileIndex in 0..maxTileIndex) {
-                            val imageData = mediaRepository.getTrickplayData(
-                                currentItem.id,
-                                info.width,
-                                tileIndex
-                            )
+                            val imageData =
+                                mediaRepository.getTrickplayData(
+                                    currentItem.id,
+                                    info.width,
+                                    tileIndex,
+                                )
                             if (imageData != null) {
                                 val tileBitmap =
                                     BitmapFactory.decodeByteArray(imageData, 0, imageData.size)
-                                for (offsetY in 0 until (info.height * info.tileHeight) step info.height) {
-                                    for (offsetX in 0 until (info.width * info.tileWidth) step info.width) {
+                                for (offsetY in
+                                    0 until (info.height * info.tileHeight) step info.height) {
+                                    for (offsetX in
+                                        0 until (info.width * info.tileWidth) step info.width) {
                                         try {
-                                            val thumbnail = Bitmap.createBitmap(
-                                                tileBitmap,
-                                                offsetX,
-                                                offsetY,
-                                                info.width,
-                                                info.height
-                                            )
+                                            val thumbnail =
+                                                Bitmap.createBitmap(
+                                                    tileBitmap,
+                                                    offsetX,
+                                                    offsetY,
+                                                    info.width,
+                                                    info.height,
+                                                )
                                             individualThumbnails.add(thumbnail.asImageBitmap())
-                                            if (individualThumbnails.size >= info.thumbnailCount) break
+                                            if (individualThumbnails.size >= info.thumbnailCount)
+                                                break
                                         } catch (_: Exception) {
-                                            Timber.w("Failed to crop thumbnail at offset ($offsetX, $offsetY)")
+                                            Timber.w(
+                                                "Failed to crop thumbnail at offset ($offsetX, $offsetY)"
+                                            )
                                         }
                                     }
                                     if (individualThumbnails.size >= info.thumbnailCount) break
@@ -999,12 +1041,12 @@ class PlayerViewModel @Inject constructor(
                         }
 
                         if (individualThumbnails.isNotEmpty()) {
-                            currentTrickplay = Trickplay(
-                                interval = info.interval,
-                                images = individualThumbnails
-                            )
+                            currentTrickplay =
+                                Trickplay(interval = info.interval, images = individualThumbnails)
                         } else {
-                            Timber.d("No trickplay thumbnails could be extracted for ${currentItem.name}")
+                            Timber.d(
+                                "No trickplay thumbnails could be extracted for ${currentItem.name}"
+                            )
                         }
                     }
                 } catch (e: Exception) {
@@ -1021,44 +1063,47 @@ class PlayerViewModel @Inject constructor(
 
     fun switchToTrack(trackType: @C.TrackType Int, index: Int) {
         if (index == -1) {
-            player.trackSelectionParameters = player.trackSelectionParameters
-                .buildUpon()
-                .clearOverridesOfType(trackType)
-                .setTrackTypeDisabled(trackType, true)
-                .build()
+            player.trackSelectionParameters =
+                player.trackSelectionParameters
+                    .buildUpon()
+                    .clearOverridesOfType(trackType)
+                    .setTrackTypeDisabled(trackType, true)
+                    .build()
         } else {
-            val tracksGroups = player.currentTracks.groups.filter {
-                it.type == trackType && it.isSupported
-            }
+            val tracksGroups =
+                player.currentTracks.groups.filter { it.type == trackType && it.isSupported }
 
             if (index < tracksGroups.size) {
-                player.trackSelectionParameters = player.trackSelectionParameters
-                    .buildUpon()
-                    .setOverrideForType(
-                        TrackSelectionOverride(tracksGroups[index].mediaTrackGroup, 0)
-                    )
-                    .setTrackTypeDisabled(trackType, false)
-                    .build()
+                player.trackSelectionParameters =
+                    player.trackSelectionParameters
+                        .buildUpon()
+                        .setOverrideForType(
+                            TrackSelectionOverride(tracksGroups[index].mediaTrackGroup, 0)
+                        )
+                        .setTrackTypeDisabled(trackType, false)
+                        .build()
             }
         }
         updateCurrentTrackSelections()
     }
 
     private fun updateCurrentTrackSelections() {
-        val currentAudioTrackIndex = player.currentTracks.groups
-            .filter { it.type == C.TRACK_TYPE_AUDIO && it.isSupported }
-            .indexOfFirst { it.isSelected }
-            .takeIf { it != -1 }
-
-        val currentSubtitleTrackIndex = player.currentTracks.groups
-            .filter { it.type == C.TRACK_TYPE_TEXT && it.isSupported }
-            .indexOfFirst { it.isSelected }
-            .takeIf { it != -1 }
+        val currentAudioTrackIndex =
+            player.currentTracks.groups
+                .filter { it.type == C.TRACK_TYPE_AUDIO && it.isSupported }
+                .indexOfFirst { it.isSelected }
+                .takeIf { it != -1 }
+
+        val currentSubtitleTrackIndex =
+            player.currentTracks.groups
+                .filter { it.type == C.TRACK_TYPE_TEXT && it.isSupported }
+                .indexOfFirst { it.isSelected }
+                .takeIf { it != -1 }
 
         updateUiState {
             it.copy(
                 audioStreamIndex = currentAudioTrackIndex,
-                subtitleStreamIndex = currentSubtitleTrackIndex
+                subtitleStreamIndex = currentSubtitleTrackIndex,
             )
         }
     }
@@ -1073,7 +1118,7 @@ class PlayerViewModel @Inject constructor(
                     audioStreamIndex = 0,
                     subtitleStreamIndex = null,
                     playMethod = "DirectPlay",
-                    canSeek = true
+                    canSeek = true,
                 )
             }
         } catch (e: Exception) {
@@ -1082,12 +1127,13 @@ class PlayerViewModel @Inject constructor(
     }
 
     private suspend fun loadSegments(itemId: UUID) {
-        currentMediaSegments = try {
-            segmentsRepository.getSegments(itemId)
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to load segments for item $itemId")
-            emptyList()
-        }
+        currentMediaSegments =
+            try {
+                segmentsRepository.getSegments(itemId)
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to load segments for item $itemId")
+                emptyList()
+            }
 
         if (currentMediaSegments.isNotEmpty()) {
             startSegmentMonitoring()
@@ -1098,13 +1144,14 @@ class PlayerViewModel @Inject constructor(
 
     private fun startSegmentMonitoring() {
         segmentCheckingJob?.cancel()
-        segmentCheckingJob = viewModelScope.launch {
-            delay(2000L)
-            while (true) {
-                updateCurrentSegment()
-                delay(1000L)
+        segmentCheckingJob =
+            viewModelScope.launch {
+                delay(2000L)
+                while (true) {
+                    updateCurrentSegment()
+                    delay(1000L)
+                }
             }
-        }
     }
 
     private suspend fun updateCurrentSegment() {
@@ -1112,19 +1159,21 @@ class PlayerViewModel @Inject constructor(
 
         val currentPositionMs = uiState.value.currentPosition
 
-        val currentSegment = currentMediaSegments.find { segment ->
-            currentPositionMs in segment.startTicks..<(segment.endTicks - 100L)
-        }
+        val currentSegment =
+            currentMediaSegments.find { segment ->
+                currentPositionMs in segment.startTicks..<(segment.endTicks - 100L)
+            }
 
         currentSegment?.let { segment ->
             val skipIntroEnabled = preferencesRepository.getSkipIntroEnabled()
             val skipOutroEnabled = preferencesRepository.getSkipOutroEnabled()
 
-            val shouldShowSkipButton = when (segment.type) {
-                AfinitySegmentType.INTRO -> skipIntroEnabled
-                AfinitySegmentType.OUTRO -> skipOutroEnabled
-                else -> false
-            }
+            val shouldShowSkipButton =
+                when (segment.type) {
+                    AfinitySegmentType.INTRO -> skipIntroEnabled
+                    AfinitySegmentType.OUTRO -> skipOutroEnabled
+                    else -> false
+                }
 
             if (shouldShowSkipButton) {
                 val skipButtonText = getSkipButtonText(segment)
@@ -1132,25 +1181,13 @@ class PlayerViewModel @Inject constructor(
                     it.copy(
                         currentSegment = segment,
                         skipButtonText = skipButtonText,
-                        showSkipButton = true
+                        showSkipButton = true,
                     )
                 }
             } else {
-                updateUiState {
-                    it.copy(
-                        currentSegment = null,
-                        showSkipButton = false
-                    )
-                }
-            }
-        } ?: run {
-            updateUiState {
-                it.copy(
-                    currentSegment = null,
-                    showSkipButton = false
-                )
+                updateUiState { it.copy(currentSegment = null, showSkipButton = false) }
             }
-        }
+        } ?: run { updateUiState { it.copy(currentSegment = null, showSkipButton = false) } }
     }
 
     private fun getSkipButtonText(segment: AfinitySegment): String {
@@ -1223,9 +1260,7 @@ class PlayerViewModel @Inject constructor(
 
     fun jumpToEpisode(episodeId: UUID) {
         viewModelScope.launch {
-            playlistManager.jumpToItem(episodeId)?.let { targetItem ->
-                playQueueItem(targetItem)
-            }
+            playlistManager.jumpToItem(episodeId)?.let { targetItem -> playQueueItem(targetItem) }
         }
     }
 
@@ -1251,13 +1286,14 @@ class PlayerViewModel @Inject constructor(
 
             if (currentChapterIndex != -1) {
                 val currentChapter = chapters[currentChapterIndex]
-                val targetPosition = if (currentPos - currentChapter.startPosition > 3000) {
-                    currentChapter.startPosition
-                } else if (currentChapterIndex > 0) {
-                    chapters[currentChapterIndex - 1].startPosition
-                } else {
-                    0L
-                }
+                val targetPosition =
+                    if (currentPos - currentChapter.startPosition > 3000) {
+                        currentChapter.startPosition
+                    } else if (currentChapterIndex > 0) {
+                        chapters[currentChapterIndex - 1].startPosition
+                    } else {
+                        0L
+                    }
                 handlePlayerEvent(PlayerEvent.Seek(targetPosition))
                 return
             }
@@ -1272,7 +1308,7 @@ class PlayerViewModel @Inject constructor(
                 mediaSourceId = item.sources.firstOrNull()?.id ?: "",
                 audioStreamIndex = null,
                 subtitleStreamIndex = null,
-                startPositionMs = 0L
+                startPositionMs = 0L,
             )
         )
     }
@@ -1283,24 +1319,21 @@ class PlayerViewModel @Inject constructor(
         var currentLevel = _uiState.value.brightnessLevel
         if (currentLevel < 0f) currentLevel = getSystemBrightness()
 
-        val newBrightness = if (isAbsolute) {
-            value.coerceIn(0.0f, 1.0f)
-        } else {
-            (currentLevel + value * gestureConfig.brightnessStepSize).coerceIn(0.0f, 1.0f)
-        }
+        val newBrightness =
+            if (isAbsolute) {
+                value.coerceIn(0.0f, 1.0f)
+            } else {
+                (currentLevel + value * gestureConfig.brightnessStepSize).coerceIn(0.0f, 1.0f)
+            }
 
-        updateUiState {
-            it.copy(
-                showBrightnessIndicator = true,
-                brightnessLevel = newBrightness
-            )
-        }
+        updateUiState { it.copy(showBrightnessIndicator = true, brightnessLevel = newBrightness) }
 
         brightnessHideJob?.cancel()
-        brightnessHideJob = viewModelScope.launch {
-            delay(2000)
-            updateUiState { it.copy(showBrightnessIndicator = false) }
-        }
+        brightnessHideJob =
+            viewModelScope.launch {
+                delay(2000)
+                updateUiState { it.copy(showBrightnessIndicator = false) }
+            }
     }
 
     private var volumeHideJob: Job? = null
@@ -1318,7 +1351,7 @@ class PlayerViewModel @Inject constructor(
                 it.copy(
                     showTrickplayPreview = false,
                     trickplayPreviewImage = null,
-                    trickplayPreviewPosition = 0L
+                    trickplayPreviewPosition = 0L,
                 )
             }
             return
@@ -1334,7 +1367,7 @@ class PlayerViewModel @Inject constructor(
                 it.copy(
                     showTrickplayPreview = true,
                     trickplayPreviewImage = trickplay.images[index],
-                    trickplayPreviewPosition = position
+                    trickplayPreviewPosition = position,
                 )
             }
         }
@@ -1369,10 +1402,7 @@ class PlayerViewModel @Inject constructor(
 
     fun showControls() {
         updateUiState {
-            it.copy(
-                showControls = true,
-                showPlayButton = !uiState.value.isControlsLocked
-            )
+            it.copy(showControls = true, showPlayButton = !uiState.value.isControlsLocked)
         }
         startControlsAutoHide()
     }
@@ -1382,17 +1412,21 @@ class PlayerViewModel @Inject constructor(
         controlsHideJob?.cancel()
     }
 
-
     private fun startControlsAutoHide() {
         controlsHideJob?.cancel()
-        controlsHideJob = viewModelScope.launch {
-            delay(3000)
-            if (uiState.value.isPlaying && uiState.value.showControls && !uiState.value.isSeeking) {
-                hideControls()
-            } else if (uiState.value.isSeeking) {
-                startControlsAutoHide()
+        controlsHideJob =
+            viewModelScope.launch {
+                delay(3000)
+                if (
+                    uiState.value.isPlaying &&
+                        uiState.value.showControls &&
+                        !uiState.value.isSeeking
+                ) {
+                    hideControls()
+                } else if (uiState.value.isSeeking) {
+                    startControlsAutoHide()
+                }
             }
-        }
     }
 
     override fun onCleared() {
@@ -1409,9 +1443,7 @@ class PlayerViewModel @Inject constructor(
     }
 
     fun onPipModeChanged(isInPictureInPictureMode: Boolean) {
-        _uiState.value = _uiState.value.copy(
-            isInPictureInPictureMode = isInPictureInPictureMode
-        )
+        _uiState.value = _uiState.value.copy(isInPictureInPictureMode = isInPictureInPictureMode)
 
         if (isInPictureInPictureMode) {
             hideControls()
@@ -1466,7 +1498,7 @@ class PlayerViewModel @Inject constructor(
         val isControlsVisible: Boolean = true,
         val videoZoomMode: VideoZoomMode = VideoZoomMode.FIT,
         val logoAutoHide: Boolean = false,
-        val isLiveChannel: Boolean = false
+        val isLiveChannel: Boolean = false,
     )
 }
 
@@ -1476,5 +1508,5 @@ private data class MpvPrefsSnapshot(
     val audioOutput: String,
     val subtitlePrefs: SubtitlePreferences,
     val preferredAudioLanguage: String,
-    val preferredSubtitleLanguage: String
-)
\ No newline at end of file
+    val preferredSubtitleLanguage: String,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/player/PlayerWrapperViewModel.kt b/app/src/main/java/com/makd/afinity/ui/player/PlayerWrapperViewModel.kt
index e6cc1b687..b36e8243e 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/PlayerWrapperViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/PlayerWrapperViewModel.kt
@@ -14,22 +14,24 @@ import com.makd.afinity.data.repository.JellyfinRepository
 import com.makd.afinity.data.repository.livetv.LiveTvRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import java.util.UUID
+import javax.inject.Inject
 import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import java.util.UUID
-import javax.inject.Inject
 
 @HiltViewModel
-class PlayerWrapperViewModel @Inject constructor(
+class PlayerWrapperViewModel
+@Inject
+constructor(
     @ApplicationContext private val context: Context,
     private val jellyfinRepository: JellyfinRepository,
     private val databaseRepository: DatabaseRepository,
     private val sessionManager: SessionManager,
-    private val liveTvRepository: LiveTvRepository
+    private val liveTvRepository: LiveTvRepository,
 ) : ViewModel() {
 
     private val _item = MutableStateFlow<AfinityItem?>(null)
@@ -50,33 +52,36 @@ class PlayerWrapperViewModel @Inject constructor(
             _streamError.value = null
             Timber.d("PlayerWrapperViewModel: Loading live channel $channelId ($channelName)")
 
-            val placeholderChannel = AfinityChannel(
-                id = channelId,
-                name = channelName,
-                images = AfinityImages(),
-                channelNumber = null,
-                channelType = ChannelType.TV,
-                serviceName = null
-            )
+            val placeholderChannel =
+                AfinityChannel(
+                    id = channelId,
+                    name = channelName,
+                    images = AfinityImages(),
+                    channelNumber = null,
+                    channelType = ChannelType.TV,
+                    serviceName = null,
+                )
             _item.value = placeholderChannel
 
             try {
-                val channelDeferred = viewModelScope.async {
-                    try {
-                        liveTvRepository.getChannel(channelId)
-                    } catch (e: Exception) {
-                        Timber.w(e, "Failed to load channel details, using placeholder")
-                        null
+                val channelDeferred =
+                    viewModelScope.async {
+                        try {
+                            liveTvRepository.getChannel(channelId)
+                        } catch (e: Exception) {
+                            Timber.w(e, "Failed to load channel details, using placeholder")
+                            null
+                        }
                     }
-                }
 
-                val streamUrlDeferred = viewModelScope.async {
-                    liveTvRepository.getChannelStreamUrl(channelId)
-                }
+                val streamUrlDeferred =
+                    viewModelScope.async { liveTvRepository.getChannelStreamUrl(channelId) }
 
                 val channel = channelDeferred.await()
                 if (channel != null) {
-                    Timber.d("PlayerWrapperViewModel: Loaded live channel from API: ${channel.name}")
+                    Timber.d(
+                        "PlayerWrapperViewModel: Loaded live channel from API: ${channel.name}"
+                    )
                     _item.value = channel
                 }
 
@@ -104,20 +109,27 @@ class PlayerWrapperViewModel @Inject constructor(
             try {
                 var loadedItem: AfinityItem? = null
 
-                val userId = sessionManager.currentSession.value?.userId ?: run {
-                    Timber.w("No active session found in PlayerWrapperViewModel, trying DB fallback")
-                    databaseRepository.getAllUsers().firstOrNull()?.id
-                }
+                val userId =
+                    sessionManager.currentSession.value?.userId
+                        ?: run {
+                            Timber.w(
+                                "No active session found in PlayerWrapperViewModel, trying DB fallback"
+                            )
+                            databaseRepository.getAllUsers().firstOrNull()?.id
+                        }
 
                 if (userId != null) {
                     Timber.d("PlayerWrapperViewModel: Using userId: $userId")
 
                     try {
-                        loadedItem = databaseRepository.getMovie(itemId, userId)
-                            ?: databaseRepository.getEpisode(itemId, userId)
+                        loadedItem =
+                            databaseRepository.getMovie(itemId, userId)
+                                ?: databaseRepository.getEpisode(itemId, userId)
 
                         if (loadedItem != null) {
-                            Timber.d("PlayerWrapperViewModel: Loaded item from database: ${loadedItem.name}")
+                            Timber.d(
+                                "PlayerWrapperViewModel: Loaded item from database: ${loadedItem.name}"
+                            )
                         }
                     } catch (e: Exception) {
                         Timber.w(e, "PlayerWrapperViewModel: Database lookup failed")
@@ -131,7 +143,9 @@ class PlayerWrapperViewModel @Inject constructor(
                     try {
                         loadedItem = jellyfinRepository.getItemById(itemId)
                         if (loadedItem != null) {
-                            Timber.d("PlayerWrapperViewModel: Loaded item from API: ${loadedItem.name}")
+                            Timber.d(
+                                "PlayerWrapperViewModel: Loaded item from API: ${loadedItem.name}"
+                            )
                         } else {
                             Timber.w("PlayerWrapperViewModel: Item not found via API")
                         }
@@ -141,7 +155,9 @@ class PlayerWrapperViewModel @Inject constructor(
                 }
 
                 if (loadedItem == null) {
-                    Timber.e("PlayerWrapperViewModel: Failed to load item from both database and API")
+                    Timber.e(
+                        "PlayerWrapperViewModel: Failed to load item from both database and API"
+                    )
                 }
 
                 _item.value = loadedItem
@@ -153,4 +169,4 @@ class PlayerWrapperViewModel @Inject constructor(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/PlaylistManager.kt b/app/src/main/java/com/makd/afinity/ui/player/PlaylistManager.kt
index fe80b39ea..b20bd2ed5 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/PlaylistManager.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/PlaylistManager.kt
@@ -4,26 +4,24 @@ import com.makd.afinity.data.models.common.SortBy
 import com.makd.afinity.data.models.media.AfinityEpisode
 import com.makd.afinity.data.models.media.AfinityItem
 import com.makd.afinity.data.repository.JellyfinRepository
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import timber.log.Timber
-import java.util.UUID
-import javax.inject.Inject
-import javax.inject.Singleton
 
 data class PlaylistState(
     val queue: List<AfinityItem> = emptyList(),
     val currentIndex: Int = -1,
     val hasNext: Boolean = false,
     val hasPrevious: Boolean = false,
-    val currentItem: AfinityItem? = null
+    val currentItem: AfinityItem? = null,
 )
 
 @Singleton
-class PlaylistManager @Inject constructor(
-    private val jellyfinRepository: JellyfinRepository
-) {
+class PlaylistManager @Inject constructor(private val jellyfinRepository: JellyfinRepository) {
     private val _playlistState = MutableStateFlow(PlaylistState())
     val playlistState: StateFlow<PlaylistState> = _playlistState.asStateFlow()
 
@@ -32,7 +30,11 @@ class PlaylistManager @Inject constructor(
     private var currentSeriesId: UUID? = null
 
     suspend fun initializePlaylist(startingItem: AfinityItem, seasonId: UUID? = null): Boolean {
-        if (startingItem is AfinityEpisode && currentSeriesId == startingItem.seriesId && currentQueue.isNotEmpty()) {
+        if (
+            startingItem is AfinityEpisode &&
+                currentSeriesId == startingItem.seriesId &&
+                currentQueue.isNotEmpty()
+        ) {
             val existingIndex = currentQueue.indexOfFirst { it.id == startingItem.id }
             if (existingIndex != -1) {
                 currentIndex = existingIndex
@@ -42,17 +44,18 @@ class PlaylistManager @Inject constructor(
         }
 
         return try {
-            val result = when (startingItem) {
-                is AfinityEpisode -> {
-                    currentSeriesId = startingItem.seriesId
-                    initializeEpisodeQueue(startingItem, seasonId)
-                }
+            val result =
+                when (startingItem) {
+                    is AfinityEpisode -> {
+                        currentSeriesId = startingItem.seriesId
+                        initializeEpisodeQueue(startingItem, seasonId)
+                    }
 
-                else -> {
-                    currentSeriesId = null
-                    initializeSingleItemQueue(startingItem)
+                    else -> {
+                        currentSeriesId = null
+                        initializeSingleItemQueue(startingItem)
+                    }
                 }
-            }
             result
         } catch (e: Exception) {
             Timber.e(e, "Failed to initialize playlist")
@@ -62,7 +65,7 @@ class PlaylistManager @Inject constructor(
 
     private suspend fun initializeEpisodeQueue(
         startingEpisode: AfinityEpisode,
-        seasonId: UUID? = null
+        seasonId: UUID? = null,
     ): Boolean {
         return try {
             if (seasonId != null) {
@@ -89,11 +92,12 @@ class PlaylistManager @Inject constructor(
             }
 
             Timber.d("Loading episodes for entire series")
-            val seasons = jellyfinRepository.getSeasons(
-                startingEpisode.seriesId,
-                SortBy.NAME,
-                sortDescending = false
-            )
+            val seasons =
+                jellyfinRepository.getSeasons(
+                    startingEpisode.seriesId,
+                    SortBy.NAME,
+                    sortDescending = false,
+                )
 
             if (seasons.isEmpty()) {
                 setQueue(listOf(startingEpisode), 0)
@@ -114,11 +118,11 @@ class PlaylistManager @Inject constructor(
                     if (allEpisodes.isNotEmpty()) {
                         setQueue(
                             allEpisodes.map { it as AfinityItem },
-                            allEpisodes.indexOfFirst { it.id == startingEpisode.id }
-                                .coerceAtLeast(0)
+                            allEpisodes
+                                .indexOfFirst { it.id == startingEpisode.id }
+                                .coerceAtLeast(0),
                         )
                     }
-
                 } catch (_: Exception) {
                     Timber.w("Failed to load episodes for season ${season.indexNumber}")
                 }
@@ -243,33 +247,38 @@ class PlaylistManager @Inject constructor(
             return
         }
 
-        val resumableIndex = currentQueue.indexOfFirst { item ->
-            item.playbackPositionTicks > 0 && item.playbackPositionTicks < item.runtimeTicks
-        }
-
-        val unwatchedIndex = if (resumableIndex == -1) {
+        val resumableIndex =
             currentQueue.indexOfFirst { item ->
-                !item.played && item.playbackPositionTicks == 0L
+                item.playbackPositionTicks > 0 && item.playbackPositionTicks < item.runtimeTicks
+            }
+
+        val unwatchedIndex =
+            if (resumableIndex == -1) {
+                currentQueue.indexOfFirst { item ->
+                    !item.played && item.playbackPositionTicks == 0L
+                }
+            } else {
+                -1
             }
-        } else {
-            -1
-        }
 
         val priorityIndex = if (resumableIndex != -1) resumableIndex else unwatchedIndex
 
         if (priorityIndex != -1) {
             val priorityEpisode = currentQueue[priorityIndex]
-            val remainingEpisodes = currentQueue.toMutableList().apply {
-                removeAt(priorityIndex)
-                shuffle()
-            }
+            val remainingEpisodes =
+                currentQueue.toMutableList().apply {
+                    removeAt(priorityIndex)
+                    shuffle()
+                }
 
             currentQueue.clear()
             currentQueue.add(priorityEpisode)
             currentQueue.addAll(remainingEpisodes)
             currentIndex = 0
 
-            Timber.d("Queue shuffled with priority episode: ${priorityEpisode.name} (${currentQueue.size} total items)")
+            Timber.d(
+                "Queue shuffled with priority episode: ${priorityEpisode.name} (${currentQueue.size} total items)"
+            )
         } else {
             currentQueue.shuffle()
             currentIndex = 0
@@ -281,14 +290,17 @@ class PlaylistManager @Inject constructor(
     }
 
     private fun updatePlaylistState() {
-        _playlistState.value = PlaylistState(
-            queue = currentQueue.toList(),
-            currentIndex = currentIndex,
-            hasNext = hasNext(),
-            hasPrevious = hasPrevious(),
-            currentItem = getCurrentItem()
-        )
+        _playlistState.value =
+            PlaylistState(
+                queue = currentQueue.toList(),
+                currentIndex = currentIndex,
+                hasNext = hasNext(),
+                hasPrevious = hasPrevious(),
+                currentItem = getCurrentItem(),
+            )
 
-        Timber.d("Playlist state updated: index=$currentIndex, hasNext=${hasNext()}, hasPrevious=${hasPrevious()}")
+        Timber.d(
+            "Playlist state updated: index=$currentIndex, hasNext=${hasNext()}, hasPrevious=${hasPrevious()}"
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/components/BufferingIndicator.kt b/app/src/main/java/com/makd/afinity/ui/player/components/BufferingIndicator.kt
index 58381fc86..76f576529 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/components/BufferingIndicator.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/components/BufferingIndicator.kt
@@ -34,34 +34,28 @@ fun ErrorIndicator(
     isVisible: Boolean,
     errorMessage: String?,
     onRetryClick: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     AnimatedVisibility(
         visible = isVisible,
         enter = scaleIn(animationSpec = tween(200)) + fadeIn(),
         exit = scaleOut(animationSpec = tween(200)) + fadeOut(),
-        modifier = modifier
+        modifier = modifier,
     ) {
         Card(
-            modifier = Modifier
-                .widthIn(max = 300.dp)
-                .clip(RoundedCornerShape(16.dp)),
-            colors = CardDefaults.cardColors(
-                containerColor = Color.Black.copy(alpha = 0.9f)
-            )
+            modifier = Modifier.widthIn(max = 300.dp).clip(RoundedCornerShape(16.dp)),
+            colors = CardDefaults.cardColors(containerColor = Color.Black.copy(alpha = 0.9f)),
         ) {
             Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(24.dp),
+                modifier = Modifier.fillMaxWidth().padding(24.dp),
                 horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.spacedBy(16.dp)
+                verticalArrangement = Arrangement.spacedBy(16.dp),
             ) {
                 Text(
                     text = stringResource(R.string.player_error_title),
                     color = Color.White,
                     fontSize = 18.sp,
-                    fontWeight = FontWeight.Bold
+                    fontWeight = FontWeight.Bold,
                 )
 
                 if (errorMessage != null) {
@@ -69,23 +63,24 @@ fun ErrorIndicator(
                         text = errorMessage,
                         color = Color.White.copy(alpha = 0.8f),
                         fontSize = 14.sp,
-                        lineHeight = 20.sp
+                        lineHeight = 20.sp,
                     )
                 }
 
                 Button(
                     onClick = onRetryClick,
-                    colors = ButtonDefaults.buttonColors(
-                        containerColor = MaterialTheme.colorScheme.primary
-                    )
+                    colors =
+                        ButtonDefaults.buttonColors(
+                            containerColor = MaterialTheme.colorScheme.primary
+                        ),
                 ) {
                     Text(
                         text = stringResource(R.string.action_retry),
                         color = Color.White,
-                        fontWeight = FontWeight.Medium
+                        fontWeight = FontWeight.Medium,
                     )
                 }
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/components/EpisodeSwitcher.kt b/app/src/main/java/com/makd/afinity/ui/player/components/EpisodeSwitcher.kt
index e3bb792c0..6f73ec656 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/components/EpisodeSwitcher.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/components/EpisodeSwitcher.kt
@@ -74,11 +74,10 @@ fun EpisodeSwitcher(
     isPlaying: Boolean,
     onEpisodeClick: (UUID) -> Unit,
     onDismiss: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
-    val listState = rememberLazyListState(
-        initialFirstVisibleItemIndex = (currentIndex - 1).coerceAtLeast(0)
-    )
+    val listState =
+        rememberLazyListState(initialFirstVisibleItemIndex = (currentIndex - 1).coerceAtLeast(0))
     LaunchedEffect(currentIndex) {
         if (currentIndex >= 0) {
             listState.animateScrollToItem((currentIndex - 1).coerceAtLeast(0))
@@ -86,103 +85,102 @@ fun EpisodeSwitcher(
     }
 
     Box(
-        modifier = modifier
-            .fillMaxSize()
-            .background(Color.Black.copy(alpha = 0.5f))
-            .clickable(
+        modifier =
+            modifier.fillMaxSize().background(Color.Black.copy(alpha = 0.5f)).clickable(
                 interactionSource = remember { MutableInteractionSource() },
-                indication = null
-            ) { onDismiss() },
-        contentAlignment = Alignment.CenterEnd
+                indication = null,
+            ) {
+                onDismiss()
+            },
+        contentAlignment = Alignment.CenterEnd,
     ) {
         AnimatedVisibility(
             visible = true,
             enter = slideInHorizontally { it } + fadeIn(),
-            modifier = Modifier.fillMaxHeight()
+            modifier = Modifier.fillMaxHeight(),
         ) {
             Surface(
-                modifier = Modifier
-                    .fillMaxHeight()
-                    .widthIn(min = 380.dp, max = 450.dp)
-                    .padding(16.dp)
-                    .clickable(
-                        interactionSource = remember { MutableInteractionSource() },
-                        indication = null
-                    ) { /* Consume clicks */ },
+                modifier =
+                    Modifier.fillMaxHeight()
+                        .widthIn(min = 380.dp, max = 450.dp)
+                        .padding(16.dp)
+                        .clickable(
+                            interactionSource = remember { MutableInteractionSource() },
+                            indication = null,
+                        ) { /* Consume clicks */
+                        },
                 shape = RoundedCornerShape(24.dp),
                 color = MaterialTheme.colorScheme.surface,
                 tonalElevation = 1.dp,
-                shadowElevation = 8.dp
+                shadowElevation = 8.dp,
             ) {
-                Column(
-                    modifier = Modifier.fillMaxSize()
-                ) {
+                Column(modifier = Modifier.fillMaxSize()) {
                     Row(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(top = 24.dp, start = 24.dp, end = 16.dp, bottom = 16.dp),
+                        modifier =
+                            Modifier.fillMaxWidth()
+                                .padding(top = 24.dp, start = 24.dp, end = 16.dp, bottom = 16.dp),
                         horizontalArrangement = Arrangement.SpaceBetween,
-                        verticalAlignment = Alignment.CenterVertically
+                        verticalAlignment = Alignment.CenterVertically,
                     ) {
                         Column {
                             Text(
                                 text = stringResource(R.string.player_up_next),
                                 style = MaterialTheme.typography.titleLarge,
                                 fontWeight = FontWeight.Bold,
-                                color = MaterialTheme.colorScheme.onSurface
+                                color = MaterialTheme.colorScheme.onSurface,
                             )
 
                             val currentSeason =
-                                (episodes.getOrNull(currentIndex) as? AfinityEpisode)?.parentIndexNumber
+                                (episodes.getOrNull(currentIndex) as? AfinityEpisode)
+                                    ?.parentIndexNumber
                             if (currentSeason != null) {
                                 Text(
-                                    text = stringResource(R.string.player_season_fmt, currentSeason),
+                                    text =
+                                        stringResource(R.string.player_season_fmt, currentSeason),
                                     style = MaterialTheme.typography.labelMedium,
                                     color = MaterialTheme.colorScheme.primary,
-                                    fontWeight = FontWeight.Medium
+                                    fontWeight = FontWeight.Medium,
                                 )
                             }
                         }
 
                         IconButton(
                             onClick = onDismiss,
-                            modifier = Modifier
-                                .background(
-                                    MaterialTheme.colorScheme.surfaceContainerHighest.copy(alpha = 0.5f),
-                                    CircleShape
-                                )
-                                .size(32.dp)
+                            modifier =
+                                Modifier.background(
+                                        MaterialTheme.colorScheme.surfaceContainerHighest.copy(
+                                            alpha = 0.5f
+                                        ),
+                                        CircleShape,
+                                    )
+                                    .size(32.dp),
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_close),
                                 contentDescription = stringResource(R.string.cd_close),
                                 tint = MaterialTheme.colorScheme.onSurface,
-                                modifier = Modifier.size(16.dp)
+                                modifier = Modifier.size(16.dp),
                             )
                         }
                     }
 
                     HorizontalDivider(
                         modifier = Modifier.padding(horizontal = 24.dp),
-                        color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.3f)
+                        color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.3f),
                     )
                     LazyColumn(
                         state = listState,
-                        contentPadding = PaddingValues(
-                            top = 16.dp,
-                            bottom = 24.dp,
-                            start = 12.dp,
-                            end = 12.dp
-                        ),
+                        contentPadding =
+                            PaddingValues(top = 16.dp, bottom = 24.dp, start = 12.dp, end = 12.dp),
                         verticalArrangement = Arrangement.spacedBy(8.dp),
-                        modifier = Modifier.fillMaxSize()
+                        modifier = Modifier.fillMaxSize(),
                     ) {
                         itemsIndexed(episodes) { index, item ->
                             EpisodeSwitcherCard(
                                 episode = item,
                                 isCurrentlyPlaying = index == currentIndex,
                                 isPlaying = isPlaying,
-                                onClick = { onEpisodeClick(item.id) }
+                                onClick = { onEpisodeClick(item.id) },
                             )
                         }
                     }
@@ -198,73 +196,73 @@ private fun EpisodeSwitcherCard(
     isCurrentlyPlaying: Boolean,
     isPlaying: Boolean,
     onClick: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
-    val backgroundColor = if (isCurrentlyPlaying) {
-        MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.4f)
-    } else {
-        Color.Transparent
-    }
+    val backgroundColor =
+        if (isCurrentlyPlaying) {
+            MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.4f)
+        } else {
+            Color.Transparent
+        }
 
-    val borderColor = if (isCurrentlyPlaying) {
-        MaterialTheme.colorScheme.primary.copy(alpha = 0.3f)
-    } else {
-        Color.Transparent
-    }
+    val borderColor =
+        if (isCurrentlyPlaying) {
+            MaterialTheme.colorScheme.primary.copy(alpha = 0.3f)
+        } else {
+            Color.Transparent
+        }
 
     Row(
-        modifier = modifier
-            .fillMaxWidth()
-            .clip(RoundedCornerShape(16.dp))
-            .background(backgroundColor)
-            .border(1.dp, borderColor, RoundedCornerShape(16.dp))
-            .clickable(onClick = onClick)
-            .padding(12.dp),
-        verticalAlignment = Alignment.CenterVertically
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(16.dp))
+                .background(backgroundColor)
+                .border(1.dp, borderColor, RoundedCornerShape(16.dp))
+                .clickable(onClick = onClick)
+                .padding(12.dp),
+        verticalAlignment = Alignment.CenterVertically,
     ) {
         Box(
-            modifier = Modifier
-                .width(140.dp)
-                .aspectRatio(16f / 9f)
-                .clip(RoundedCornerShape(12.dp))
-                .background(MaterialTheme.colorScheme.surfaceContainerHighest)
+            modifier =
+                Modifier.width(140.dp)
+                    .aspectRatio(16f / 9f)
+                    .clip(RoundedCornerShape(12.dp))
+                    .background(MaterialTheme.colorScheme.surfaceContainerHighest)
         ) {
             AsyncImage(
                 imageUrl = episode.images?.primaryImageUrl.toString(),
                 contentDescription = episode.name,
                 modifier = Modifier.fillMaxSize(),
                 contentScale = ContentScale.Crop,
-                blurHash = episode.images?.primaryBlurHash
+                blurHash = episode.images?.primaryBlurHash,
             )
 
             Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .background(
-                        Brush.verticalGradient(
-                            colors = listOf(Color.Transparent, Color.Black.copy(alpha = 0.6f)),
-                            startY = 50f
+                modifier =
+                    Modifier.fillMaxSize()
+                        .background(
+                            Brush.verticalGradient(
+                                colors = listOf(Color.Transparent, Color.Black.copy(alpha = 0.6f)),
+                                startY = 50f,
+                            )
                         )
-                    )
             )
 
             if (episode.played) {
                 Box(
-                    modifier = Modifier
-                        .align(Alignment.TopEnd)
-                        .padding(6.dp)
-                        .size(20.dp)
-                        .background(
-                            MaterialTheme.colorScheme.primary,
-                            CircleShape
-                        ),
-                    contentAlignment = Alignment.Center
+                    modifier =
+                        Modifier.align(Alignment.TopEnd)
+                            .padding(6.dp)
+                            .size(20.dp)
+                            .background(MaterialTheme.colorScheme.primary, CircleShape),
+                    contentAlignment = Alignment.Center,
                 ) {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_check),
                         contentDescription = stringResource(R.string.cd_watched_status),
                         tint = MaterialTheme.colorScheme.onPrimary,
-                        modifier = Modifier.size(12.dp)
+                        modifier = Modifier.size(12.dp),
                     )
                 }
             }
@@ -275,12 +273,10 @@ private fun EpisodeSwitcherCard(
                 if (progress > 0f && progress < 0.95f) {
                     LinearProgressIndicator(
                         progress = { progress },
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(3.dp)
-                            .align(Alignment.BottomCenter),
+                        modifier =
+                            Modifier.fillMaxWidth().height(3.dp).align(Alignment.BottomCenter),
                         color = MaterialTheme.colorScheme.primary,
-                        trackColor = Color.White.copy(alpha = 0.2f)
+                        trackColor = Color.White.copy(alpha = 0.2f),
                     )
                 }
             }
@@ -289,18 +285,18 @@ private fun EpisodeSwitcherCard(
                 Surface(
                     color = Color.Black.copy(alpha = 0.75f),
                     shape = RoundedCornerShape(4.dp),
-                    modifier = Modifier
-                        .align(Alignment.BottomEnd)
-                        .padding(6.dp)
+                    modifier = Modifier.align(Alignment.BottomEnd).padding(6.dp),
                 ) {
                     val minutesFmt = stringResource(R.string.time_minutes_short)
                     val secondsFmt = stringResource(R.string.time_seconds_short)
-                    val runtimeText = remember(episode.runtimeTicks) {
-                        val totalSeconds = episode.runtimeTicks / 10000000
-                        val minutes = totalSeconds / 60
-                        val seconds = totalSeconds % 60
-                        if (minutes > 0) String.format(minutesFmt, minutes) else String.format(secondsFmt, seconds)
-                    }
+                    val runtimeText =
+                        remember(episode.runtimeTicks) {
+                            val totalSeconds = episode.runtimeTicks / 10000000
+                            val minutes = totalSeconds / 60
+                            val seconds = totalSeconds % 60
+                            if (minutes > 0) String.format(minutesFmt, minutes)
+                            else String.format(secondsFmt, seconds)
+                        }
 
                     Text(
                         text = runtimeText,
@@ -308,41 +304,39 @@ private fun EpisodeSwitcherCard(
                         color = Color.White,
                         fontSize = 10.sp,
                         fontWeight = FontWeight.Bold,
-                        modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp)
+                        modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp),
                     )
                 }
             }
 
             if (isCurrentlyPlaying) {
-                val composition by rememberLottieComposition(
-                    LottieCompositionSpec.Asset("anim_equalizer.lottie")
-                )
+                val composition by
+                    rememberLottieComposition(LottieCompositionSpec.Asset("anim_equalizer.lottie"))
 
                 Box(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .background(Color.Black.copy(alpha = 0.3f)),
-                    contentAlignment = Alignment.Center
+                    modifier = Modifier.fillMaxSize().background(Color.Black.copy(alpha = 0.3f)),
+                    contentAlignment = Alignment.Center,
                 ) {
-                    val dynamicProperties = rememberLottieDynamicProperties(
-                        rememberLottieDynamicProperty(
-                            property = LottieProperty.COLOR,
-                            value = MaterialTheme.colorScheme.primary.toArgb(),
-                            keyPath = arrayOf("**")
-                        ),
-                        rememberLottieDynamicProperty(
-                            property = LottieProperty.STROKE_COLOR,
-                            value = MaterialTheme.colorScheme.primary.toArgb(),
-                            keyPath = arrayOf("**")
+                    val dynamicProperties =
+                        rememberLottieDynamicProperties(
+                            rememberLottieDynamicProperty(
+                                property = LottieProperty.COLOR,
+                                value = MaterialTheme.colorScheme.primary.toArgb(),
+                                keyPath = arrayOf("**"),
+                            ),
+                            rememberLottieDynamicProperty(
+                                property = LottieProperty.STROKE_COLOR,
+                                value = MaterialTheme.colorScheme.primary.toArgb(),
+                                keyPath = arrayOf("**"),
+                            ),
                         )
-                    )
 
                     LottieAnimation(
                         composition = composition,
                         iterations = LottieConstants.IterateForever,
                         isPlaying = isPlaying,
                         dynamicProperties = dynamicProperties,
-                        modifier = Modifier.size(120.dp)
+                        modifier = Modifier.size(120.dp),
                     )
                 }
             }
@@ -350,50 +344,50 @@ private fun EpisodeSwitcherCard(
 
         Spacer(modifier = Modifier.width(16.dp))
 
-        Column(
-            modifier = Modifier.weight(1f),
-            verticalArrangement = Arrangement.Center
-        ) {
+        Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center) {
             if (episode is AfinityEpisode) {
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(6.dp)
+                    horizontalArrangement = Arrangement.spacedBy(6.dp),
                 ) {
                     Text(
-                        text = stringResource(
-                            R.string.player_season_episode_fmt,
-                            episode.parentIndexNumber ?: 1,
-                            episode.indexNumber ?: 0
-                        ),
+                        text =
+                            stringResource(
+                                R.string.player_season_episode_fmt,
+                                episode.parentIndexNumber ?: 1,
+                                episode.indexNumber ?: 0,
+                            ),
                         style = MaterialTheme.typography.labelSmall,
-                        color = if (isCurrentlyPlaying) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.secondary,
+                        color =
+                            if (isCurrentlyPlaying) MaterialTheme.colorScheme.primary
+                            else MaterialTheme.colorScheme.secondary,
                         fontWeight = FontWeight.Bold,
-                        letterSpacing = 0.5.sp
+                        letterSpacing = 0.5.sp,
                     )
-                    val rating = (episode  as? AfinityEpisode)?.communityRating
+                    val rating = (episode as? AfinityEpisode)?.communityRating
 
                     if (rating != null && rating > 0) {
                         Text(
                             text = "•",
                             style = MaterialTheme.typography.labelSmall,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f)
+                            color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f),
                         )
 
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(2.dp)
+                            horizontalArrangement = Arrangement.spacedBy(2.dp),
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_imdb_logo),
                                 contentDescription = stringResource(R.string.cd_imdb),
                                 tint = Color.Unspecified,
-                                modifier = Modifier.size(16.dp)
+                                modifier = Modifier.size(16.dp),
                             )
                             Text(
                                 text = String.format(Locale.US, "%.1f", rating),
                                 style = MaterialTheme.typography.labelSmall,
                                 color = MaterialTheme.colorScheme.onSurfaceVariant,
-                                fontWeight = FontWeight.Medium
+                                fontWeight = FontWeight.Medium,
                             )
                         }
                     }
@@ -405,12 +399,14 @@ private fun EpisodeSwitcherCard(
             Text(
                 text = episode.name,
                 style = MaterialTheme.typography.titleMedium,
-                color = if (isCurrentlyPlaying) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurface,
+                color =
+                    if (isCurrentlyPlaying) MaterialTheme.colorScheme.primary
+                    else MaterialTheme.colorScheme.onSurface,
                 maxLines = 2,
                 overflow = TextOverflow.Ellipsis,
                 fontSize = 15.sp,
                 fontWeight = if (isCurrentlyPlaying) FontWeight.Bold else FontWeight.SemiBold,
-                lineHeight = 20.sp
+                lineHeight = 20.sp,
             )
 
             if (episode is AfinityEpisode && !episode.overview.isNullOrBlank()) {
@@ -422,9 +418,9 @@ private fun EpisodeSwitcherCard(
                     maxLines = 2,
                     overflow = TextOverflow.Ellipsis,
                     fontSize = 11.sp,
-                    lineHeight = 14.sp
+                    lineHeight = 14.sp,
                 )
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/components/GestureHandler.kt b/app/src/main/java/com/makd/afinity/ui/player/components/GestureHandler.kt
index b2bd1430f..298e4e3de 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/components/GestureHandler.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/components/GestureHandler.kt
@@ -17,11 +17,13 @@ import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
-import timber.log.Timber
 import kotlin.math.abs
+import timber.log.Timber
 
 private enum class GestureType {
-    BRIGHTNESS, VOLUME, SEEK
+    BRIGHTNESS,
+    VOLUME,
+    SEEK,
 }
 
 @Composable
@@ -33,7 +35,7 @@ fun GestureHandler(
     onVolumeGesture: (percent: Float, isActive: Boolean) -> Unit,
     onSeekGesture: (delta: Float) -> Unit,
     onSeekPreview: (isActive: Boolean) -> Unit = {},
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
     val configuration = LocalConfiguration.current
     val density = LocalDensity.current
@@ -63,116 +65,128 @@ fun GestureHandler(
     var isSeeking by remember { mutableStateOf(false) }
 
     Box(
-        modifier = modifier
-            .fillMaxSize()
-            .pointerInput(screenWidth) {
-                detectTapGestures(
-                    onDoubleTap = { offset ->
-                        val isForward = offset.x > screenWidth / 2
-                        currentOnDoubleTap(isForward)
-                    },
-                    onTap = { currentOnSingleTap() }
-                )
-            }
-            .pointerInput(screenWidth, screenHeight) {
-                detectDragGestures(
-                    onDragStart = { offset ->
-                        if (offset.y < exclusionVertical ||
-                            offset.y > screenHeight - exclusionVertical ||
-                            offset.x < exclusionHorizontal ||
-                            offset.x > screenWidth - exclusionHorizontal
-                        ) {
-                            return@detectDragGestures
-                        }
-
-                        isDragging = true
-                        dragStartOffset = offset
-                        totalHorizontalDelta = 0f
-                        totalVerticalDelta = 0f
-                        gestureType = null
-                        isSeeking = false
-                        Timber.d("Drag started at $offset")
-                    },
-                    onDragEnd = {
-                        isDragging = false
-                        if (gestureType == GestureType.VOLUME) currentOnVolumeGesture(0f, false)
-                        if (gestureType == GestureType.BRIGHTNESS) currentOnBrightnessGesture(0f, false)
-                        if (isSeeking) currentOnSeekPreview(false)
-
-                        gestureType = null
-                        isSeeking = false
-                        Timber.d("Drag ended")
-                    },
-                    onDragCancel = {
-                        isDragging = false
-                        if (gestureType == GestureType.VOLUME) currentOnVolumeGesture(0f, false)
-                        if (gestureType == GestureType.BRIGHTNESS) currentOnBrightnessGesture(0f, false)
-                        if (isSeeking) currentOnSeekPreview(false)
-
-                        gestureType = null
-                        isSeeking = false
-                        Timber.d("Drag cancelled")
-                    },
-                    onDrag = { change, dragAmount ->
-                        if (!isDragging) return@detectDragGestures
-
-                        val verticalDrag = -dragAmount.y
-                        val horizontalDrag = dragAmount.x
-
-                        if (gestureType == null) {
-                            val minimumDragDistance = 20f
-
-                            if (abs(verticalDrag) > minimumDragDistance || abs(horizontalDrag) > minimumDragDistance) {
-                                gestureType = when {
-                                    abs(verticalDrag) > abs(horizontalDrag) -> {
+        modifier =
+            modifier
+                .fillMaxSize()
+                .pointerInput(screenWidth) {
+                    detectTapGestures(
+                        onDoubleTap = { offset ->
+                            val isForward = offset.x > screenWidth / 2
+                            currentOnDoubleTap(isForward)
+                        },
+                        onTap = { currentOnSingleTap() },
+                    )
+                }
+                .pointerInput(screenWidth, screenHeight) {
+                    detectDragGestures(
+                        onDragStart = { offset ->
+                            if (
+                                offset.y < exclusionVertical ||
+                                    offset.y > screenHeight - exclusionVertical ||
+                                    offset.x < exclusionHorizontal ||
+                                    offset.x > screenWidth - exclusionHorizontal
+                            ) {
+                                return@detectDragGestures
+                            }
+
+                            isDragging = true
+                            dragStartOffset = offset
+                            totalHorizontalDelta = 0f
+                            totalVerticalDelta = 0f
+                            gestureType = null
+                            isSeeking = false
+                            Timber.d("Drag started at $offset")
+                        },
+                        onDragEnd = {
+                            isDragging = false
+                            if (gestureType == GestureType.VOLUME) currentOnVolumeGesture(0f, false)
+                            if (gestureType == GestureType.BRIGHTNESS)
+                                currentOnBrightnessGesture(0f, false)
+                            if (isSeeking) currentOnSeekPreview(false)
+
+                            gestureType = null
+                            isSeeking = false
+                            Timber.d("Drag ended")
+                        },
+                        onDragCancel = {
+                            isDragging = false
+                            if (gestureType == GestureType.VOLUME) currentOnVolumeGesture(0f, false)
+                            if (gestureType == GestureType.BRIGHTNESS)
+                                currentOnBrightnessGesture(0f, false)
+                            if (isSeeking) currentOnSeekPreview(false)
+
+                            gestureType = null
+                            isSeeking = false
+                            Timber.d("Drag cancelled")
+                        },
+                        onDrag = { change, dragAmount ->
+                            if (!isDragging) return@detectDragGestures
+
+                            val verticalDrag = -dragAmount.y
+                            val horizontalDrag = dragAmount.x
+
+                            if (gestureType == null) {
+                                val minimumDragDistance = 20f
+
+                                if (
+                                    abs(verticalDrag) > minimumDragDistance ||
+                                        abs(horizontalDrag) > minimumDragDistance
+                                ) {
+                                    gestureType =
                                         when {
-                                            dragStartOffset.x < leftZoneWidth -> GestureType.BRIGHTNESS
-                                            dragStartOffset.x > rightZoneStart -> GestureType.VOLUME
-                                            else -> null
+                                            abs(verticalDrag) > abs(horizontalDrag) -> {
+                                                when {
+                                                    dragStartOffset.x < leftZoneWidth ->
+                                                        GestureType.BRIGHTNESS
+                                                    dragStartOffset.x > rightZoneStart ->
+                                                        GestureType.VOLUME
+                                                    else -> null
+                                                }
+                                            }
+                                            else -> GestureType.SEEK
                                         }
-                                    }
-                                    else -> GestureType.SEEK
-                                }
 
-                                if (gestureType == GestureType.VOLUME) currentOnVolumeGesture(0f, true)
-                                if (gestureType == GestureType.BRIGHTNESS) currentOnBrightnessGesture(0f, true)
-                            }
-                        }
-
-                        when (gestureType) {
-                            GestureType.BRIGHTNESS -> {
-                                totalVerticalDelta += verticalDrag
-                                val distanceFull = screenHeight * 0.5f
-                                val accumulatedPercent = totalVerticalDelta / distanceFull
-                                currentOnBrightnessGesture(accumulatedPercent, true)
+                                    if (gestureType == GestureType.VOLUME)
+                                        currentOnVolumeGesture(0f, true)
+                                    if (gestureType == GestureType.BRIGHTNESS)
+                                        currentOnBrightnessGesture(0f, true)
+                                }
                             }
 
-                            GestureType.VOLUME -> {
-                                totalVerticalDelta += verticalDrag
-                                val distanceFull = screenHeight * 0.5f
-                                val accumulatedPercent = totalVerticalDelta / distanceFull
-                                currentOnVolumeGesture(accumulatedPercent, true)
-                            }
+                            when (gestureType) {
+                                GestureType.BRIGHTNESS -> {
+                                    totalVerticalDelta += verticalDrag
+                                    val distanceFull = screenHeight * 0.5f
+                                    val accumulatedPercent = totalVerticalDelta / distanceFull
+                                    currentOnBrightnessGesture(accumulatedPercent, true)
+                                }
 
-                            GestureType.SEEK -> {
-                                totalHorizontalDelta += horizontalDrag
-                                val seekActivationThreshold = 20f
+                                GestureType.VOLUME -> {
+                                    totalVerticalDelta += verticalDrag
+                                    val distanceFull = screenHeight * 0.5f
+                                    val accumulatedPercent = totalVerticalDelta / distanceFull
+                                    currentOnVolumeGesture(accumulatedPercent, true)
+                                }
 
-                                if (abs(totalHorizontalDelta) > seekActivationThreshold) {
-                                    if (!isSeeking) {
-                                        isSeeking = true
-                                        currentOnSeekPreview(true)
+                                GestureType.SEEK -> {
+                                    totalHorizontalDelta += horizontalDrag
+                                    val seekActivationThreshold = 20f
+
+                                    if (abs(totalHorizontalDelta) > seekActivationThreshold) {
+                                        if (!isSeeking) {
+                                            isSeeking = true
+                                            currentOnSeekPreview(true)
+                                        }
+                                        val normalizedDelta = totalHorizontalDelta / screenWidth
+                                        currentOnSeekGesture(normalizedDelta)
                                     }
-                                    val normalizedDelta = totalHorizontalDelta / screenWidth
-                                    currentOnSeekGesture(normalizedDelta)
                                 }
+                                null -> {}
                             }
-                            null -> { }
-                        }
-                    }
-                )
-            }
+                        },
+                    )
+                }
     ) {
         content()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/components/MpvSurface.kt b/app/src/main/java/com/makd/afinity/ui/player/components/MpvSurface.kt
index e357a7371..a18247735 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/components/MpvSurface.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/components/MpvSurface.kt
@@ -14,42 +14,44 @@ fun MpvSurface(
     modifier: Modifier = Modifier,
     videoOutput: String = "gpu",
     onSurfaceCreated: () -> Unit = {},
-    onSurfaceDestroyed: () -> Unit = {}
+    onSurfaceDestroyed: () -> Unit = {},
 ) {
     AndroidView(
         modifier = modifier.fillMaxSize(),
         factory = { context ->
             SurfaceView(context).apply {
-                holder.addCallback(object : SurfaceHolder.Callback {
-                    override fun surfaceCreated(holder: SurfaceHolder) {
-                        MPVLib.attachSurface(holder.surface)
-                        MPVLib.setOptionString("force-window", "yes")
-                        MPVLib.setOptionString("vo", videoOutput)
-                        MPVLib.setOptionString("vid", "auto")
-                        onSurfaceCreated()
-                        Timber.d("MPV surface created and attached")
-                    }
+                holder.addCallback(
+                    object : SurfaceHolder.Callback {
+                        override fun surfaceCreated(holder: SurfaceHolder) {
+                            MPVLib.attachSurface(holder.surface)
+                            MPVLib.setOptionString("force-window", "yes")
+                            MPVLib.setOptionString("vo", videoOutput)
+                            MPVLib.setOptionString("vid", "auto")
+                            onSurfaceCreated()
+                            Timber.d("MPV surface created and attached")
+                        }
 
-                    override fun surfaceChanged(
-                        holder: SurfaceHolder,
-                        format: Int,
-                        width: Int,
-                        height: Int
-                    ) {
-                        MPVLib.setPropertyString("android-surface-size", "${width}x$height")
-                        Timber.d("MPV surface changed: ${width}x${height}")
-                    }
+                        override fun surfaceChanged(
+                            holder: SurfaceHolder,
+                            format: Int,
+                            width: Int,
+                            height: Int,
+                        ) {
+                            MPVLib.setPropertyString("android-surface-size", "${width}x$height")
+                            Timber.d("MPV surface changed: ${width}x${height}")
+                        }
 
-                    override fun surfaceDestroyed(holder: SurfaceHolder) {
-                        MPVLib.setOptionString("vid", "no")
-                        MPVLib.setOptionString("vo", "null")
-                        MPVLib.setOptionString("force-window", "no")
-                        MPVLib.detachSurface()
-                        onSurfaceDestroyed()
-                        Timber.d("MPV surface destroyed and detached")
+                        override fun surfaceDestroyed(holder: SurfaceHolder) {
+                            MPVLib.setOptionString("vid", "no")
+                            MPVLib.setOptionString("vo", "null")
+                            MPVLib.setOptionString("force-window", "no")
+                            MPVLib.detachSurface()
+                            onSurfaceDestroyed()
+                            Timber.d("MPV surface destroyed and detached")
+                        }
                     }
-                })
+                )
             }
-        }
+        },
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/components/PlaybackSpeedDialog.kt b/app/src/main/java/com/makd/afinity/ui/player/components/PlaybackSpeedDialog.kt
index b085b50c9..b8de130f3 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/components/PlaybackSpeedDialog.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/components/PlaybackSpeedDialog.kt
@@ -48,48 +48,41 @@ import kotlin.math.absoluteValue
 fun PlaybackSpeedDialog(
     currentSpeed: Float,
     onSpeedChange: (Float) -> Unit,
-    onDismiss: () -> Unit
+    onDismiss: () -> Unit,
 ) {
     var sliderSpeed by remember(currentSpeed) { mutableFloatStateOf(currentSpeed) }
 
     Dialog(
         onDismissRequest = onDismiss,
-        properties = DialogProperties(
-            usePlatformDefaultWidth = false,
-            dismissOnClickOutside = true
-        )
+        properties = DialogProperties(usePlatformDefaultWidth = false, dismissOnClickOutside = true),
     ) {
         Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(16.dp)
-                .pointerInput(Unit) {
+            modifier =
+                Modifier.fillMaxSize().padding(16.dp).pointerInput(Unit) {
                     detectTapGestures(onTap = { onDismiss() })
                 },
-            contentAlignment = Alignment.BottomCenter
+            contentAlignment = Alignment.BottomCenter,
         ) {
             Card(
-                modifier = Modifier
-                    .fillMaxWidth(0.5f)
-                    .pointerInput(Unit) {
+                modifier =
+                    Modifier.fillMaxWidth(0.5f).pointerInput(Unit) {
                         detectTapGestures(onTap = { /* Consume tap - prevent dismissal */ })
                     },
                 shape = RoundedCornerShape(16.dp),
-                colors = CardDefaults.cardColors(
-                    containerColor = MaterialTheme.colorScheme.surfaceContainer
-                )
+                colors =
+                    CardDefaults.cardColors(
+                        containerColor = MaterialTheme.colorScheme.surfaceContainer
+                    ),
             ) {
                 Column(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(24.dp),
-                    horizontalAlignment = Alignment.CenterHorizontally
+                    modifier = Modifier.fillMaxWidth().padding(24.dp),
+                    horizontalAlignment = Alignment.CenterHorizontally,
                 ) {
                     Text(
                         text = stringResource(R.string.player_speed_title_fmt, sliderSpeed),
                         color = MaterialTheme.colorScheme.onSurface,
                         fontSize = 20.sp,
-                        fontWeight = FontWeight.Medium
+                        fontWeight = FontWeight.Medium,
                     )
 
                     Spacer(modifier = Modifier.height(32.dp))
@@ -97,43 +90,38 @@ fun PlaybackSpeedDialog(
                     Row(
                         modifier = Modifier.fillMaxWidth(),
                         horizontalArrangement = Arrangement.SpaceBetween,
-                        verticalAlignment = Alignment.CenterVertically
+                        verticalAlignment = Alignment.CenterVertically,
                     ) {
                         IconButton(
                             onClick = {
                                 sliderSpeed = (sliderSpeed - 0.25f).coerceIn(0.25f, 2.0f)
                                 onSpeedChange(sliderSpeed)
                             },
-                            modifier = Modifier
-                                .size(48.dp)
-                                .clip(CircleShape)
-                                .background(MaterialTheme.colorScheme.surfaceVariant)
+                            modifier =
+                                Modifier.size(48.dp)
+                                    .clip(CircleShape)
+                                    .background(MaterialTheme.colorScheme.surfaceVariant),
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_remove),
                                 contentDescription = stringResource(R.string.cd_speed_decrease),
-                                tint = MaterialTheme.colorScheme.primary
+                                tint = MaterialTheme.colorScheme.primary,
                             )
                         }
 
                         Slider(
                             value = sliderSpeed,
-                            onValueChange = { newSpeed ->
-                                sliderSpeed = newSpeed
-                            },
-                            onValueChangeFinished = {
-                                onSpeedChange(sliderSpeed)
-                            },
+                            onValueChange = { newSpeed -> sliderSpeed = newSpeed },
+                            onValueChangeFinished = { onSpeedChange(sliderSpeed) },
                             valueRange = 0.25f..2.0f,
                             steps = 6,
-                            modifier = Modifier
-                                .weight(1f)
-                                .padding(horizontal = 16.dp),
-                            colors = SliderDefaults.colors(
-                                thumbColor = MaterialTheme.colorScheme.primary,
-                                activeTrackColor = MaterialTheme.colorScheme.primary,
-                                inactiveTrackColor = MaterialTheme.colorScheme.surfaceVariant
-                            )
+                            modifier = Modifier.weight(1f).padding(horizontal = 16.dp),
+                            colors =
+                                SliderDefaults.colors(
+                                    thumbColor = MaterialTheme.colorScheme.primary,
+                                    activeTrackColor = MaterialTheme.colorScheme.primary,
+                                    inactiveTrackColor = MaterialTheme.colorScheme.surfaceVariant,
+                                ),
                         )
 
                         IconButton(
@@ -141,15 +129,15 @@ fun PlaybackSpeedDialog(
                                 sliderSpeed = (sliderSpeed + 0.25f).coerceIn(0.25f, 2.0f)
                                 onSpeedChange(sliderSpeed)
                             },
-                            modifier = Modifier
-                                .size(48.dp)
-                                .clip(CircleShape)
-                                .background(MaterialTheme.colorScheme.surfaceVariant)
+                            modifier =
+                                Modifier.size(48.dp)
+                                    .clip(CircleShape)
+                                    .background(MaterialTheme.colorScheme.surfaceVariant),
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_add),
                                 contentDescription = stringResource(R.string.cd_speed_increase),
-                                tint = MaterialTheme.colorScheme.primary
+                                tint = MaterialTheme.colorScheme.primary,
                             )
                         }
                     }
@@ -158,7 +146,7 @@ fun PlaybackSpeedDialog(
 
                     Row(
                         modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.SpaceEvenly
+                        horizontalArrangement = Arrangement.SpaceEvenly,
                     ) {
                         SpeedChip(
                             speed = 0.25f,
@@ -166,7 +154,7 @@ fun PlaybackSpeedDialog(
                             onClick = {
                                 sliderSpeed = 0.25f
                                 onSpeedChange(0.25f)
-                            }
+                            },
                         )
                         SpeedChip(
                             speed = 0.50f,
@@ -174,7 +162,7 @@ fun PlaybackSpeedDialog(
                             onClick = {
                                 sliderSpeed = 0.50f
                                 onSpeedChange(0.50f)
-                            }
+                            },
                         )
                         SpeedChip(
                             speed = 1.00f,
@@ -182,7 +170,7 @@ fun PlaybackSpeedDialog(
                             onClick = {
                                 sliderSpeed = 1.00f
                                 onSpeedChange(1.00f)
-                            }
+                            },
                         )
                         SpeedChip(
                             speed = 1.50f,
@@ -190,7 +178,7 @@ fun PlaybackSpeedDialog(
                             onClick = {
                                 sliderSpeed = 1.50f
                                 onSpeedChange(1.50f)
-                            }
+                            },
                         )
                         SpeedChip(
                             speed = 2.00f,
@@ -198,7 +186,7 @@ fun PlaybackSpeedDialog(
                             onClick = {
                                 sliderSpeed = 2.00f
                                 onSpeedChange(2.00f)
-                            }
+                            },
                         )
                     }
                 }
@@ -208,33 +196,32 @@ fun PlaybackSpeedDialog(
 }
 
 @Composable
-private fun SpeedChip(
-    speed: Float,
-    isSelected: Boolean,
-    onClick: () -> Unit
-) {
+private fun SpeedChip(speed: Float, isSelected: Boolean, onClick: () -> Unit) {
     Button(
         onClick = onClick,
         modifier = Modifier.height(40.dp),
         shape = RoundedCornerShape(20.dp),
-        colors = ButtonDefaults.buttonColors(
-            containerColor = if (isSelected) {
-                MaterialTheme.colorScheme.primary
-            } else {
-                MaterialTheme.colorScheme.surfaceVariant
-            },
-            contentColor = if (isSelected) {
-                MaterialTheme.colorScheme.onPrimary
-            } else {
-                MaterialTheme.colorScheme.onSurfaceVariant
-            }
-        ),
-        contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp)
+        colors =
+            ButtonDefaults.buttonColors(
+                containerColor =
+                    if (isSelected) {
+                        MaterialTheme.colorScheme.primary
+                    } else {
+                        MaterialTheme.colorScheme.surfaceVariant
+                    },
+                contentColor =
+                    if (isSelected) {
+                        MaterialTheme.colorScheme.onPrimary
+                    } else {
+                        MaterialTheme.colorScheme.onSurfaceVariant
+                    },
+            ),
+        contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp),
     ) {
         Text(
             text = stringResource(R.string.player_speed_value_fmt, speed),
             fontSize = 14.sp,
-            fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Normal
+            fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Normal,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/components/PlayerControls.kt b/app/src/main/java/com/makd/afinity/ui/player/components/PlayerControls.kt
index 2a200b2a3..c6a6f733e 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/components/PlayerControls.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/components/PlayerControls.kt
@@ -66,15 +66,15 @@ import com.makd.afinity.data.models.player.PlayerEvent
 import com.makd.afinity.ui.components.AsyncImage
 import com.makd.afinity.ui.livetv.components.LiveBadge
 import com.makd.afinity.ui.player.PlayerViewModel
-import org.jellyfin.sdk.model.api.MediaStreamType
 import java.util.Locale
 import kotlin.math.abs
+import org.jellyfin.sdk.model.api.MediaStreamType
 
 data class AudioStreamOption(
     val stream: AfinityMediaStream,
     val displayName: String,
     val isDefault: Boolean,
-    val position: Int = 0
+    val position: Int = 0,
 )
 
 data class SubtitleStreamOption(
@@ -82,7 +82,7 @@ data class SubtitleStreamOption(
     val displayName: String,
     val isDefault: Boolean,
     val index: Int,
-    val isNone: Boolean = false
+    val isNone: Boolean = false,
 )
 
 @OptIn(UnstableApi::class)
@@ -97,7 +97,7 @@ fun PlayerControls(
     onPipToggle: () -> Unit = {},
     playlistQueue: List<com.makd.afinity.data.models.media.AfinityItem> = emptyList(),
     currentPlaylistIndex: Int = -1,
-    onJumpToEpisode: (java.util.UUID) -> Unit = {}
+    onJumpToEpisode: (java.util.UUID) -> Unit = {},
 ) {
     var showAudioSelector by remember { mutableStateOf(false) }
     var showSubtitleSelector by remember { mutableStateOf(false) }
@@ -109,107 +109,110 @@ fun PlayerControls(
     val unknownLang = stringResource(R.string.track_unknown)
     val channelFmt = stringResource(R.string.audio_channel_fmt)
 
-    val audioStreamOptions = remember(currentItem, unknownLang, channelFmt) {
-        val streams = currentItem?.sources?.firstOrNull()?.mediaStreams
-            ?.filter { it.type == MediaStreamType.AUDIO }
-            ?.mapIndexed { index, stream ->
-                val displayName = buildString {
-                    append(stream.language?.uppercase() ?: unknownLang)
-                    append(" • ${stream.codec?.uppercase() ?: "N/A"}")
-                    if ((stream.channels ?: 0) > 0) {
-                        append(String.format(channelFmt, stream.channels))
-                    }
-                }
+    val audioStreamOptions =
+        remember(currentItem, unknownLang, channelFmt) {
+            val streams =
+                currentItem
+                    ?.sources
+                    ?.firstOrNull()
+                    ?.mediaStreams
+                    ?.filter { it.type == MediaStreamType.AUDIO }
+                    ?.mapIndexed { index, stream ->
+                        val displayName = buildString {
+                            append(stream.language?.uppercase() ?: unknownLang)
+                            append(" • ${stream.codec?.uppercase() ?: "N/A"}")
+                            if ((stream.channels ?: 0) > 0) {
+                                append(String.format(channelFmt, stream.channels))
+                            }
+                        }
 
-                AudioStreamOption(
-                    stream = stream,
-                    displayName = displayName,
-                    isDefault = stream.isDefault,
-                    position = index
-                )
-            } ?: emptyList()
-        streams
-    }
+                        AudioStreamOption(
+                            stream = stream,
+                            displayName = displayName,
+                            isDefault = stream.isDefault,
+                            position = index,
+                        )
+                    } ?: emptyList()
+            streams
+        }
 
     val noneText = stringResource(R.string.track_none)
     val trackFmt = stringResource(R.string.track_number_fmt)
 
-    val subtitleStreamOptions = remember(currentItem, player.currentTracks, noneText, trackFmt) {
-        val options = mutableListOf<SubtitleStreamOption>()
-        options.add(
-            SubtitleStreamOption(
-                stream = null,
-                displayName = noneText,
-                isDefault = false,
-                index = -1,
-                isNone = true
+    val subtitleStreamOptions =
+        remember(currentItem, player.currentTracks, noneText, trackFmt) {
+            val options = mutableListOf<SubtitleStreamOption>()
+            options.add(
+                SubtitleStreamOption(
+                    stream = null,
+                    displayName = noneText,
+                    isDefault = false,
+                    index = -1,
+                    isNone = true,
+                )
             )
-        )
-        player.currentTracks.groups
-            .filter { it.type == androidx.media3.common.C.TRACK_TYPE_TEXT && it.isSupported }
-            .forEachIndexed { index, trackGroup ->
-                val format = trackGroup.mediaTrackGroup.getFormat(0)
-                val displayName = listOfNotNull(
-                    format.label ?: format.language ?: String.format(trackFmt, index + 1),
-                    format.codecs?.let { formatSubtitleCodec(it) }
-                ).joinToString(" - ")
-                options.add(
-                    SubtitleStreamOption(
-                        stream = null,
-                        displayName = displayName,
-                        isDefault = trackGroup.isSelected,
-                        index = index,
-                        isNone = false
+            player.currentTracks.groups
+                .filter { it.type == androidx.media3.common.C.TRACK_TYPE_TEXT && it.isSupported }
+                .forEachIndexed { index, trackGroup ->
+                    val format = trackGroup.mediaTrackGroup.getFormat(0)
+                    val displayName =
+                        listOfNotNull(
+                                format.label
+                                    ?: format.language
+                                    ?: String.format(trackFmt, index + 1),
+                                format.codecs?.let { formatSubtitleCodec(it) },
+                            )
+                            .joinToString(" - ")
+                    options.add(
+                        SubtitleStreamOption(
+                            stream = null,
+                            displayName = displayName,
+                            isDefault = trackGroup.isSelected,
+                            index = index,
+                            isNone = false,
+                        )
                     )
-                )
-            }
-        options
-    }
-    Box(
-        modifier = Modifier.fillMaxSize()
-    ) {
+                }
+            options
+        }
+    Box(modifier = Modifier.fillMaxSize()) {
         AnimatedVisibility(
-            visible = if (uiState.logoAutoHide) {
-                uiState.showControls && !uiState.isInPictureInPictureMode
-            } else {
-                true
-            },
+            visible =
+                if (uiState.logoAutoHide) {
+                    uiState.showControls && !uiState.isInPictureInPictureMode
+                } else {
+                    true
+                },
             enter = fadeIn(animationSpec = tween(300)),
-            exit = fadeOut(animationSpec = tween(300))
+            exit = fadeOut(animationSpec = tween(300)),
         ) {
             Box(
-                modifier = Modifier
-                    .align(Alignment.TopStart)
-                    .fillMaxWidth()
-                    .background(
-                        Brush.verticalGradient(
-                            colors = listOf(
-                                Color.Black.copy(alpha = 0.7f),
-                                Color.Transparent
+                modifier =
+                    Modifier.align(Alignment.TopStart)
+                        .fillMaxWidth()
+                        .background(
+                            Brush.verticalGradient(
+                                colors = listOf(Color.Black.copy(alpha = 0.7f), Color.Transparent)
                             )
                         )
-                    )
-                    .padding(start = 16.dp, end = 16.dp, top = 32.dp, bottom = 16.dp)
+                        .padding(start = 16.dp, end = 16.dp, top = 32.dp, bottom = 16.dp)
             ) {
-                Row(
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
+                Row(verticalAlignment = Alignment.CenterVertically) {
                     Column(
                         modifier = Modifier.padding(start = 60.dp),
-                        horizontalAlignment = Alignment.Start
+                        horizontalAlignment = Alignment.Start,
                     ) {
                         val currentItem = uiState.currentItem
 
                         if (currentItem is AfinityMovie) {
                             if (currentItem.images?.logo != null) {
                                 AsyncImage(
-                                    imageUrl = currentItem.images.logoImageUrlWithTransparency.toString(),
+                                    imageUrl =
+                                        currentItem.images.logoImageUrlWithTransparency.toString(),
                                     contentDescription = "Logo",
-                                    modifier = Modifier
-                                        .height(60.dp)
-                                        .widthIn(max = 200.dp),
+                                    modifier = Modifier.height(60.dp).widthIn(max = 200.dp),
                                     contentScale = ContentScale.Fit,
-                                    blurHash = null
+                                    blurHash = null,
                                 )
                             } else {
                                 Text(
@@ -218,7 +221,7 @@ fun PlayerControls(
                                     fontSize = 18.sp,
                                     fontWeight = FontWeight.Medium,
                                     maxLines = 1,
-                                    overflow = TextOverflow.Ellipsis
+                                    overflow = TextOverflow.Ellipsis,
                                 )
                             }
                         }
@@ -232,19 +235,20 @@ fun PlayerControls(
                             if (seasonNumber != null && episodeNumber != null) {
                                 Column(
                                     horizontalAlignment = Alignment.Start,
-                                    modifier = Modifier.wrapContentWidth()
+                                    modifier = Modifier.wrapContentWidth(),
                                 ) {
                                     if (currentItem.seriesLogo != null) {
-                                        val logoUrl = currentItem.seriesLogo.toString().let { url ->
-                                            if (url.contains("?")) "$url&format=png" else "$url?format=png"
-                                        }
+                                        val logoUrl =
+                                            currentItem.seriesLogo.toString().let { url ->
+                                                if (url.contains("?")) "$url&format=png"
+                                                else "$url?format=png"
+                                            }
                                         AsyncImage(
                                             imageUrl = logoUrl,
-                                            contentDescription = stringResource(R.string.cd_series_logo),
-                                            modifier = Modifier
-                                                .height(60.dp)
-                                                .widthIn(max = 200.dp),
-                                            contentScale = ContentScale.Fit
+                                            contentDescription =
+                                                stringResource(R.string.cd_series_logo),
+                                            modifier = Modifier.height(60.dp).widthIn(max = 200.dp),
+                                            contentScale = ContentScale.Fit,
                                         )
                                     } else {
                                         Text(
@@ -256,17 +260,18 @@ fun PlayerControls(
                                         )
                                     }
                                     Text(
-                                        text = stringResource(
-                                            R.string.player_episode_header_fmt,
-                                            seasonNumber.toString().padStart(2, '0'),
-                                            episodeNumber.toString().padStart(2, '0'),
-                                            episodeTitle ?: ""
-                                        ),
+                                        text =
+                                            stringResource(
+                                                R.string.player_episode_header_fmt,
+                                                seasonNumber.toString().padStart(2, '0'),
+                                                episodeNumber.toString().padStart(2, '0'),
+                                                episodeTitle ?: "",
+                                            ),
                                         color = Color.White.copy(alpha = 0.8f),
                                         fontSize = 14.sp,
                                         maxLines = 1,
                                         overflow = TextOverflow.Ellipsis,
-                                        modifier = Modifier.padding(top = 4.dp)
+                                        modifier = Modifier.padding(top = 4.dp),
                                     )
                                 }
                             }
@@ -280,16 +285,14 @@ fun PlayerControls(
             enter = fadeIn(animationSpec = tween(300)),
             exit = fadeOut(animationSpec = tween(300)),
         ) {
-            Box(
-                modifier = Modifier.fillMaxSize()
-            ) {
+            Box(modifier = Modifier.fillMaxSize()) {
                 TopControls(
                     modifier = Modifier.align(Alignment.TopCenter),
                     uiState = uiState,
                     onPlayerEvent = onPlayerEvent,
                     onBackClick = onBackClick,
                     onLockToggle = { onPlayerEvent(PlayerEvent.ToggleLock) },
-                    onPipToggle = onPipToggle
+                    onPipToggle = onPipToggle,
                 )
 
                 if (!uiState.isControlsLocked && !uiState.isInPictureInPictureMode) {
@@ -306,7 +309,7 @@ fun PlayerControls(
                         onSeekForward = { onPlayerEvent(PlayerEvent.SeekRelative(30000L)) },
                         onNextClick = onNextClick,
                         onPreviousClick = onPreviousClick,
-                        modifier = Modifier.align(Alignment.Center)
+                        modifier = Modifier.align(Alignment.Center),
                     )
                     BottomControls(
                         uiState = uiState,
@@ -315,35 +318,32 @@ fun PlayerControls(
                         onAudioToggle = { showAudioSelector = !showAudioSelector },
                         onSubtitleToggle = { showSubtitleSelector = !showSubtitleSelector },
                         onEpisodeSwitcherToggle = { showEpisodeSwitcher = !showEpisodeSwitcher },
-                        showEpisodeSwitcherButton = currentItem is AfinityEpisode && playlistQueue.size > 1,
-                        modifier = Modifier.align(Alignment.BottomCenter)
+                        showEpisodeSwitcherButton =
+                            currentItem is AfinityEpisode && playlistQueue.size > 1,
+                        modifier = Modifier.align(Alignment.BottomCenter),
                     )
                 }
             }
         }
         AnimatedVisibility(
-            visible = uiState.isSeeking && !uiState.showControls && !uiState.isInPictureInPictureMode,
+            visible =
+                uiState.isSeeking && !uiState.showControls && !uiState.isInPictureInPictureMode,
             enter = fadeIn(),
-            exit = fadeOut()
+            exit = fadeOut(),
         ) {
-            Box(
-                modifier = Modifier.fillMaxSize(),
-                contentAlignment = Alignment.BottomCenter
-            ) {
+            Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.BottomCenter) {
                 Column(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .background(
-                            Brush.verticalGradient(
-                                colors = listOf(Color.Transparent, Color.Black.copy(alpha = 0.7f))
+                    modifier =
+                        Modifier.fillMaxWidth()
+                            .background(
+                                Brush.verticalGradient(
+                                    colors =
+                                        listOf(Color.Transparent, Color.Black.copy(alpha = 0.7f))
+                                )
                             )
-                        )
-                        .padding(start = 16.dp, end = 16.dp, top = 10.dp, bottom = 10.dp)
+                            .padding(start = 16.dp, end = 16.dp, top = 10.dp, bottom = 10.dp)
                 ) {
-                    SeekBar(
-                        uiState = uiState,
-                        onPlayerEvent = onPlayerEvent
-                    )
+                    SeekBar(uiState = uiState, onPlayerEvent = onPlayerEvent)
                     Spacer(modifier = Modifier.height(48.dp))
                 }
             }
@@ -355,71 +355,68 @@ fun PlayerControls(
                 segment = uiState.currentSegment,
                 skipButtonText = uiState.skipButtonText,
                 onClick = { onPlayerEvent(PlayerEvent.SkipSegment(uiState.currentSegment)) },
-                modifier = Modifier
-                    .align(Alignment.BottomEnd)
-                    .padding(
-                        end = 16.dp,
-                        bottom = if (uiState.showControls) 70.dp else 16.dp
-                    )
+                modifier =
+                    Modifier.align(Alignment.BottomEnd)
+                        .padding(end = 16.dp, bottom = if (uiState.showControls) 70.dp else 16.dp),
             )
         }
     }
 
     if (showAudioSelector && audioStreamOptions.isNotEmpty()) {
         Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .clickable(
+            modifier =
+                Modifier.fillMaxSize().clickable(
                     interactionSource = remember { MutableInteractionSource() },
-                    indication = null
+                    indication = null,
                 ) {
                     showAudioSelector = false
                 }
         ) {
             Box(
-                modifier = Modifier
-                    .align(Alignment.BottomEnd)
-                    .padding(bottom = 110.dp, end = 56.dp)
-                    .clickable(
-                        interactionSource = remember { MutableInteractionSource() },
-                        indication = null
-                    ) { /* Consume clicks */ }
+                modifier =
+                    Modifier.align(Alignment.BottomEnd)
+                        .padding(bottom = 110.dp, end = 56.dp)
+                        .clickable(
+                            interactionSource = remember { MutableInteractionSource() },
+                            indication = null,
+                        ) { /* Consume clicks */
+                        }
             ) {
                 Box(
-                    modifier = Modifier
-                        .background(
-                            Color.Black.copy(alpha = 0.95f),
-                            RoundedCornerShape(8.dp)
-                        )
-                        .padding(12.dp)
-                        .widthIn(min = 200.dp, max = 280.dp)
-                        .heightIn(max = 400.dp)
+                    modifier =
+                        Modifier.background(
+                                Color.Black.copy(alpha = 0.95f),
+                                RoundedCornerShape(8.dp),
+                            )
+                            .padding(12.dp)
+                            .widthIn(min = 200.dp, max = 280.dp)
+                            .heightIn(max = 400.dp)
                 ) {
                     Column(
                         modifier = Modifier.verticalScroll(rememberScrollState()),
-                        verticalArrangement = Arrangement.spacedBy(4.dp)
+                        verticalArrangement = Arrangement.spacedBy(4.dp),
                     ) {
                         Text(
                             text = stringResource(R.string.player_audio_title),
                             style = MaterialTheme.typography.titleSmall,
                             color = Color.White,
-                            modifier = Modifier.padding(bottom = 4.dp)
+                            modifier = Modifier.padding(bottom = 4.dp),
                         )
                         audioStreamOptions.forEach { option ->
                             Row(
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .clickable {
-                                        onPlayerEvent(
-                                            PlayerEvent.SwitchToTrack(
-                                                androidx.media3.common.C.TRACK_TYPE_AUDIO,
-                                                option.position
+                                modifier =
+                                    Modifier.fillMaxWidth()
+                                        .clickable {
+                                            onPlayerEvent(
+                                                PlayerEvent.SwitchToTrack(
+                                                    androidx.media3.common.C.TRACK_TYPE_AUDIO,
+                                                    option.position,
+                                                )
                                             )
-                                        )
-                                        showAudioSelector = false
-                                    }
-                                    .padding(vertical = 6.dp),
-                                verticalAlignment = Alignment.CenterVertically
+                                            showAudioSelector = false
+                                        }
+                                        .padding(vertical = 6.dp),
+                                verticalAlignment = Alignment.CenterVertically,
                             ) {
                                 RadioButton(
                                     selected = uiState.audioStreamIndex == option.position,
@@ -427,15 +424,16 @@ fun PlayerControls(
                                         onPlayerEvent(
                                             PlayerEvent.SwitchToTrack(
                                                 androidx.media3.common.C.TRACK_TYPE_AUDIO,
-                                                option.position
+                                                option.position,
                                             )
                                         )
                                         showAudioSelector = false
                                     },
-                                    colors = RadioButtonDefaults.colors(
-                                        selectedColor = MaterialTheme.colorScheme.primary
-                                    ),
-                                    modifier = Modifier.size(20.dp)
+                                    colors =
+                                        RadioButtonDefaults.colors(
+                                            selectedColor = MaterialTheme.colorScheme.primary
+                                        ),
+                                    modifier = Modifier.size(20.dp),
                                 )
                                 Spacer(modifier = Modifier.width(8.dp))
                                 Text(
@@ -443,7 +441,7 @@ fun PlayerControls(
                                     style = MaterialTheme.typography.bodySmall,
                                     color = Color.White,
                                     maxLines = 2,
-                                    overflow = TextOverflow.Ellipsis
+                                    overflow = TextOverflow.Ellipsis,
                                 )
                             }
                         }
@@ -455,59 +453,59 @@ fun PlayerControls(
 
     if (showSubtitleSelector && subtitleStreamOptions.isNotEmpty()) {
         Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .clickable(
+            modifier =
+                Modifier.fillMaxSize().clickable(
                     interactionSource = remember { MutableInteractionSource() },
-                    indication = null
+                    indication = null,
                 ) {
                     showSubtitleSelector = false
                 }
         ) {
             Box(
-                modifier = Modifier
-                    .align(Alignment.BottomEnd)
-                    .padding(bottom = 110.dp, end = 8.dp)
-                    .clickable(
-                        interactionSource = remember { MutableInteractionSource() },
-                        indication = null
-                    ) { /* Consume clicks */ }
+                modifier =
+                    Modifier.align(Alignment.BottomEnd)
+                        .padding(bottom = 110.dp, end = 8.dp)
+                        .clickable(
+                            interactionSource = remember { MutableInteractionSource() },
+                            indication = null,
+                        ) { /* Consume clicks */
+                        }
             ) {
                 Box(
-                    modifier = Modifier
-                        .background(
-                            Color.Black.copy(alpha = 0.95f),
-                            RoundedCornerShape(8.dp)
-                        )
-                        .padding(12.dp)
-                        .widthIn(min = 200.dp, max = 280.dp)
-                        .heightIn(max = 400.dp)
+                    modifier =
+                        Modifier.background(
+                                Color.Black.copy(alpha = 0.95f),
+                                RoundedCornerShape(8.dp),
+                            )
+                            .padding(12.dp)
+                            .widthIn(min = 200.dp, max = 280.dp)
+                            .heightIn(max = 400.dp)
                 ) {
                     Column(
                         modifier = Modifier.verticalScroll(rememberScrollState()),
-                        verticalArrangement = Arrangement.spacedBy(4.dp)
+                        verticalArrangement = Arrangement.spacedBy(4.dp),
                     ) {
                         Text(
                             text = stringResource(R.string.player_subtitle_title),
                             style = MaterialTheme.typography.titleSmall,
                             color = Color.White,
-                            modifier = Modifier.padding(bottom = 4.dp)
+                            modifier = Modifier.padding(bottom = 4.dp),
                         )
                         subtitleStreamOptions.forEach { option ->
                             Row(
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .clickable {
-                                        onPlayerEvent(
-                                            PlayerEvent.SwitchToTrack(
-                                                androidx.media3.common.C.TRACK_TYPE_TEXT,
-                                                option.index
+                                modifier =
+                                    Modifier.fillMaxWidth()
+                                        .clickable {
+                                            onPlayerEvent(
+                                                PlayerEvent.SwitchToTrack(
+                                                    androidx.media3.common.C.TRACK_TYPE_TEXT,
+                                                    option.index,
+                                                )
                                             )
-                                        )
-                                        showSubtitleSelector = false
-                                    }
-                                    .padding(vertical = 6.dp),
-                                verticalAlignment = Alignment.CenterVertically
+                                            showSubtitleSelector = false
+                                        }
+                                        .padding(vertical = 6.dp),
+                                verticalAlignment = Alignment.CenterVertically,
                             ) {
                                 RadioButton(
                                     selected = uiState.subtitleStreamIndex == option.index,
@@ -515,15 +513,16 @@ fun PlayerControls(
                                         onPlayerEvent(
                                             PlayerEvent.SwitchToTrack(
                                                 androidx.media3.common.C.TRACK_TYPE_TEXT,
-                                                option.index
+                                                option.index,
                                             )
                                         )
                                         showSubtitleSelector = false
                                     },
-                                    colors = RadioButtonDefaults.colors(
-                                        selectedColor = MaterialTheme.colorScheme.primary
-                                    ),
-                                    modifier = Modifier.size(20.dp)
+                                    colors =
+                                        RadioButtonDefaults.colors(
+                                            selectedColor = MaterialTheme.colorScheme.primary
+                                        ),
+                                    modifier = Modifier.size(20.dp),
                                 )
                                 Spacer(modifier = Modifier.width(8.dp))
                                 Text(
@@ -531,7 +530,7 @@ fun PlayerControls(
                                     style = MaterialTheme.typography.bodySmall,
                                     color = Color.White,
                                     maxLines = 2,
-                                    overflow = TextOverflow.Ellipsis
+                                    overflow = TextOverflow.Ellipsis,
                                 )
                             }
                         }
@@ -545,7 +544,7 @@ fun PlayerControls(
         PlaybackSpeedDialog(
             currentSpeed = uiState.playbackSpeed,
             onSpeedChange = { speed -> onPlayerEvent(PlayerEvent.SetPlaybackSpeed(speed)) },
-            onDismiss = { showSpeedDialog = false }
+            onDismiss = { showSpeedDialog = false },
         )
     }
 
@@ -558,7 +557,7 @@ fun PlayerControls(
                 onJumpToEpisode(episodeId)
                 showEpisodeSwitcher = false
             },
-            onDismiss = { showEpisodeSwitcher = false }
+            onDismiss = { showEpisodeSwitcher = false },
         )
     }
 }
@@ -574,37 +573,23 @@ private fun TopControls(
     onPipToggle: () -> Unit = { /* TODO */ },
 ) {
     Box(
-        modifier = modifier
-            .fillMaxWidth()
-            .background(
-                Brush.verticalGradient(
-                    colors = listOf(
-                        Color.Black.copy(alpha = 0.7f),
-                        Color.Transparent
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .background(
+                    Brush.verticalGradient(
+                        colors = listOf(Color.Black.copy(alpha = 0.7f), Color.Transparent)
                     )
                 )
-            )
-            .padding(
-                start = 16.dp,
-                end = 16.dp,
-                bottom = 16.dp,
-                top = 32.dp
-            )
+                .padding(start = 16.dp, end = 16.dp, bottom = 16.dp, top = 32.dp)
     ) {
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            verticalAlignment = Alignment.Top
-        ) {
-            IconButton(
-                onClick = onBackClick,
-                modifier = Modifier
-                    .size(36.dp)
-            ) {
+        Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.Top) {
+            IconButton(onClick = onBackClick, modifier = Modifier.size(36.dp)) {
                 Icon(
                     painter = painterResource(R.drawable.ic_chevron_left),
                     contentDescription = stringResource(R.string.cd_back),
                     tint = Color.White,
-                    modifier = Modifier.size(24.dp)
+                    modifier = Modifier.size(24.dp),
                 )
             }
 
@@ -612,30 +597,31 @@ private fun TopControls(
 
             Row(
                 horizontalArrangement = Arrangement.spacedBy(8.dp),
-                verticalAlignment = Alignment.CenterVertically
+                verticalAlignment = Alignment.CenterVertically,
             ) {
-                IconButton(
-                    onClick = onLockToggle,
-                    modifier = Modifier.size(40.dp)
-                ) {
+                IconButton(onClick = onLockToggle, modifier = Modifier.size(40.dp)) {
                     Icon(
-                        painter = painterResource(id = if (uiState.isControlsLocked) R.drawable.ic_unlock_player else R.drawable.ic_lock_player),
-                        contentDescription = if (uiState.isControlsLocked) stringResource(R.string.cd_unlock) else stringResource(R.string.cd_lock),
+                        painter =
+                            painterResource(
+                                id =
+                                    if (uiState.isControlsLocked) R.drawable.ic_unlock_player
+                                    else R.drawable.ic_lock_player
+                            ),
+                        contentDescription =
+                            if (uiState.isControlsLocked) stringResource(R.string.cd_unlock)
+                            else stringResource(R.string.cd_lock),
                         tint = Color.White,
-                        modifier = Modifier.size(24.dp)
+                        modifier = Modifier.size(24.dp),
                     )
                 }
 
                 if (!uiState.isControlsLocked && !uiState.isInPictureInPictureMode) {
-                    IconButton(
-                        onClick = onPipToggle,
-                        modifier = Modifier.size(40.dp)
-                    ) {
+                    IconButton(onClick = onPipToggle, modifier = Modifier.size(40.dp)) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_pip),
                             contentDescription = stringResource(R.string.cd_enter_pip),
                             tint = Color.White,
-                            modifier = Modifier.size(24.dp)
+                            modifier = Modifier.size(24.dp),
                         )
                     }
                 }
@@ -656,7 +642,7 @@ private fun CenterPlayButton(
     onSeekBackward: () -> Unit,
     onSeekForward: () -> Unit,
     onNextClick: () -> Unit,
-    onPreviousClick: () -> Unit
+    onPreviousClick: () -> Unit,
 ) {
     val hasChapters = uiState.chapters.isNotEmpty()
     val isEpisode = uiState.currentItem is AfinityEpisode
@@ -666,81 +652,69 @@ private fun CenterPlayButton(
         visible = showPlayButton,
         enter = scaleIn(animationSpec = tween(200)) + fadeIn(),
         exit = scaleOut(animationSpec = tween(200)) + fadeOut(),
-        modifier = modifier
+        modifier = modifier,
     ) {
         Row(
             horizontalArrangement = Arrangement.spacedBy(16.dp),
-            verticalAlignment = Alignment.CenterVertically
+            verticalAlignment = Alignment.CenterVertically,
         ) {
             if (showSkipButtons) {
-                IconButton(
-                    onClick = onPreviousClick,
-                    modifier = Modifier.size(60.dp)
-                ) {
+                IconButton(onClick = onPreviousClick, modifier = Modifier.size(60.dp)) {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_player_skip_back),
                         contentDescription = stringResource(R.string.cd_previous),
                         tint = Color.White,
-                        modifier = Modifier.size(32.dp)
+                        modifier = Modifier.size(32.dp),
                     )
                 }
             }
 
-            IconButton(
-                onClick = onSeekBackward,
-                modifier = Modifier.size(60.dp)
-            ) {
+            IconButton(onClick = onSeekBackward, modifier = Modifier.size(60.dp)) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_rewind_backward_10),
                     contentDescription = stringResource(R.string.cd_rewind_10),
                     tint = Color.White,
-                    modifier = Modifier.size(32.dp)
+                    modifier = Modifier.size(32.dp),
                 )
             }
 
-            IconButton(
-                onClick = onPlayPauseClick,
-                modifier = Modifier.size(60.dp)
-            ) {
+            IconButton(onClick = onPlayPauseClick, modifier = Modifier.size(60.dp)) {
                 if (isBuffering) {
                     CircularProgressIndicator(
                         modifier = Modifier.size(40.dp),
                         color = Color.White,
-                        strokeWidth = 4.dp
+                        strokeWidth = 4.dp,
                     )
                 } else {
                     Icon(
-                        painter = if (isPlaying) painterResource(id = R.drawable.ic_player_pause_filled)
-                        else painterResource(id = R.drawable.ic_player_play_filled),
-                        contentDescription = if (isPlaying) stringResource(R.string.cd_pause) else stringResource(R.string.cd_play),
+                        painter =
+                            if (isPlaying) painterResource(id = R.drawable.ic_player_pause_filled)
+                            else painterResource(id = R.drawable.ic_player_play_filled),
+                        contentDescription =
+                            if (isPlaying) stringResource(R.string.cd_pause)
+                            else stringResource(R.string.cd_play),
                         tint = Color.White,
-                        modifier = Modifier.size(40.dp)
+                        modifier = Modifier.size(40.dp),
                     )
                 }
             }
 
-            IconButton(
-                onClick = onSeekForward,
-                modifier = Modifier.size(60.dp)
-            ) {
+            IconButton(onClick = onSeekForward, modifier = Modifier.size(60.dp)) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_rewind_forward_30),
                     contentDescription = stringResource(R.string.cd_forward_30),
                     tint = Color.White,
-                    modifier = Modifier.size(32.dp)
+                    modifier = Modifier.size(32.dp),
                 )
             }
 
             if (showSkipButtons) {
-                IconButton(
-                    onClick = onNextClick,
-                    modifier = Modifier.size(60.dp)
-                ) {
+                IconButton(onClick = onNextClick, modifier = Modifier.size(60.dp)) {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_player_skip_forward),
                         contentDescription = stringResource(R.string.cd_next),
                         tint = Color.White,
-                        modifier = Modifier.size(32.dp)
+                        modifier = Modifier.size(32.dp),
                     )
                 }
             }
@@ -761,97 +735,80 @@ private fun BottomControls(
     showEpisodeSwitcherButton: Boolean = false,
 ) {
     Box(
-        modifier = modifier
-            .fillMaxWidth()
-            .background(
-                Brush.verticalGradient(
-                    colors = listOf(
-                        Color.Transparent,
-                        Color.Black.copy(alpha = 0.7f)
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .background(
+                    Brush.verticalGradient(
+                        colors = listOf(Color.Transparent, Color.Black.copy(alpha = 0.7f))
                     )
                 )
-            )
-            .padding(
-                start = 16.dp,
-                end = 16.dp,
-                top = 10.dp,
-                bottom = 10.dp
-            )
+                .padding(start = 16.dp, end = 16.dp, top = 10.dp, bottom = 10.dp)
     ) {
         Column {
-            SeekBar(
-                uiState = uiState,
-                onPlayerEvent = onPlayerEvent
-            )
+            SeekBar(uiState = uiState, onPlayerEvent = onPlayerEvent)
             Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(top = 8.dp),
+                modifier = Modifier.fillMaxWidth().padding(top = 8.dp),
                 horizontalArrangement = Arrangement.End,
-                verticalAlignment = Alignment.CenterVertically
+                verticalAlignment = Alignment.CenterVertically,
             ) {
-                Row(
-                    horizontalArrangement = Arrangement.spacedBy(8.dp)
-                ) {
+                Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                     if (showEpisodeSwitcherButton) {
                         IconButton(
                             onClick = onEpisodeSwitcherToggle,
-                            modifier = Modifier.size(40.dp)
+                            modifier = Modifier.size(40.dp),
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_episodes_list),
                                 contentDescription = stringResource(R.string.cd_episodes),
                                 tint = MaterialTheme.colorScheme.primary,
-                                modifier = Modifier.size(24.dp)
+                                modifier = Modifier.size(24.dp),
                             )
                         }
                     }
 
-                    IconButton(
-                        onClick = onSpeedToggle,
-                        modifier = Modifier.size(40.dp)
-                    ) {
+                    IconButton(onClick = onSpeedToggle, modifier = Modifier.size(40.dp)) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_speed),
                             contentDescription = stringResource(R.string.cd_speed),
                             tint = Color.White,
-                            modifier = Modifier.size(24.dp)
+                            modifier = Modifier.size(24.dp),
                         )
                     }
 
-                    IconButton(
-                        onClick = onAudioToggle,
-                        modifier = Modifier.size(40.dp)
-                    ) {
+                    IconButton(onClick = onAudioToggle, modifier = Modifier.size(40.dp)) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_audio),
                             contentDescription = stringResource(R.string.cd_audio_settings),
-                            tint = if (uiState.audioStreamIndex != null) MaterialTheme.colorScheme.primary else Color.White,
-                            modifier = Modifier.size(24.dp)
+                            tint =
+                                if (uiState.audioStreamIndex != null)
+                                    MaterialTheme.colorScheme.primary
+                                else Color.White,
+                            modifier = Modifier.size(24.dp),
                         )
                     }
 
-                    IconButton(
-                        onClick = onSubtitleToggle,
-                        modifier = Modifier.size(40.dp)
-                    ) {
+                    IconButton(onClick = onSubtitleToggle, modifier = Modifier.size(40.dp)) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_subtitles),
                             contentDescription = stringResource(R.string.cd_subtitle_settings),
-                            tint = if (uiState.subtitleStreamIndex != null) MaterialTheme.colorScheme.primary else Color.White,
-                            modifier = Modifier.size(24.dp)
+                            tint =
+                                if (uiState.subtitleStreamIndex != null)
+                                    MaterialTheme.colorScheme.primary
+                                else Color.White,
+                            modifier = Modifier.size(24.dp),
                         )
                     }
 
                     IconButton(
                         onClick = { onPlayerEvent(PlayerEvent.CycleVideoZoomMode) },
-                        modifier = Modifier.size(40.dp)
+                        modifier = Modifier.size(40.dp),
                     ) {
                         Icon(
                             painter = uiState.videoZoomMode.getIconPainter(),
                             contentDescription = stringResource(R.string.cd_aspect_ratio),
                             tint = Color.White,
-                            modifier = Modifier.size(24.dp)
+                            modifier = Modifier.size(24.dp),
                         )
                     }
                 }
@@ -865,7 +822,7 @@ private fun BottomControls(
 private fun SeekBar(
     uiState: PlayerViewModel.PlayerUiState,
     onPlayerEvent: (PlayerEvent) -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     var draggedPosition by remember { mutableStateOf<Float?>(null) }
     val duration = uiState.duration
@@ -874,18 +831,15 @@ private fun SeekBar(
     Row(
         modifier = modifier.fillMaxWidth(),
         verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(12.dp)
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
     ) {
         if (uiState.isLiveChannel) {
             Box(
-                modifier = Modifier
-                    .weight(1f)
-                    .height(6.dp)
-                    .padding(start = 8.dp)
-                    .background(
-                        Color.Red.copy(alpha = 0.8f),
-                        RoundedCornerShape(3.dp)
-                    )
+                modifier =
+                    Modifier.weight(1f)
+                        .height(6.dp)
+                        .padding(start = 8.dp)
+                        .background(Color.Red.copy(alpha = 0.8f), RoundedCornerShape(3.dp))
             )
         } else {
             Slider(
@@ -902,41 +856,41 @@ private fun SeekBar(
                     draggedPosition = null
                 },
                 valueRange = 0f..duration.toFloat().coerceAtLeast(0f),
-                colors = SliderDefaults.colors(
-                    thumbColor = MaterialTheme.colorScheme.primary,
-                    activeTrackColor = MaterialTheme.colorScheme.primary,
-                    inactiveTrackColor = Color.White.copy(alpha = 0.3f)
-                ),
+                colors =
+                    SliderDefaults.colors(
+                        thumbColor = MaterialTheme.colorScheme.primary,
+                        activeTrackColor = MaterialTheme.colorScheme.primary,
+                        inactiveTrackColor = Color.White.copy(alpha = 0.3f),
+                    ),
                 track = { sliderState ->
                     Box(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(18.dp),
-                        contentAlignment = Alignment.Center
+                        modifier = Modifier.fillMaxWidth().height(18.dp),
+                        contentAlignment = Alignment.Center,
                     ) {
                         SliderDefaults.Track(
                             sliderState = sliderState,
                             modifier = Modifier.height(6.dp),
-                            thumbTrackGapSize = 6.dp
+                            thumbTrackGapSize = 6.dp,
                         )
                         Canvas(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(horizontal = 6.dp)
-                                .height(6.dp)
+                            modifier =
+                                Modifier.fillMaxWidth().padding(horizontal = 6.dp).height(6.dp)
                         ) {
                             if (duration > 0) {
-                                val progress = (sliderState.value - sliderState.valueRange.start) /
-                                        (sliderState.valueRange.endInclusive - sliderState.valueRange.start)
+                                val progress =
+                                    (sliderState.value - sliderState.valueRange.start) /
+                                        (sliderState.valueRange.endInclusive -
+                                            sliderState.valueRange.start)
 
                                 val activeWidthPx = size.width * progress
                                 val gapSafetyOffset = 10.dp.toPx()
 
                                 clipRect(
-                                    left = (activeWidthPx + gapSafetyOffset).coerceAtMost(size.width),
+                                    left =
+                                        (activeWidthPx + gapSafetyOffset).coerceAtMost(size.width),
                                     top = 0f,
                                     right = size.width,
-                                    bottom = size.height
+                                    bottom = size.height,
                                 ) {
                                     uiState.chapters.forEach { chapter ->
                                         val fraction =
@@ -946,10 +900,7 @@ private fun SeekBar(
                                         drawCircle(
                                             color = Color.White.copy(alpha = 0.8f),
                                             radius = 2.dp.toPx(),
-                                            center = Offset(
-                                                x,
-                                                size.height / 2
-                                            )
+                                            center = Offset(x, size.height / 2),
                                         )
                                     }
                                 }
@@ -957,10 +908,7 @@ private fun SeekBar(
                         }
                     }
                 },
-                modifier = Modifier
-                    .weight(1f)
-                    .height(18.dp)
-                    .padding(start = 8.dp)
+                modifier = Modifier.weight(1f).height(18.dp).padding(start = 8.dp),
             )
         }
 
@@ -968,25 +916,25 @@ private fun SeekBar(
             LiveBadge()
         } else {
             Box(
-                modifier = Modifier
-                    .width(50.dp)
-                    .clickable(
+                modifier =
+                    Modifier.width(50.dp).clickable(
                         interactionSource = remember { MutableInteractionSource() },
-                        indication = null
+                        indication = null,
                     ) {
                         onPlayerEvent(PlayerEvent.ToggleRemainingTime)
                     },
-                contentAlignment = Alignment.CenterEnd
+                contentAlignment = Alignment.CenterEnd,
             ) {
                 Text(
-                    text = if (uiState.showRemainingTime) {
-                        "-${formatTime((duration - position).coerceAtLeast(0L))}"
-                    } else {
-                        formatTime(position)
-                    },
+                    text =
+                        if (uiState.showRemainingTime) {
+                            "-${formatTime((duration - position).coerceAtLeast(0L))}"
+                        } else {
+                            formatTime(position)
+                        },
                     color = Color.White,
                     fontSize = 12.sp,
-                    maxLines = 1
+                    maxLines = 1,
                 )
             }
         }
@@ -1009,15 +957,19 @@ private fun formatTime(timeMs: Long): String {
 private fun formatSubtitleCodec(codec: String): String {
     return when (codec.lowercase()) {
         "subrip" -> "SRT"
-        "ass", "ssa" -> "ASS"
-        "webvtt", "vtt" -> "VTT"
+        "ass",
+        "ssa" -> "ASS"
+        "webvtt",
+        "vtt" -> "VTT"
         "mov_text" -> "TX3G"
-        "dvd_subtitle", "dvdsub" -> "VOBSUB"
-        "hdmv_pgs_subtitle", "pgssub" -> "PGS"
+        "dvd_subtitle",
+        "dvdsub" -> "VOBSUB"
+        "hdmv_pgs_subtitle",
+        "pgssub" -> "PGS"
         "dvb_subtitle" -> "DVB"
         "sami" -> "SAMI"
         "microdvd" -> "MicroDVD"
         "subviewer" -> "SubViewer"
         else -> codec.uppercase()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/components/PlayerIndicators.kt b/app/src/main/java/com/makd/afinity/ui/player/components/PlayerIndicators.kt
index e1f91500a..16601555d 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/components/PlayerIndicators.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/components/PlayerIndicators.kt
@@ -43,74 +43,65 @@ import kotlin.math.roundToInt
 
 @UnstableApi
 @Composable
-fun PlayerIndicators(
-    uiState: PlayerViewModel.PlayerUiState,
-    modifier: Modifier = Modifier
-) {
-    Box(
-        modifier = modifier.fillMaxSize()
-    ) {
+fun PlayerIndicators(uiState: PlayerViewModel.PlayerUiState, modifier: Modifier = Modifier) {
+    Box(modifier = modifier.fillMaxSize()) {
         SeekIndicator(
             show = uiState.showSeekIndicator,
             direction = uiState.seekDirection,
-            modifier = Modifier.align(Alignment.Center)
+            modifier = Modifier.align(Alignment.Center),
         )
 
         BrightnessIndicator(
             show = uiState.showBrightnessIndicator,
             level = uiState.brightnessLevel,
-            modifier = Modifier.align(Alignment.CenterStart)
+            modifier = Modifier.align(Alignment.CenterStart),
         )
 
         VolumeIndicator(
             show = uiState.showVolumeIndicator,
             level = uiState.volumeLevel,
-            modifier = Modifier.align(Alignment.CenterEnd)
+            modifier = Modifier.align(Alignment.CenterEnd),
         )
     }
 }
 
 @Composable
-private fun SeekIndicator(
-    show: Boolean,
-    direction: Int,
-    modifier: Modifier = Modifier
-) {
+private fun SeekIndicator(show: Boolean, direction: Int, modifier: Modifier = Modifier) {
     AnimatedVisibility(
         visible = show,
         enter = scaleIn(animationSpec = tween(200)) + fadeIn(),
         exit = scaleOut(animationSpec = tween(200)) + fadeOut(),
-        modifier = modifier
+        modifier = modifier,
     ) {
         Card(
-            modifier = Modifier
-                .size(120.dp)
-                .clip(RoundedCornerShape(16.dp)),
-            colors = CardDefaults.cardColors(
-                containerColor = Color.Black.copy(alpha = 0.8f)
-            )
+            modifier = Modifier.size(120.dp).clip(RoundedCornerShape(16.dp)),
+            colors = CardDefaults.cardColors(containerColor = Color.Black.copy(alpha = 0.8f)),
         ) {
             Column(
                 modifier = Modifier.fillMaxSize(),
                 horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.Center
+                verticalArrangement = Arrangement.Center,
             ) {
                 Icon(
-                    painter = if (direction > 0) painterResource(id = R.drawable.ic_fast_forward) else painterResource(
-                        id = R.drawable.ic_fast_rewind
-                    ),
-                    contentDescription = if (direction > 0) stringResource(R.string.cd_fast_forward) else stringResource(R.string.cd_rewind),
+                    painter =
+                        if (direction > 0) painterResource(id = R.drawable.ic_fast_forward)
+                        else painterResource(id = R.drawable.ic_fast_rewind),
+                    contentDescription =
+                        if (direction > 0) stringResource(R.string.cd_fast_forward)
+                        else stringResource(R.string.cd_rewind),
                     tint = Color.White,
-                    modifier = Modifier.size(40.dp)
+                    modifier = Modifier.size(40.dp),
                 )
 
                 Spacer(modifier = Modifier.height(8.dp))
 
                 Text(
-                    text = if (direction > 0) stringResource(R.string.seek_forward_text) else stringResource(R.string.seek_rewind_text),
+                    text =
+                        if (direction > 0) stringResource(R.string.seek_forward_text)
+                        else stringResource(R.string.seek_rewind_text),
                     color = Color.White,
                     fontSize = 16.sp,
-                    fontWeight = FontWeight.Medium
+                    fontWeight = FontWeight.Medium,
                 )
             }
         }
@@ -118,64 +109,43 @@ private fun SeekIndicator(
 }
 
 @Composable
-private fun BrightnessIndicator(
-    show: Boolean,
-    level: Float,
-    modifier: Modifier = Modifier
-) {
+private fun BrightnessIndicator(show: Boolean, level: Float, modifier: Modifier = Modifier) {
     AnimatedVisibility(
         visible = show,
-        enter = slideInHorizontally(
-            initialOffsetX = { -it },
-            animationSpec = tween(200)
-        ) + fadeIn(),
-        exit = slideOutHorizontally(
-            targetOffsetX = { -it },
-            animationSpec = tween(200)
-        ) + fadeOut(),
-        modifier = modifier.padding(start = 32.dp)
+        enter =
+            slideInHorizontally(initialOffsetX = { -it }, animationSpec = tween(200)) + fadeIn(),
+        exit =
+            slideOutHorizontally(targetOffsetX = { -it }, animationSpec = tween(200)) + fadeOut(),
+        modifier = modifier.padding(start = 32.dp),
     ) {
         Card(
-            modifier = Modifier
-                .width(80.dp)
-                .height(200.dp)
-                .clip(RoundedCornerShape(16.dp)),
-            colors = CardDefaults.cardColors(
-                containerColor = Color.Black.copy(alpha = 0.8f)
-            )
+            modifier = Modifier.width(80.dp).height(200.dp).clip(RoundedCornerShape(16.dp)),
+            colors = CardDefaults.cardColors(containerColor = Color.Black.copy(alpha = 0.8f)),
         ) {
             Column(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(16.dp),
+                modifier = Modifier.fillMaxSize().padding(16.dp),
                 horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.spacedBy(12.dp)
+                verticalArrangement = Arrangement.spacedBy(12.dp),
             ) {
                 Icon(
                     painter = getBrightnessIcon(level),
                     contentDescription = stringResource(R.string.cd_brightness),
                     tint = Color.White,
-                    modifier = Modifier.size(24.dp)
+                    modifier = Modifier.size(24.dp),
                 )
 
                 Box(
-                    modifier = Modifier
-                        .width(6.dp)
-                        .weight(1f)
-                        .background(
-                            Color.White.copy(alpha = 0.3f),
-                            RoundedCornerShape(3.dp)
-                        )
+                    modifier =
+                        Modifier.width(6.dp)
+                            .weight(1f)
+                            .background(Color.White.copy(alpha = 0.3f), RoundedCornerShape(3.dp))
                 ) {
                     Box(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .fillMaxHeight(level)
-                            .background(
-                                Color.White,
-                                RoundedCornerShape(3.dp)
-                            )
-                            .align(Alignment.BottomCenter)
+                        modifier =
+                            Modifier.fillMaxWidth()
+                                .fillMaxHeight(level)
+                                .background(Color.White, RoundedCornerShape(3.dp))
+                                .align(Alignment.BottomCenter)
                     )
                 }
 
@@ -183,7 +153,7 @@ private fun BrightnessIndicator(
                     text = stringResource(R.string.percent_fmt, (level * 100).roundToInt()),
                     color = Color.White,
                     fontSize = 12.sp,
-                    fontWeight = FontWeight.Medium
+                    fontWeight = FontWeight.Medium,
                 )
             }
         }
@@ -191,64 +161,41 @@ private fun BrightnessIndicator(
 }
 
 @Composable
-private fun VolumeIndicator(
-    show: Boolean,
-    level: Int,
-    modifier: Modifier = Modifier
-) {
+private fun VolumeIndicator(show: Boolean, level: Int, modifier: Modifier = Modifier) {
     AnimatedVisibility(
         visible = show,
-        enter = slideInHorizontally(
-            initialOffsetX = { it },
-            animationSpec = tween(200)
-        ) + fadeIn(),
-        exit = slideOutHorizontally(
-            targetOffsetX = { it },
-            animationSpec = tween(200)
-        ) + fadeOut(),
-        modifier = modifier.padding(end = 32.dp)
+        enter = slideInHorizontally(initialOffsetX = { it }, animationSpec = tween(200)) + fadeIn(),
+        exit = slideOutHorizontally(targetOffsetX = { it }, animationSpec = tween(200)) + fadeOut(),
+        modifier = modifier.padding(end = 32.dp),
     ) {
         Card(
-            modifier = Modifier
-                .width(80.dp)
-                .height(200.dp)
-                .clip(RoundedCornerShape(16.dp)),
-            colors = CardDefaults.cardColors(
-                containerColor = Color.Black.copy(alpha = 0.8f)
-            )
+            modifier = Modifier.width(80.dp).height(200.dp).clip(RoundedCornerShape(16.dp)),
+            colors = CardDefaults.cardColors(containerColor = Color.Black.copy(alpha = 0.8f)),
         ) {
             Column(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(16.dp),
+                modifier = Modifier.fillMaxSize().padding(16.dp),
                 horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.spacedBy(12.dp)
+                verticalArrangement = Arrangement.spacedBy(12.dp),
             ) {
                 Icon(
                     painter = getVolumeIcon(level),
                     contentDescription = stringResource(R.string.cd_volume),
                     tint = Color.White,
-                    modifier = Modifier.size(24.dp)
+                    modifier = Modifier.size(24.dp),
                 )
 
                 Box(
-                    modifier = Modifier
-                        .width(6.dp)
-                        .weight(1f)
-                        .background(
-                            Color.White.copy(alpha = 0.3f),
-                            RoundedCornerShape(3.dp)
-                        )
+                    modifier =
+                        Modifier.width(6.dp)
+                            .weight(1f)
+                            .background(Color.White.copy(alpha = 0.3f), RoundedCornerShape(3.dp))
                 ) {
                     Box(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .fillMaxHeight(level / 100f)
-                            .background(
-                                Color.White,
-                                RoundedCornerShape(3.dp)
-                            )
-                            .align(Alignment.BottomCenter)
+                        modifier =
+                            Modifier.fillMaxWidth()
+                                .fillMaxHeight(level / 100f)
+                                .background(Color.White, RoundedCornerShape(3.dp))
+                                .align(Alignment.BottomCenter)
                     )
                 }
 
@@ -256,7 +203,7 @@ private fun VolumeIndicator(
                     text = stringResource(R.string.percent_fmt, level),
                     color = Color.White,
                     fontSize = 12.sp,
-                    fontWeight = FontWeight.Medium
+                    fontWeight = FontWeight.Medium,
                 )
             }
         }
@@ -279,4 +226,4 @@ private fun getVolumeIcon(level: Int): Painter {
         level < 30 -> painterResource(id = R.drawable.ic_volume_down)
         else -> painterResource(id = R.drawable.ic_volume_up)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/components/SkipButton.kt b/app/src/main/java/com/makd/afinity/ui/player/components/SkipButton.kt
index 02dbb6ba3..abeece787 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/components/SkipButton.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/components/SkipButton.kt
@@ -33,46 +33,36 @@ fun SkipButton(
     segment: AfinitySegment,
     skipButtonText: String,
     onClick: (AfinitySegment) -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     AnimatedVisibility(
         visible = true,
-        enter = slideInVertically(
-            initialOffsetY = { it },
-            animationSpec = tween(300)
-        ) + fadeIn(animationSpec = tween(300)),
-        exit = slideOutVertically(
-            targetOffsetY = { it },
-            animationSpec = tween(300)
-        ) + fadeOut(animationSpec = tween(300)),
-        modifier = modifier
+        enter =
+            slideInVertically(initialOffsetY = { it }, animationSpec = tween(300)) +
+                fadeIn(animationSpec = tween(300)),
+        exit =
+            slideOutVertically(targetOffsetY = { it }, animationSpec = tween(300)) +
+                fadeOut(animationSpec = tween(300)),
+        modifier = modifier,
     ) {
         FilledTonalButton(
             onClick = { onClick(segment) },
-            modifier = Modifier
-                .wrapContentSize()
-                .padding(16.dp),
-            colors = ButtonDefaults.filledTonalButtonColors(
-                containerColor = Color.Black.copy(alpha = 0.8f),
-                contentColor = Color.White
-            ),
+            modifier = Modifier.wrapContentSize().padding(16.dp),
+            colors =
+                ButtonDefaults.filledTonalButtonColors(
+                    containerColor = Color.Black.copy(alpha = 0.8f),
+                    contentColor = Color.White,
+                ),
             shape = RoundedCornerShape(8.dp),
-            contentPadding = PaddingValues(
-                horizontal = 16.dp,
-                vertical = 12.dp
-            )
+            contentPadding = PaddingValues(horizontal = 16.dp, vertical = 12.dp),
         ) {
             Icon(
                 painter = painterResource(id = R.drawable.ic_skip_next),
                 contentDescription = stringResource(R.string.cd_skip_button_icon),
-                modifier = Modifier.size(20.dp)
+                modifier = Modifier.size(20.dp),
             )
             Spacer(modifier = Modifier.width(8.dp))
-            Text(
-                text = skipButtonText,
-                fontSize = 16.sp,
-                fontWeight = FontWeight.Medium
-            )
+            Text(text = skipButtonText, fontSize = 16.sp, fontWeight = FontWeight.Medium)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/components/TrickplayPreview.kt b/app/src/main/java/com/makd/afinity/ui/player/components/TrickplayPreview.kt
index 77680889a..d375e3136 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/components/TrickplayPreview.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/components/TrickplayPreview.kt
@@ -38,7 +38,7 @@ fun TrickplayPreview(
     positionMs: Long,
     durationMs: Long,
     chapters: List<AfinityChapter>,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val configuration = LocalConfiguration.current
     val screenWidth = configuration.screenWidthDp.dp
@@ -49,7 +49,7 @@ fun TrickplayPreview(
         visible = isVisible && previewImage != null,
         enter = fadeIn(),
         exit = fadeOut(),
-        modifier = modifier
+        modifier = modifier,
     ) {
         if (previewImage != null) {
             Box(modifier = Modifier.fillMaxSize()) {
@@ -59,29 +59,34 @@ fun TrickplayPreview(
                 val endPadding = 78.dp
 
                 val actualSliderWidth = screenWidth - startPadding - endPadding
-                val progress = if (durationMs > 0) (positionMs.toFloat() / durationMs.toFloat()).coerceIn(0f, 1f) else 0f
+                val progress =
+                    if (durationMs > 0)
+                        (positionMs.toFloat() / durationMs.toFloat()).coerceIn(0f, 1f)
+                    else 0f
                 val targetX = startPadding + (actualSliderWidth * progress)
 
-                val constrainedX = when {
-                    targetX - previewWidth / 2 < 8.dp -> 8.dp
-                    targetX + previewWidth / 2 > screenWidth - 8.dp -> screenWidth - previewWidth - 8.dp
-                    else -> targetX - previewWidth / 2
-                }
+                val constrainedX =
+                    when {
+                        targetX - previewWidth / 2 < 8.dp -> 8.dp
+                        targetX + previewWidth / 2 > screenWidth - 8.dp ->
+                            screenWidth - previewWidth - 8.dp
+                        else -> targetX - previewWidth / 2
+                    }
 
                 Card(
-                    modifier = Modifier
-                        .offset(x = constrainedX, y = seekBarY - previewHeight - 8.dp)
-                        .size(previewWidth, previewHeight),
+                    modifier =
+                        Modifier.offset(x = constrainedX, y = seekBarY - previewHeight - 8.dp)
+                            .size(previewWidth, previewHeight),
                     colors = CardDefaults.cardColors(containerColor = Color.Black),
                     shape = RoundedCornerShape(8.dp),
-                    elevation = CardDefaults.cardElevation(defaultElevation = 8.dp)
+                    elevation = CardDefaults.cardElevation(defaultElevation = 8.dp),
                 ) {
                     Box(modifier = Modifier.fillMaxSize()) {
                         Image(
                             bitmap = previewImage,
                             contentDescription = null,
                             modifier = Modifier.fillMaxSize(),
-                            contentScale = ContentScale.Crop
+                            contentScale = ContentScale.Crop,
                         )
 
                         val currentChapter = chapters.lastOrNull { it.startPosition <= positionMs }
@@ -90,23 +95,21 @@ fun TrickplayPreview(
                             targetState = currentChapter?.name,
                             transitionSpec = {
                                 fadeIn(animationSpec = tween(200)) togetherWith
-                                        fadeOut(animationSpec = tween(200)) using
-                                        SizeTransform(clip = false)
+                                    fadeOut(animationSpec = tween(200)) using
+                                    SizeTransform(clip = false)
                             },
                             contentAlignment = Alignment.CenterStart,
-                            modifier = Modifier
-                                .align(Alignment.BottomStart)
-                                .padding(8.dp),
-                            label = "ChapterNameAnimation"
+                            modifier = Modifier.align(Alignment.BottomStart).padding(8.dp),
+                            label = "ChapterNameAnimation",
                         ) { chapterName ->
                             if (!chapterName.isNullOrEmpty()) {
                                 Box(
-                                    modifier = Modifier
-                                        .background(
-                                            color = Color.Black.copy(alpha = 0.75f),
-                                            shape = RoundedCornerShape(4.dp)
-                                        )
-                                        .padding(horizontal = 8.dp, vertical = 4.dp)
+                                    modifier =
+                                        Modifier.background(
+                                                color = Color.Black.copy(alpha = 0.75f),
+                                                shape = RoundedCornerShape(4.dp),
+                                            )
+                                            .padding(horizontal = 8.dp, vertical = 4.dp)
                                 ) {
                                     Text(
                                         text = chapterName,
@@ -114,7 +117,7 @@ fun TrickplayPreview(
                                         fontSize = 11.sp,
                                         fontWeight = FontWeight.Bold,
                                         maxLines = 1,
-                                        overflow = TextOverflow.Ellipsis
+                                        overflow = TextOverflow.Ellipsis,
                                     )
                                 }
                             }
@@ -124,4 +127,4 @@ fun TrickplayPreview(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/utils/KeepScreenOn.kt b/app/src/main/java/com/makd/afinity/ui/player/utils/KeepScreenOn.kt
index 7c22c081f..7977726ac 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/utils/KeepScreenOn.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/utils/KeepScreenOn.kt
@@ -20,8 +20,6 @@ fun KeepScreenOn(keepOn: Boolean) {
             activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         }
 
-        onDispose {
-            activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-        }
+        onDispose { activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/utils/PlayerSystemBarsController.kt b/app/src/main/java/com/makd/afinity/ui/player/utils/PlayerSystemBarsController.kt
index 1dd5b0b7f..c40a60068 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/utils/PlayerSystemBarsController.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/utils/PlayerSystemBarsController.kt
@@ -12,9 +12,7 @@ import androidx.core.view.WindowInsetsControllerCompat
 
 @ComposableTarget("androidx.compose.ui.UiComposable")
 @Composable
-fun PlayerSystemBarsController(
-    isControlsVisible: Boolean = false
-) {
+fun PlayerSystemBarsController(isControlsVisible: Boolean = false) {
     val context = LocalContext.current
     val activity = context as? Activity
 
@@ -47,4 +45,4 @@ fun PlayerSystemBarsController(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/utils/ScreenBrightnessHelper.kt b/app/src/main/java/com/makd/afinity/ui/player/utils/ScreenBrightnessHelper.kt
index 1d5094275..1f6f6c191 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/utils/ScreenBrightnessHelper.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/utils/ScreenBrightnessHelper.kt
@@ -8,20 +8,19 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.platform.LocalContext
 
 @Composable
-fun ScreenBrightnessController(
-    brightness: Float
-) {
+fun ScreenBrightnessController(brightness: Float) {
     val context = LocalContext.current
     val activity = remember(context) { context.findActivity() } ?: return
 
     LaunchedEffect(brightness) {
         val layoutParams = activity.window.attributes
 
-        layoutParams.screenBrightness = if (brightness < 0f) {
-            WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE
-        } else {
-            brightness.coerceIn(0f, 1f)
-        }
+        layoutParams.screenBrightness =
+            if (brightness < 0f) {
+                WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE
+            } else {
+                brightness.coerceIn(0f, 1f)
+            }
 
         activity.window.attributes = layoutParams
     }
@@ -42,4 +41,4 @@ fun Context.findActivity(): Activity? {
         context = context.baseContext
     }
     return null
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/player/utils/VolmeManager.kt b/app/src/main/java/com/makd/afinity/ui/player/utils/VolmeManager.kt
index acff1522c..33f659f9f 100644
--- a/app/src/main/java/com/makd/afinity/ui/player/utils/VolmeManager.kt
+++ b/app/src/main/java/com/makd/afinity/ui/player/utils/VolmeManager.kt
@@ -21,11 +21,7 @@ class VolumeManager(private val context: Context) {
             val maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
             val targetVolume = ((clampedVolume.toFloat() / 100f) * maxVolume).toInt()
 
-            audioManager.setStreamVolume(
-                AudioManager.STREAM_MUSIC,
-                targetVolume,
-                0
-            )
+            audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, targetVolume, 0)
 
             Timber.d("System volume set to $clampedVolume% (raw: $targetVolume/$maxVolume)")
         } catch (e: Exception) {
@@ -42,4 +38,4 @@ class VolumeManager(private val context: Context) {
     fun getMaxVolume(): Int {
         return audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/requests/DiscoverMediaCard.kt b/app/src/main/java/com/makd/afinity/ui/requests/DiscoverMediaCard.kt
index aa397c97b..855466edf 100644
--- a/app/src/main/java/com/makd/afinity/ui/requests/DiscoverMediaCard.kt
+++ b/app/src/main/java/com/makd/afinity/ui/requests/DiscoverMediaCard.kt
@@ -28,8 +28,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 import com.makd.afinity.R
 import com.makd.afinity.data.models.jellyseerr.MediaStatus
 import com.makd.afinity.data.models.jellyseerr.SearchResultItem
@@ -41,23 +41,18 @@ fun DiscoverMediaCard(
     item: SearchResultItem,
     onClick: () -> Unit,
     cardWidth: Dp,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val density = LocalDensity.current
     val fontScale = density.fontScale
 
-    Column(
-        modifier = modifier.width(cardWidth)
-    ) {
+    Column(modifier = modifier.width(cardWidth)) {
         Card(
             onClick = onClick,
-            modifier = Modifier
-                .fillMaxWidth()
-                .aspectRatio(CardDimensions.ASPECT_RATIO_PORTRAIT),
-            colors = CardDefaults.cardColors(
-                containerColor = MaterialTheme.colorScheme.surfaceVariant
-            ),
-            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+            modifier = Modifier.fillMaxWidth().aspectRatio(CardDimensions.ASPECT_RATIO_PORTRAIT),
+            colors =
+                CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
+            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
         ) {
             Box(modifier = Modifier.fillMaxSize()) {
                 AsyncImage(
@@ -67,52 +62,56 @@ fun DiscoverMediaCard(
                     targetWidth = cardWidth,
                     targetHeight = cardWidth * 3f / 2f,
                     contentScale = ContentScale.Crop,
-                    modifier = Modifier.fillMaxSize()
+                    modifier = Modifier.fillMaxSize(),
                 )
 
                 if (item.hasExistingRequest()) {
                     item.getDisplayStatus()?.let { status ->
-                        val backgroundColor = when (status) {
-                            MediaStatus.UNKNOWN -> MaterialTheme.colorScheme.surfaceVariant
-                            MediaStatus.PENDING -> MaterialTheme.colorScheme.tertiary
-                            MediaStatus.PROCESSING -> MaterialTheme.colorScheme.primary
-                            MediaStatus.PARTIALLY_AVAILABLE -> MaterialTheme.colorScheme.secondary
-                            MediaStatus.AVAILABLE -> MaterialTheme.colorScheme.secondary
-                            MediaStatus.DELETED -> MaterialTheme.colorScheme.error
-                        }
+                        val backgroundColor =
+                            when (status) {
+                                MediaStatus.UNKNOWN -> MaterialTheme.colorScheme.surfaceVariant
+                                MediaStatus.PENDING -> MaterialTheme.colorScheme.tertiary
+                                MediaStatus.PROCESSING -> MaterialTheme.colorScheme.primary
+                                MediaStatus.PARTIALLY_AVAILABLE ->
+                                    MaterialTheme.colorScheme.secondary
+                                MediaStatus.AVAILABLE -> MaterialTheme.colorScheme.secondary
+                                MediaStatus.DELETED -> MaterialTheme.colorScheme.error
+                            }
 
-                        val textColor = when (status) {
-                            MediaStatus.UNKNOWN -> MaterialTheme.colorScheme.onSurfaceVariant
-                            MediaStatus.PENDING -> MaterialTheme.colorScheme.onTertiary
-                            MediaStatus.PROCESSING -> MaterialTheme.colorScheme.onPrimary
-                            MediaStatus.PARTIALLY_AVAILABLE -> MaterialTheme.colorScheme.onSecondary
-                            MediaStatus.AVAILABLE -> MaterialTheme.colorScheme.onSecondary
-                            MediaStatus.DELETED -> MaterialTheme.colorScheme.onError
-                        }
+                        val textColor =
+                            when (status) {
+                                MediaStatus.UNKNOWN -> MaterialTheme.colorScheme.onSurfaceVariant
+                                MediaStatus.PENDING -> MaterialTheme.colorScheme.onTertiary
+                                MediaStatus.PROCESSING -> MaterialTheme.colorScheme.onPrimary
+                                MediaStatus.PARTIALLY_AVAILABLE ->
+                                    MaterialTheme.colorScheme.onSecondary
+                                MediaStatus.AVAILABLE -> MaterialTheme.colorScheme.onSecondary
+                                MediaStatus.DELETED -> MaterialTheme.colorScheme.onError
+                            }
 
                         Card(
-                            modifier = Modifier
-                                .align(Alignment.TopEnd)
-                                .padding(8.dp),
+                            modifier = Modifier.align(Alignment.TopEnd).padding(8.dp),
                             shape = RoundedCornerShape(4.dp),
-                            colors = CardDefaults.cardColors(
-                                containerColor = backgroundColor
-                            )
+                            colors = CardDefaults.cardColors(containerColor = backgroundColor),
                         ) {
-                            val statusText = when (status) {
-                                MediaStatus.PENDING -> stringResource(R.string.status_pending)
-                                MediaStatus.PROCESSING -> stringResource(R.string.status_processing)
-                                MediaStatus.PARTIALLY_AVAILABLE -> stringResource(R.string.status_partially_available)
-                                MediaStatus.AVAILABLE -> stringResource(R.string.status_available)
-                                MediaStatus.DELETED -> stringResource(R.string.status_deleted)
-                                else -> stringResource(R.string.status_unknown)
-                            }
+                            val statusText =
+                                when (status) {
+                                    MediaStatus.PENDING -> stringResource(R.string.status_pending)
+                                    MediaStatus.PROCESSING ->
+                                        stringResource(R.string.status_processing)
+                                    MediaStatus.PARTIALLY_AVAILABLE ->
+                                        stringResource(R.string.status_partially_available)
+                                    MediaStatus.AVAILABLE ->
+                                        stringResource(R.string.status_available)
+                                    MediaStatus.DELETED -> stringResource(R.string.status_deleted)
+                                    else -> stringResource(R.string.status_unknown)
+                                }
                             Text(
                                 text = statusText,
                                 style = MaterialTheme.typography.labelSmall,
                                 color = textColor,
                                 modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp),
-                                fontWeight = FontWeight.Bold
+                                fontWeight = FontWeight.Bold,
                             )
                         }
                     }
@@ -124,12 +123,10 @@ fun DiscoverMediaCard(
 
         Text(
             text = item.getDisplayTitle(),
-            style = MaterialTheme.typography.bodyMedium.copy(
-                fontWeight = FontWeight.SemiBold
-            ),
+            style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
             color = MaterialTheme.colorScheme.onBackground,
             maxLines = 1,
-            overflow = TextOverflow.Ellipsis
+            overflow = TextOverflow.Ellipsis,
         )
 
         Row(
@@ -142,11 +139,14 @@ fun DiscoverMediaCard(
                 metadataItems.add {
                     Text(
                         text = year,
-                        style = MaterialTheme.typography.bodySmall.copy(
-                            fontSize = MaterialTheme.typography.bodySmall.fontSize *
-                                    if (fontScale > 1.3f) 0.8f else if (fontScale > 1.15f) 0.9f else 1f
-                        ),
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        style =
+                            MaterialTheme.typography.bodySmall.copy(
+                                fontSize =
+                                    MaterialTheme.typography.bodySmall.fontSize *
+                                        if (fontScale > 1.3f) 0.8f
+                                        else if (fontScale > 1.15f) 0.9f else 1f
+                            ),
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
                 }
             }
@@ -155,25 +155,28 @@ fun DiscoverMediaCard(
                 metadataItems.add {
                     Row(
                         verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.spacedBy(2.dp)
+                        horizontalArrangement = Arrangement.spacedBy(2.dp),
                     ) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_tmdb_short),
                             contentDescription = stringResource(R.string.cd_tmdb_rating),
                             tint = Color.Unspecified,
-                            modifier = Modifier.size(
-                                if (fontScale > 1.3f) 12.dp
-                                else if (fontScale > 1.15f) 14.dp
-                                else 16.dp
-                            )
+                            modifier =
+                                Modifier.size(
+                                    if (fontScale > 1.3f) 12.dp
+                                    else if (fontScale > 1.15f) 14.dp else 16.dp
+                                ),
                         )
                         Text(
                             text = rating,
-                            style = MaterialTheme.typography.bodySmall.copy(
-                                fontSize = MaterialTheme.typography.bodySmall.fontSize *
-                                        if (fontScale > 1.3f) 0.8f else if (fontScale > 1.15f) 0.9f else 1f
-                            ),
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            style =
+                                MaterialTheme.typography.bodySmall.copy(
+                                    fontSize =
+                                        MaterialTheme.typography.bodySmall.fontSize *
+                                            if (fontScale > 1.3f) 0.8f
+                                            else if (fontScale > 1.15f) 0.9f else 1f
+                                ),
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
                 }
@@ -185,10 +188,10 @@ fun DiscoverMediaCard(
                     Text(
                         text = "•",
                         style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
                 }
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/requests/FilteredMediaScreen.kt b/app/src/main/java/com/makd/afinity/ui/requests/FilteredMediaScreen.kt
index 736012258..2a7619ca3 100644
--- a/app/src/main/java/com/makd/afinity/ui/requests/FilteredMediaScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/requests/FilteredMediaScreen.kt
@@ -42,14 +42,10 @@ enum class FilterType {
     POPULAR_MOVIES,
     UPCOMING_MOVIES,
     POPULAR_TV,
-    UPCOMING_TV
+    UPCOMING_TV,
 }
 
-data class FilterParams(
-    val type: FilterType,
-    val id: Int,
-    val name: String
-)
+data class FilterParams(val type: FilterType, val id: Int, val name: String)
 
 @Composable
 fun FilteredMediaScreen(
@@ -61,14 +57,12 @@ fun FilteredMediaScreen(
     modifier: Modifier = Modifier,
     viewModel: FilteredMediaViewModel = hiltViewModel(),
     requestsViewModel: RequestsViewModel = hiltViewModel(),
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val requestsUiState by requestsViewModel.uiState.collectAsStateWithLifecycle()
 
-    LaunchedEffect(filterParams) {
-        viewModel.loadContent(filterParams)
-    }
+    LaunchedEffect(filterParams) { viewModel.loadContent(filterParams) }
 
     val cardWidth = widthSizeClass.portraitWidth
 
@@ -78,62 +72,55 @@ fun FilteredMediaScreen(
                 title = {
                     Text(
                         text = filterParams.name,
-                        style = MaterialTheme.typography.headlineLarge.copy(
-                            fontWeight = FontWeight.Bold
-                        ),
-                        color = MaterialTheme.colorScheme.onBackground
+                        style =
+                            MaterialTheme.typography.headlineLarge.copy(
+                                fontWeight = FontWeight.Bold
+                            ),
+                        color = MaterialTheme.colorScheme.onBackground,
                     )
                 },
                 onSearchClick = onSearchClick,
                 onProfileClick = onProfileClick,
-                userProfileImageUrl = mainUiState.userProfileImageUrl
+                userProfileImageUrl = mainUiState.userProfileImageUrl,
             )
         },
-        modifier = modifier.fillMaxSize()
+        modifier = modifier.fillMaxSize(),
     ) { innerPadding ->
         when {
             uiState.isLoading && uiState.items.isEmpty() -> {
-                LoadingView(modifier = Modifier
-                    .fillMaxSize()
-                    .padding(innerPadding))
+                LoadingView(modifier = Modifier.fillMaxSize().padding(innerPadding))
             }
 
             uiState.error != null && uiState.items.isEmpty() -> {
                 ErrorView(
                     message = uiState.error!!,
                     onRetry = { viewModel.loadContent(filterParams) },
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(innerPadding)
+                    modifier = Modifier.fillMaxSize().padding(innerPadding),
                 )
             }
 
             uiState.items.isEmpty() -> {
-                EmptyView(modifier = Modifier
-                    .fillMaxSize()
-                    .padding(innerPadding))
+                EmptyView(modifier = Modifier.fillMaxSize().padding(innerPadding))
             }
 
             else -> {
                 LazyVerticalGrid(
                     columns = GridCells.Adaptive(widthSizeClass.gridMinSize),
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(innerPadding),
+                    modifier = Modifier.fillMaxSize().padding(innerPadding),
                     contentPadding = PaddingValues(horizontal = 14.dp, vertical = 16.dp),
                     horizontalArrangement = Arrangement.spacedBy(12.dp),
-                    verticalArrangement = Arrangement.spacedBy(16.dp)
+                    verticalArrangement = Arrangement.spacedBy(16.dp),
                 ) {
-                    items(
-                        count = uiState.items.size,
-                        key = { index -> uiState.items[index].id }
-                    ) { index ->
+                    items(count = uiState.items.size, key = { index -> uiState.items[index].id }) {
+                        index ->
                         val item = uiState.items[index]
 
-                        if (index >= uiState.items.size - 5 && !uiState.isLoading && !uiState.hasReachedEnd) {
-                            LaunchedEffect(Unit) {
-                                viewModel.loadNextPage()
-                            }
+                        if (
+                            index >= uiState.items.size - 5 &&
+                                !uiState.isLoading &&
+                                !uiState.hasReachedEnd
+                        ) {
+                            LaunchedEffect(Unit) { viewModel.loadNextPage() }
                         }
 
                         DiscoverMediaCard(
@@ -151,22 +138,20 @@ fun FilteredMediaScreen(
                                             title = item.getDisplayTitle(),
                                             posterUrl = item.getPosterUrl(),
                                             availableSeasons = 0,
-                                            existingStatus = item.getDisplayStatus()
+                                            existingStatus = item.getDisplayStatus(),
                                         )
                                     }
                                 }
                             },
-                            cardWidth = cardWidth
+                            cardWidth = cardWidth,
                         )
                     }
 
                     if (uiState.isLoading && uiState.items.isNotEmpty()) {
                         item {
                             Box(
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .padding(16.dp),
-                                contentAlignment = Alignment.Center
+                                modifier = Modifier.fillMaxWidth().padding(16.dp),
+                                contentAlignment = Alignment.Center,
                             ) {
                                 CircularProgressIndicator()
                             }
@@ -200,73 +185,52 @@ fun FilteredMediaScreen(
             originalLanguage = requestsUiState.pendingRequest!!.originalLanguage,
             director = requestsUiState.pendingRequest!!.director,
             genres = requestsUiState.pendingRequest!!.genres,
-            ratingsCombined = requestsUiState.pendingRequest!!.ratingsCombined
+            ratingsCombined = requestsUiState.pendingRequest!!.ratingsCombined,
         )
     }
 }
 
 @Composable
 private fun LoadingView(modifier: Modifier = Modifier) {
-    Box(
-        modifier = modifier,
-        contentAlignment = Alignment.Center
-    ) {
-        CircularProgressIndicator()
-    }
+    Box(modifier = modifier, contentAlignment = Alignment.Center) { CircularProgressIndicator() }
 }
 
 @Composable
-private fun ErrorView(
-    message: String,
-    onRetry: () -> Unit,
-    modifier: Modifier = Modifier
-) {
-    Box(
-        modifier = modifier,
-        contentAlignment = Alignment.Center
-    ) {
+private fun ErrorView(message: String, onRetry: () -> Unit, modifier: Modifier = Modifier) {
+    Box(modifier = modifier, contentAlignment = Alignment.Center) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.spacedBy(16.dp),
-            modifier = Modifier.padding(32.dp)
+            modifier = Modifier.padding(32.dp),
         ) {
             Text(
                 text = stringResource(R.string.error_title),
-                style = MaterialTheme.typography.headlineMedium.copy(
-                    fontWeight = FontWeight.Bold
-                ),
-                color = MaterialTheme.colorScheme.onBackground
+                style = MaterialTheme.typography.headlineMedium.copy(fontWeight = FontWeight.Bold),
+                color = MaterialTheme.colorScheme.onBackground,
             )
             Text(
                 text = message,
                 style = MaterialTheme.typography.bodyLarge,
                 color = MaterialTheme.colorScheme.onSurfaceVariant,
-                textAlign = TextAlign.Center
+                textAlign = TextAlign.Center,
             )
-            Button(onClick = onRetry) {
-                Text(text = stringResource(R.string.action_retry))
-            }
+            Button(onClick = onRetry) { Text(text = stringResource(R.string.action_retry)) }
         }
     }
 }
 
 @Composable
 private fun EmptyView(modifier: Modifier = Modifier) {
-    Box(
-        modifier = modifier,
-        contentAlignment = Alignment.Center
-    ) {
+    Box(modifier = modifier, contentAlignment = Alignment.Center) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.spacedBy(16.dp)
+            verticalArrangement = Arrangement.spacedBy(16.dp),
         ) {
             Text(
                 text = stringResource(R.string.error_no_content),
-                style = MaterialTheme.typography.titleLarge.copy(
-                    fontWeight = FontWeight.SemiBold
-                ),
-                color = MaterialTheme.colorScheme.onSurfaceVariant
+                style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.SemiBold),
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/requests/FilteredMediaViewModel.kt b/app/src/main/java/com/makd/afinity/ui/requests/FilteredMediaViewModel.kt
index a5692bcb5..59e698556 100644
--- a/app/src/main/java/com/makd/afinity/ui/requests/FilteredMediaViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/requests/FilteredMediaViewModel.kt
@@ -8,18 +8,20 @@ import com.makd.afinity.data.models.jellyseerr.SearchResultItem
 import com.makd.afinity.data.repository.JellyseerrRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltViewModel
-class FilteredMediaViewModel @Inject constructor(
+class FilteredMediaViewModel
+@Inject
+constructor(
     @ApplicationContext private val context: Context,
-    private val jellyseerrRepository: JellyseerrRepository
+    private val jellyseerrRepository: JellyseerrRepository,
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(FilteredMediaUiState())
@@ -35,16 +37,19 @@ class FilteredMediaViewModel @Inject constructor(
 
                 _uiState.update { state ->
                     state.copy(
-                        items = state.items.map { item ->
-                            if (item.id == updatedRequest.media.tmdbId) {
-                                item.copy(mediaInfo = updatedRequest.media)
-                            } else {
-                                item
+                        items =
+                            state.items.map { item ->
+                                if (item.id == updatedRequest.media.tmdbId) {
+                                    item.copy(mediaInfo = updatedRequest.media)
+                                } else {
+                                    item
+                                }
                             }
-                        }
                     )
                 }
-                Timber.d("Updated media item ${updatedRequest.media.tmdbId} with new request status")
+                Timber.d(
+                    "Updated media item ${updatedRequest.media.tmdbId} with new request status"
+                )
             }
         }
 
@@ -90,29 +95,27 @@ class FilteredMediaViewModel @Inject constructor(
 
         viewModelScope.launch {
             try {
-                val result = when (params.type) {
-                    FilterType.GENRE_MOVIE -> jellyseerrRepository.getMoviesByGenre(
-                        params.id,
-                        currentPage
-                    )
-
-                    FilterType.GENRE_TV -> jellyseerrRepository.getTvByGenre(params.id, currentPage)
-                    FilterType.STUDIO -> jellyseerrRepository.getMoviesByStudio(
-                        params.id,
-                        currentPage
-                    )
-
-                    FilterType.NETWORK -> jellyseerrRepository.getTvByNetwork(
-                        params.id,
-                        currentPage
-                    )
-
-                    FilterType.TRENDING -> jellyseerrRepository.getTrending(currentPage)
-                    FilterType.POPULAR_MOVIES -> jellyseerrRepository.getDiscoverMovies(currentPage)
-                    FilterType.UPCOMING_MOVIES -> jellyseerrRepository.getUpcomingMovies(currentPage)
-                    FilterType.POPULAR_TV -> jellyseerrRepository.getDiscoverTv(currentPage)
-                    FilterType.UPCOMING_TV -> jellyseerrRepository.getUpcomingTv(currentPage)
-                }
+                val result =
+                    when (params.type) {
+                        FilterType.GENRE_MOVIE ->
+                            jellyseerrRepository.getMoviesByGenre(params.id, currentPage)
+
+                        FilterType.GENRE_TV ->
+                            jellyseerrRepository.getTvByGenre(params.id, currentPage)
+                        FilterType.STUDIO ->
+                            jellyseerrRepository.getMoviesByStudio(params.id, currentPage)
+
+                        FilterType.NETWORK ->
+                            jellyseerrRepository.getTvByNetwork(params.id, currentPage)
+
+                        FilterType.TRENDING -> jellyseerrRepository.getTrending(currentPage)
+                        FilterType.POPULAR_MOVIES ->
+                            jellyseerrRepository.getDiscoverMovies(currentPage)
+                        FilterType.UPCOMING_MOVIES ->
+                            jellyseerrRepository.getUpcomingMovies(currentPage)
+                        FilterType.POPULAR_TV -> jellyseerrRepository.getDiscoverTv(currentPage)
+                        FilterType.UPCOMING_TV -> jellyseerrRepository.getUpcomingTv(currentPage)
+                    }
 
                 result.fold(
                     onSuccess = { searchResult ->
@@ -127,7 +130,7 @@ class FilteredMediaViewModel @Inject constructor(
                             state.copy(
                                 items = uniqueList,
                                 isLoading = false,
-                                hasReachedEnd = hasReachedEnd
+                                hasReachedEnd = hasReachedEnd,
                             )
                         }
                         Timber.d("Loaded page $currentPage for ${params.name}")
@@ -136,17 +139,19 @@ class FilteredMediaViewModel @Inject constructor(
                         _uiState.update {
                             it.copy(
                                 isLoading = false,
-                                error = error.message ?: context.getString(R.string.error_load_content_generic)
+                                error =
+                                    error.message
+                                        ?: context.getString(R.string.error_load_content_generic),
                             )
                         }
                         Timber.e(error, "Failed to load content for ${params.name}")
-                    }
+                    },
                 )
             } catch (e: Exception) {
                 _uiState.update {
                     it.copy(
                         isLoading = false,
-                        error = e.message ?: context.getString(R.string.error_unknown)
+                        error = e.message ?: context.getString(R.string.error_unknown),
                     )
                 }
                 Timber.e(e, "Error loading content")
@@ -159,5 +164,5 @@ data class FilteredMediaUiState(
     val items: List<SearchResultItem> = emptyList(),
     val isLoading: Boolean = false,
     val error: String? = null,
-    val hasReachedEnd: Boolean = false
-)
\ No newline at end of file
+    val hasReachedEnd: Boolean = false,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/requests/RequestCard.kt b/app/src/main/java/com/makd/afinity/ui/requests/RequestCard.kt
index 608820645..f4142d4ac 100644
--- a/app/src/main/java/com/makd/afinity/ui/requests/RequestCard.kt
+++ b/app/src/main/java/com/makd/afinity/ui/requests/RequestCard.kt
@@ -30,8 +30,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 import com.makd.afinity.R
 import com.makd.afinity.data.models.jellyseerr.JellyseerrRequest
 import com.makd.afinity.data.models.jellyseerr.MediaStatus
@@ -47,22 +47,17 @@ fun RequestCard(
     onApprove: () -> Unit,
     onDecline: () -> Unit,
     cardWidth: Dp,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val isPending = request.status == RequestStatus.PENDING.value
 
-    Column(
-        modifier = modifier.width(cardWidth)
-    ) {
+    Column(modifier = modifier.width(cardWidth)) {
         Card(
             onClick = onClick,
-            modifier = Modifier
-                .fillMaxWidth()
-                .aspectRatio(CardDimensions.ASPECT_RATIO_LANDSCAPE),
-            colors = CardDefaults.cardColors(
-                containerColor = MaterialTheme.colorScheme.surfaceVariant
-            ),
-            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+            modifier = Modifier.fillMaxWidth().aspectRatio(CardDimensions.ASPECT_RATIO_LANDSCAPE),
+            colors =
+                CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
+            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
         ) {
             Box(modifier = Modifier.fillMaxSize()) {
                 val backdropUrl = request.media.getBackdropUrl() ?: request.media.getPosterUrl()
@@ -73,16 +68,10 @@ fun RequestCard(
                     targetWidth = cardWidth,
                     targetHeight = cardWidth * 9f / 16f,
                     contentScale = ContentScale.Crop,
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .align(Alignment.Center)
+                    modifier = Modifier.fillMaxSize().align(Alignment.Center),
                 )
 
-                Box(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .background(Color.Black.copy(alpha = 0.75f))
-                )
+                Box(modifier = Modifier.fillMaxSize().background(Color.Black.copy(alpha = 0.75f)))
 
                 request.media.getPosterUrl()?.let { posterUrl ->
                     AsyncImage(
@@ -92,105 +81,111 @@ fun RequestCard(
                         targetWidth = cardWidth * 0.3f,
                         targetHeight = cardWidth * 9f / 16f,
                         contentScale = ContentScale.Crop,
-                        modifier = Modifier
-                            .align(Alignment.CenterStart)
-                            .padding(start = 6.dp, top = 6.dp, bottom = 6.dp)
-                            .fillMaxHeight()
-                            .aspectRatio(2f / 3f)
-                            .clip(RoundedCornerShape(8.dp))
+                        modifier =
+                            Modifier.align(Alignment.CenterStart)
+                                .padding(start = 6.dp, top = 6.dp, bottom = 6.dp)
+                                .fillMaxHeight()
+                                .aspectRatio(2f / 3f)
+                                .clip(RoundedCornerShape(8.dp)),
                     )
                 }
 
                 val requestStatus = RequestStatus.fromValue(request.status)
                 val mediaStatus = MediaStatus.fromValue(request.media.status ?: 1)
 
-                val (badgeText, badgeColor, badgeTextColor) = when {
-                    requestStatus == RequestStatus.DECLINED -> Triple(
-                        stringResource(R.string.status_declined),
-                        MaterialTheme.colorScheme.error,
-                        MaterialTheme.colorScheme.onError
-                    )
-
-                    requestStatus == RequestStatus.APPROVED && mediaStatus == MediaStatus.PENDING -> Triple(
-                        stringResource(R.string.status_processing),
-                        MaterialTheme.colorScheme.primary,
-                        MaterialTheme.colorScheme.onPrimary
-                    )
-
-                    else -> {
-                        val statusText = when (mediaStatus) {
-                            MediaStatus.PENDING -> stringResource(R.string.status_pending)
-                            MediaStatus.PROCESSING -> stringResource(R.string.status_processing)
-                            MediaStatus.PARTIALLY_AVAILABLE -> stringResource(R.string.status_partially_available)
-                            MediaStatus.AVAILABLE -> stringResource(R.string.status_available)
-                            MediaStatus.DELETED -> stringResource(R.string.status_deleted)
-                            else -> stringResource(R.string.status_unknown)
+                val (badgeText, badgeColor, badgeTextColor) =
+                    when {
+                        requestStatus == RequestStatus.DECLINED ->
+                            Triple(
+                                stringResource(R.string.status_declined),
+                                MaterialTheme.colorScheme.error,
+                                MaterialTheme.colorScheme.onError,
+                            )
+
+                        requestStatus == RequestStatus.APPROVED &&
+                            mediaStatus == MediaStatus.PENDING ->
+                            Triple(
+                                stringResource(R.string.status_processing),
+                                MaterialTheme.colorScheme.primary,
+                                MaterialTheme.colorScheme.onPrimary,
+                            )
+
+                        else -> {
+                            val statusText =
+                                when (mediaStatus) {
+                                    MediaStatus.PENDING -> stringResource(R.string.status_pending)
+                                    MediaStatus.PROCESSING ->
+                                        stringResource(R.string.status_processing)
+                                    MediaStatus.PARTIALLY_AVAILABLE ->
+                                        stringResource(R.string.status_partially_available)
+                                    MediaStatus.AVAILABLE ->
+                                        stringResource(R.string.status_available)
+                                    MediaStatus.DELETED -> stringResource(R.string.status_deleted)
+                                    else -> stringResource(R.string.status_unknown)
+                                }
+
+                            Triple(
+                                statusText,
+                                when (mediaStatus) {
+                                    MediaStatus.UNKNOWN -> MaterialTheme.colorScheme.surfaceVariant
+                                    MediaStatus.PENDING -> MaterialTheme.colorScheme.tertiary
+                                    MediaStatus.PROCESSING -> MaterialTheme.colorScheme.primary
+                                    MediaStatus.PARTIALLY_AVAILABLE ->
+                                        MaterialTheme.colorScheme.secondary
+                                    MediaStatus.AVAILABLE -> MaterialTheme.colorScheme.secondary
+                                    MediaStatus.DELETED -> MaterialTheme.colorScheme.error
+                                },
+                                when (mediaStatus) {
+                                    MediaStatus.UNKNOWN ->
+                                        MaterialTheme.colorScheme.onSurfaceVariant
+                                    MediaStatus.PENDING -> MaterialTheme.colorScheme.onTertiary
+                                    MediaStatus.PROCESSING -> MaterialTheme.colorScheme.onPrimary
+                                    MediaStatus.PARTIALLY_AVAILABLE ->
+                                        MaterialTheme.colorScheme.onSecondary
+                                    MediaStatus.AVAILABLE -> MaterialTheme.colorScheme.onSecondary
+                                    MediaStatus.DELETED -> MaterialTheme.colorScheme.onError
+                                },
+                            )
                         }
-
-                        Triple(
-                            statusText,
-                            when (mediaStatus) {
-                                MediaStatus.UNKNOWN -> MaterialTheme.colorScheme.surfaceVariant
-                                MediaStatus.PENDING -> MaterialTheme.colorScheme.tertiary
-                                MediaStatus.PROCESSING -> MaterialTheme.colorScheme.primary
-                                MediaStatus.PARTIALLY_AVAILABLE -> MaterialTheme.colorScheme.secondary
-                                MediaStatus.AVAILABLE -> MaterialTheme.colorScheme.secondary
-                                MediaStatus.DELETED -> MaterialTheme.colorScheme.error
-                            },
-                            when (mediaStatus) {
-                                MediaStatus.UNKNOWN -> MaterialTheme.colorScheme.onSurfaceVariant
-                                MediaStatus.PENDING -> MaterialTheme.colorScheme.onTertiary
-                                MediaStatus.PROCESSING -> MaterialTheme.colorScheme.onPrimary
-                                MediaStatus.PARTIALLY_AVAILABLE -> MaterialTheme.colorScheme.onSecondary
-                                MediaStatus.AVAILABLE -> MaterialTheme.colorScheme.onSecondary
-                                MediaStatus.DELETED -> MaterialTheme.colorScheme.onError
-                            }
-                        )
                     }
-                }
 
                 Card(
-                    modifier = Modifier
-                        .align(Alignment.TopEnd)
-                        .padding(8.dp),
+                    modifier = Modifier.align(Alignment.TopEnd).padding(8.dp),
                     shape = RoundedCornerShape(4.dp),
-                    colors = CardDefaults.cardColors(
-                        containerColor = badgeColor
-                    )
+                    colors = CardDefaults.cardColors(containerColor = badgeColor),
                 ) {
                     Text(
                         text = badgeText,
                         style = MaterialTheme.typography.labelSmall,
                         color = badgeTextColor,
                         modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp),
-                        fontWeight = FontWeight.Bold
+                        fontWeight = FontWeight.Bold,
                     )
                 }
 
                 if (isPending && isAdmin) {
                     Row(
                         horizontalArrangement = Arrangement.spacedBy(6.dp),
-                        modifier = Modifier
-                            .align(Alignment.BottomEnd)
-                            .padding(8.dp)
+                        modifier = Modifier.align(Alignment.BottomEnd).padding(8.dp),
                     ) {
                         Card(
                             onClick = onApprove,
                             shape = RoundedCornerShape(8.dp),
-                            colors = CardDefaults.cardColors(
-                                containerColor = MaterialTheme.colorScheme.primary
-                            ),
-                            modifier = Modifier.size(36.dp)
+                            colors =
+                                CardDefaults.cardColors(
+                                    containerColor = MaterialTheme.colorScheme.primary
+                                ),
+                            modifier = Modifier.size(36.dp),
                         ) {
                             Box(
                                 modifier = Modifier.fillMaxSize(),
-                                contentAlignment = Alignment.Center
+                                contentAlignment = Alignment.Center,
                             ) {
                                 Icon(
                                     painter = painterResource(id = R.drawable.ic_check),
                                     contentDescription = stringResource(R.string.cd_approve),
                                     tint = MaterialTheme.colorScheme.onPrimary,
-                                    modifier = Modifier.size(18.dp)
+                                    modifier = Modifier.size(18.dp),
                                 )
                             }
                         }
@@ -198,20 +193,21 @@ fun RequestCard(
                         Card(
                             onClick = onDecline,
                             shape = RoundedCornerShape(8.dp),
-                            colors = CardDefaults.cardColors(
-                                containerColor = MaterialTheme.colorScheme.errorContainer
-                            ),
-                            modifier = Modifier.size(36.dp)
+                            colors =
+                                CardDefaults.cardColors(
+                                    containerColor = MaterialTheme.colorScheme.errorContainer
+                                ),
+                            modifier = Modifier.size(36.dp),
                         ) {
                             Box(
                                 modifier = Modifier.fillMaxSize(),
-                                contentAlignment = Alignment.Center
+                                contentAlignment = Alignment.Center,
                             ) {
                                 Icon(
                                     painter = painterResource(id = R.drawable.ic_cancel),
                                     contentDescription = stringResource(R.string.cd_decline),
                                     tint = MaterialTheme.colorScheme.onErrorContainer,
-                                    modifier = Modifier.size(18.dp)
+                                    modifier = Modifier.size(18.dp),
                                 )
                             }
                         }
@@ -224,25 +220,24 @@ fun RequestCard(
 
         Text(
             text = request.media.getDisplayTitle(),
-            style = MaterialTheme.typography.bodyMedium.copy(
-                fontWeight = FontWeight.SemiBold
-            ),
+            style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
             color = MaterialTheme.colorScheme.onBackground,
             maxLines = 1,
-            overflow = TextOverflow.Ellipsis
+            overflow = TextOverflow.Ellipsis,
         )
 
         Spacer(modifier = Modifier.height(4.dp))
 
         Text(
-            text = stringResource(
-                R.string.requested_by_fmt,
-                request.requestedBy.displayName ?: stringResource(R.string.user_unknown)
-            ),
+            text =
+                stringResource(
+                    R.string.requested_by_fmt,
+                    request.requestedBy.displayName ?: stringResource(R.string.user_unknown),
+                ),
             style = MaterialTheme.typography.bodySmall,
             color = MaterialTheme.colorScheme.onSurfaceVariant,
             maxLines = 1,
-            overflow = TextOverflow.Ellipsis
+            overflow = TextOverflow.Ellipsis,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/requests/RequestsScreen.kt b/app/src/main/java/com/makd/afinity/ui/requests/RequestsScreen.kt
index 5214b096b..49cc3d0a3 100644
--- a/app/src/main/java/com/makd/afinity/ui/requests/RequestsScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/requests/RequestsScreen.kt
@@ -46,13 +46,14 @@ fun RequestsScreen(
     viewModel: RequestsViewModel = hiltViewModel(),
     onNavigateToFilteredMedia: (FilterParams) -> Unit = {},
     onItemClick: (jellyfinItemId: String) -> Unit = {},
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
-    val isAuthenticated by viewModel.isAuthenticated.collectAsStateWithLifecycle(initialValue = false)
+    val isAuthenticated by
+        viewModel.isAuthenticated.collectAsStateWithLifecycle(initialValue = false)
     val currentUser by viewModel.currentUser.collectAsStateWithLifecycle()
     var showJellyseerrBottomSheet by remember { mutableStateOf(false) }
-    val sheetState = rememberModalBottomSheetState()
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
 
     Scaffold(
         topBar = {
@@ -60,59 +61,54 @@ fun RequestsScreen(
                 title = {
                     Text(
                         text = stringResource(R.string.requests_title),
-                        style = MaterialTheme.typography.headlineLarge.copy(
-                            fontWeight = FontWeight.Bold
-                        ),
-                        color = MaterialTheme.colorScheme.onBackground
+                        style =
+                            MaterialTheme.typography.headlineLarge.copy(
+                                fontWeight = FontWeight.Bold
+                            ),
+                        color = MaterialTheme.colorScheme.onBackground,
                     )
                 },
                 onSearchClick = onSearchClick,
                 onProfileClick = onProfileClick,
-                userProfileImageUrl = mainUiState.userProfileImageUrl
+                userProfileImageUrl = mainUiState.userProfileImageUrl,
             )
         },
-        modifier = modifier.fillMaxSize()
+        modifier = modifier.fillMaxSize(),
     ) { innerPadding ->
         if (!isAuthenticated) {
             NotLoggedInView(
                 onLoginClick = { showJellyseerrBottomSheet = true },
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(innerPadding)
+                modifier = Modifier.fillMaxSize().padding(innerPadding),
             )
         } else {
             when {
                 uiState.isLoadingDiscover && uiState.trendingItems.isEmpty() -> {
                     Box(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .padding(innerPadding),
-                        contentAlignment = Alignment.Center
+                        modifier = Modifier.fillMaxSize().padding(innerPadding),
+                        contentAlignment = Alignment.Center,
                     ) {
                         CircularProgressIndicator()
                     }
                 }
 
-                uiState.error != null && uiState.requests.isEmpty() && uiState.trendingItems.isEmpty() -> {
+                uiState.error != null &&
+                    uiState.requests.isEmpty() &&
+                    uiState.trendingItems.isEmpty() -> {
                     ErrorView(
                         message = uiState.error ?: stringResource(R.string.error_unknown),
                         onRetry = {
                             viewModel.loadRequests()
                             viewModel.loadDiscoverContent()
                         },
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .padding(innerPadding)
+                        modifier = Modifier.fillMaxSize().padding(innerPadding),
                     )
                 }
 
                 else -> {
                     LazyColumn(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .padding(innerPadding),
+                        modifier = Modifier.fillMaxSize().padding(innerPadding),
                         contentPadding = PaddingValues(vertical = 16.dp),
-                        verticalArrangement = Arrangement.spacedBy(24.dp)
+                        verticalArrangement = Arrangement.spacedBy(24.dp),
                     ) {
                         if (uiState.requests.isNotEmpty()) {
                             item {
@@ -120,9 +116,13 @@ fun RequestsScreen(
                                     requests = uiState.requests,
                                     isAdmin = currentUser?.isAdmin() == true,
                                     onRequestClick = { /* TODO: Navigate to request details */ },
-                                    onApprove = { requestId -> viewModel.approveRequest(requestId) },
-                                    onDecline = { requestId -> viewModel.declineRequest(requestId) },
-                                    widthSizeClass = widthSizeClass
+                                    onApprove = { requestId ->
+                                        viewModel.approveRequest(requestId)
+                                    },
+                                    onDecline = { requestId ->
+                                        viewModel.declineRequest(requestId)
+                                    },
+                                    widthSizeClass = widthSizeClass,
                                 )
                             }
                         }
@@ -146,7 +146,7 @@ fun RequestsScreen(
                                                     title = item.getDisplayTitle(),
                                                     posterUrl = item.getPosterUrl(),
                                                     availableSeasons = 0,
-                                                    existingStatus = item.getDisplayStatus()
+                                                    existingStatus = item.getDisplayStatus(),
                                                 )
                                             }
                                         }
@@ -156,11 +156,11 @@ fun RequestsScreen(
                                             FilterParams(
                                                 type = FilterType.TRENDING,
                                                 id = 0,
-                                                name = trendingTitle
+                                                name = trendingTitle,
                                             )
                                         )
                                     },
-                                    widthSizeClass = widthSizeClass
+                                    widthSizeClass = widthSizeClass,
                                 )
                             }
                         }
@@ -184,7 +184,7 @@ fun RequestsScreen(
                                                     title = item.getDisplayTitle(),
                                                     posterUrl = item.getPosterUrl(),
                                                     availableSeasons = 0,
-                                                    existingStatus = item.getDisplayStatus()
+                                                    existingStatus = item.getDisplayStatus(),
                                                 )
                                             }
                                         }
@@ -194,11 +194,11 @@ fun RequestsScreen(
                                             FilterParams(
                                                 type = FilterType.POPULAR_MOVIES,
                                                 id = 0,
-                                                name = popMoviesTitle
+                                                name = popMoviesTitle,
                                             )
                                         )
                                     },
-                                    widthSizeClass = widthSizeClass
+                                    widthSizeClass = widthSizeClass,
                                 )
                             }
                         }
@@ -212,19 +212,20 @@ fun RequestsScreen(
                                             FilterParams(
                                                 type = FilterType.GENRE_MOVIE,
                                                 id = genre.id,
-                                                name = genre.name
+                                                name = genre.name,
                                             )
                                         )
                                     },
                                     backdropTracker = viewModel.backdropTracker,
-                                    widthSizeClass = widthSizeClass
+                                    widthSizeClass = widthSizeClass,
                                 )
                             }
                         }
 
                         if (uiState.upcomingMovies.isNotEmpty()) {
                             item {
-                                val upcomingMoviesTitle = stringResource(R.string.section_upcoming_movies)
+                                val upcomingMoviesTitle =
+                                    stringResource(R.string.section_upcoming_movies)
                                 DiscoverSection(
                                     title = upcomingMoviesTitle,
                                     items = uiState.upcomingMovies.take(15),
@@ -241,7 +242,7 @@ fun RequestsScreen(
                                                     title = item.getDisplayTitle(),
                                                     posterUrl = item.getPosterUrl(),
                                                     availableSeasons = 0,
-                                                    existingStatus = item.getDisplayStatus()
+                                                    existingStatus = item.getDisplayStatus(),
                                                 )
                                             }
                                         }
@@ -251,11 +252,11 @@ fun RequestsScreen(
                                             FilterParams(
                                                 type = FilterType.UPCOMING_MOVIES,
                                                 id = 0,
-                                                name = upcomingMoviesTitle
+                                                name = upcomingMoviesTitle,
                                             )
                                         )
                                     },
-                                    widthSizeClass = widthSizeClass
+                                    widthSizeClass = widthSizeClass,
                                 )
                             }
                         }
@@ -268,11 +269,11 @@ fun RequestsScreen(
                                             FilterParams(
                                                 type = FilterType.STUDIO,
                                                 id = studio.id,
-                                                name = studio.name
+                                                name = studio.name,
                                             )
                                         )
                                     },
-                                    widthSizeClass = widthSizeClass
+                                    widthSizeClass = widthSizeClass,
                                 )
                             }
                         }
@@ -296,7 +297,7 @@ fun RequestsScreen(
                                                     title = item.getDisplayTitle(),
                                                     posterUrl = item.getPosterUrl(),
                                                     availableSeasons = 0,
-                                                    existingStatus = item.getDisplayStatus()
+                                                    existingStatus = item.getDisplayStatus(),
                                                 )
                                             }
                                         }
@@ -306,11 +307,11 @@ fun RequestsScreen(
                                             FilterParams(
                                                 type = FilterType.POPULAR_TV,
                                                 id = 0,
-                                                name = popTvTitle
+                                                name = popTvTitle,
                                             )
                                         )
                                     },
-                                    widthSizeClass = widthSizeClass
+                                    widthSizeClass = widthSizeClass,
                                 )
                             }
                         }
@@ -324,12 +325,12 @@ fun RequestsScreen(
                                             FilterParams(
                                                 type = FilterType.GENRE_TV,
                                                 id = genre.id,
-                                                name = genre.name
+                                                name = genre.name,
                                             )
                                         )
                                     },
                                     backdropTracker = viewModel.backdropTracker,
-                                    widthSizeClass = widthSizeClass
+                                    widthSizeClass = widthSizeClass,
                                 )
                             }
                         }
@@ -353,7 +354,7 @@ fun RequestsScreen(
                                                     title = item.getDisplayTitle(),
                                                     posterUrl = item.getPosterUrl(),
                                                     availableSeasons = 0,
-                                                    existingStatus = item.getDisplayStatus()
+                                                    existingStatus = item.getDisplayStatus(),
                                                 )
                                             }
                                         }
@@ -363,11 +364,11 @@ fun RequestsScreen(
                                             FilterParams(
                                                 type = FilterType.UPCOMING_TV,
                                                 id = 0,
-                                                name = upcomingTvTitle
+                                                name = upcomingTvTitle,
                                             )
                                         )
                                     },
-                                    widthSizeClass = widthSizeClass
+                                    widthSizeClass = widthSizeClass,
                                 )
                             }
                         }
@@ -380,30 +381,27 @@ fun RequestsScreen(
                                             FilterParams(
                                                 type = FilterType.NETWORK,
                                                 id = network.id,
-                                                name = network.name
+                                                name = network.name,
                                             )
                                         )
                                     },
-                                    widthSizeClass = widthSizeClass
+                                    widthSizeClass = widthSizeClass,
                                 )
                             }
                         }
 
-                        if (uiState.requests.isEmpty() &&
-                            uiState.trendingItems.isEmpty() &&
-                            uiState.popularMovies.isEmpty() &&
-                            uiState.popularTv.isEmpty() &&
-                            uiState.upcomingMovies.isEmpty() &&
-                            uiState.upcomingTv.isEmpty() &&
-                            !uiState.isLoading &&
-                            !uiState.isLoadingDiscover
+                        if (
+                            uiState.requests.isEmpty() &&
+                                uiState.trendingItems.isEmpty() &&
+                                uiState.popularMovies.isEmpty() &&
+                                uiState.popularTv.isEmpty() &&
+                                uiState.upcomingMovies.isEmpty() &&
+                                uiState.upcomingTv.isEmpty() &&
+                                !uiState.isLoading &&
+                                !uiState.isLoadingDiscover
                         ) {
                             item {
-                                EmptyStateView(
-                                    modifier = Modifier
-                                        .fillMaxWidth()
-                                        .padding(32.dp)
-                                )
+                                EmptyStateView(modifier = Modifier.fillMaxWidth().padding(32.dp))
                             }
                         }
                     }
@@ -434,125 +432,101 @@ fun RequestsScreen(
                 originalLanguage = uiState.pendingRequest!!.originalLanguage,
                 director = uiState.pendingRequest!!.director,
                 genres = uiState.pendingRequest!!.genres,
-                ratingsCombined = uiState.pendingRequest!!.ratingsCombined
+                ratingsCombined = uiState.pendingRequest!!.ratingsCombined,
             )
         }
 
         if (showJellyseerrBottomSheet) {
             JellyseerrBottomSheet(
                 onDismiss = { showJellyseerrBottomSheet = false },
-                sheetState = sheetState
+                sheetState = sheetState,
             )
         }
     }
 }
 
 @Composable
-private fun NotLoggedInView(
-    onLoginClick: () -> Unit,
-    modifier: Modifier = Modifier
-) {
-    Box(
-        modifier = modifier,
-        contentAlignment = Alignment.Center
-    ) {
+private fun NotLoggedInView(onLoginClick: () -> Unit, modifier: Modifier = Modifier) {
+    Box(modifier = modifier, contentAlignment = Alignment.Center) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.spacedBy(16.dp),
-            modifier = Modifier.padding(32.dp)
+            modifier = Modifier.padding(32.dp),
         ) {
             Icon(
-                painter = painterResource(id = R.drawable.ic_request_seerr_dark),
+                painter = painterResource(id = R.drawable.ic_seerr_logo),
                 contentDescription = null,
                 tint = MaterialTheme.colorScheme.primary,
-                modifier = Modifier.height(64.dp)
+                modifier = Modifier.height(64.dp),
             )
             Text(
                 text = stringResource(R.string.jellyseerr_connect_title),
-                style = MaterialTheme.typography.headlineMedium.copy(
-                    fontWeight = FontWeight.Bold
-                ),
+                style = MaterialTheme.typography.headlineMedium.copy(fontWeight = FontWeight.Bold),
                 color = MaterialTheme.colorScheme.onBackground,
-                textAlign = TextAlign.Center
+                textAlign = TextAlign.Center,
             )
             Text(
                 text = stringResource(R.string.jellyseerr_connect_message),
                 style = MaterialTheme.typography.bodyLarge,
                 color = MaterialTheme.colorScheme.onSurfaceVariant,
-                textAlign = TextAlign.Center
+                textAlign = TextAlign.Center,
             )
         }
     }
 }
 
 @Composable
-private fun ErrorView(
-    message: String,
-    onRetry: () -> Unit,
-    modifier: Modifier = Modifier
-) {
-    Box(
-        modifier = modifier,
-        contentAlignment = Alignment.Center
-    ) {
+private fun ErrorView(message: String, onRetry: () -> Unit, modifier: Modifier = Modifier) {
+    Box(modifier = modifier, contentAlignment = Alignment.Center) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.spacedBy(16.dp),
-            modifier = Modifier.padding(32.dp)
+            modifier = Modifier.padding(32.dp),
         ) {
             Icon(
                 painter = painterResource(id = R.drawable.ic_exclamation_circle),
                 contentDescription = null,
                 tint = MaterialTheme.colorScheme.error,
-                modifier = Modifier.height(48.dp)
+                modifier = Modifier.height(48.dp),
             )
             Text(
                 text = stringResource(R.string.error_title),
-                style = MaterialTheme.typography.headlineMedium.copy(
-                    fontWeight = FontWeight.Bold
-                ),
-                color = MaterialTheme.colorScheme.onBackground
+                style = MaterialTheme.typography.headlineMedium.copy(fontWeight = FontWeight.Bold),
+                color = MaterialTheme.colorScheme.onBackground,
             )
             Text(
                 text = message,
                 style = MaterialTheme.typography.bodyLarge,
                 color = MaterialTheme.colorScheme.onSurfaceVariant,
-                textAlign = TextAlign.Center
+                textAlign = TextAlign.Center,
             )
         }
     }
 }
 
 @Composable
-private fun EmptyStateView(
-    modifier: Modifier = Modifier
-) {
-    Box(
-        modifier = modifier,
-        contentAlignment = Alignment.Center
-    ) {
+private fun EmptyStateView(modifier: Modifier = Modifier) {
+    Box(modifier = modifier, contentAlignment = Alignment.Center) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.spacedBy(16.dp)
+            verticalArrangement = Arrangement.spacedBy(16.dp),
         ) {
             Icon(
                 painter = painterResource(id = R.drawable.ic_inbox),
                 contentDescription = null,
                 tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                modifier = Modifier.height(48.dp)
+                modifier = Modifier.height(48.dp),
             )
             Text(
                 text = stringResource(R.string.error_no_content),
-                style = MaterialTheme.typography.titleLarge.copy(
-                    fontWeight = FontWeight.SemiBold
-                ),
-                color = MaterialTheme.colorScheme.onSurfaceVariant
+                style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.SemiBold),
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
             )
             Text(
                 text = stringResource(R.string.empty_content_message),
                 style = MaterialTheme.typography.bodyMedium,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/requests/RequestsSections.kt b/app/src/main/java/com/makd/afinity/ui/requests/RequestsSections.kt
index 84aa0bdf6..ba32afbcb 100644
--- a/app/src/main/java/com/makd/afinity/ui/requests/RequestsSections.kt
+++ b/app/src/main/java/com/makd/afinity/ui/requests/RequestsSections.kt
@@ -45,40 +45,34 @@ fun MyRequestsSection(
     onApprove: (Int) -> Unit,
     onDecline: (Int) -> Unit,
     widthSizeClass: WindowWidthSizeClass,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val cardWidth = widthSizeClass.landscapeWidth
-    val cardHeight = CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_LANDSCAPE)
+    val cardHeight =
+        CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_LANDSCAPE)
     val fixedRowHeight = cardHeight + 8.dp + 20.dp + 22.dp
 
-    Column(
-        modifier = modifier.padding(horizontal = 14.dp)
-    ) {
+    Column(modifier = modifier.padding(horizontal = 14.dp)) {
         Text(
             text = stringResource(R.string.section_recent_requests),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             color = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         LazyRow(
             modifier = Modifier.height(fixedRowHeight),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
-            items(
-                items = requests,
-                key = { request -> "request_${request.id}" }
-            ) { request ->
+            items(items = requests, key = { request -> "request_${request.id}" }) { request ->
                 RequestCard(
                     request = request,
                     isAdmin = isAdmin,
                     onClick = { onRequestClick(request) },
                     onApprove = { onApprove(request.id) },
                     onDecline = { onDecline(request.id) },
-                    cardWidth = cardWidth
+                    cardWidth = cardWidth,
                 )
             }
         }
@@ -92,47 +86,41 @@ fun DiscoverSection(
     onItemClick: (SearchResultItem) -> Unit,
     widthSizeClass: WindowWidthSizeClass,
     modifier: Modifier = Modifier,
-    onViewAllClick: (() -> Unit)? = null
+    onViewAllClick: (() -> Unit)? = null,
 ) {
     val cardWidth = widthSizeClass.portraitWidth
     val cardHeight = CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_PORTRAIT)
     val fixedRowHeight = cardHeight + 8.dp + 20.dp + 22.dp
     val headerBottomPadding = if (onViewAllClick != null) 4.dp else 16.dp
 
-    Column(
-        modifier = modifier.padding(horizontal = 14.dp)
-    ) {
+    Column(modifier = modifier.padding(horizontal = 14.dp)) {
         Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(bottom = headerBottomPadding),
+            modifier = Modifier.fillMaxWidth().padding(bottom = headerBottomPadding),
             horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.Top
+            verticalAlignment = Alignment.Top,
         ) {
             Text(
                 text = title,
-                style = MaterialTheme.typography.headlineSmall.copy(
-                    fontWeight = FontWeight.Bold
-                ),
-                color = MaterialTheme.colorScheme.onBackground
+                style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+                color = MaterialTheme.colorScheme.onBackground,
             )
 
             if (onViewAllClick != null) {
                 Box(
-                    modifier = Modifier
-                        .size(40.dp)
-                        .clickable(
-                            interactionSource = remember { MutableInteractionSource() },
-                            indication = null,
-                            onClick = onViewAllClick
-                        ),
-                    contentAlignment = Alignment.TopEnd
+                    modifier =
+                        Modifier.size(40.dp)
+                            .clickable(
+                                interactionSource = remember { MutableInteractionSource() },
+                                indication = null,
+                                onClick = onViewAllClick,
+                            ),
+                    contentAlignment = Alignment.TopEnd,
                 ) {
                     Icon(
                         painter = painterResource(id = drawable.ic_chevron_right),
                         contentDescription = stringResource(R.string.cd_view_all),
                         tint = MaterialTheme.colorScheme.primary,
-                        modifier = Modifier.size(28.dp)
+                        modifier = Modifier.size(28.dp),
                     )
                 }
             }
@@ -141,16 +129,14 @@ fun DiscoverSection(
         LazyRow(
             modifier = Modifier.height(fixedRowHeight),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
-            items(
-                items = items,
-                key = { item -> "${title.replace(" ", "_")}_${item.id}" }
-            ) { item ->
+            items(items = items, key = { item -> "${title.replace(" ", "_")}_${item.id}" }) { item
+                ->
                 DiscoverMediaCard(
                     item = item,
                     onClick = { onItemClick(item) },
-                    cardWidth = cardWidth
+                    cardWidth = cardWidth,
                 )
             }
         }
@@ -162,37 +148,31 @@ fun StudiosSection(
     studios: List<Studio>,
     onStudioClick: (Studio) -> Unit,
     widthSizeClass: WindowWidthSizeClass,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val cardWidth = widthSizeClass.landscapeWidth
-    val cardHeight = CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_LANDSCAPE)
+    val cardHeight =
+        CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_LANDSCAPE)
     val fixedRowHeight = cardHeight + 10.dp
 
-    Column(
-        modifier = modifier.padding(horizontal = 14.dp)
-    ) {
+    Column(modifier = modifier.padding(horizontal = 14.dp)) {
         Text(
             text = stringResource(R.string.section_studios),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             color = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         LazyRow(
             modifier = Modifier.height(fixedRowHeight),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
-            items(
-                items = studios,
-                key = { studio -> "studio_${studio.id}" }
-            ) { studio ->
+            items(items = studios, key = { studio -> "studio_${studio.id}" }) { studio ->
                 StudioCard(
                     studio = studio,
                     onClick = { onStudioClick(studio) },
-                    cardWidth = cardWidth
+                    cardWidth = cardWidth,
                 )
             }
         }
@@ -204,36 +184,30 @@ fun NetworksSection(
     networks: List<Network>,
     onNetworkClick: (Network) -> Unit,
     widthSizeClass: WindowWidthSizeClass,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val cardWidth = widthSizeClass.landscapeWidth
-    val cardHeight = CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_LANDSCAPE)
+    val cardHeight =
+        CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_LANDSCAPE)
 
-    Column(
-        modifier = modifier.padding(horizontal = 14.dp)
-    ) {
+    Column(modifier = modifier.padding(horizontal = 14.dp)) {
         Text(
             text = stringResource(R.string.section_networks),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             color = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         LazyRow(
             modifier = Modifier.height(cardHeight),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
-            items(
-                items = networks,
-                key = { network -> "network_${network.id}" }
-            ) { network ->
+            items(items = networks, key = { network -> "network_${network.id}" }) { network ->
                 NetworkCard(
                     network = network,
                     onClick = { onNetworkClick(network) },
-                    cardWidth = cardWidth
+                    cardWidth = cardWidth,
                 )
             }
         }
@@ -246,39 +220,33 @@ fun MovieGenresSection(
     onGenreClick: (GenreSliderItem) -> Unit,
     widthSizeClass: WindowWidthSizeClass,
     modifier: Modifier = Modifier,
-    backdropTracker: BackdropTracker? = null
+    backdropTracker: BackdropTracker? = null,
 ) {
     val cardWidth = widthSizeClass.landscapeWidth
-    val cardHeight = CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_LANDSCAPE)
+    val cardHeight =
+        CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_LANDSCAPE)
     val fixedRowHeight = cardHeight + 10.dp
 
-    Column(
-        modifier = modifier.padding(horizontal = 14.dp)
-    ) {
+    Column(modifier = modifier.padding(horizontal = 14.dp)) {
         Text(
             text = stringResource(R.string.section_movie_genres),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             color = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         LazyRow(
             modifier = Modifier.height(fixedRowHeight),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
-            items(
-                items = genres,
-                key = { genre -> "movie_genre_${genre.id}" }
-            ) { genre ->
+            items(items = genres, key = { genre -> "movie_genre_${genre.id}" }) { genre ->
                 GenreCard(
                     genre = genre,
                     onClick = { onGenreClick(genre) },
                     backdropTracker = backdropTracker,
                     isMovie = true,
-                    cardWidth = cardWidth
+                    cardWidth = cardWidth,
                 )
             }
         }
@@ -291,41 +259,35 @@ fun TvGenresSection(
     onGenreClick: (GenreSliderItem) -> Unit,
     widthSizeClass: WindowWidthSizeClass,
     modifier: Modifier = Modifier,
-    backdropTracker: BackdropTracker? = null
+    backdropTracker: BackdropTracker? = null,
 ) {
     val cardWidth = widthSizeClass.landscapeWidth
-    val cardHeight = CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_LANDSCAPE)
+    val cardHeight =
+        CardDimensions.calculateHeight(cardWidth, CardDimensions.ASPECT_RATIO_LANDSCAPE)
     val fixedRowHeight = cardHeight + 10.dp
 
-    Column(
-        modifier = modifier.padding(horizontal = 14.dp)
-    ) {
+    Column(modifier = modifier.padding(horizontal = 14.dp)) {
         Text(
             text = stringResource(R.string.section_tv_genres),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             color = MaterialTheme.colorScheme.onBackground,
-            modifier = Modifier.padding(bottom = 16.dp)
+            modifier = Modifier.padding(bottom = 16.dp),
         )
 
         LazyRow(
             modifier = Modifier.height(fixedRowHeight),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
-            items(
-                items = genres,
-                key = { genre -> "tv_genre_${genre.id}" }
-            ) { genre ->
+            items(items = genres, key = { genre -> "tv_genre_${genre.id}" }) { genre ->
                 GenreCard(
                     genre = genre,
                     onClick = { onGenreClick(genre) },
                     backdropTracker = backdropTracker,
                     isMovie = false,
-                    cardWidth = cardWidth
+                    cardWidth = cardWidth,
                 )
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/requests/RequestsViewModel.kt b/app/src/main/java/com/makd/afinity/ui/requests/RequestsViewModel.kt
index 4126c2f16..ef7c819d5 100644
--- a/app/src/main/java/com/makd/afinity/ui/requests/RequestsViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/requests/RequestsViewModel.kt
@@ -17,6 +17,7 @@ import com.makd.afinity.data.repository.JellyseerrRepository
 import com.makd.afinity.util.BackdropTracker
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -25,20 +26,17 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltViewModel
-class RequestsViewModel @Inject constructor(
+class RequestsViewModel
+@Inject
+constructor(
     @ApplicationContext private val context: Context,
-    private val jellyseerrRepository: JellyseerrRepository
+    private val jellyseerrRepository: JellyseerrRepository,
 ) : ViewModel() {
 
-    private val _uiState = MutableStateFlow(
-        RequestsUiState(
-            isLoading = true,
-            isLoadingDiscover = true
-        )
-    )
+    private val _uiState =
+        MutableStateFlow(RequestsUiState(isLoading = true, isLoadingDiscover = true))
     val uiState: StateFlow<RequestsUiState> = _uiState.asStateFlow()
 
     val isAuthenticated = jellyseerrRepository.isAuthenticated
@@ -46,87 +44,87 @@ class RequestsViewModel @Inject constructor(
     private val _currentUser = MutableStateFlow<JellyseerrUser?>(null)
     val currentUser: StateFlow<JellyseerrUser?> = _currentUser.asStateFlow()
     private val _backdropTracker = BackdropTracker()
-    val backdropTracker: BackdropTracker get() = _backdropTracker
+    val backdropTracker: BackdropTracker
+        get() = _backdropTracker
 
     private var requestsJob: Job? = null
 
     init {
         viewModelScope.launch {
-            combine(
-                jellyseerrRepository.currentSessionId,
-                jellyseerrRepository.isAuthenticated
-            ) { sessionId, isAuth ->
-                sessionId to isAuth
-            }.collect { (sessionId, isAuth) ->
-                if (sessionId != null && isAuth) {
-                    Timber.d("Session Active & Authenticated ($sessionId). Reloading ALL content...")
-                    loadCurrentUser()
-                    observeRequests()
-                    loadRequests()
-                    loadDiscoverContent()
-                } else {
-                    Timber.d("Session Inactive or Logged Out. Clearing content...")
-                    _currentUser.value = null
-                    requestsJob?.cancel()
-                    _uiState.update {
-                        it.copy(
-                            requests = emptyList(),
-                            trendingItems = emptyList(),
-                            popularMovies = emptyList(),
-                            popularTv = emptyList(),
-                            upcomingMovies = emptyList(),
-                            upcomingTv = emptyList(),
-                            movieGenres = emptyList(),
-                            tvGenres = emptyList(),
-                            isLoadingDiscover = false
+            combine(jellyseerrRepository.currentSessionId, jellyseerrRepository.isAuthenticated) {
+                    sessionId,
+                    isAuth ->
+                    sessionId to isAuth
+                }
+                .collect { (sessionId, isAuth) ->
+                    if (sessionId != null && isAuth) {
+                        Timber.d(
+                            "Session Active & Authenticated ($sessionId). Reloading ALL content..."
                         )
+                        loadCurrentUser()
+                        observeRequests()
+                        loadRequests()
+                        loadDiscoverContent()
+                    } else {
+                        Timber.d("Session Inactive or Logged Out. Clearing content...")
+                        _currentUser.value = null
+                        requestsJob?.cancel()
+                        _uiState.update {
+                            it.copy(
+                                requests = emptyList(),
+                                trendingItems = emptyList(),
+                                popularMovies = emptyList(),
+                                popularTv = emptyList(),
+                                upcomingMovies = emptyList(),
+                                upcomingTv = emptyList(),
+                                movieGenres = emptyList(),
+                                tvGenres = emptyList(),
+                                isLoadingDiscover = false,
+                            )
+                        }
                     }
                 }
-            }
         }
         observeRequestEvents()
     }
 
     private fun loadCurrentUser() {
         viewModelScope.launch {
-            jellyseerrRepository.getCurrentUser().fold(
-                onSuccess = { user ->
-                    _currentUser.value = user
-                    Timber.d("Loaded current user: ${user.displayName}, isAdmin: ${user.permissions}")
-                },
-                onFailure = { error ->
-                    Timber.e(error, "Failed to load current user")
-                }
-            )
+            jellyseerrRepository
+                .getCurrentUser()
+                .fold(
+                    onSuccess = { user ->
+                        _currentUser.value = user
+                        Timber.d(
+                            "Loaded current user: ${user.displayName}, isAdmin: ${user.permissions}"
+                        )
+                    },
+                    onFailure = { error -> Timber.e(error, "Failed to load current user") },
+                )
         }
     }
 
     private fun observeRequests() {
         requestsJob?.cancel()
-        requestsJob = viewModelScope.launch {
-            try {
-                jellyseerrRepository.observeRequests().collect { requests ->
-                    _uiState.update {
-                        it.copy(
-                            requests = requests,
-                            isLoading = false
-                        )
+        requestsJob =
+            viewModelScope.launch {
+                try {
+                    jellyseerrRepository.observeRequests().collect { requests ->
+                        _uiState.update { it.copy(requests = requests, isLoading = false) }
+                        Timber.d("Database updated with ${requests.size} requests for active user")
                     }
-                    Timber.d("Database updated with ${requests.size} requests for active user")
+                } catch (e: Exception) {
+                    Timber.e(e, "Error observing requests")
                 }
-            } catch (e: Exception) {
-                Timber.e(e, "Error observing requests")
             }
-        }
     }
 
     private fun observeRequestEvents() {
         viewModelScope.launch {
             jellyseerrRepository.requestEvents.collect { event ->
                 val updatedRequest = event.request
-                val updatedMediaInfo = updatedRequest.media.copy(
-                    requests = listOfNotNull(updatedRequest)
-                )
+                val updatedMediaInfo =
+                    updatedRequest.media.copy(requests = listOfNotNull(updatedRequest))
 
                 val updateItemStatus: (SearchResultItem) -> SearchResultItem = { item ->
                     if (item.id == updatedRequest.media.tmdbId) {
@@ -142,10 +140,12 @@ class RequestsViewModel @Inject constructor(
                         popularMovies = it.popularMovies.map(updateItemStatus),
                         popularTv = it.popularTv.map(updateItemStatus),
                         upcomingMovies = it.upcomingMovies.map(updateItemStatus),
-                        upcomingTv = it.upcomingTv.map(updateItemStatus)
+                        upcomingTv = it.upcomingTv.map(updateItemStatus),
                     )
                 }
-                Timber.d("Updated discover items for tmdbId ${updatedRequest.media.tmdbId} with new request status")
+                Timber.d(
+                    "Updated discover items for tmdbId ${updatedRequest.media.tmdbId} with new request status"
+                )
             }
         }
     }
@@ -155,25 +155,31 @@ class RequestsViewModel @Inject constructor(
             try {
                 _uiState.update { it.copy(isLoading = true, error = null) }
 
-                jellyseerrRepository.getRequests().fold(
-                    onSuccess = {
-                        Timber.d("Requests refreshed from network and cached to database")
-                    },
-                    onFailure = { error ->
-                        _uiState.update {
-                            it.copy(
-                                isLoading = false,
-                                error = error.message ?: context.getString(R.string.error_requests_load_failed)
-                            )
-                        }
-                        Timber.e(error, "Failed to load requests")
-                    }
-                )
+                jellyseerrRepository
+                    .getRequests()
+                    .fold(
+                        onSuccess = {
+                            Timber.d("Requests refreshed from network and cached to database")
+                        },
+                        onFailure = { error ->
+                            _uiState.update {
+                                it.copy(
+                                    isLoading = false,
+                                    error =
+                                        error.message
+                                            ?: context.getString(
+                                                R.string.error_requests_load_failed
+                                            ),
+                                )
+                            }
+                            Timber.e(error, "Failed to load requests")
+                        },
+                    )
             } catch (e: Exception) {
                 _uiState.update {
                     it.copy(
                         isLoading = false,
-                        error = e.message ?: context.getString(R.string.error_unknown)
+                        error = e.message ?: context.getString(R.string.error_unknown),
                     )
                 }
                 Timber.e(e, "Error loading requests")
@@ -186,26 +192,32 @@ class RequestsViewModel @Inject constructor(
             try {
                 _uiState.update { it.copy(isDeletingRequest = true) }
 
-                jellyseerrRepository.deleteRequest(requestId).fold(
-                    onSuccess = {
-                        _uiState.update { it.copy(isDeletingRequest = false) }
-                        Timber.d("Request $requestId deleted successfully")
-                    },
-                    onFailure = { error ->
-                        _uiState.update {
-                            it.copy(
-                                isDeletingRequest = false,
-                                error = context.getString(R.string.error_request_delete_failed_fmt, error.message)
-                            )
-                        }
-                        Timber.e(error, "Failed to delete request")
-                    }
-                )
+                jellyseerrRepository
+                    .deleteRequest(requestId)
+                    .fold(
+                        onSuccess = {
+                            _uiState.update { it.copy(isDeletingRequest = false) }
+                            Timber.d("Request $requestId deleted successfully")
+                        },
+                        onFailure = { error ->
+                            _uiState.update {
+                                it.copy(
+                                    isDeletingRequest = false,
+                                    error =
+                                        context.getString(
+                                            R.string.error_request_delete_failed_fmt,
+                                            error.message,
+                                        ),
+                                )
+                            }
+                            Timber.e(error, "Failed to delete request")
+                        },
+                    )
             } catch (e: Exception) {
                 _uiState.update {
                     it.copy(
                         isDeletingRequest = false,
-                        error = e.message ?: context.getString(R.string.error_unknown)
+                        error = e.message ?: context.getString(R.string.error_unknown),
                     )
                 }
                 Timber.e(e, "Error deleting request")
@@ -218,44 +230,54 @@ class RequestsViewModel @Inject constructor(
             try {
                 _uiState.update { it.copy(isProcessingRequest = true) }
 
-                jellyseerrRepository.approveRequest(requestId).fold(
-                    onSuccess = { updatedRequest ->
-                        _uiState.update {
-                            it.copy(
-                                isProcessingRequest = false,
-                                requests = it.requests.map { request ->
-                                    if (request.id == requestId) {
-                                        updatedRequest.copy(
-                                            media = updatedRequest.media.copy(
-                                                title = request.media.title,
-                                                name = request.media.name,
-                                                posterPath = request.media.posterPath,
-                                                backdropPath = request.media.backdropPath,
-                                                releaseDate = request.media.releaseDate,
-                                                firstAirDate = request.media.firstAirDate
-                                            )
-                                        )
-                                    } else request
-                                }
-                            )
-                        }
-                        Timber.d("Request $requestId approved successfully")
-                    },
-                    onFailure = { error ->
-                        _uiState.update {
-                            it.copy(
-                                isProcessingRequest = false,
-                                error = context.getString(R.string.error_request_approve_failed_fmt, error.message)
-                            )
-                        }
-                        Timber.e(error, "Failed to approve request")
-                    }
-                )
+                jellyseerrRepository
+                    .approveRequest(requestId)
+                    .fold(
+                        onSuccess = { updatedRequest ->
+                            _uiState.update {
+                                it.copy(
+                                    isProcessingRequest = false,
+                                    requests =
+                                        it.requests.map { request ->
+                                            if (request.id == requestId) {
+                                                updatedRequest.copy(
+                                                    media =
+                                                        updatedRequest.media.copy(
+                                                            title = request.media.title,
+                                                            name = request.media.name,
+                                                            posterPath = request.media.posterPath,
+                                                            backdropPath =
+                                                                request.media.backdropPath,
+                                                            releaseDate = request.media.releaseDate,
+                                                            firstAirDate =
+                                                                request.media.firstAirDate,
+                                                        )
+                                                )
+                                            } else request
+                                        },
+                                )
+                            }
+                            Timber.d("Request $requestId approved successfully")
+                        },
+                        onFailure = { error ->
+                            _uiState.update {
+                                it.copy(
+                                    isProcessingRequest = false,
+                                    error =
+                                        context.getString(
+                                            R.string.error_request_approve_failed_fmt,
+                                            error.message,
+                                        ),
+                                )
+                            }
+                            Timber.e(error, "Failed to approve request")
+                        },
+                    )
             } catch (e: Exception) {
                 _uiState.update {
                     it.copy(
                         isProcessingRequest = false,
-                        error = e.message ?: context.getString(R.string.error_unknown)
+                        error = e.message ?: context.getString(R.string.error_unknown),
                     )
                 }
                 Timber.e(e, "Error approving request")
@@ -268,44 +290,54 @@ class RequestsViewModel @Inject constructor(
             try {
                 _uiState.update { it.copy(isProcessingRequest = true) }
 
-                jellyseerrRepository.declineRequest(requestId).fold(
-                    onSuccess = { updatedRequest ->
-                        _uiState.update {
-                            it.copy(
-                                isProcessingRequest = false,
-                                requests = it.requests.map { request ->
-                                    if (request.id == requestId) {
-                                        updatedRequest.copy(
-                                            media = updatedRequest.media.copy(
-                                                title = request.media.title,
-                                                name = request.media.name,
-                                                posterPath = request.media.posterPath,
-                                                backdropPath = request.media.backdropPath,
-                                                releaseDate = request.media.releaseDate,
-                                                firstAirDate = request.media.firstAirDate
-                                            )
-                                        )
-                                    } else request
-                                }
-                            )
-                        }
-                        Timber.d("Request $requestId declined successfully")
-                    },
-                    onFailure = { error ->
-                        _uiState.update {
-                            it.copy(
-                                isProcessingRequest = false,
-                                error = context.getString(R.string.error_request_decline_failed_fmt, error.message)
-                            )
-                        }
-                        Timber.e(error, "Failed to decline request")
-                    }
-                )
+                jellyseerrRepository
+                    .declineRequest(requestId)
+                    .fold(
+                        onSuccess = { updatedRequest ->
+                            _uiState.update {
+                                it.copy(
+                                    isProcessingRequest = false,
+                                    requests =
+                                        it.requests.map { request ->
+                                            if (request.id == requestId) {
+                                                updatedRequest.copy(
+                                                    media =
+                                                        updatedRequest.media.copy(
+                                                            title = request.media.title,
+                                                            name = request.media.name,
+                                                            posterPath = request.media.posterPath,
+                                                            backdropPath =
+                                                                request.media.backdropPath,
+                                                            releaseDate = request.media.releaseDate,
+                                                            firstAirDate =
+                                                                request.media.firstAirDate,
+                                                        )
+                                                )
+                                            } else request
+                                        },
+                                )
+                            }
+                            Timber.d("Request $requestId declined successfully")
+                        },
+                        onFailure = { error ->
+                            _uiState.update {
+                                it.copy(
+                                    isProcessingRequest = false,
+                                    error =
+                                        context.getString(
+                                            R.string.error_request_decline_failed_fmt,
+                                            error.message,
+                                        ),
+                                )
+                            }
+                            Timber.e(error, "Failed to decline request")
+                        },
+                    )
             } catch (e: Exception) {
                 _uiState.update {
                     it.copy(
                         isProcessingRequest = false,
-                        error = e.message ?: context.getString(R.string.error_unknown)
+                        error = e.message ?: context.getString(R.string.error_unknown),
                     )
                 }
                 Timber.e(e, "Error declining request")
@@ -317,44 +349,52 @@ class RequestsViewModel @Inject constructor(
         viewModelScope.launch {
             try {
                 _uiState.update {
-                    it.copy(
-                        isSearching = true,
-                        searchQuery = query,
-                        searchError = null
-                    )
+                    it.copy(isSearching = true, searchQuery = query, searchError = null)
                 }
 
-                jellyseerrRepository.findMediaByName(query, mediaType).fold(
-                    onSuccess = { results ->
-                        _uiState.update {
-                            it.copy(
-                                searchResults = results,
-                                isSearching = false,
-                                showSearchDialog = results.isNotEmpty()
-                            )
-                        }
-                        if (results.isEmpty()) {
+                jellyseerrRepository
+                    .findMediaByName(query, mediaType)
+                    .fold(
+                        onSuccess = { results ->
                             _uiState.update {
-                                it.copy(searchError = context.getString(R.string.error_search_no_results_fmt, query))
+                                it.copy(
+                                    searchResults = results,
+                                    isSearching = false,
+                                    showSearchDialog = results.isNotEmpty(),
+                                )
                             }
-                        }
-                        Timber.d("Found ${results.size} search results")
-                    },
-                    onFailure = { error ->
-                        _uiState.update {
-                            it.copy(
-                                isSearching = false,
-                                searchError = context.getString(R.string.error_search_failed_fmt, error.message)
-                            )
-                        }
-                        Timber.e(error, "Search failed")
-                    }
-                )
+                            if (results.isEmpty()) {
+                                _uiState.update {
+                                    it.copy(
+                                        searchError =
+                                            context.getString(
+                                                R.string.error_search_no_results_fmt,
+                                                query,
+                                            )
+                                    )
+                                }
+                            }
+                            Timber.d("Found ${results.size} search results")
+                        },
+                        onFailure = { error ->
+                            _uiState.update {
+                                it.copy(
+                                    isSearching = false,
+                                    searchError =
+                                        context.getString(
+                                            R.string.error_search_failed_fmt,
+                                            error.message,
+                                        ),
+                                )
+                            }
+                            Timber.e(error, "Search failed")
+                        },
+                    )
             } catch (e: Exception) {
                 _uiState.update {
                     it.copy(
                         isSearching = false,
-                        searchError = e.message ?: context.getString(R.string.error_unknown)
+                        searchError = e.message ?: context.getString(R.string.error_unknown),
                     )
                 }
                 Timber.e(e, "Error searching")
@@ -367,34 +407,40 @@ class RequestsViewModel @Inject constructor(
             try {
                 _uiState.update { it.copy(isCreatingRequest = true) }
 
-                jellyseerrRepository.createRequest(mediaId, mediaType, seasons).fold(
-                    onSuccess = { newRequest ->
-                        _uiState.update {
-                            it.copy(
-                                isCreatingRequest = false,
-                                showSearchDialog = false,
-                                searchResults = emptyList(),
-                                searchQuery = ""
-                            )
-                        }
-                        loadRequests()
-                        Timber.d("Request created successfully: ${newRequest.id}")
-                    },
-                    onFailure = { error ->
-                        _uiState.update {
-                            it.copy(
-                                isCreatingRequest = false,
-                                error = context.getString(R.string.error_request_create_failed_fmt, error.message)
-                            )
-                        }
-                        Timber.e(error, "Failed to create request")
-                    }
-                )
+                jellyseerrRepository
+                    .createRequest(mediaId, mediaType, seasons)
+                    .fold(
+                        onSuccess = { newRequest ->
+                            _uiState.update {
+                                it.copy(
+                                    isCreatingRequest = false,
+                                    showSearchDialog = false,
+                                    searchResults = emptyList(),
+                                    searchQuery = "",
+                                )
+                            }
+                            loadRequests()
+                            Timber.d("Request created successfully: ${newRequest.id}")
+                        },
+                        onFailure = { error ->
+                            _uiState.update {
+                                it.copy(
+                                    isCreatingRequest = false,
+                                    error =
+                                        context.getString(
+                                            R.string.error_request_create_failed_fmt,
+                                            error.message,
+                                        ),
+                                )
+                            }
+                            Timber.e(error, "Failed to create request")
+                        },
+                    )
             } catch (e: Exception) {
                 _uiState.update {
                     it.copy(
                         isCreatingRequest = false,
-                        error = e.message ?: context.getString(R.string.error_unknown)
+                        error = e.message ?: context.getString(R.string.error_unknown),
                     )
                 }
                 Timber.e(e, "Error creating request")
@@ -408,7 +454,7 @@ class RequestsViewModel @Inject constructor(
                 showSearchDialog = false,
                 searchResults = emptyList(),
                 searchQuery = "",
-                searchError = null
+                searchError = null,
             )
         }
     }
@@ -430,20 +476,19 @@ class RequestsViewModel @Inject constructor(
         _uiState.update { it.copy(isLoadingDiscover = true) }
 
         viewModelScope.launch {
-            jellyseerrRepository.getTrending(limit = 10).fold(
-                onSuccess = { result ->
-                    _uiState.update {
-                        it.copy(
-                            trendingItems = result.results,
-                            isLoadingDiscover = false
-                        )
-                    }
-                },
-                onFailure = {
-                    Timber.e(it, "Failed to load trending items")
-                    _uiState.update { it.copy(isLoadingDiscover = false) }
-                }
-            )
+            jellyseerrRepository
+                .getTrending(limit = 10)
+                .fold(
+                    onSuccess = { result ->
+                        _uiState.update {
+                            it.copy(trendingItems = result.results, isLoadingDiscover = false)
+                        }
+                    },
+                    onFailure = {
+                        Timber.e(it, "Failed to load trending items")
+                        _uiState.update { it.copy(isLoadingDiscover = false) }
+                    },
+                )
         }
 
         viewModelScope.launch {
@@ -489,17 +534,18 @@ class RequestsViewModel @Inject constructor(
         title: String,
         posterUrl: String?,
         availableSeasons: Int = 0,
-        existingStatus: MediaStatus? = null
+        existingStatus: MediaStatus? = null,
     ) {
         viewModelScope.launch {
             try {
                 _uiState.update { it.copy(isFetchingTvDetails = true) }
 
-                val detailsResult = if (mediaType == MediaType.TV) {
-                    jellyseerrRepository.getTvDetails(tmdbId)
-                } else {
-                    jellyseerrRepository.getMovieDetails(tmdbId)
-                }
+                val detailsResult =
+                    if (mediaType == MediaType.TV) {
+                        jellyseerrRepository.getTvDetails(tmdbId)
+                    } else {
+                        jellyseerrRepository.getMovieDetails(tmdbId)
+                    }
 
                 detailsResult.fold(
                     onSuccess = { details ->
@@ -509,34 +555,36 @@ class RequestsViewModel @Inject constructor(
                             if (mediaType == MediaType.TV) details.getSeasonCount() else 0
                         val alreadyAvailableSeasons =
                             details.mediaInfo?.getAvailableSeasons() ?: emptyList()
-                        val selectableSeasons = if (mediaType == MediaType.TV) {
-                            (1..seasonCount).filter { it !in alreadyAvailableSeasons }
-                        } else emptyList()
+                        val selectableSeasons =
+                            if (mediaType == MediaType.TV) {
+                                (1..seasonCount).filter { it !in alreadyAvailableSeasons }
+                            } else emptyList()
 
                         _uiState.update {
                             it.copy(
                                 showRequestDialog = true,
-                                pendingRequest = PendingRequest(
-                                    tmdbId = tmdbId,
-                                    mediaType = mediaType,
-                                    title = details.title ?: details.name ?: title,
-                                    posterUrl = details.getPosterUrl(),
-                                    availableSeasons = seasonCount,
-                                    existingStatus = existingStatus,
-                                    backdropUrl = details.getBackdropUrl(),
-                                    tagline = details.tagline,
-                                    overview = details.overview,
-                                    releaseDate = details.releaseDate ?: details.firstAirDate,
-                                    runtime = details.runtime,
-                                    voteAverage = details.voteAverage,
-                                    certification = details.getCertification(),
-                                    originalLanguage = details.originalLanguage,
-                                    director = details.getDirector(),
-                                    genres = details.getGenreNames(),
-                                    ratingsCombined = details.ratingsCombined
-                                ),
+                                pendingRequest =
+                                    PendingRequest(
+                                        tmdbId = tmdbId,
+                                        mediaType = mediaType,
+                                        title = details.title ?: details.name ?: title,
+                                        posterUrl = details.getPosterUrl(),
+                                        availableSeasons = seasonCount,
+                                        existingStatus = existingStatus,
+                                        backdropUrl = details.getBackdropUrl(),
+                                        tagline = details.tagline,
+                                        overview = details.overview,
+                                        releaseDate = details.releaseDate ?: details.firstAirDate,
+                                        runtime = details.runtime,
+                                        voteAverage = details.voteAverage,
+                                        certification = details.getCertification(),
+                                        originalLanguage = details.originalLanguage,
+                                        director = details.getDirector(),
+                                        genres = details.getGenreNames(),
+                                        ratingsCombined = details.ratingsCombined,
+                                    ),
                                 selectedSeasons = selectableSeasons,
-                                disabledSeasons = alreadyAvailableSeasons
+                                disabledSeasons = alreadyAvailableSeasons,
                             )
                         }
                     },
@@ -547,40 +595,44 @@ class RequestsViewModel @Inject constructor(
                         _uiState.update {
                             it.copy(
                                 showRequestDialog = true,
-                                pendingRequest = PendingRequest(
-                                    tmdbId = tmdbId,
-                                    mediaType = mediaType,
-                                    title = title,
-                                    posterUrl = posterUrl,
-                                    availableSeasons = availableSeasons,
-                                    existingStatus = existingStatus
-                                ),
-                                selectedSeasons = if (mediaType == MediaType.TV && availableSeasons > 0) {
-                                    (1..availableSeasons).toList()
-                                } else emptyList(),
-                                disabledSeasons = emptyList()
+                                pendingRequest =
+                                    PendingRequest(
+                                        tmdbId = tmdbId,
+                                        mediaType = mediaType,
+                                        title = title,
+                                        posterUrl = posterUrl,
+                                        availableSeasons = availableSeasons,
+                                        existingStatus = existingStatus,
+                                    ),
+                                selectedSeasons =
+                                    if (mediaType == MediaType.TV && availableSeasons > 0) {
+                                        (1..availableSeasons).toList()
+                                    } else emptyList(),
+                                disabledSeasons = emptyList(),
                             )
                         }
-                    }
+                    },
                 )
             } catch (e: Exception) {
                 Timber.e(e, "Error showing request dialog")
                 _uiState.update {
                     it.copy(
                         showRequestDialog = true,
-                        pendingRequest = PendingRequest(
-                            tmdbId = tmdbId,
-                            mediaType = mediaType,
-                            title = title,
-                            posterUrl = posterUrl,
-                            availableSeasons = availableSeasons,
-                            existingStatus = existingStatus
-                        ),
-                        selectedSeasons = if (mediaType == MediaType.TV && availableSeasons > 0) {
-                            (1..availableSeasons).toList()
-                        } else emptyList(),
+                        pendingRequest =
+                            PendingRequest(
+                                tmdbId = tmdbId,
+                                mediaType = mediaType,
+                                title = title,
+                                posterUrl = posterUrl,
+                                availableSeasons = availableSeasons,
+                                existingStatus = existingStatus,
+                            ),
+                        selectedSeasons =
+                            if (mediaType == MediaType.TV && availableSeasons > 0) {
+                                (1..availableSeasons).toList()
+                            } else emptyList(),
                         disabledSeasons = emptyList(),
-                        isFetchingTvDetails = false
+                        isFetchingTvDetails = false,
                     )
                 }
             }
@@ -589,60 +641,66 @@ class RequestsViewModel @Inject constructor(
 
     fun confirmRequest() {
         val pending = _uiState.value.pendingRequest ?: return
-        val seasons = if (pending.mediaType == MediaType.TV) {
-            _uiState.value.selectedSeasons.takeIf { it.isNotEmpty() }
-        } else null
+        val seasons =
+            if (pending.mediaType == MediaType.TV) {
+                _uiState.value.selectedSeasons.takeIf { it.isNotEmpty() }
+            } else null
 
         viewModelScope.launch {
             try {
                 _uiState.update { it.copy(isCreatingRequest = true) }
 
-                jellyseerrRepository.createRequest(pending.tmdbId, pending.mediaType, seasons).fold(
-                    onSuccess = { newRequest ->
-                        val updatedMediaInfo = newRequest.media.copy(
-                            requests = listOfNotNull(newRequest)
-                        )
-
-                        val updateItemStatus: (SearchResultItem) -> SearchResultItem = { item ->
-                            if (item.id == pending.tmdbId) {
-                                item.copy(mediaInfo = updatedMediaInfo)
-                            } else {
-                                item
+                jellyseerrRepository
+                    .createRequest(pending.tmdbId, pending.mediaType, seasons)
+                    .fold(
+                        onSuccess = { newRequest ->
+                            val updatedMediaInfo =
+                                newRequest.media.copy(requests = listOfNotNull(newRequest))
+
+                            val updateItemStatus: (SearchResultItem) -> SearchResultItem = { item ->
+                                if (item.id == pending.tmdbId) {
+                                    item.copy(mediaInfo = updatedMediaInfo)
+                                } else {
+                                    item
+                                }
                             }
-                        }
 
-                        _uiState.update {
-                            it.copy(
-                                isCreatingRequest = false,
-                                showRequestDialog = false,
-                                pendingRequest = null,
-                                selectedSeasons = emptyList(),
-                                disabledSeasons = emptyList(),
-                                trendingItems = it.trendingItems.map(updateItemStatus),
-                                popularMovies = it.popularMovies.map(updateItemStatus),
-                                popularTv = it.popularTv.map(updateItemStatus),
-                                upcomingMovies = it.upcomingMovies.map(updateItemStatus),
-                                upcomingTv = it.upcomingTv.map(updateItemStatus)
-                            )
-                        }
-                        loadRequests()
-                        Timber.d("Request created successfully: ${newRequest.id}")
-                    },
-                    onFailure = { error ->
-                        _uiState.update {
-                            it.copy(
-                                isCreatingRequest = false,
-                                error = context.getString(R.string.error_request_create_failed_fmt, error.message)
-                            )
-                        }
-                        Timber.e(error, "Failed to create request")
-                    }
-                )
+                            _uiState.update {
+                                it.copy(
+                                    isCreatingRequest = false,
+                                    showRequestDialog = false,
+                                    pendingRequest = null,
+                                    selectedSeasons = emptyList(),
+                                    disabledSeasons = emptyList(),
+                                    trendingItems = it.trendingItems.map(updateItemStatus),
+                                    popularMovies = it.popularMovies.map(updateItemStatus),
+                                    popularTv = it.popularTv.map(updateItemStatus),
+                                    upcomingMovies = it.upcomingMovies.map(updateItemStatus),
+                                    upcomingTv = it.upcomingTv.map(updateItemStatus),
+                                )
+                            }
+                            loadRequests()
+                            Timber.d("Request created successfully: ${newRequest.id}")
+                        },
+                        onFailure = { error ->
+                            _uiState.update {
+                                it.copy(
+                                    isCreatingRequest = false,
+                                    error =
+                                        context.getString(
+                                            R.string.error_request_create_failed_fmt,
+                                            error.message,
+                                        ),
+                                )
+                            }
+                            Timber.e(error, "Failed to create request")
+                        },
+                    )
             } catch (e: Exception) {
                 _uiState.update {
                     it.copy(
                         isCreatingRequest = false,
-                        error = e.message ?: context.getString(R.string.error_unknown)
+                        error = e.message ?: context.getString(R.string.error_unknown),
                     )
                 }
                 Timber.e(e, "Error creating request")
@@ -652,11 +710,7 @@ class RequestsViewModel @Inject constructor(
 
     fun dismissRequestDialog() {
         _uiState.update {
-            it.copy(
-                showRequestDialog = false,
-                pendingRequest = null,
-                selectedSeasons = emptyList()
-            )
+            it.copy(showRequestDialog = false, pendingRequest = null, selectedSeasons = emptyList())
         }
     }
 
@@ -677,7 +731,6 @@ data class RequestsUiState(
     val searchQuery: String = "",
     val searchError: String? = null,
     val showSearchDialog: Boolean = false,
-
     val trendingItems: List<SearchResultItem> = emptyList(),
     val popularMovies: List<SearchResultItem> = emptyList(),
     val popularTv: List<SearchResultItem> = emptyList(),
@@ -688,12 +741,11 @@ data class RequestsUiState(
     val movieGenres: List<GenreSliderItem> = emptyList(),
     val tvGenres: List<GenreSliderItem> = emptyList(),
     val isLoadingDiscover: Boolean = false,
-
     val showRequestDialog: Boolean = false,
     val pendingRequest: PendingRequest? = null,
     val selectedSeasons: List<Int> = emptyList(),
     val disabledSeasons: List<Int> = emptyList(),
-    val isFetchingTvDetails: Boolean = false
+    val isFetchingTvDetails: Boolean = false,
 )
 
 data class PendingRequest(
@@ -713,5 +765,5 @@ data class PendingRequest(
     val originalLanguage: String? = null,
     val director: String? = null,
     val genres: List<String> = emptyList(),
-    val ratingsCombined: RatingsCombined? = null
-)
\ No newline at end of file
+    val ratingsCombined: RatingsCombined? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/requests/StudioNetworkCard.kt b/app/src/main/java/com/makd/afinity/ui/requests/StudioNetworkCard.kt
index cd8e21f2a..95c746d9d 100644
--- a/app/src/main/java/com/makd/afinity/ui/requests/StudioNetworkCard.kt
+++ b/app/src/main/java/com/makd/afinity/ui/requests/StudioNetworkCard.kt
@@ -20,8 +20,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 import com.makd.afinity.data.models.jellyseerr.GenreSliderItem
 import com.makd.afinity.data.models.jellyseerr.Network
 import com.makd.afinity.data.models.jellyseerr.Studio
@@ -30,30 +30,16 @@ import com.makd.afinity.ui.theme.CardDimensions
 import com.makd.afinity.util.BackdropTracker
 
 @Composable
-fun StudioCard(
-    studio: Studio,
-    onClick: () -> Unit,
-    cardWidth: Dp,
-    modifier: Modifier = Modifier
-) {
+fun StudioCard(studio: Studio, onClick: () -> Unit, cardWidth: Dp, modifier: Modifier = Modifier) {
 
-    Column(
-        modifier = modifier.width(cardWidth)
-    ) {
+    Column(modifier = modifier.width(cardWidth)) {
         Card(
             onClick = onClick,
-            modifier = Modifier
-                .fillMaxWidth()
-                .aspectRatio(CardDimensions.ASPECT_RATIO_LANDSCAPE),
-            colors = CardDefaults.cardColors(
-                containerColor = Color(0xFF1C1C1C)
-            ),
-            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+            modifier = Modifier.fillMaxWidth().aspectRatio(CardDimensions.ASPECT_RATIO_LANDSCAPE),
+            colors = CardDefaults.cardColors(containerColor = Color(0xFF1C1C1C)),
+            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
         ) {
-            Box(
-                modifier = Modifier.fillMaxSize(),
-                contentAlignment = Alignment.Center
-            ) {
+            Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                 AsyncImage(
                     imageUrl = studio.getImageUrl(),
                     contentDescription = studio.name,
@@ -61,9 +47,7 @@ fun StudioCard(
                     targetWidth = cardWidth,
                     targetHeight = cardWidth * 9f / 16f,
                     contentScale = ContentScale.Fit,
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(16.dp)
+                    modifier = Modifier.fillMaxSize().padding(16.dp),
                 )
             }
         }
@@ -75,26 +59,17 @@ fun NetworkCard(
     network: Network,
     onClick: () -> Unit,
     cardWidth: Dp,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
 
-    Column(
-        modifier = modifier.width(cardWidth)
-    ) {
+    Column(modifier = modifier.width(cardWidth)) {
         Card(
             onClick = onClick,
-            modifier = Modifier
-                .fillMaxWidth()
-                .aspectRatio(CardDimensions.ASPECT_RATIO_LANDSCAPE),
-            colors = CardDefaults.cardColors(
-                containerColor = Color(0xFF1C1C1C)
-            ),
-            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+            modifier = Modifier.fillMaxWidth().aspectRatio(CardDimensions.ASPECT_RATIO_LANDSCAPE),
+            colors = CardDefaults.cardColors(containerColor = Color(0xFF1C1C1C)),
+            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
         ) {
-            Box(
-                modifier = Modifier.fillMaxSize(),
-                contentAlignment = Alignment.Center
-            ) {
+            Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                 AsyncImage(
                     imageUrl = network.getImageUrl(),
                     contentDescription = network.name,
@@ -102,9 +77,7 @@ fun NetworkCard(
                     targetWidth = cardWidth,
                     targetHeight = cardWidth * 9f / 16f,
                     contentScale = ContentScale.Fit,
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(16.dp)
+                    modifier = Modifier.fillMaxSize().padding(16.dp),
                 )
             }
         }
@@ -118,26 +91,18 @@ fun GenreCard(
     cardWidth: Dp,
     modifier: Modifier = Modifier,
     backdropTracker: BackdropTracker? = null,
-    isMovie: Boolean = true
+    isMovie: Boolean = true,
 ) {
 
-    Column(
-        modifier = modifier.width(cardWidth)
-    ) {
+    Column(modifier = modifier.width(cardWidth)) {
         Card(
             onClick = onClick,
-            modifier = Modifier
-                .fillMaxWidth()
-                .aspectRatio(CardDimensions.ASPECT_RATIO_LANDSCAPE),
-            colors = CardDefaults.cardColors(
-                containerColor = MaterialTheme.colorScheme.surfaceVariant
-            ),
-            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+            modifier = Modifier.fillMaxWidth().aspectRatio(CardDimensions.ASPECT_RATIO_LANDSCAPE),
+            colors =
+                CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
+            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
         ) {
-            Box(
-                modifier = Modifier.fillMaxSize(),
-                contentAlignment = Alignment.Center
-            ) {
+            Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                 genre.getDuotoneBackdropUrl(backdropTracker, isMovie)?.let { backdropUrl ->
                     AsyncImage(
                         imageUrl = backdropUrl,
@@ -146,37 +111,32 @@ fun GenreCard(
                         targetWidth = cardWidth,
                         targetHeight = cardWidth * 9f / 16f,
                         contentScale = ContentScale.Crop,
-                        modifier = Modifier.fillMaxSize()
+                        modifier = Modifier.fillMaxSize(),
                     )
                 }
 
                 Box(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .background(
-                            Brush.verticalGradient(
-                                colors = listOf(
-                                    Color.Transparent,
-                                    Color.Black.copy(alpha = 0.7f)
-                                ),
-                                startY = 0f,
-                                endY = Float.POSITIVE_INFINITY
+                    modifier =
+                        Modifier.fillMaxSize()
+                            .background(
+                                Brush.verticalGradient(
+                                    colors =
+                                        listOf(Color.Transparent, Color.Black.copy(alpha = 0.7f)),
+                                    startY = 0f,
+                                    endY = Float.POSITIVE_INFINITY,
+                                )
                             )
-                        )
                 )
 
                 Text(
                     text = genre.name,
-                    style = MaterialTheme.typography.headlineMedium.copy(
-                        fontWeight = FontWeight.Bold
-                    ),
+                    style =
+                        MaterialTheme.typography.headlineMedium.copy(fontWeight = FontWeight.Bold),
                     color = Color.White,
                     textAlign = TextAlign.Center,
-                    modifier = Modifier
-                        .align(Alignment.Center)
-                        .padding(12.dp)
+                    modifier = Modifier.align(Alignment.Center).padding(12.dp),
                 )
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/search/GenreResultsScreen.kt b/app/src/main/java/com/makd/afinity/ui/search/GenreResultsScreen.kt
index d6aa16b50..77d562907 100644
--- a/app/src/main/java/com/makd/afinity/ui/search/GenreResultsScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/search/GenreResultsScreen.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
@@ -51,64 +52,52 @@ fun GenreResultsScreen(
     onItemClick: (AfinityItem) -> Unit,
     modifier: Modifier = Modifier,
     viewModel: GenreResultsViewModel = hiltViewModel(),
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
-    LaunchedEffect(genre) {
-        viewModel.loadGenreResults(genre)
-    }
+    LaunchedEffect(genre) { viewModel.loadGenreResults(genre) }
 
-    Column(
-        modifier = modifier
-            .fillMaxSize()
-    ) {
+    Column(modifier = modifier.fillMaxSize().safeDrawingPadding()) {
         TopAppBar(
             title = {
                 Text(
                     text = genre,
-                    style = MaterialTheme.typography.headlineLarge.copy(
-                        fontWeight = FontWeight.Bold
-                    )
+                    style =
+                        MaterialTheme.typography.headlineLarge.copy(fontWeight = FontWeight.Bold),
                 )
             },
             navigationIcon = {
                 IconButton(onClick = onBackClick) {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_chevron_left),
-                        contentDescription = stringResource(R.string.cd_back)
+                        contentDescription = stringResource(R.string.cd_back),
                     )
                 }
-            }
+            },
         )
 
         when {
             uiState.isLoading -> {
-                Box(
-                    modifier = Modifier.fillMaxSize(),
-                    contentAlignment = Alignment.Center
-                ) {
+                Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                     CircularProgressIndicator()
                 }
             }
 
             uiState.error != null -> {
-                Box(
-                    modifier = Modifier.fillMaxSize(),
-                    contentAlignment = Alignment.Center
-                ) {
+                Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                     Column(
                         horizontalAlignment = Alignment.CenterHorizontally,
-                        verticalArrangement = Arrangement.spacedBy(8.dp)
+                        verticalArrangement = Arrangement.spacedBy(8.dp),
                     ) {
                         Text(
                             text = stringResource(R.string.error_something_went_wrong),
-                            style = MaterialTheme.typography.headlineSmall
+                            style = MaterialTheme.typography.headlineSmall,
                         )
                         Text(
                             text = uiState.error ?: stringResource(R.string.error_unknown),
                             style = MaterialTheme.typography.bodyMedium,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
                 }
@@ -119,7 +108,7 @@ fun GenreResultsScreen(
                     movies = uiState.movies,
                     shows = uiState.shows,
                     onItemClick = onItemClick,
-                    widthSizeClass = widthSizeClass
+                    widthSizeClass = widthSizeClass,
                 )
             }
         }
@@ -131,28 +120,22 @@ private fun GenreResultsContent(
     movies: List<AfinityMovie>,
     shows: List<AfinityShow>,
     onItemClick: (AfinityItem) -> Unit,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     var selectedTab by remember { mutableIntStateOf(0) }
     val tabs = listOf(stringResource(R.string.tab_movies), stringResource(R.string.tab_tv_shows))
 
     Column {
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 16.dp, vertical = 8.dp)
-        ) {
+        Box(modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp)) {
             Surface(
                 modifier = Modifier.fillMaxWidth(),
                 shape = RoundedCornerShape(12.dp),
                 color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.7f),
-                tonalElevation = 2.dp
+                tonalElevation = 2.dp,
             ) {
                 Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(4.dp),
-                    horizontalArrangement = Arrangement.spacedBy(4.dp)
+                    modifier = Modifier.fillMaxWidth().padding(4.dp),
+                    horizontalArrangement = Arrangement.spacedBy(4.dp),
                 ) {
                     tabs.forEachIndexed { index, title ->
                         val isSelected = selectedTab == index
@@ -162,52 +145,58 @@ private fun GenreResultsContent(
                             onClick = { selectedTab = index },
                             modifier = Modifier.weight(1f),
                             shape = RoundedCornerShape(8.dp),
-                            color = if (isSelected) {
-                                MaterialTheme.colorScheme.primary
-                            } else {
-                                Color.Transparent
-                            },
-                            tonalElevation = if (isSelected) 4.dp else 0.dp
+                            color =
+                                if (isSelected) {
+                                    MaterialTheme.colorScheme.primary
+                                } else {
+                                    Color.Transparent
+                                },
+                            tonalElevation = if (isSelected) 4.dp else 0.dp,
                         ) {
                             Column(
                                 modifier = Modifier.padding(vertical = 12.dp, horizontal = 16.dp),
                                 horizontalAlignment = Alignment.CenterHorizontally,
-                                verticalArrangement = Arrangement.spacedBy(2.dp)
+                                verticalArrangement = Arrangement.spacedBy(2.dp),
                             ) {
                                 Text(
                                     text = title,
-                                    style = MaterialTheme.typography.labelLarge.copy(
-                                        fontWeight = if (isSelected) FontWeight.SemiBold else FontWeight.Medium
-                                    ),
-                                    color = if (isSelected) {
-                                        MaterialTheme.colorScheme.onPrimary
-                                    } else {
-                                        MaterialTheme.colorScheme.onSurfaceVariant
-                                    }
+                                    style =
+                                        MaterialTheme.typography.labelLarge.copy(
+                                            fontWeight =
+                                                if (isSelected) FontWeight.SemiBold
+                                                else FontWeight.Medium
+                                        ),
+                                    color =
+                                        if (isSelected) {
+                                            MaterialTheme.colorScheme.onPrimary
+                                        } else {
+                                            MaterialTheme.colorScheme.onSurfaceVariant
+                                        },
                                 )
 
                                 Surface(
                                     shape = RoundedCornerShape(10.dp),
-                                    color = if (isSelected) {
-                                        MaterialTheme.colorScheme.onPrimary.copy(alpha = 0.2f)
-                                    } else {
-                                        MaterialTheme.colorScheme.primary.copy(alpha = 0.15f)
-                                    }
+                                    color =
+                                        if (isSelected) {
+                                            MaterialTheme.colorScheme.onPrimary.copy(alpha = 0.2f)
+                                        } else {
+                                            MaterialTheme.colorScheme.primary.copy(alpha = 0.15f)
+                                        },
                                 ) {
                                     Text(
                                         text = count.toString(),
-                                        modifier = Modifier.padding(
-                                            horizontal = 8.dp,
-                                            vertical = 2.dp
-                                        ),
-                                        style = MaterialTheme.typography.labelSmall.copy(
-                                            fontWeight = FontWeight.Medium
-                                        ),
-                                        color = if (isSelected) {
-                                            MaterialTheme.colorScheme.onPrimary
-                                        } else {
-                                            MaterialTheme.colorScheme.primary
-                                        }
+                                        modifier =
+                                            Modifier.padding(horizontal = 8.dp, vertical = 2.dp),
+                                        style =
+                                            MaterialTheme.typography.labelSmall.copy(
+                                                fontWeight = FontWeight.Medium
+                                            ),
+                                        color =
+                                            if (isSelected) {
+                                                MaterialTheme.colorScheme.onPrimary
+                                            } else {
+                                                MaterialTheme.colorScheme.primary
+                                            },
                                     )
                                 }
                             }
@@ -225,7 +214,7 @@ private fun GenreResultsContent(
                     ItemGrid(
                         items = movies,
                         onItemClick = onItemClick,
-                        widthSizeClass = widthSizeClass
+                        widthSizeClass = widthSizeClass,
                     )
                 }
             }
@@ -237,7 +226,7 @@ private fun GenreResultsContent(
                     ItemGrid(
                         items = shows,
                         onItemClick = onItemClick,
-                        widthSizeClass = widthSizeClass
+                        widthSizeClass = widthSizeClass,
                     )
                 }
             }
@@ -249,21 +238,19 @@ private fun GenreResultsContent(
 private fun ItemGrid(
     items: List<AfinityItem>,
     onItemClick: (AfinityItem) -> Unit,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     LazyVerticalGrid(
         columns = GridCells.Adaptive(widthSizeClass.gridMinSize),
         modifier = Modifier.fillMaxSize(),
         contentPadding = PaddingValues(16.dp),
         horizontalArrangement = Arrangement.spacedBy(12.dp),
-        verticalArrangement = Arrangement.spacedBy(16.dp)
+        verticalArrangement = Arrangement.spacedBy(16.dp),
     ) {
         items(items) { item ->
             MediaItemCard(
                 item = item,
-                onClick = {
-                    onItemClick(item)
-                },
+                onClick = { onItemClick(item) },
                 cardWidth = widthSizeClass.gridMinSize,
                 modifier = Modifier.fillMaxWidth(),
             )
@@ -273,16 +260,11 @@ private fun ItemGrid(
 
 @Composable
 private fun EmptyStateMessage(message: String) {
-    Box(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(32.dp),
-        contentAlignment = Alignment.Center
-    ) {
+    Box(modifier = Modifier.fillMaxSize().padding(32.dp), contentAlignment = Alignment.Center) {
         Text(
             text = message,
             style = MaterialTheme.typography.bodyLarge,
-            color = MaterialTheme.colorScheme.onSurfaceVariant
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/search/GenreResultsViewModel.kt b/app/src/main/java/com/makd/afinity/ui/search/GenreResultsViewModel.kt
index 4d347acd3..949fa6a46 100644
--- a/app/src/main/java/com/makd/afinity/ui/search/GenreResultsViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/search/GenreResultsViewModel.kt
@@ -12,19 +12,21 @@ import com.makd.afinity.data.repository.JellyfinRepository
 import com.makd.afinity.data.repository.media.MediaRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltViewModel
-class GenreResultsViewModel @Inject constructor(
+class GenreResultsViewModel
+@Inject
+constructor(
     @ApplicationContext private val context: Context,
     private val mediaRepository: MediaRepository,
     private val jellyfinRepository: JellyfinRepository,
-    private val appDataRepository: AppDataRepository
+    private val appDataRepository: AppDataRepository,
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(GenreResultsUiState())
@@ -50,38 +52,42 @@ class GenreResultsViewModel @Inject constructor(
             try {
                 _uiState.value = _uiState.value.copy(isLoading = true, error = null)
 
-                val results = mediaRepository.getItems(
-                    genres = listOf(genre),
-                    includeItemTypes = listOf("MOVIE", "SERIES"),
-                    limit = 200
-                )
+                val results =
+                    mediaRepository.getItems(
+                        genres = listOf(genre),
+                        includeItemTypes = listOf("MOVIE", "SERIES"),
+                        limit = 200,
+                    )
 
-                val allItems = results.items?.mapNotNull { baseItemDto ->
-                    try {
-                        baseItemDto.toAfinityItem(jellyfinRepository.getBaseUrl())
-                    } catch (e: Exception) {
-                        Timber.w(e, "Failed to convert item to AfinityItem: ${baseItemDto.name}")
-                        null
-                    }
-                } ?: emptyList()
+                val allItems =
+                    results.items?.mapNotNull { baseItemDto ->
+                        try {
+                            baseItemDto.toAfinityItem(jellyfinRepository.getBaseUrl())
+                        } catch (e: Exception) {
+                            Timber.w(
+                                e,
+                                "Failed to convert item to AfinityItem: ${baseItemDto.name}",
+                            )
+                            null
+                        }
+                    } ?: emptyList()
 
                 val movies = allItems.filterIsInstance<AfinityMovie>()
                 val shows = allItems.filterIsInstance<AfinityShow>()
 
-                _uiState.value = _uiState.value.copy(
-                    movies = movies,
-                    shows = shows,
-                    isLoading = false
-                )
-
-                Timber.d("Genre results loaded: ${movies.size} movies, ${shows.size} shows for '$genre'")
+                _uiState.value =
+                    _uiState.value.copy(movies = movies, shows = shows, isLoading = false)
 
+                Timber.d(
+                    "Genre results loaded: ${movies.size} movies, ${shows.size} shows for '$genre'"
+                )
             } catch (e: Exception) {
                 Timber.e(e, "Failed to load genre results")
-                _uiState.value = _uiState.value.copy(
-                    isLoading = false,
-                    error = e.message ?: context.getString(R.string.error_unknown_occurred)
-                )
+                _uiState.value =
+                    _uiState.value.copy(
+                        isLoading = false,
+                        error = e.message ?: context.getString(R.string.error_unknown_occurred),
+                    )
             }
         }
     }
@@ -91,5 +97,5 @@ data class GenreResultsUiState(
     val movies: List<AfinityMovie> = emptyList(),
     val shows: List<AfinityShow> = emptyList(),
     val isLoading: Boolean = false,
-    val error: String? = null
-)
\ No newline at end of file
+    val error: String? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/search/SearchScreen.kt b/app/src/main/java/com/makd/afinity/ui/search/SearchScreen.kt
index 1620ada7d..3a3b688b5 100644
--- a/app/src/main/java/com/makd/afinity/ui/search/SearchScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/search/SearchScreen.kt
@@ -32,6 +32,7 @@ import androidx.compose.material3.FilterChip
 import androidx.compose.material3.FilterChipDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -43,6 +44,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
@@ -56,9 +58,11 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.core.text.HtmlCompat
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.makd.afinity.R
+import com.makd.afinity.data.models.audiobookshelf.LibraryItem
 import com.makd.afinity.data.models.extensions.primaryBlurHash
 import com.makd.afinity.data.models.extensions.primaryImageUrl
 import com.makd.afinity.data.models.jellyseerr.MediaStatus
@@ -78,21 +82,27 @@ fun SearchScreen(
     onBackClick: () -> Unit,
     onItemClick: (AfinityItem) -> Unit,
     onGenreClick: (String) -> Unit,
+    onAudiobookshelfItemClick: (String) -> Unit,
+    onAudiobookshelfGenreClick: (String) -> Unit,
     modifier: Modifier = Modifier,
     viewModel: SearchViewModel = hiltViewModel(),
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
-    val isJellyseerrAuthenticated by viewModel.isJellyseerrAuthenticated.collectAsStateWithLifecycle()
+    val isJellyseerrAuthenticated by
+        viewModel.isJellyseerrAuthenticated.collectAsStateWithLifecycle()
+    val isAudiobookshelfAuthenticated by
+        viewModel.isAudiobookshelfAuthenticated.collectAsStateWithLifecycle()
     val focusRequester = remember { FocusRequester() }
     val keyboardController = LocalSoftwareKeyboardController.current
     LocalFocusManager.current
 
     Column(
-        modifier = modifier
-            .fillMaxSize()
-            .background(MaterialTheme.colorScheme.background)
-            .safeDrawingPadding()
+        modifier =
+            modifier
+                .fillMaxSize()
+                .background(MaterialTheme.colorScheme.background)
+                .safeDrawingPadding()
     ) {
         SearchTopBar(
             searchQuery = uiState.searchQuery,
@@ -101,44 +111,80 @@ fun SearchScreen(
             focusRequester = focusRequester,
             onSearch = {
                 keyboardController?.hide()
-                if (uiState.isJellyseerrSearchMode) {
-                    viewModel.performJellyseerrSearch()
-                } else {
-                    viewModel.performSearch()
+                when {
+                    uiState.isJellyseerrSearchMode -> viewModel.performJellyseerrSearch()
+                    uiState.isAudiobookshelfSearchMode -> viewModel.performAudiobookshelfSearch()
+                    else -> {
+                        viewModel.performSearch()
+                        viewModel.performAudiobookshelfSearch()
+                    }
                 }
-            }
+            },
         )
 
-        if (uiState.libraries.isNotEmpty() || isJellyseerrAuthenticated) {
+        if (
+            uiState.libraries.isNotEmpty() ||
+                isJellyseerrAuthenticated ||
+                isAudiobookshelfAuthenticated
+        ) {
             HorizontalLibraryFilters(
                 libraries = uiState.libraries,
                 selectedLibrary = uiState.selectedLibrary,
                 isJellyseerrAuthenticated = isJellyseerrAuthenticated,
                 isJellyseerrSearchMode = uiState.isJellyseerrSearchMode,
+                isAudiobookshelfAuthenticated = isAudiobookshelfAuthenticated,
+                isAudiobookshelfSearchMode = uiState.isAudiobookshelfSearchMode,
                 onLibrarySelected = viewModel::selectLibrary,
                 onJellyseerrSearchSelected = viewModel::selectJellyseerrSearchMode,
-                onJellyfinSearchSelected = viewModel::selectJellyfinSearchMode
+                onJellyfinSearchSelected = viewModel::selectJellyfinSearchMode,
+                onAudiobookshelfSearchSelected = viewModel::selectAudiobookshelfSearchMode,
             )
         }
 
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-        ) {
+        Box(modifier = Modifier.fillMaxSize()) {
+            val isAllMode =
+                !uiState.isJellyseerrSearchMode &&
+                    !uiState.isAudiobookshelfSearchMode &&
+                    uiState.selectedLibrary == null
+            val allLoading =
+                if (isAllMode) {
+                    uiState.isSearching &&
+                        uiState.isAudiobookshelfSearching &&
+                        uiState.searchResults.isEmpty() &&
+                        uiState.audiobookshelfSearchResults.isEmpty()
+                } else {
+                    uiState.isSearching ||
+                        uiState.isJellyseerrSearching ||
+                        uiState.isAudiobookshelfSearching
+                }
+
             when {
-                uiState.searchQuery.isEmpty() && !uiState.isSearching && !uiState.isJellyseerrSearching -> {
-                    SearchHomeContent(
-                        genres = uiState.genres,
-                        onGenreClick = onGenreClick,
-                        widthSizeClass = widthSizeClass
-                    )
+                uiState.searchQuery.isEmpty() &&
+                    !uiState.isSearching &&
+                    !uiState.isJellyseerrSearching &&
+                    !uiState.isAudiobookshelfSearching -> {
+                    when {
+                        uiState.isJellyseerrSearchMode -> {}
+                        uiState.isAudiobookshelfSearchMode -> {
+                            SearchHomeContent(
+                                genres = uiState.audiobookshelfGenres,
+                                onGenreClick = onAudiobookshelfGenreClick,
+                                widthSizeClass = widthSizeClass,
+                                isAudiobookshelf = true,
+                            )
+                        }
+                        else -> {
+                            SearchHomeContent(
+                                genres = uiState.genres,
+                                onGenreClick = onGenreClick,
+                                widthSizeClass = widthSizeClass,
+                            )
+                        }
+                    }
                 }
 
-                uiState.isSearching || uiState.isJellyseerrSearching -> {
-                    Box(
-                        modifier = Modifier.fillMaxSize(),
-                        contentAlignment = Alignment.Center
-                    ) {
+                allLoading -> {
+                    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                         CircularProgressIndicator()
                     }
                 }
@@ -154,39 +200,55 @@ fun SearchScreen(
                                     title = item.getDisplayTitle(),
                                     posterUrl = item.getPosterUrl(),
                                     availableSeasons = 0,
-                                    existingStatus = item.getDisplayStatus()
+                                    existingStatus = item.getDisplayStatus(),
                                 )
                             }
-                        }
+                        },
                     )
                 }
 
-                uiState.searchResults.isNotEmpty() -> {
-                    SearchResultsContent(
-                        results = uiState.searchResults,
-                        onItemClick = onItemClick
+                uiState.isAudiobookshelfSearchMode &&
+                    uiState.audiobookshelfSearchResults.isNotEmpty() -> {
+                    AudiobookshelfSearchResultsContent(
+                        results = uiState.audiobookshelfSearchResults,
+                        serverUrl = uiState.audiobookshelfServerUrl,
+                        onItemClick = onAudiobookshelfItemClick,
+                    )
+                }
+
+                isAllMode &&
+                    (uiState.searchResults.isNotEmpty() ||
+                        uiState.audiobookshelfSearchResults.isNotEmpty()) -> {
+                    CombinedSearchResultsContent(
+                        jellyfinResults = uiState.searchResults,
+                        audiobookshelfResults = uiState.audiobookshelfSearchResults,
+                        isAudiobookshelfSearching = uiState.isAudiobookshelfSearching,
+                        serverUrl = uiState.audiobookshelfServerUrl,
+                        onItemClick = onItemClick,
+                        onAudiobookshelfItemClick = onAudiobookshelfItemClick,
                     )
                 }
 
+                uiState.searchResults.isNotEmpty() -> {
+                    SearchResultsContent(results = uiState.searchResults, onItemClick = onItemClick)
+                }
+
                 else -> {
-                    Box(
-                        modifier = Modifier.fillMaxSize(),
-                        contentAlignment = Alignment.Center
-                    ) {
+                    Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                         Column(
                             horizontalAlignment = Alignment.CenterHorizontally,
-                            verticalArrangement = Arrangement.spacedBy(8.dp)
+                            verticalArrangement = Arrangement.spacedBy(8.dp),
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_search),
                                 contentDescription = null,
                                 modifier = Modifier.size(48.dp),
-                                tint = MaterialTheme.colorScheme.onSurfaceVariant
+                                tint = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                             Text(
                                 text = stringResource(R.string.search_no_results),
                                 style = MaterialTheme.typography.titleMedium,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                         }
                     }
@@ -217,7 +279,7 @@ fun SearchScreen(
                 originalLanguage = uiState.pendingRequest!!.originalLanguage,
                 director = uiState.pendingRequest!!.director,
                 genres = uiState.pendingRequest!!.genres,
-                ratingsCombined = uiState.pendingRequest!!.ratingsCombined
+                ratingsCombined = uiState.pendingRequest!!.ratingsCombined,
             )
         }
     }
@@ -229,40 +291,36 @@ private fun SearchTopBar(
     onSearchQueryChange: (String) -> Unit,
     onBackClick: () -> Unit,
     focusRequester: FocusRequester,
-    onSearch: () -> Unit
+    onSearch: () -> Unit,
 ) {
     Row(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(16.dp),
+        modifier = Modifier.fillMaxWidth().padding(16.dp),
         verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(12.dp)
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
     ) {
         IconButton(onClick = onBackClick) {
             Icon(
                 painter = painterResource(id = R.drawable.ic_chevron_left),
                 contentDescription = "Back",
-                tint = MaterialTheme.colorScheme.onBackground
+                tint = MaterialTheme.colorScheme.onBackground,
             )
         }
 
         TextField(
             value = searchQuery,
             onValueChange = onSearchQueryChange,
-            modifier = Modifier
-                .weight(1f)
-                .focusRequester(focusRequester),
+            modifier = Modifier.weight(1f).focusRequester(focusRequester),
             placeholder = {
                 Text(
                     text = stringResource(R.string.search_placeholder),
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             },
             leadingIcon = {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_search),
                     contentDescription = null,
-                    tint = MaterialTheme.colorScheme.onSurfaceVariant
+                    tint = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             },
             trailingIcon = {
@@ -271,7 +329,7 @@ private fun SearchTopBar(
                         Icon(
                             painter = painterResource(id = R.drawable.ic_clear),
                             contentDescription = stringResource(R.string.cd_clear),
-                            tint = MaterialTheme.colorScheme.onSurfaceVariant
+                            tint = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
                 }
@@ -279,13 +337,14 @@ private fun SearchTopBar(
             keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
             keyboardActions = KeyboardActions(onSearch = { onSearch() }),
             singleLine = true,
-            colors = TextFieldDefaults.colors(
-                focusedContainerColor = MaterialTheme.colorScheme.surfaceVariant,
-                unfocusedContainerColor = MaterialTheme.colorScheme.surfaceVariant,
-                focusedIndicatorColor = Color.Transparent,
-                unfocusedIndicatorColor = Color.Transparent
-            ),
-            shape = RoundedCornerShape(28.dp)
+            colors =
+                TextFieldDefaults.colors(
+                    focusedContainerColor = MaterialTheme.colorScheme.surfaceVariant,
+                    unfocusedContainerColor = MaterialTheme.colorScheme.surfaceVariant,
+                    focusedIndicatorColor = Color.Transparent,
+                    unfocusedIndicatorColor = Color.Transparent,
+                ),
+            shape = RoundedCornerShape(28.dp),
         )
     }
 }
@@ -296,27 +355,30 @@ private fun HorizontalLibraryFilters(
     selectedLibrary: AfinityCollection?,
     isJellyseerrAuthenticated: Boolean,
     isJellyseerrSearchMode: Boolean,
+    isAudiobookshelfAuthenticated: Boolean,
+    isAudiobookshelfSearchMode: Boolean,
     onLibrarySelected: (AfinityCollection?) -> Unit,
     onJellyseerrSearchSelected: () -> Unit,
-    onJellyfinSearchSelected: () -> Unit
+    onJellyfinSearchSelected: () -> Unit,
+    onAudiobookshelfSearchSelected: () -> Unit,
 ) {
     LazyRow(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(horizontal = 16.dp)
-            .padding(bottom = 16.dp),
+        modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp).padding(bottom = 16.dp),
         horizontalArrangement = Arrangement.spacedBy(8.dp),
-        contentPadding = PaddingValues(horizontal = 4.dp)
+        contentPadding = PaddingValues(horizontal = 4.dp),
     ) {
         item {
             LibraryFilterChip(
                 text = stringResource(R.string.filter_all),
-                isSelected = !isJellyseerrSearchMode && selectedLibrary == null,
+                isSelected =
+                    !isJellyseerrSearchMode &&
+                        !isAudiobookshelfSearchMode &&
+                        selectedLibrary == null,
                 onClick = {
                     onJellyfinSearchSelected()
                     onLibrarySelected(null)
                 },
-                showCheckIcon = true
+                showCheckIcon = true,
             )
         }
 
@@ -326,7 +388,18 @@ private fun HorizontalLibraryFilters(
                     text = stringResource(R.string.filter_request),
                     isSelected = isJellyseerrSearchMode,
                     onClick = onJellyseerrSearchSelected,
-                    showCheckIcon = false
+                    showCheckIcon = false,
+                )
+            }
+        }
+
+        if (isAudiobookshelfAuthenticated) {
+            item {
+                LibraryFilterChip(
+                    text = stringResource(R.string.filter_audiobooks),
+                    isSelected = isAudiobookshelfSearchMode,
+                    onClick = onAudiobookshelfSearchSelected,
+                    showCheckIcon = false,
                 )
             }
         }
@@ -334,12 +407,15 @@ private fun HorizontalLibraryFilters(
         items(libraries) { library ->
             LibraryFilterChip(
                 text = library.name,
-                isSelected = !isJellyseerrSearchMode && selectedLibrary?.id == library.id,
+                isSelected =
+                    !isJellyseerrSearchMode &&
+                        !isAudiobookshelfSearchMode &&
+                        selectedLibrary?.id == library.id,
                 onClick = {
                     onJellyfinSearchSelected()
                     onLibrarySelected(library)
                 },
-                showCheckIcon = false
+                showCheckIcon = false,
             )
         }
     }
@@ -349,20 +425,17 @@ private fun HorizontalLibraryFilters(
 private fun SearchHomeContent(
     genres: List<String>,
     onGenreClick: (String) -> Unit,
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
+    isAudiobookshelf: Boolean = false,
 ) {
     Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(16.dp),
-        verticalArrangement = Arrangement.spacedBy(16.dp)
+        modifier = Modifier.fillMaxSize().padding(16.dp),
+        verticalArrangement = Arrangement.spacedBy(16.dp),
     ) {
         Text(
             text = stringResource(R.string.explore_genres),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
-            color = MaterialTheme.colorScheme.onBackground
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+            color = MaterialTheme.colorScheme.onBackground,
         )
 
         LazyVerticalGrid(
@@ -370,12 +443,13 @@ private fun SearchHomeContent(
             modifier = Modifier.fillMaxSize(),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
             verticalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(bottom = 16.dp)
+            contentPadding = PaddingValues(bottom = 16.dp),
         ) {
             items(genres) { genre ->
                 GenreCard(
                     genre = genre,
-                    onClick = { onGenreClick(genre) }
+                    onClick = { onGenreClick(genre) },
+                    isAudiobookshelf = isAudiobookshelf,
                 )
             }
         }
@@ -383,31 +457,22 @@ private fun SearchHomeContent(
 }
 
 @Composable
-private fun SearchResultsContent(
-    results: List<AfinityItem>,
-    onItemClick: (AfinityItem) -> Unit
-) {
+private fun SearchResultsContent(results: List<AfinityItem>, onItemClick: (AfinityItem) -> Unit) {
     LocalSoftwareKeyboardController.current
     LazyColumn(
-        modifier = Modifier
-            .fillMaxSize(),
+        modifier = Modifier.fillMaxSize(),
         contentPadding = PaddingValues(16.dp),
-        verticalArrangement = Arrangement.spacedBy(16.dp)
+        verticalArrangement = Arrangement.spacedBy(16.dp),
     ) {
         item {
             Text(
                 text = stringResource(R.string.search_results_count_fmt, results.size),
                 style = MaterialTheme.typography.titleMedium,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
             )
         }
 
-        items(results) { item ->
-            SearchResultItem(
-                item = item,
-                onClick = { onItemClick(item) }
-            )
-        }
+        items(results) { item -> SearchResultItem(item = item, onClick = { onItemClick(item) }) }
     }
 }
 
@@ -416,7 +481,7 @@ private fun LibraryFilterChip(
     text: String,
     isSelected: Boolean,
     onClick: () -> Unit,
-    showCheckIcon: Boolean = false
+    showCheckIcon: Boolean = false,
 ) {
     FilterChip(
         onClick = onClick,
@@ -425,64 +490,58 @@ private fun LibraryFilterChip(
                 text = text,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
-                style = MaterialTheme.typography.labelMedium
+                style = MaterialTheme.typography.labelMedium,
             )
         },
         selected = isSelected,
-        leadingIcon = if (isSelected && showCheckIcon) {
-            {
-                Icon(
-                    painter = painterResource(id = R.drawable.ic_check),
-                    contentDescription = null,
-                    modifier = Modifier.size(16.dp)
-                )
-            }
-        } else null,
+        leadingIcon =
+            if (isSelected && showCheckIcon) {
+                {
+                    Icon(
+                        painter = painterResource(id = R.drawable.ic_check),
+                        contentDescription = null,
+                        modifier = Modifier.size(16.dp),
+                    )
+                }
+            } else null,
         shape = RoundedCornerShape(20.dp),
-        colors = FilterChipDefaults.filterChipColors(
-            selectedContainerColor = MaterialTheme.colorScheme.primary,
-            selectedLabelColor = MaterialTheme.colorScheme.onPrimary,
-            selectedLeadingIconColor = MaterialTheme.colorScheme.onPrimary
-        )
+        colors =
+            FilterChipDefaults.filterChipColors(
+                selectedContainerColor = MaterialTheme.colorScheme.primary,
+                selectedLabelColor = MaterialTheme.colorScheme.onPrimary,
+                selectedLeadingIconColor = MaterialTheme.colorScheme.onPrimary,
+            ),
     )
 }
 
 @Composable
-private fun GenreCard(
-    genre: String,
-    onClick: () -> Unit
-) {
+private fun GenreCard(genre: String, onClick: () -> Unit, isAudiobookshelf: Boolean = false) {
     Card(
         onClick = onClick,
-        modifier = Modifier
-            .fillMaxWidth()
-            .height(80.dp),
-        colors = CardDefaults.cardColors(
-            containerColor = MaterialTheme.colorScheme.surfaceVariant
-        )
+        modifier = Modifier.fillMaxWidth().height(80.dp),
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
     ) {
         Box(
-            modifier = Modifier.fillMaxSize(),
-            contentAlignment = Alignment.Center
+            modifier = Modifier.fillMaxSize().padding(horizontal = 8.dp),
+            contentAlignment = Alignment.Center,
         ) {
             Column(
                 horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.spacedBy(4.dp)
+                verticalArrangement = Arrangement.spacedBy(4.dp),
             ) {
                 Icon(
-                    painter = getGenreIcon(genre),
+                    painter = getGenreIcon(genre, isAudiobookshelf),
                     contentDescription = null,
                     modifier = Modifier.size(24.dp),
-                    tint = MaterialTheme.colorScheme.primary
+                    tint = MaterialTheme.colorScheme.primary,
                 )
                 Text(
                     text = genre,
-                    style = MaterialTheme.typography.bodyMedium.copy(
-                        fontWeight = FontWeight.Medium
-                    ),
+                    style = MaterialTheme.typography.bodySmall.copy(fontWeight = FontWeight.Medium),
                     color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    maxLines = 2,
-                    overflow = TextOverflow.Ellipsis
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    textAlign = androidx.compose.ui.text.style.TextAlign.Center,
                 )
             }
         }
@@ -490,91 +549,72 @@ private fun GenreCard(
 }
 
 @Composable
-private fun SearchResultItem(
-    item: AfinityItem,
-    onClick: () -> Unit
-) {
+private fun SearchResultItem(item: AfinityItem, onClick: () -> Unit) {
     Card(
         onClick = onClick,
         modifier = Modifier.fillMaxWidth(),
-        colors = CardDefaults.cardColors(
-            containerColor = MaterialTheme.colorScheme.surface
-        )
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface),
     ) {
         Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(12.dp),
-            horizontalArrangement = Arrangement.spacedBy(12.dp)
+            modifier = Modifier.fillMaxWidth().padding(12.dp),
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
         ) {
-            Box(
-                modifier = Modifier
-                    .width(80.dp)
-                    .height(120.dp)
-            ) {
-                Card(
-                    modifier = Modifier.fillMaxSize(),
-                    shape = RoundedCornerShape(8.dp)
-                ) {
+            Box(modifier = Modifier.width(80.dp).height(120.dp)) {
+                Card(modifier = Modifier.fillMaxSize(), shape = RoundedCornerShape(8.dp)) {
                     AsyncImage(
                         imageUrl = item.images.primaryImageUrl,
                         contentDescription = item.name,
                         blurHash = item.images.primaryBlurHash,
                         modifier = Modifier.fillMaxSize(),
-                        contentScale = ContentScale.Crop
+                        contentScale = ContentScale.Crop,
                     )
                 }
 
                 if (item.played) {
                     Box(
-                        modifier = Modifier
-                            .align(Alignment.TopEnd)
-                            .padding(4.dp)
-                            .size(24.dp)
-                            .background(
-                                MaterialTheme.colorScheme.primary,
-                                CircleShape
-                            ),
-                        contentAlignment = Alignment.Center
+                        modifier =
+                            Modifier.align(Alignment.TopEnd)
+                                .padding(4.dp)
+                                .size(24.dp)
+                                .background(MaterialTheme.colorScheme.primary, CircleShape),
+                        contentAlignment = Alignment.Center,
                     ) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_check),
                             contentDescription = stringResource(R.string.cd_watched),
                             tint = MaterialTheme.colorScheme.onPrimary,
-                            modifier = Modifier.size(16.dp)
+                            modifier = Modifier.size(16.dp),
                         )
                     }
                 }
             }
 
             Column(
-                modifier = Modifier
-                    .weight(1f)
-                    .fillMaxHeight(),
-                verticalArrangement = Arrangement.spacedBy(4.dp)
+                modifier = Modifier.weight(1f).fillMaxHeight(),
+                verticalArrangement = Arrangement.spacedBy(4.dp),
             ) {
                 Text(
                     text = item.name,
-                    style = MaterialTheme.typography.titleMedium.copy(
-                        fontWeight = FontWeight.SemiBold
-                    ),
+                    style =
+                        MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.SemiBold),
                     color = MaterialTheme.colorScheme.onSurface,
                     maxLines = 2,
-                    overflow = TextOverflow.Ellipsis
+                    overflow = TextOverflow.Ellipsis,
                 )
 
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(6.dp)
+                    horizontalArrangement = Arrangement.spacedBy(6.dp),
                 ) {
                     Text(
-                        text = when (item) {
-                            is AfinityMovie -> stringResource(R.string.media_type_movie)
-                            is AfinityShow -> stringResource(R.string.media_type_tv_show)
-                            else -> stringResource(R.string.media_type_media)
-                        },
+                        text =
+                            when (item) {
+                                is AfinityMovie -> stringResource(R.string.media_type_movie)
+                                is AfinityShow -> stringResource(R.string.media_type_tv_show)
+                                else -> stringResource(R.string.media_type_media)
+                            },
                         style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
 
                     when (item) {
@@ -585,12 +625,12 @@ private fun SearchResultItem(
                         Text(
                             text = "•",
                             style = MaterialTheme.typography.bodyMedium,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                         Text(
                             text = year.toString(),
                             style = MaterialTheme.typography.bodyMedium,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
 
@@ -602,18 +642,18 @@ private fun SearchResultItem(
                         Text(
                             text = "•",
                             style = MaterialTheme.typography.bodyMedium,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                         Icon(
                             painter = painterResource(id = R.drawable.ic_imdb_logo),
                             contentDescription = stringResource(R.string.cd_imdb),
                             tint = Color.Unspecified,
-                            modifier = Modifier.size(16.dp)
+                            modifier = Modifier.size(16.dp),
                         )
                         Text(
                             text = String.format(Locale.US, "%.1f", rating),
                             style = MaterialTheme.typography.bodyMedium,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
 
@@ -622,24 +662,26 @@ private fun SearchResultItem(
                             Text(
                                 text = "•",
                                 style = MaterialTheme.typography.bodyMedium,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                             Icon(
-                                painter = painterResource(
-                                    id = if (rtRating > 60) {
-                                        R.drawable.ic_rotten_tomato_fresh
-                                    } else {
-                                        R.drawable.ic_rotten_tomato_rotten
-                                    }
-                                ),
+                                painter =
+                                    painterResource(
+                                        id =
+                                            if (rtRating > 60) {
+                                                R.drawable.ic_rotten_tomato_fresh
+                                            } else {
+                                                R.drawable.ic_rotten_tomato_rotten
+                                            }
+                                    ),
                                 contentDescription = stringResource(R.string.cd_rotten_tomatoes),
                                 tint = Color.Unspecified,
-                                modifier = Modifier.size(14.dp)
+                                modifier = Modifier.size(14.dp),
                             )
                             Text(
                                 text = "${rtRating.toInt()}%",
                                 style = MaterialTheme.typography.bodyMedium,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                         }
                     }
@@ -651,7 +693,7 @@ private fun SearchResultItem(
                         style = MaterialTheme.typography.bodySmall,
                         color = MaterialTheme.colorScheme.onSurfaceVariant,
                         maxLines = 3,
-                        overflow = TextOverflow.Ellipsis
+                        overflow = TextOverflow.Ellipsis,
                     )
                 }
             }
@@ -662,87 +704,73 @@ private fun SearchResultItem(
 @Composable
 private fun JellyseerrSearchResultsContent(
     results: List<SearchResultItem>,
-    onRequestClick: (SearchResultItem) -> Unit
+    onRequestClick: (SearchResultItem) -> Unit,
 ) {
     LazyColumn(
         modifier = Modifier.fillMaxSize(),
         contentPadding = PaddingValues(16.dp),
-        verticalArrangement = Arrangement.spacedBy(16.dp)
+        verticalArrangement = Arrangement.spacedBy(16.dp),
     ) {
         item {
             Text(
                 text = stringResource(R.string.search_results_count_fmt, results.size),
                 style = MaterialTheme.typography.titleMedium,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
             )
         }
 
         items(results) { item ->
-            JellyseerrSearchResultItem(
-                item = item,
-                onRequestClick = { onRequestClick(item) }
-            )
+            JellyseerrSearchResultItem(item = item, onRequestClick = { onRequestClick(item) })
         }
     }
 }
 
 @Composable
-private fun JellyseerrSearchResultItem(
-    item: SearchResultItem,
-    onRequestClick: () -> Unit
-) {
+private fun JellyseerrSearchResultItem(item: SearchResultItem, onRequestClick: () -> Unit) {
     Card(
         modifier = Modifier.fillMaxWidth(),
-        colors = CardDefaults.cardColors(
-            containerColor = MaterialTheme.colorScheme.surface
-        )
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface),
     ) {
         Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(12.dp),
-            horizontalArrangement = Arrangement.spacedBy(12.dp)
+            modifier = Modifier.fillMaxWidth().padding(12.dp),
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
         ) {
             Card(
-                modifier = Modifier
-                    .width(80.dp)
-                    .height(120.dp),
-                shape = RoundedCornerShape(8.dp)
+                modifier = Modifier.width(80.dp).height(120.dp),
+                shape = RoundedCornerShape(8.dp),
             ) {
                 AsyncImage(
                     imageUrl = item.getPosterUrl(),
                     contentDescription = item.getDisplayTitle(),
                     blurHash = null,
                     modifier = Modifier.fillMaxSize(),
-                    contentScale = ContentScale.Crop
+                    contentScale = ContentScale.Crop,
                 )
             }
 
             Column(
-                modifier = Modifier
-                    .weight(1f)
-                    .fillMaxHeight(),
-                verticalArrangement = Arrangement.spacedBy(4.dp)
+                modifier = Modifier.weight(1f).fillMaxHeight(),
+                verticalArrangement = Arrangement.spacedBy(4.dp),
             ) {
                 Text(
                     text = item.getDisplayTitle(),
-                    style = MaterialTheme.typography.titleMedium.copy(
-                        fontWeight = FontWeight.SemiBold
-                    ),
+                    style =
+                        MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.SemiBold),
                     color = MaterialTheme.colorScheme.onSurface,
                     maxLines = 2,
-                    overflow = TextOverflow.Ellipsis
+                    overflow = TextOverflow.Ellipsis,
                 )
 
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(6.dp)
+                    horizontalArrangement = Arrangement.spacedBy(6.dp),
                 ) {
                     Text(
-                        text = item.getMediaType()?.name
-                            ?: stringResource(R.string.media_type_unknown),
+                        text =
+                            item.getMediaType()?.name
+                                ?: stringResource(R.string.media_type_unknown),
                         style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
 
                     item.releaseDate?.let { releaseDate ->
@@ -751,12 +779,12 @@ private fun JellyseerrSearchResultItem(
                             Text(
                                 text = "•",
                                 style = MaterialTheme.typography.bodyMedium,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                             Text(
                                 text = year,
                                 style = MaterialTheme.typography.bodyMedium,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                         }
                     }
@@ -769,7 +797,7 @@ private fun JellyseerrSearchResultItem(
                             style = MaterialTheme.typography.bodySmall,
                             color = MaterialTheme.colorScheme.onSurfaceVariant,
                             maxLines = 3,
-                            overflow = TextOverflow.Ellipsis
+                            overflow = TextOverflow.Ellipsis,
                         )
                     }
                 }
@@ -778,40 +806,49 @@ private fun JellyseerrSearchResultItem(
             val status = item.getDisplayStatus()
             val canRequest = !item.hasExistingRequest() || status == MediaStatus.PARTIALLY_AVAILABLE
 
-            if (item.hasExistingRequest() && status != null && status != MediaStatus.PARTIALLY_AVAILABLE) {
+            if (
+                item.hasExistingRequest() &&
+                    status != null &&
+                    status != MediaStatus.PARTIALLY_AVAILABLE
+            ) {
                 Surface(
                     modifier = Modifier.align(Alignment.CenterVertically),
                     shape = RoundedCornerShape(16.dp),
-                    color = when (status) {
-                        MediaStatus.UNKNOWN -> MaterialTheme.colorScheme.surfaceVariant
-                        MediaStatus.PENDING -> MaterialTheme.colorScheme.tertiary
-                        MediaStatus.PROCESSING -> MaterialTheme.colorScheme.primary
-                        MediaStatus.PARTIALLY_AVAILABLE -> MaterialTheme.colorScheme.secondary
-                        MediaStatus.AVAILABLE -> MaterialTheme.colorScheme.secondary
-                        MediaStatus.DELETED -> MaterialTheme.colorScheme.error
-                    }
+                    color =
+                        when (status) {
+                            MediaStatus.UNKNOWN -> MaterialTheme.colorScheme.surfaceVariant
+                            MediaStatus.PENDING -> MaterialTheme.colorScheme.tertiary
+                            MediaStatus.PROCESSING -> MaterialTheme.colorScheme.primary
+                            MediaStatus.PARTIALLY_AVAILABLE -> MaterialTheme.colorScheme.secondary
+                            MediaStatus.AVAILABLE -> MaterialTheme.colorScheme.secondary
+                            MediaStatus.DELETED -> MaterialTheme.colorScheme.error
+                        },
                 ) {
-                    val statusText = when (status) {
-                        MediaStatus.PENDING -> stringResource(R.string.status_pending)
-                        MediaStatus.PROCESSING -> stringResource(R.string.status_processing)
-                        MediaStatus.PARTIALLY_AVAILABLE -> stringResource(R.string.status_partially_available)
-                        MediaStatus.AVAILABLE -> stringResource(R.string.status_available)
-                        MediaStatus.DELETED -> stringResource(R.string.status_deleted)
-                        else -> stringResource(R.string.status_unknown)
-                    }
+                    val statusText =
+                        when (status) {
+                            MediaStatus.PENDING -> stringResource(R.string.status_pending)
+                            MediaStatus.PROCESSING -> stringResource(R.string.status_processing)
+                            MediaStatus.PARTIALLY_AVAILABLE ->
+                                stringResource(R.string.status_partially_available)
+                            MediaStatus.AVAILABLE -> stringResource(R.string.status_available)
+                            MediaStatus.DELETED -> stringResource(R.string.status_deleted)
+                            else -> stringResource(R.string.status_unknown)
+                        }
 
                     Text(
                         text = statusText,
                         modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
                         style = MaterialTheme.typography.labelMedium,
-                        color = when (status) {
-                            MediaStatus.UNKNOWN -> MaterialTheme.colorScheme.onSurfaceVariant
-                            MediaStatus.PENDING -> MaterialTheme.colorScheme.onTertiary
-                            MediaStatus.PROCESSING -> MaterialTheme.colorScheme.onPrimary
-                            MediaStatus.PARTIALLY_AVAILABLE -> MaterialTheme.colorScheme.onSecondary
-                            MediaStatus.AVAILABLE -> MaterialTheme.colorScheme.onSecondary
-                            MediaStatus.DELETED -> MaterialTheme.colorScheme.onError
-                        }
+                        color =
+                            when (status) {
+                                MediaStatus.UNKNOWN -> MaterialTheme.colorScheme.onSurfaceVariant
+                                MediaStatus.PENDING -> MaterialTheme.colorScheme.onTertiary
+                                MediaStatus.PROCESSING -> MaterialTheme.colorScheme.onPrimary
+                                MediaStatus.PARTIALLY_AVAILABLE ->
+                                    MaterialTheme.colorScheme.onSecondary
+                                MediaStatus.AVAILABLE -> MaterialTheme.colorScheme.onSecondary
+                                MediaStatus.DELETED -> MaterialTheme.colorScheme.onError
+                            },
                     )
                 }
             }
@@ -819,12 +856,203 @@ private fun JellyseerrSearchResultItem(
             if (canRequest) {
                 IconButton(
                     onClick = onRequestClick,
-                    modifier = Modifier.align(Alignment.CenterVertically)
+                    modifier = Modifier.align(Alignment.CenterVertically),
                 ) {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_add),
                         contentDescription = stringResource(R.string.cd_request_add),
-                        tint = MaterialTheme.colorScheme.primary
+                        tint = MaterialTheme.colorScheme.primary,
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun getGenreIcon(genre: String, isAudiobookshelf: Boolean = false): Painter {
+    val normalizedGenre = genre.lowercase()
+    return when {
+        normalizedGenre == "action" || normalizedGenre.startsWith("action") ->
+            painterResource(id = R.drawable.ic_boom)
+        normalizedGenre == "comedy" || normalizedGenre.contains("humor") ->
+            painterResource(id = R.drawable.ic_comedy)
+        normalizedGenre == "drama" -> painterResource(id = R.drawable.ic_theater)
+        normalizedGenre == "horror" -> painterResource(id = R.drawable.ic_horror)
+        normalizedGenre == "thriller" -> painterResource(id = R.drawable.ic_bolt)
+        normalizedGenre == "romance" || normalizedGenre.contains("romance") ->
+            painterResource(id = R.drawable.ic_favorite)
+        normalizedGenre == "sci-fi" ||
+            normalizedGenre == "science fiction" ||
+            normalizedGenre.contains("sci-fi") -> painterResource(id = R.drawable.ic_alien)
+        normalizedGenre == "fantasy" || normalizedGenre.startsWith("fantasy") ->
+            painterResource(id = R.drawable.ic_auto_awesome)
+        normalizedGenre == "documentary" -> painterResource(id = R.drawable.ic_article)
+        normalizedGenre == "animation" -> painterResource(id = R.drawable.ic_animation)
+        normalizedGenre == "family" || normalizedGenre.contains("family") ->
+            painterResource(id = R.drawable.ic_family)
+        normalizedGenre == "adventure" || normalizedGenre.contains("adventure") ->
+            painterResource(id = R.drawable.ic_adventure)
+        normalizedGenre == "crime" -> painterResource(id = R.drawable.ic_security)
+        normalizedGenre == "mystery" || normalizedGenre.contains("mystery") ->
+            painterResource(id = R.drawable.ic_mystery)
+        normalizedGenre == "western" -> painterResource(id = R.drawable.ic_cactus)
+        normalizedGenre == "war" || normalizedGenre.contains("military") ->
+            painterResource(id = R.drawable.ic_war)
+        normalizedGenre == "music" -> painterResource(id = R.drawable.ic_music_heart)
+        normalizedGenre == "sport" || normalizedGenre == "sports" ->
+            painterResource(id = R.drawable.ic_sports)
+        normalizedGenre == "biography" ||
+            normalizedGenre.contains("biograph") ||
+            normalizedGenre.contains("memoir") -> painterResource(id = R.drawable.ic_person_heart)
+        normalizedGenre == "history" || normalizedGenre.startsWith("history") ->
+            painterResource(id = R.drawable.ic_history)
+        normalizedGenre.contains("fiction") || normalizedGenre.contains("literary") ->
+            painterResource(id = R.drawable.ic_book_audio)
+        normalizedGenre.contains("children") || normalizedGenre.contains("young adult") ->
+            painterResource(id = R.drawable.ic_family)
+        normalizedGenre.contains("erotica") -> painterResource(id = R.drawable.ic_favorite)
+        normalizedGenre.contains("art") -> painterResource(id = R.drawable.ic_auto_awesome)
+        normalizedGenre.contains("entertainment") -> painterResource(id = R.drawable.ic_theater)
+        else ->
+            if (isAudiobookshelf) {
+                painterResource(id = R.drawable.ic_book_audio)
+            } else {
+                painterResource(id = R.drawable.ic_movie)
+            }
+    }
+}
+
+private fun formatAudiobookDuration(seconds: Double): String {
+    val totalMinutes = (seconds / 60).toInt()
+    val hours = totalMinutes / 60
+    val minutes = totalMinutes % 60
+    return if (hours > 0) "${hours}h ${minutes}m" else "${minutes}m"
+}
+
+@Composable
+private fun AudiobookshelfSearchResultItem(
+    item: LibraryItem,
+    serverUrl: String?,
+    onClick: () -> Unit,
+) {
+    val isFinished = item.userMediaProgress?.isFinished == true
+    val progress = item.userMediaProgress?.progress ?: 0.0
+
+    Card(
+        onClick = onClick,
+        modifier = Modifier.fillMaxWidth(),
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface),
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(12.dp),
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
+        ) {
+            Box(modifier = Modifier.width(80.dp).height(120.dp)) {
+                Card(modifier = Modifier.fillMaxSize(), shape = RoundedCornerShape(8.dp)) {
+                    AsyncImage(
+                        imageUrl = serverUrl?.let { "$it/api/items/${item.id}/cover" },
+                        contentDescription = item.media.metadata.title,
+                        blurHash = null,
+                        modifier = Modifier.fillMaxSize(),
+                        contentScale = ContentScale.Crop,
+                    )
+                }
+
+                if (isFinished) {
+                    Box(
+                        modifier =
+                            Modifier.align(Alignment.TopEnd)
+                                .padding(4.dp)
+                                .size(24.dp)
+                                .background(Color(0xFF4CAF50), CircleShape),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        Icon(
+                            painter = painterResource(id = R.drawable.ic_check),
+                            contentDescription = stringResource(R.string.cd_finished),
+                            tint = Color.White,
+                            modifier = Modifier.size(16.dp),
+                        )
+                    }
+                }
+            }
+
+            Column(
+                modifier = Modifier.weight(1f).fillMaxHeight(),
+                verticalArrangement = Arrangement.spacedBy(4.dp),
+            ) {
+                Text(
+                    text = item.media.metadata.title ?: "",
+                    style =
+                        MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.SemiBold),
+                    color = MaterialTheme.colorScheme.onSurface,
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                )
+
+                item.media.metadata.authorName?.let { author ->
+                    Text(
+                        text = author,
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(6.dp),
+                ) {
+                    Text(
+                        text =
+                            if (item.mediaType == "podcast") {
+                                stringResource(R.string.media_type_podcast)
+                            } else {
+                                stringResource(R.string.media_type_book)
+                            },
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+
+                    item.media.duration?.let { duration ->
+                        Text(
+                            text = "\u2022",
+                            style = MaterialTheme.typography.bodyMedium,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        )
+                        Text(
+                            text = formatAudiobookDuration(duration),
+                            style = MaterialTheme.typography.bodyMedium,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        )
+                    }
+                }
+
+                if (!isFinished && progress > 0.0) {
+                    LinearProgressIndicator(
+                        progress = { progress.toFloat() },
+                        modifier =
+                            Modifier.fillMaxWidth().height(4.dp).clip(RoundedCornerShape(2.dp)),
+                        color = Color(0xFFFFC107),
+                        trackColor = MaterialTheme.colorScheme.surfaceVariant,
+                    )
+                }
+
+                item.media.metadata.description?.let { rawHtml ->
+                    val cleanDescription =
+                        remember(rawHtml) {
+                            HtmlCompat.fromHtml(rawHtml, HtmlCompat.FROM_HTML_MODE_COMPACT)
+                                .toString()
+                                .trim()
+                        }
+                    Text(
+                        text = cleanDescription,
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        maxLines = 2,
+                        overflow = TextOverflow.Ellipsis,
                     )
                 }
             }
@@ -833,28 +1061,93 @@ private fun JellyseerrSearchResultItem(
 }
 
 @Composable
-private fun getGenreIcon(genre: String): Painter {
-    return when (genre.lowercase()) {
-        "action" -> painterResource(id = R.drawable.ic_boom)
-        "comedy" -> painterResource(id = R.drawable.ic_comedy)
-        "drama" -> painterResource(id = R.drawable.ic_theater)
-        "horror" -> painterResource(id = R.drawable.ic_horror)
-        "thriller" -> painterResource(id = R.drawable.ic_bolt)
-        "romance" -> painterResource(id = R.drawable.ic_favorite)
-        "sci-fi", "science fiction" -> painterResource(id = R.drawable.ic_alien)
-        "fantasy" -> painterResource(id = R.drawable.ic_auto_awesome)
-        "documentary" -> painterResource(id = R.drawable.ic_article)
-        "animation" -> painterResource(id = R.drawable.ic_animation)
-        "family" -> painterResource(id = R.drawable.ic_family)
-        "adventure" -> painterResource(id = R.drawable.ic_adventure)
-        "crime" -> painterResource(id = R.drawable.ic_security)
-        "mystery" -> painterResource(id = R.drawable.ic_mystery)
-        "western" -> painterResource(id = R.drawable.ic_cactus)
-        "war" -> painterResource(id = R.drawable.ic_war)
-        "music" -> painterResource(id = R.drawable.ic_music_heart)
-        "sport" -> painterResource(id = R.drawable.ic_sports)
-        "biography" -> painterResource(id = R.drawable.ic_person_heart)
-        "history" -> painterResource(id = R.drawable.ic_history)
-        else -> painterResource(id = R.drawable.ic_movie)
+private fun AudiobookshelfSearchResultsContent(
+    results: List<LibraryItem>,
+    serverUrl: String?,
+    onItemClick: (String) -> Unit,
+) {
+    LazyColumn(
+        modifier = Modifier.fillMaxSize(),
+        contentPadding = PaddingValues(16.dp),
+        verticalArrangement = Arrangement.spacedBy(16.dp),
+    ) {
+        item {
+            Text(
+                text = stringResource(R.string.search_results_count_fmt, results.size),
+                style = MaterialTheme.typography.titleMedium,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
+        }
+
+        items(results, key = { it.id }) { item ->
+            AudiobookshelfSearchResultItem(
+                item = item,
+                serverUrl = serverUrl,
+                onClick = { onItemClick(item.id) },
+            )
+        }
+    }
+}
+
+@Composable
+private fun CombinedSearchResultsContent(
+    jellyfinResults: List<AfinityItem>,
+    audiobookshelfResults: List<LibraryItem>,
+    isAudiobookshelfSearching: Boolean,
+    serverUrl: String?,
+    onItemClick: (AfinityItem) -> Unit,
+    onAudiobookshelfItemClick: (String) -> Unit,
+) {
+    LazyColumn(
+        modifier = Modifier.fillMaxSize(),
+        contentPadding = PaddingValues(16.dp),
+        verticalArrangement = Arrangement.spacedBy(16.dp),
+    ) {
+        if (jellyfinResults.isNotEmpty()) {
+            item {
+                Text(
+                    text = stringResource(R.string.search_results_count_fmt, jellyfinResults.size),
+                    style = MaterialTheme.typography.titleMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                )
+            }
+
+            items(jellyfinResults) { item ->
+                SearchResultItem(item = item, onClick = { onItemClick(item) })
+            }
+        }
+
+        if (audiobookshelfResults.isNotEmpty() || isAudiobookshelfSearching) {
+            item {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(8.dp),
+                ) {
+                    Text(
+                        text =
+                            stringResource(
+                                R.string.search_results_count_fmt,
+                                audiobookshelfResults.size,
+                            ),
+                        style = MaterialTheme.typography.titleMedium,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                    if (isAudiobookshelfSearching) {
+                        CircularProgressIndicator(
+                            modifier = Modifier.size(16.dp),
+                            strokeWidth = 2.dp,
+                        )
+                    }
+                }
+            }
+
+            items(audiobookshelfResults, key = { it.id }) { item ->
+                AudiobookshelfSearchResultItem(
+                    item = item,
+                    serverUrl = serverUrl,
+                    onClick = { onAudiobookshelfItemClick(item.id) },
+                )
+            }
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/search/SearchViewModel.kt b/app/src/main/java/com/makd/afinity/ui/search/SearchViewModel.kt
index 93aa906c3..6d9eaac44 100644
--- a/app/src/main/java/com/makd/afinity/ui/search/SearchViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/search/SearchViewModel.kt
@@ -2,6 +2,7 @@ package com.makd.afinity.ui.search
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.makd.afinity.data.models.audiobookshelf.LibraryItem
 import com.makd.afinity.data.models.common.SortBy
 import com.makd.afinity.data.models.extensions.toAfinityItem
 import com.makd.afinity.data.models.jellyseerr.MediaStatus
@@ -13,31 +14,39 @@ import com.makd.afinity.data.models.media.AfinityItem
 import com.makd.afinity.data.models.media.AfinityMovie
 import com.makd.afinity.data.models.media.AfinityShow
 import com.makd.afinity.data.repository.AppDataRepository
+import com.makd.afinity.data.repository.AudiobookshelfRepository
 import com.makd.afinity.data.repository.FieldSets
 import com.makd.afinity.data.repository.JellyfinRepository
 import com.makd.afinity.data.repository.JellyseerrRepository
 import com.makd.afinity.data.repository.media.MediaRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltViewModel
-class SearchViewModel @Inject constructor(
+class SearchViewModel
+@Inject
+constructor(
     private val mediaRepository: MediaRepository,
     private val jellyfinRepository: JellyfinRepository,
     private val jellyseerrRepository: JellyseerrRepository,
-    private val appDataRepository: AppDataRepository
+    private val appDataRepository: AppDataRepository,
+    private val audiobookshelfRepository: AudiobookshelfRepository,
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(SearchUiState())
     val uiState: StateFlow<SearchUiState> = _uiState.asStateFlow()
 
     val isJellyseerrAuthenticated = jellyseerrRepository.isAuthenticated
+    val isAudiobookshelfAuthenticated = audiobookshelfRepository.isAuthenticated
 
     init {
         viewModelScope.launch {
@@ -47,10 +56,14 @@ class SearchViewModel @Inject constructor(
                     loadGenres()
 
                     if (_uiState.value.searchQuery.isNotEmpty()) {
-                        if (_uiState.value.isJellyseerrSearchMode) {
-                            performJellyseerrSearch()
-                        } else {
-                            performSearch()
+                        when {
+                            _uiState.value.isJellyseerrSearchMode -> performJellyseerrSearch()
+                            _uiState.value.isAudiobookshelfSearchMode ->
+                                performAudiobookshelfSearch()
+                            else -> {
+                                performSearch()
+                                performAudiobookshelfSearch()
+                            }
                         }
                     }
                 } else {
@@ -58,6 +71,12 @@ class SearchViewModel @Inject constructor(
                 }
             }
         }
+
+        viewModelScope.launch {
+            audiobookshelfRepository.currentConfig.collect { config ->
+                _uiState.update { it.copy(audiobookshelfServerUrl = config?.serverUrl) }
+            }
+        }
     }
 
     fun loadLibraries() {
@@ -76,11 +95,12 @@ class SearchViewModel @Inject constructor(
         viewModelScope.launch {
             try {
                 val selectedLibraryId = _uiState.value.selectedLibrary?.id
-                val genres = mediaRepository.getGenres(
-                    parentId = selectedLibraryId,
-                    limit = 100,
-                    includeItemTypes = listOf("MOVIE", "SERIES", "BOXSET")
-                )
+                val genres =
+                    mediaRepository.getGenres(
+                        parentId = selectedLibraryId,
+                        limit = 100,
+                        includeItemTypes = listOf("MOVIE", "SERIES", "BOXSET"),
+                    )
                 _uiState.value = _uiState.value.copy(genres = genres)
                 Timber.d("Loaded ${genres.size} genres from API")
             } catch (e: Exception) {
@@ -90,6 +110,28 @@ class SearchViewModel @Inject constructor(
         }
     }
 
+    fun loadAudiobookshelfGenres() {
+        viewModelScope.launch {
+            try {
+                audiobookshelfRepository
+                    .getGenres()
+                    .fold(
+                        onSuccess = { genres ->
+                            _uiState.update { it.copy(audiobookshelfGenres = genres) }
+                            Timber.d("Loaded ${genres.size} Audiobookshelf genres")
+                        },
+                        onFailure = { error ->
+                            Timber.e(error, "Failed to load Audiobookshelf genres")
+                            _uiState.update { it.copy(audiobookshelfGenres = emptyList()) }
+                        },
+                    )
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to load Audiobookshelf genres")
+                _uiState.update { it.copy(audiobookshelfGenres = emptyList()) }
+            }
+        }
+    }
+
     fun updateSearchQuery(query: String) {
         _uiState.value = _uiState.value.copy(searchQuery = query)
 
@@ -97,23 +139,33 @@ class SearchViewModel @Inject constructor(
             viewModelScope.launch {
                 kotlinx.coroutines.delay(500)
                 if (_uiState.value.searchQuery == query) {
-                    if (_uiState.value.isJellyseerrSearchMode) {
-                        performJellyseerrSearch()
-                    } else {
-                        performSearch()
+                    when {
+                        _uiState.value.isJellyseerrSearchMode -> performJellyseerrSearch()
+                        _uiState.value.isAudiobookshelfSearchMode -> performAudiobookshelfSearch()
+                        else -> {
+                            performSearch()
+                            performAudiobookshelfSearch()
+                        }
                     }
                 }
             }
         } else if (query.isEmpty()) {
-            _uiState.value = _uiState.value.copy(
-                searchResults = emptyList(),
-                jellyseerrSearchResults = emptyList()
-            )
+            _uiState.value =
+                _uiState.value.copy(
+                    searchResults = emptyList(),
+                    jellyseerrSearchResults = emptyList(),
+                    audiobookshelfSearchResults = emptyList(),
+                )
         }
     }
 
     fun selectLibrary(library: AfinityCollection?) {
-        _uiState.value = _uiState.value.copy(selectedLibrary = library)
+        _uiState.value =
+            _uiState.value.copy(
+                selectedLibrary = library,
+                isAudiobookshelfSearchMode = false,
+                audiobookshelfSearchResults = emptyList(),
+            )
 
         loadGenres()
 
@@ -134,73 +186,78 @@ class SearchViewModel @Inject constructor(
                 Timber.d("- Query: '$query'")
                 Timber.d("- Selected library: ${_uiState.value.selectedLibrary?.name}")
 
-                val results = mediaRepository.getItems(
-                    parentId = _uiState.value.selectedLibrary?.id,
-                    searchTerm = query,
-                    includeItemTypes = listOf("MOVIE", "SERIES"),
-                    limit = 50,
-                    sortBy = SortBy.NAME,
-                    sortDescending = false,
-                    fields = FieldSets.SEARCH_RESULTS
-                )
+                val results =
+                    mediaRepository.getItems(
+                        parentId = _uiState.value.selectedLibrary?.id,
+                        searchTerm = query,
+                        includeItemTypes = listOf("MOVIE", "SERIES"),
+                        limit = 50,
+                        sortBy = SortBy.NAME,
+                        sortDescending = false,
+                        fields = FieldSets.SEARCH_RESULTS,
+                    )
 
-                val afinityItems = results.items?.mapNotNull { baseItemDto ->
-                    try {
-                        val item = baseItemDto.toAfinityItem(jellyfinRepository.getBaseUrl())
-                        when (item) {
-                            is AfinityMovie -> item
-                            is AfinityShow -> item
-                            else -> null
-                        }
-                    } catch (e: Exception) {
-                        Timber.w(e, "Failed to convert item: ${baseItemDto.name}")
-                        null
-                    }
-                }?.let { items ->
-                    items.sortedBy { item ->
-                        val name = item.name.lowercase()
-                        val queryLower = query.lowercase()
-                        when {
-                            name == queryLower -> 0
-                            name.startsWith(queryLower) -> 1
-                            name.contains(queryLower) -> 2
-                            else -> 3
+                val afinityItems =
+                    results.items
+                        ?.mapNotNull { baseItemDto ->
+                            try {
+                                val item =
+                                    baseItemDto.toAfinityItem(jellyfinRepository.getBaseUrl())
+                                when (item) {
+                                    is AfinityMovie -> item
+                                    is AfinityShow -> item
+                                    else -> null
+                                }
+                            } catch (e: Exception) {
+                                Timber.w(e, "Failed to convert item: ${baseItemDto.name}")
+                                null
+                            }
                         }
-                    }
-                } ?: emptyList()
+                        ?.let { items ->
+                            items.sortedBy { item ->
+                                val name = item.name.lowercase()
+                                val queryLower = query.lowercase()
+                                when {
+                                    name == queryLower -> 0
+                                    name.startsWith(queryLower) -> 1
+                                    name.contains(queryLower) -> 2
+                                    else -> 3
+                                }
+                            }
+                        } ?: emptyList()
 
-                _uiState.value = _uiState.value.copy(
-                    searchResults = afinityItems,
-                    isSearching = false
-                )
+                _uiState.value =
+                    _uiState.value.copy(searchResults = afinityItems, isSearching = false)
 
                 Timber.d("Search completed: ${afinityItems.size} results for '$query'")
-
             } catch (e: Exception) {
                 Timber.e(e, "Failed to perform search")
-                _uiState.value = _uiState.value.copy(
-                    searchResults = emptyList(),
-                    isSearching = false
-                )
+                _uiState.value =
+                    _uiState.value.copy(searchResults = emptyList(), isSearching = false)
             }
         }
     }
 
     fun clearSearch() {
-        _uiState.value = _uiState.value.copy(
-            searchQuery = "",
-            searchResults = emptyList(),
-            isSearching = false,
-            jellyseerrSearchResults = emptyList(),
-            isJellyseerrSearching = false
-        )
+        _uiState.value =
+            _uiState.value.copy(
+                searchQuery = "",
+                searchResults = emptyList(),
+                isSearching = false,
+                jellyseerrSearchResults = emptyList(),
+                isJellyseerrSearching = false,
+                audiobookshelfSearchResults = emptyList(),
+                isAudiobookshelfSearching = false,
+            )
     }
 
     fun selectJellyseerrSearchMode() {
         _uiState.update {
             it.copy(
                 isJellyseerrSearchMode = true,
-                selectedLibrary = null
+                isAudiobookshelfSearchMode = false,
+                selectedLibrary = null,
+                audiobookshelfSearchResults = emptyList(),
             )
         }
 
@@ -213,49 +270,133 @@ class SearchViewModel @Inject constructor(
         _uiState.update {
             it.copy(
                 isJellyseerrSearchMode = false,
-                jellyseerrSearchResults = emptyList()
+                isAudiobookshelfSearchMode = false,
+                jellyseerrSearchResults = emptyList(),
+                audiobookshelfSearchResults = emptyList(),
             )
         }
 
         if (_uiState.value.searchQuery.isNotEmpty()) {
             performSearch()
+            performAudiobookshelfSearch()
         }
     }
 
-    fun performJellyseerrSearch() {
+    fun selectAudiobookshelfSearchMode() {
+        _uiState.update {
+            it.copy(
+                isAudiobookshelfSearchMode = true,
+                isJellyseerrSearchMode = false,
+                selectedLibrary = null,
+                jellyseerrSearchResults = emptyList(),
+                searchResults = emptyList(),
+            )
+        }
+
+        loadAudiobookshelfGenres()
+
+        if (_uiState.value.searchQuery.isNotEmpty()) {
+            performAudiobookshelfSearch()
+        }
+    }
+
+    fun performAudiobookshelfSearch() {
         val query = _uiState.value.searchQuery.trim()
         if (query.isEmpty()) return
 
         viewModelScope.launch {
             try {
-                _uiState.update { it.copy(isJellyseerrSearching = true) }
-                jellyseerrRepository.findMediaByName(query).fold(
-                    onSuccess = { results ->
-                        _uiState.update {
-                            it.copy(
-                                jellyseerrSearchResults = results,
-                                isJellyseerrSearching = false
-                            )
+                _uiState.update { it.copy(isAudiobookshelfSearching = true) }
+
+                var libraries = audiobookshelfRepository.getLibrariesFlow().first()
+                if (libraries.isEmpty()) {
+                    Timber.d("No cached libraries, refreshing from server")
+                    libraries =
+                        audiobookshelfRepository.refreshLibraries().getOrDefault(emptyList())
+                }
+
+                Timber.d(
+                    "Searching ${libraries.size} libraries: ${libraries.map { "${it.name}(${it.id})" }}"
+                )
+
+                val results =
+                    libraries
+                        .map { library ->
+                            async {
+                                audiobookshelfRepository
+                                    .searchLibrary(library.id, query)
+                                    .onSuccess { response ->
+                                        Timber.d(
+                                            "Library '${library.name}': ${response.book?.size ?: 0} books, ${response.podcast?.size ?: 0} podcasts"
+                                        )
+                                    }
+                                    .onFailure {
+                                        Timber.w(it, "Search failed for library ${library.name}")
+                                    }
+                                    .getOrNull()
+                            }
                         }
-                        Timber.d("Jellyseerr search completed: ${results.size} results")
-                    },
-                    onFailure = { error ->
-                        _uiState.update {
-                            it.copy(
-                                jellyseerrSearchResults = emptyList(),
-                                isJellyseerrSearching = false
-                            )
+                        .awaitAll()
+                        .filterNotNull()
+
+                val items =
+                    results
+                        .flatMap { response ->
+                            val books = response.book?.map { it.libraryItem } ?: emptyList()
+                            val podcasts = response.podcast?.map { it.libraryItem } ?: emptyList()
+                            books + podcasts
                         }
-                        Timber.e(error, "Jellyseerr search failed")
-                    }
-                )
+                        .distinctBy { it.id }
+
+                _uiState.update {
+                    it.copy(audiobookshelfSearchResults = items, isAudiobookshelfSearching = false)
+                }
+                Timber.d("Audiobookshelf search completed: ${items.size} results for '$query'")
             } catch (e: Exception) {
                 _uiState.update {
                     it.copy(
-                        jellyseerrSearchResults = emptyList(),
-                        isJellyseerrSearching = false
+                        audiobookshelfSearchResults = emptyList(),
+                        isAudiobookshelfSearching = false,
                     )
                 }
+                Timber.e(e, "Error during Audiobookshelf search")
+            }
+        }
+    }
+
+    fun performJellyseerrSearch() {
+        val query = _uiState.value.searchQuery.trim()
+        if (query.isEmpty()) return
+
+        viewModelScope.launch {
+            try {
+                _uiState.update { it.copy(isJellyseerrSearching = true) }
+                jellyseerrRepository
+                    .findMediaByName(query)
+                    .fold(
+                        onSuccess = { results ->
+                            _uiState.update {
+                                it.copy(
+                                    jellyseerrSearchResults = results,
+                                    isJellyseerrSearching = false,
+                                )
+                            }
+                            Timber.d("Jellyseerr search completed: ${results.size} results")
+                        },
+                        onFailure = { error ->
+                            _uiState.update {
+                                it.copy(
+                                    jellyseerrSearchResults = emptyList(),
+                                    isJellyseerrSearching = false,
+                                )
+                            }
+                            Timber.e(error, "Jellyseerr search failed")
+                        },
+                    )
+            } catch (e: Exception) {
+                _uiState.update {
+                    it.copy(jellyseerrSearchResults = emptyList(), isJellyseerrSearching = false)
+                }
                 Timber.e(e, "Error during Jellyseerr search")
             }
         }
@@ -267,52 +408,57 @@ class SearchViewModel @Inject constructor(
         title: String,
         posterUrl: String?,
         availableSeasons: Int = 0,
-        existingStatus: MediaStatus? = null
+        existingStatus: MediaStatus? = null,
     ) {
         viewModelScope.launch {
             try {
                 _uiState.update { it.copy(isFetchingTvDetails = true) }
 
-                val detailsResult = if (mediaType == MediaType.TV) {
-                    jellyseerrRepository.getTvDetails(tmdbId)
-                } else {
-                    jellyseerrRepository.getMovieDetails(tmdbId)
-                }
+                val detailsResult =
+                    if (mediaType == MediaType.TV) {
+                        jellyseerrRepository.getTvDetails(tmdbId)
+                    } else {
+                        jellyseerrRepository.getMovieDetails(tmdbId)
+                    }
 
                 detailsResult.fold(
                     onSuccess = { details ->
                         _uiState.update { it.copy(isFetchingTvDetails = false) }
 
-                        val seasonCount = if (mediaType == MediaType.TV) details.getSeasonCount() else 0
-                        val alreadyAvailableSeasons = details.mediaInfo?.getAvailableSeasons() ?: emptyList()
-                        val selectableSeasons = if (mediaType == MediaType.TV) {
-                            (1..seasonCount).filter { it !in alreadyAvailableSeasons }
-                        } else emptyList()
+                        val seasonCount =
+                            if (mediaType == MediaType.TV) details.getSeasonCount() else 0
+                        val alreadyAvailableSeasons =
+                            details.mediaInfo?.getAvailableSeasons() ?: emptyList()
+                        val selectableSeasons =
+                            if (mediaType == MediaType.TV) {
+                                (1..seasonCount).filter { it !in alreadyAvailableSeasons }
+                            } else emptyList()
 
                         _uiState.update {
                             it.copy(
                                 showRequestDialog = true,
-                                pendingRequest = PendingRequestSearch(
-                                    tmdbId = tmdbId,
-                                    mediaType = mediaType,
-                                    title = details.title ?: details.name ?: title,
-                                    posterUrl = details.getPosterUrl(),
-                                    availableSeasons = seasonCount,
-                                    existingStatus = existingStatus,
-                                    backdropUrl = details.getBackdropUrl(),
-                                    tagline = details.tagline,
-                                    overview = details.overview,
-                                    releaseDate = details.releaseDate ?: details.firstAirDate,
-                                    runtime = details.runtime,
-                                    voteAverage = details.voteAverage,
-                                    certification = details.getCertification(),
-                                    originalLanguage = details.originalLanguage,
-                                    director = details.getDirector(),
-                                    genres = details.getGenreNames(),
-                                    ratingsCombined = details.ratingsCombined
-                                ),
+                                pendingRequest =
+                                    PendingRequestSearch(
+                                        tmdbId = tmdbId,
+                                        mediaType = mediaType,
+                                        title = details.title ?: details.name ?: title,
+                                        posterUrl = details.getPosterUrl(),
+                                        availableSeasons = seasonCount,
+                                        existingStatus = existingStatus,
+                                        backdropUrl = details.getBackdropUrl(),
+                                        tagline = details.tagline,
+                                        overview = details.overview,
+                                        releaseDate = details.releaseDate ?: details.firstAirDate,
+                                        runtime = details.runtime,
+                                        voteAverage = details.voteAverage,
+                                        certification = details.getCertification(),
+                                        originalLanguage = details.originalLanguage,
+                                        director = details.getDirector(),
+                                        genres = details.getGenreNames(),
+                                        ratingsCombined = details.ratingsCombined,
+                                    ),
                                 selectedSeasons = selectableSeasons,
-                                disabledSeasons = alreadyAvailableSeasons
+                                disabledSeasons = alreadyAvailableSeasons,
                             )
                         }
                     },
@@ -323,40 +469,44 @@ class SearchViewModel @Inject constructor(
                         _uiState.update {
                             it.copy(
                                 showRequestDialog = true,
-                                pendingRequest = PendingRequestSearch(
-                                    tmdbId = tmdbId,
-                                    mediaType = mediaType,
-                                    title = title,
-                                    posterUrl = posterUrl,
-                                    availableSeasons = availableSeasons,
-                                    existingStatus = existingStatus
-                                ),
-                                selectedSeasons = if (mediaType == MediaType.TV && availableSeasons > 0) {
-                                    (1..availableSeasons).toList()
-                                } else emptyList(),
-                                disabledSeasons = emptyList()
+                                pendingRequest =
+                                    PendingRequestSearch(
+                                        tmdbId = tmdbId,
+                                        mediaType = mediaType,
+                                        title = title,
+                                        posterUrl = posterUrl,
+                                        availableSeasons = availableSeasons,
+                                        existingStatus = existingStatus,
+                                    ),
+                                selectedSeasons =
+                                    if (mediaType == MediaType.TV && availableSeasons > 0) {
+                                        (1..availableSeasons).toList()
+                                    } else emptyList(),
+                                disabledSeasons = emptyList(),
                             )
                         }
-                    }
+                    },
                 )
             } catch (e: Exception) {
                 Timber.e(e, "Error showing request dialog")
                 _uiState.update {
                     it.copy(
                         showRequestDialog = true,
-                        pendingRequest = PendingRequestSearch(
-                            tmdbId = tmdbId,
-                            mediaType = mediaType,
-                            title = title,
-                            posterUrl = posterUrl,
-                            availableSeasons = availableSeasons,
-                            existingStatus = existingStatus
-                        ),
-                        selectedSeasons = if (mediaType == MediaType.TV && availableSeasons > 0) {
-                            (1..availableSeasons).toList()
-                        } else emptyList(),
+                        pendingRequest =
+                            PendingRequestSearch(
+                                tmdbId = tmdbId,
+                                mediaType = mediaType,
+                                title = title,
+                                posterUrl = posterUrl,
+                                availableSeasons = availableSeasons,
+                                existingStatus = existingStatus,
+                            ),
+                        selectedSeasons =
+                            if (mediaType == MediaType.TV && availableSeasons > 0) {
+                                (1..availableSeasons).toList()
+                            } else emptyList(),
                         disabledSeasons = emptyList(),
-                        isFetchingTvDetails = false
+                        isFetchingTvDetails = false,
                     )
                 }
             }
@@ -365,49 +515,50 @@ class SearchViewModel @Inject constructor(
 
     fun confirmRequest() {
         val pending = _uiState.value.pendingRequest ?: return
-        val seasons = if (pending.mediaType == MediaType.TV) {
-            _uiState.value.selectedSeasons.takeIf { it.isNotEmpty() }
-        } else null
+        val seasons =
+            if (pending.mediaType == MediaType.TV) {
+                _uiState.value.selectedSeasons.takeIf { it.isNotEmpty() }
+            } else null
 
         viewModelScope.launch {
             try {
                 _uiState.update { it.copy(isCreatingRequest = true) }
 
-                jellyseerrRepository.createRequest(pending.tmdbId, pending.mediaType, seasons).fold(
-                    onSuccess = { newRequest ->
-                        val updatedResults = _uiState.value.jellyseerrSearchResults.map { item ->
-                            if (item.id == pending.tmdbId) {
-                                val updatedMediaInfo = newRequest.media.copy(
-                                    requests = listOfNotNull(newRequest)
+                jellyseerrRepository
+                    .createRequest(pending.tmdbId, pending.mediaType, seasons)
+                    .fold(
+                        onSuccess = { newRequest ->
+                            val updatedResults =
+                                _uiState.value.jellyseerrSearchResults.map { item ->
+                                    if (item.id == pending.tmdbId) {
+                                        val updatedMediaInfo =
+                                            newRequest.media.copy(
+                                                requests = listOfNotNull(newRequest)
+                                            )
+                                        item.copy(mediaInfo = updatedMediaInfo)
+                                    } else {
+                                        item
+                                    }
+                                }
+
+                            _uiState.update {
+                                it.copy(
+                                    isCreatingRequest = false,
+                                    showRequestDialog = false,
+                                    pendingRequest = null,
+                                    selectedSeasons = emptyList(),
+                                    jellyseerrSearchResults = updatedResults,
                                 )
-                                item.copy(mediaInfo = updatedMediaInfo)
-                            } else {
-                                item
                             }
-                        }
-
-                        _uiState.update {
-                            it.copy(
-                                isCreatingRequest = false,
-                                showRequestDialog = false,
-                                pendingRequest = null,
-                                selectedSeasons = emptyList(),
-                                jellyseerrSearchResults = updatedResults
-                            )
-                        }
-                        Timber.d("Request created successfully: ${newRequest.id}")
-                    },
-                    onFailure = { error ->
-                        _uiState.update {
-                            it.copy(isCreatingRequest = false)
-                        }
-                        Timber.e(error, "Failed to create request")
-                    }
-                )
+                            Timber.d("Request created successfully: ${newRequest.id}")
+                        },
+                        onFailure = { error ->
+                            _uiState.update { it.copy(isCreatingRequest = false) }
+                            Timber.e(error, "Failed to create request")
+                        },
+                    )
             } catch (e: Exception) {
-                _uiState.update {
-                    it.copy(isCreatingRequest = false)
-                }
+                _uiState.update { it.copy(isCreatingRequest = false) }
                 Timber.e(e, "Error creating request")
             }
         }
@@ -415,11 +566,7 @@ class SearchViewModel @Inject constructor(
 
     fun dismissRequestDialog() {
         _uiState.update {
-            it.copy(
-                showRequestDialog = false,
-                pendingRequest = null,
-                selectedSeasons = emptyList()
-            )
+            it.copy(showRequestDialog = false, pendingRequest = null, selectedSeasons = emptyList())
         }
     }
 
@@ -435,17 +582,20 @@ data class SearchUiState(
     val libraries: List<AfinityCollection> = emptyList(),
     val selectedLibrary: AfinityCollection? = null,
     val genres: List<String> = emptyList(),
-
+    val audiobookshelfGenres: List<String> = emptyList(),
     val isJellyseerrSearchMode: Boolean = false,
     val jellyseerrSearchResults: List<SearchResultItem> = emptyList(),
     val isJellyseerrSearching: Boolean = false,
-
+    val isAudiobookshelfSearchMode: Boolean = false,
+    val audiobookshelfSearchResults: List<LibraryItem> = emptyList(),
+    val isAudiobookshelfSearching: Boolean = false,
+    val audiobookshelfServerUrl: String? = null,
     val showRequestDialog: Boolean = false,
     val pendingRequest: PendingRequestSearch? = null,
     val selectedSeasons: List<Int> = emptyList(),
     val disabledSeasons: List<Int> = emptyList(),
     val isCreatingRequest: Boolean = false,
-    val isFetchingTvDetails: Boolean = false
+    val isFetchingTvDetails: Boolean = false,
 )
 
 data class PendingRequestSearch(
@@ -465,5 +615,5 @@ data class PendingRequestSearch(
     val originalLanguage: String? = null,
     val director: String? = null,
     val genres: List<String> = emptyList(),
-    val ratingsCombined: RatingsCombined? = null
-)
\ No newline at end of file
+    val ratingsCombined: RatingsCombined? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/settings/AudiobookshelfBottomSheet.kt b/app/src/main/java/com/makd/afinity/ui/settings/AudiobookshelfBottomSheet.kt
new file mode 100644
index 000000000..994196dea
--- /dev/null
+++ b/app/src/main/java/com/makd/afinity/ui/settings/AudiobookshelfBottomSheet.kt
@@ -0,0 +1,342 @@
+package com.makd.afinity.ui.settings
+
+import android.Manifest
+import android.content.pm.PackageManager
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.SheetState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusDirection
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.makd.afinity.R
+import com.makd.afinity.ui.audiobookshelf.login.AudiobookshelfLoginViewModel
+import timber.log.Timber
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AudiobookshelfBottomSheet(
+    onDismiss: () -> Unit,
+    sheetState: SheetState,
+    modifier: Modifier = Modifier,
+    viewModel: AudiobookshelfLoginViewModel = hiltViewModel(),
+) {
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    val focusManager = LocalFocusManager.current
+    val context = LocalContext.current
+    var passwordVisible by remember { mutableStateOf(false) }
+    var showNotificationDialog by remember { mutableStateOf(false) }
+
+    val permissionLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted
+            ->
+            if (isGranted) {
+                Timber.d("Notification permission granted")
+            } else {
+                Timber.w("Notification permission denied - Media controls will not show")
+            }
+            onDismiss()
+        }
+
+    LaunchedEffect(uiState.isLoggedIn) {
+        if (uiState.isLoggedIn) {
+            val hasPermission =
+                ContextCompat.checkSelfPermission(
+                    context,
+                    Manifest.permission.POST_NOTIFICATIONS,
+                ) == PackageManager.PERMISSION_GRANTED
+            val declined = viewModel.isNotificationPermissionDeclined()
+
+            if (!hasPermission && !declined) {
+                showNotificationDialog = true
+            } else {
+                onDismiss()
+            }
+        }
+    }
+
+    if (showNotificationDialog) {
+        AlertDialog(
+            onDismissRequest = {},
+            title = {
+                Text(
+                    text = stringResource(R.string.notification_permission_title),
+                    style =
+                        MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+                )
+            },
+            text = {
+                Text(
+                    text = stringResource(R.string.notification_permission_message),
+                    style = MaterialTheme.typography.bodyMedium,
+                )
+            },
+            confirmButton = {
+                Button(
+                    onClick = {
+                        showNotificationDialog = false
+                        permissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
+                    }
+                ) {
+                    Text(stringResource(R.string.notification_permission_yes))
+                }
+            },
+            dismissButton = {
+                OutlinedButton(
+                    onClick = {
+                        showNotificationDialog = false
+                        viewModel.declineNotificationPermission()
+                        onDismiss()
+                    }
+                ) {
+                    Text(stringResource(R.string.notification_permission_no))
+                }
+            },
+        )
+    }
+
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        sheetState = sheetState,
+        modifier = modifier,
+        containerColor = MaterialTheme.colorScheme.surface,
+        contentColor = MaterialTheme.colorScheme.onSurface,
+        shape = RoundedCornerShape(topStart = 24.dp, topEnd = 24.dp),
+    ) {
+        Column(
+            modifier =
+                Modifier.fillMaxWidth()
+                    .padding(horizontal = 24.dp)
+                    .padding(bottom = 24.dp)
+                    .imePadding()
+                    .verticalScroll(rememberScrollState()),
+            verticalArrangement = Arrangement.spacedBy(20.dp),
+        ) {
+            Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                Text(
+                    text = stringResource(R.string.pref_audiobookshelf),
+                    style =
+                        MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+                )
+                Text(
+                    text = stringResource(R.string.audiobookshelf_connect),
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                )
+            }
+
+            OutlinedTextField(
+                value = uiState.serverUrl,
+                onValueChange = viewModel::updateServerUrl,
+                label = { Text(stringResource(R.string.label_server_url)) },
+                placeholder = { Text("http://192.168.1.100:13378") },
+                leadingIcon = {
+                    Icon(
+                        painterResource(id = R.drawable.ic_link_rotated),
+                        contentDescription = null,
+                    )
+                },
+                enabled = !uiState.isLoggingIn,
+                keyboardOptions =
+                    KeyboardOptions(keyboardType = KeyboardType.Uri, imeAction = ImeAction.Next),
+                keyboardActions =
+                    KeyboardActions(onNext = { focusManager.moveFocus(FocusDirection.Down) }),
+                singleLine = true,
+                shape = RoundedCornerShape(16.dp),
+                modifier = Modifier.fillMaxWidth(),
+            )
+
+            Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
+                OutlinedTextField(
+                    value = uiState.username,
+                    onValueChange = viewModel::updateUsername,
+                    label = { Text(stringResource(R.string.placeholder_username)) },
+                    placeholder = { Text(stringResource(R.string.placeholder_username)) },
+                    leadingIcon = {
+                        Icon(
+                            painter = painterResource(id = R.drawable.ic_user),
+                            contentDescription = null,
+                        )
+                    },
+                    enabled = !uiState.isLoggingIn,
+                    keyboardOptions =
+                        KeyboardOptions(
+                            keyboardType = KeyboardType.Text,
+                            imeAction = ImeAction.Next,
+                        ),
+                    keyboardActions =
+                        KeyboardActions(onNext = { focusManager.moveFocus(FocusDirection.Down) }),
+                    singleLine = true,
+                    shape = RoundedCornerShape(16.dp),
+                    modifier = Modifier.fillMaxWidth(),
+                )
+
+                OutlinedTextField(
+                    value = uiState.password,
+                    onValueChange = viewModel::updatePassword,
+                    label = { Text(stringResource(R.string.login_password_label)) },
+                    leadingIcon = {
+                        Icon(
+                            painter = painterResource(id = R.drawable.ic_lock_filled),
+                            contentDescription = null,
+                        )
+                    },
+                    enabled = !uiState.isLoggingIn,
+                    visualTransformation =
+                        if (passwordVisible) {
+                            VisualTransformation.None
+                        } else {
+                            PasswordVisualTransformation()
+                        },
+                    trailingIcon = {
+                        IconButton(onClick = { passwordVisible = !passwordVisible }) {
+                            Icon(
+                                painter =
+                                    painterResource(
+                                        id =
+                                            if (passwordVisible) {
+                                                R.drawable.ic_visibility_off
+                                            } else {
+                                                R.drawable.ic_visibility
+                                            }
+                                    ),
+                                contentDescription =
+                                    if (passwordVisible) {
+                                        stringResource(R.string.cd_hide_password)
+                                    } else {
+                                        stringResource(R.string.cd_show_password)
+                                    },
+                            )
+                        }
+                    },
+                    keyboardOptions =
+                        KeyboardOptions(
+                            keyboardType = KeyboardType.Password,
+                            imeAction = ImeAction.Done,
+                        ),
+                    keyboardActions =
+                        KeyboardActions(
+                            onDone = {
+                                focusManager.clearFocus()
+                                if (!uiState.isLoggingIn) {
+                                    viewModel.login()
+                                }
+                            }
+                        ),
+                    singleLine = true,
+                    shape = RoundedCornerShape(16.dp),
+                    modifier = Modifier.fillMaxWidth(),
+                )
+            }
+
+            AnimatedVisibility(
+                visible = uiState.error != null,
+                enter = fadeIn() + expandVertically(),
+                exit = fadeOut() + shrinkVertically(),
+            ) {
+                Surface(
+                    color = MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.5f),
+                    shape = RoundedCornerShape(12.dp),
+                    modifier = Modifier.fillMaxWidth(),
+                ) {
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.spacedBy(12.dp),
+                        modifier = Modifier.padding(12.dp),
+                    ) {
+                        Icon(
+                            painter = painterResource(id = R.drawable.ic_exclamation_circle),
+                            contentDescription = null,
+                            tint = MaterialTheme.colorScheme.error,
+                        )
+                        Text(
+                            text = uiState.error ?: "",
+                            style = MaterialTheme.typography.bodySmall,
+                            color = MaterialTheme.colorScheme.onErrorContainer,
+                        )
+                    }
+                }
+            }
+
+            Spacer(modifier = Modifier.height(8.dp))
+
+            Button(
+                onClick = viewModel::login,
+                enabled =
+                    !uiState.isLoggingIn &&
+                        uiState.serverUrl.isNotBlank() &&
+                        uiState.username.isNotBlank(),
+                modifier = Modifier.fillMaxWidth().height(56.dp),
+                shape = RoundedCornerShape(16.dp),
+                colors =
+                    ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.primary),
+            ) {
+                if (uiState.isLoggingIn) {
+                    CircularProgressIndicator(
+                        modifier = Modifier.size(24.dp),
+                        strokeWidth = 2.dp,
+                        color = MaterialTheme.colorScheme.onPrimary,
+                    )
+                } else {
+                    Text(
+                        text = stringResource(R.string.btn_login),
+                        style =
+                            MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),
+                    )
+                }
+            }
+
+            Spacer(modifier = Modifier.height(16.dp))
+        }
+    }
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/settings/JellyseerrBottomSheet.kt b/app/src/main/java/com/makd/afinity/ui/settings/JellyseerrBottomSheet.kt
index 958ca6927..e1b3bbe03 100644
--- a/app/src/main/java/com/makd/afinity/ui/settings/JellyseerrBottomSheet.kt
+++ b/app/src/main/java/com/makd/afinity/ui/settings/JellyseerrBottomSheet.kt
@@ -63,7 +63,7 @@ fun JellyseerrBottomSheet(
     onDismiss: () -> Unit,
     sheetState: SheetState,
     modifier: Modifier = Modifier,
-    viewModel: JellyseerrLoginViewModel = hiltViewModel()
+    viewModel: JellyseerrLoginViewModel = hiltViewModel(),
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val focusManager = LocalFocusManager.current
@@ -82,28 +82,27 @@ fun JellyseerrBottomSheet(
         modifier = modifier,
         containerColor = MaterialTheme.colorScheme.surface,
         contentColor = MaterialTheme.colorScheme.onSurface,
-        shape = RoundedCornerShape(topStart = 24.dp, topEnd = 24.dp)
+        shape = RoundedCornerShape(topStart = 24.dp, topEnd = 24.dp),
     ) {
         Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 24.dp)
-                .padding(bottom = 24.dp)
-                .verticalScroll(rememberScrollState())
-                .imePadding(),
-            verticalArrangement = Arrangement.spacedBy(20.dp)
+            modifier =
+                Modifier.fillMaxWidth()
+                    .padding(horizontal = 24.dp)
+                    .padding(bottom = 24.dp)
+                    .imePadding()
+                    .verticalScroll(rememberScrollState()),
+            verticalArrangement = Arrangement.spacedBy(20.dp),
         ) {
             Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
                 Text(
                     text = stringResource(R.string.jellyseerr_connect_title),
-                    style = MaterialTheme.typography.headlineSmall.copy(
-                        fontWeight = FontWeight.Bold
-                    )
+                    style =
+                        MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
                 )
                 Text(
                     text = stringResource(R.string.jellyseerr_connect_subtitle),
                     style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
 
@@ -115,22 +114,19 @@ fun JellyseerrBottomSheet(
                 leadingIcon = {
                     Icon(
                         painterResource(id = R.drawable.ic_link_rotated),
-                        contentDescription = null
+                        contentDescription = null,
                     )
                 },
                 supportingText = uiState.serverUrlError?.let { { Text(it) } },
                 isError = uiState.serverUrlError != null,
                 enabled = !uiState.isLoading,
-                keyboardOptions = KeyboardOptions(
-                    keyboardType = KeyboardType.Uri,
-                    imeAction = ImeAction.Next
-                ),
-                keyboardActions = KeyboardActions(
-                    onNext = { focusManager.moveFocus(FocusDirection.Down) }
-                ),
+                keyboardOptions =
+                    KeyboardOptions(keyboardType = KeyboardType.Uri, imeAction = ImeAction.Next),
+                keyboardActions =
+                    KeyboardActions(onNext = { focusManager.moveFocus(FocusDirection.Down) }),
                 singleLine = true,
                 shape = RoundedCornerShape(16.dp),
-                modifier = Modifier.fillMaxWidth()
+                modifier = Modifier.fillMaxWidth(),
             )
 
             Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
@@ -138,21 +134,20 @@ fun JellyseerrBottomSheet(
                     text = stringResource(R.string.label_login_method),
                     style = MaterialTheme.typography.labelLarge,
                     color = MaterialTheme.colorScheme.onSurface,
-                    fontWeight = FontWeight.Medium
+                    fontWeight = FontWeight.Medium,
                 )
 
-                SingleChoiceSegmentedButtonRow(
-                    modifier = Modifier.fillMaxWidth()
-                ) {
+                SingleChoiceSegmentedButtonRow(modifier = Modifier.fillMaxWidth()) {
                     SegmentedButton(
                         selected = uiState.useJellyfinAuth,
                         onClick = { viewModel.setUseJellyfinAuth(true) },
                         shape = SegmentedButtonDefaults.itemShape(index = 0, count = 2),
                         enabled = !uiState.isLoading,
-                        colors = SegmentedButtonDefaults.colors(
-                            activeContainerColor = MaterialTheme.colorScheme.primaryContainer,
-                            activeContentColor = MaterialTheme.colorScheme.onPrimaryContainer
-                        )
+                        colors =
+                            SegmentedButtonDefaults.colors(
+                                activeContainerColor = MaterialTheme.colorScheme.primaryContainer,
+                                activeContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
+                            ),
                     ) {
                         Text(stringResource(R.string.login_method_jellyfin))
                     }
@@ -162,10 +157,11 @@ fun JellyseerrBottomSheet(
                         onClick = { viewModel.setUseJellyfinAuth(false) },
                         shape = SegmentedButtonDefaults.itemShape(index = 1, count = 2),
                         enabled = !uiState.isLoading,
-                        colors = SegmentedButtonDefaults.colors(
-                            activeContainerColor = MaterialTheme.colorScheme.primaryContainer,
-                            activeContentColor = MaterialTheme.colorScheme.onPrimaryContainer
-                        )
+                        colors =
+                            SegmentedButtonDefaults.colors(
+                                activeContainerColor = MaterialTheme.colorScheme.primaryContainer,
+                                activeContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
+                            ),
                     ) {
                         Text(stringResource(R.string.login_method_local))
                     }
@@ -178,37 +174,39 @@ fun JellyseerrBottomSheet(
                     onValueChange = viewModel::updateEmail,
                     label = {
                         Text(
-                            if (uiState.useJellyfinAuth) stringResource(R.string.label_jellyfin_username) else stringResource(
-                                R.string.label_seerr_email
-                            )
+                            if (uiState.useJellyfinAuth)
+                                stringResource(R.string.label_jellyfin_username)
+                            else stringResource(R.string.label_seerr_email)
                         )
                     },
                     placeholder = {
                         Text(
-                            if (uiState.useJellyfinAuth) stringResource(R.string.placeholder_username) else stringResource(
-                                R.string.placeholder_email_example
-                            )
+                            if (uiState.useJellyfinAuth)
+                                stringResource(R.string.placeholder_username)
+                            else stringResource(R.string.placeholder_email_example)
                         )
                     },
                     leadingIcon = {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_user),
-                            contentDescription = null
+                            contentDescription = null,
                         )
                     },
                     supportingText = uiState.emailError?.let { { Text(it) } },
                     isError = uiState.emailError != null,
                     enabled = !uiState.isLoading,
-                    keyboardOptions = KeyboardOptions(
-                        keyboardType = if (uiState.useJellyfinAuth) KeyboardType.Text else KeyboardType.Email,
-                        imeAction = ImeAction.Next
-                    ),
-                    keyboardActions = KeyboardActions(
-                        onNext = { focusManager.moveFocus(FocusDirection.Down) }
-                    ),
+                    keyboardOptions =
+                        KeyboardOptions(
+                            keyboardType =
+                                if (uiState.useJellyfinAuth) KeyboardType.Text
+                                else KeyboardType.Email,
+                            imeAction = ImeAction.Next,
+                        ),
+                    keyboardActions =
+                        KeyboardActions(onNext = { focusManager.moveFocus(FocusDirection.Down) }),
                     singleLine = true,
                     shape = RoundedCornerShape(16.dp),
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier.fillMaxWidth(),
                 )
 
                 OutlinedTextField(
@@ -216,85 +214,91 @@ fun JellyseerrBottomSheet(
                     onValueChange = viewModel::updatePassword,
                     label = {
                         Text(
-                            if (uiState.useJellyfinAuth) stringResource(R.string.label_jellyfin_password) else stringResource(
-                                R.string.label_seerr_password
-                            )
+                            if (uiState.useJellyfinAuth)
+                                stringResource(R.string.label_jellyfin_password)
+                            else stringResource(R.string.label_seerr_password)
                         )
                     },
                     leadingIcon = {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_lock_filled),
-                            contentDescription = null
+                            contentDescription = null,
                         )
                     },
                     supportingText = uiState.passwordError?.let { { Text(it) } },
                     isError = uiState.passwordError != null,
                     enabled = !uiState.isLoading,
-                    visualTransformation = if (passwordVisible) {
-                        VisualTransformation.None
-                    } else {
-                        PasswordVisualTransformation()
-                    },
+                    visualTransformation =
+                        if (passwordVisible) {
+                            VisualTransformation.None
+                        } else {
+                            PasswordVisualTransformation()
+                        },
                     trailingIcon = {
                         IconButton(onClick = { passwordVisible = !passwordVisible }) {
                             Icon(
-                                painter = painterResource(
-                                    id = if (passwordVisible) {
-                                        R.drawable.ic_visibility_off
+                                painter =
+                                    painterResource(
+                                        id =
+                                            if (passwordVisible) {
+                                                R.drawable.ic_visibility_off
+                                            } else {
+                                                R.drawable.ic_visibility
+                                            }
+                                    ),
+                                contentDescription =
+                                    if (passwordVisible) {
+                                        stringResource(R.string.cd_hide_password)
                                     } else {
-                                        R.drawable.ic_visibility
-                                    }
-                                ),
-                                contentDescription = if (passwordVisible) {
-                                    stringResource(R.string.cd_hide_password)
-                                } else {
-                                    stringResource(R.string.cd_show_password)
-                                }
+                                        stringResource(R.string.cd_show_password)
+                                    },
                             )
                         }
                     },
-                    keyboardOptions = KeyboardOptions(
-                        keyboardType = KeyboardType.Password,
-                        imeAction = ImeAction.Done
-                    ),
-                    keyboardActions = KeyboardActions(
-                        onDone = {
-                            focusManager.clearFocus()
-                            if (!uiState.isLoading) {
-                                viewModel.login()
+                    keyboardOptions =
+                        KeyboardOptions(
+                            keyboardType = KeyboardType.Password,
+                            imeAction = ImeAction.Done,
+                        ),
+                    keyboardActions =
+                        KeyboardActions(
+                            onDone = {
+                                focusManager.clearFocus()
+                                if (!uiState.isLoading) {
+                                    viewModel.login()
+                                }
                             }
-                        }
-                    ),
+                        ),
                     singleLine = true,
                     shape = RoundedCornerShape(16.dp),
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier.fillMaxWidth(),
                 )
             }
 
             AnimatedVisibility(
                 visible = uiState.error != null,
                 enter = fadeIn() + expandVertically(),
-                exit = fadeOut() + shrinkVertically()
+                exit = fadeOut() + shrinkVertically(),
             ) {
                 Surface(
                     color = MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.5f),
                     shape = RoundedCornerShape(12.dp),
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier.fillMaxWidth(),
                 ) {
                     Row(
                         verticalAlignment = Alignment.CenterVertically,
                         horizontalArrangement = Arrangement.spacedBy(12.dp),
-                        modifier = Modifier.padding(12.dp)
+                        modifier = Modifier.padding(12.dp),
                     ) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_exclamation_circle),
                             contentDescription = null,
-                            tint = MaterialTheme.colorScheme.error
+                            tint = MaterialTheme.colorScheme.error,
                         )
                         Text(
                             text = uiState.error ?: "",
                             style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.onErrorContainer
+                            color = MaterialTheme.colorScheme.onErrorContainer,
                         )
                     }
                 }
@@ -304,30 +308,27 @@ fun JellyseerrBottomSheet(
 
             Button(
                 onClick = viewModel::login,
-                enabled = !uiState.isLoading &&
+                enabled =
+                    !uiState.isLoading &&
                         uiState.serverUrl.isNotBlank() &&
                         uiState.email.isNotBlank() &&
                         uiState.password.isNotBlank(),
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(56.dp),
+                modifier = Modifier.fillMaxWidth().height(56.dp),
                 shape = RoundedCornerShape(16.dp),
-                colors = ButtonDefaults.buttonColors(
-                    containerColor = MaterialTheme.colorScheme.primary
-                )
+                colors =
+                    ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.primary),
             ) {
                 if (uiState.isLoading) {
                     CircularProgressIndicator(
                         modifier = Modifier.size(24.dp),
                         strokeWidth = 2.dp,
-                        color = MaterialTheme.colorScheme.onPrimary
+                        color = MaterialTheme.colorScheme.onPrimary,
                     )
                 } else {
                     Text(
                         text = stringResource(R.string.btn_login),
-                        style = MaterialTheme.typography.titleMedium.copy(
-                            fontWeight = FontWeight.Bold
-                        )
+                        style =
+                            MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),
                     )
                 }
             }
@@ -335,4 +336,4 @@ fun JellyseerrBottomSheet(
             Spacer(modifier = Modifier.height(16.dp))
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/settings/LicensesScreen.kt b/app/src/main/java/com/makd/afinity/ui/settings/LicensesScreen.kt
index 19e4fffe9..99aaad9bd 100644
--- a/app/src/main/java/com/makd/afinity/ui/settings/LicensesScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/settings/LicensesScreen.kt
@@ -38,10 +38,7 @@ import com.mikepenz.aboutlibraries.ui.compose.m3.libraryColors
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun LicensesScreen(
-    onBackClick: () -> Unit,
-    modifier: Modifier = Modifier
-) {
+fun LicensesScreen(onBackClick: () -> Unit, modifier: Modifier = Modifier) {
     val libraries by produceLibraries(R.raw.aboutlibraries)
 
     Scaffold(
@@ -50,76 +47,73 @@ fun LicensesScreen(
                 title = {
                     Text(
                         text = stringResource(R.string.licenses_title),
-                        style = MaterialTheme.typography.headlineMedium.copy(
-                            fontWeight = FontWeight.Bold
-                        )
+                        style =
+                            MaterialTheme.typography.headlineMedium.copy(
+                                fontWeight = FontWeight.Bold
+                            ),
                     )
                 },
                 navigationIcon = {
                     IconButton(onClick = onBackClick) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_chevron_left),
-                            contentDescription = stringResource(R.string.cd_back)
+                            contentDescription = stringResource(R.string.cd_back),
                         )
                     }
                 },
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.surface
-                )
+                colors =
+                    TopAppBarDefaults.topAppBarColors(
+                        containerColor = MaterialTheme.colorScheme.surface
+                    ),
             )
         },
-        modifier = modifier.fillMaxSize()
+        modifier = modifier.fillMaxSize(),
     ) { innerPadding ->
         LibrariesContainer(
             libraries = libraries,
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(innerPadding),
-            libraryModifier = Modifier
-                .clip(RoundedCornerShape(16.dp))
-                .border(
-                    width = 1.dp,
-                    color = MaterialTheme.colorScheme.outlineVariant,
-                    shape = RoundedCornerShape(16.dp)
-                ),
+            modifier = Modifier.fillMaxSize().padding(innerPadding),
+            libraryModifier =
+                Modifier.clip(RoundedCornerShape(16.dp))
+                    .border(
+                        width = 1.dp,
+                        color = MaterialTheme.colorScheme.outlineVariant,
+                        shape = RoundedCornerShape(16.dp),
+                    ),
             contentPadding = PaddingValues(16.dp),
-            colors = LibraryDefaults.libraryColors(
-                libraryBackgroundColor = MaterialTheme.colorScheme.surface,
-                libraryContentColor = MaterialTheme.colorScheme.onSurface
-            ),
-            padding = LibraryDefaults.libraryPadding(
-                contentPadding = PaddingValues(16.dp)
-            ),
+            colors =
+                LibraryDefaults.libraryColors(
+                    libraryBackgroundColor = MaterialTheme.colorScheme.surface,
+                    libraryContentColor = MaterialTheme.colorScheme.onSurface,
+                ),
+            padding = LibraryDefaults.libraryPadding(contentPadding = PaddingValues(16.dp)),
             header = {
                 item {
-                    Box(
-                        modifier = Modifier.fillMaxWidth(),
-                        contentAlignment = Alignment.Center
-                    ) {
+                    Box(modifier = Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
                         Column(
                             modifier = Modifier.padding(horizontal = 16.dp),
-                            horizontalAlignment = Alignment.CenterHorizontally
+                            horizontalAlignment = Alignment.CenterHorizontally,
                         ) {
                             Icon(
                                 painter = painterResource(R.drawable.ic_launcher_foreground),
                                 contentDescription = null,
                                 modifier = Modifier.size(120.dp),
-                                tint = MaterialTheme.colorScheme.primary
+                                tint = MaterialTheme.colorScheme.primary,
                             )
                             Spacer(modifier = Modifier.height(16.dp))
 
                             Text(
                                 text = stringResource(R.string.licenses_header_title),
-                                style = MaterialTheme.typography.titleLarge.copy(
-                                    fontWeight = FontWeight.Bold
-                                )
+                                style =
+                                    MaterialTheme.typography.titleLarge.copy(
+                                        fontWeight = FontWeight.Bold
+                                    ),
                             )
                             Spacer(modifier = Modifier.height(8.dp))
                             Text(
                                 text = stringResource(R.string.licenses_header_subtitle),
                                 style = MaterialTheme.typography.bodyLarge,
                                 textAlign = TextAlign.Center,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                             Spacer(modifier = Modifier.height(16.dp))
                             HorizontalDivider()
@@ -128,34 +122,31 @@ fun LicensesScreen(
                     }
                 }
             },
-            divider = {
-                Spacer(modifier = Modifier.height(12.dp))
-            },
+            divider = { Spacer(modifier = Modifier.height(12.dp)) },
             footer = {
                 item {
                     Column(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(16.dp),
-                        horizontalAlignment = Alignment.CenterHorizontally
+                        modifier = Modifier.fillMaxWidth().padding(16.dp),
+                        horizontalAlignment = Alignment.CenterHorizontally,
                     ) {
                         Spacer(modifier = Modifier.height(16.dp))
                         HorizontalDivider()
                         Spacer(modifier = Modifier.height(16.dp))
                         Text(
                             text = stringResource(R.string.licenses_footer_built_with),
-                            style = MaterialTheme.typography.bodyMedium.copy(
-                                fontWeight = FontWeight.Medium
-                            ),
+                            style =
+                                MaterialTheme.typography.bodyMedium.copy(
+                                    fontWeight = FontWeight.Medium
+                                ),
                             textAlign = TextAlign.Center,
-                            color = MaterialTheme.colorScheme.onSurface
+                            color = MaterialTheme.colorScheme.onSurface,
                         )
                         Spacer(modifier = Modifier.height(4.dp))
                         Text(
                             text = stringResource(R.string.licenses_footer_terms),
                             style = MaterialTheme.typography.bodySmall,
                             textAlign = TextAlign.Center,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                         Spacer(modifier = Modifier.height(8.dp))
                     }
@@ -163,4 +154,4 @@ fun LicensesScreen(
             },
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/settings/SessionSwitcherBottomSheet.kt b/app/src/main/java/com/makd/afinity/ui/settings/SessionSwitcherBottomSheet.kt
index 922cd62de..6cd97ccfa 100644
--- a/app/src/main/java/com/makd/afinity/ui/settings/SessionSwitcherBottomSheet.kt
+++ b/app/src/main/java/com/makd/afinity/ui/settings/SessionSwitcherBottomSheet.kt
@@ -53,7 +53,7 @@ fun SessionSwitcherBottomSheet(
     onAddAccountClick: (Server) -> Unit,
     sheetState: SheetState,
     modifier: Modifier = Modifier,
-    viewModel: SessionSwitcherViewModel = hiltViewModel()
+    viewModel: SessionSwitcherViewModel = hiltViewModel(),
 ) {
     val state by viewModel.state.collectAsStateWithLifecycle()
     val snackbarHostState = remember { SnackbarHostState() }
@@ -77,32 +77,24 @@ fun SessionSwitcherBottomSheet(
         sheetState = sheetState,
         modifier = modifier,
         containerColor = MaterialTheme.colorScheme.surface,
-        tonalElevation = 0.dp
+        tonalElevation = 0.dp,
     ) {
-        Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(bottom = 16.dp)
-        ) {
+        Column(modifier = Modifier.fillMaxWidth().padding(bottom = 16.dp)) {
             Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 24.dp, vertical = 8.dp),
-                verticalAlignment = Alignment.CenterVertically
+                modifier = Modifier.fillMaxWidth().padding(horizontal = 24.dp, vertical = 8.dp),
+                verticalAlignment = Alignment.CenterVertically,
             ) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_user),
                     contentDescription = null,
                     tint = MaterialTheme.colorScheme.primary,
-                    modifier = Modifier.size(24.dp)
+                    modifier = Modifier.size(24.dp),
                 )
                 Spacer(modifier = Modifier.width(12.dp))
                 Text(
                     text = stringResource(R.string.session_switcher_title),
-                    style = MaterialTheme.typography.titleLarge.copy(
-                        fontWeight = FontWeight.Bold
-                    ),
-                    color = MaterialTheme.colorScheme.onSurface
+                    style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.Bold),
+                    color = MaterialTheme.colorScheme.onSurface,
                 )
             }
 
@@ -110,23 +102,17 @@ fun SessionSwitcherBottomSheet(
 
             if (state.isSwitching) {
                 Box(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(vertical = 48.dp),
-                    contentAlignment = Alignment.Center
+                    modifier = Modifier.fillMaxWidth().padding(vertical = 48.dp),
+                    contentAlignment = Alignment.Center,
                 ) {
                     CircularProgressIndicator()
                 }
             } else if (state.sessionGroups.isEmpty()) {
-                EmptySessionsState(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(vertical = 48.dp)
-                )
+                EmptySessionsState(modifier = Modifier.fillMaxWidth().padding(vertical = 48.dp))
             } else {
                 LazyColumn(
                     contentPadding = PaddingValues(vertical = 8.dp),
-                    verticalArrangement = Arrangement.spacedBy(24.dp)
+                    verticalArrangement = Arrangement.spacedBy(24.dp),
                 ) {
                     items(items = state.sessionGroups, key = { it.server.id }) { sessionGroup ->
                         ServerSessionGroupItem(
@@ -134,7 +120,7 @@ fun SessionSwitcherBottomSheet(
                             onSessionClick = { session ->
                                 viewModel.switchSession(session.serverId, session.userId)
                             },
-                            onAddAccountClick = { onAddAccountClick(sessionGroup.server) }
+                            onAddAccountClick = { onAddAccountClick(sessionGroup.server) },
                         )
                     }
                 }
@@ -150,82 +136,75 @@ private fun ServerSessionGroupItem(
     sessionGroup: ServerSessionGroup,
     onSessionClick: (UserSession) -> Unit,
     onAddAccountClick: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
-    Column(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(horizontal = 16.dp)
-    ) {
+    Column(modifier = modifier.fillMaxWidth().padding(horizontal = 16.dp)) {
         Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 8.dp, vertical = 4.dp),
+            modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 4.dp),
             verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(8.dp)
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
         ) {
             Icon(
                 painter = painterResource(id = R.drawable.ic_server),
                 contentDescription = null,
                 tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                modifier = Modifier.size(16.dp)
+                modifier = Modifier.size(16.dp),
             )
             Text(
                 text = sessionGroup.server.name,
                 style = MaterialTheme.typography.labelLarge.copy(fontWeight = FontWeight.SemiBold),
-                color = MaterialTheme.colorScheme.onSurfaceVariant
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
             )
         }
 
         Spacer(modifier = Modifier.height(8.dp))
 
         Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .clip(RoundedCornerShape(16.dp))
-                .background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f))
+            modifier =
+                Modifier.fillMaxWidth()
+                    .clip(RoundedCornerShape(16.dp))
+                    .background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f))
         ) {
             sessionGroup.sessions.forEach { session ->
-                SessionItem(
-                    session = session,
-                    onClick = { onSessionClick(session) }
-                )
+                SessionItem(session = session, onClick = { onSessionClick(session) })
                 HorizontalDivider(
                     modifier = Modifier.padding(horizontal = 16.dp),
-                    color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f)
+                    color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f),
                 )
             }
 
             Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .clickable(onClick = onAddAccountClick)
-                    .padding(horizontal = 16.dp, vertical = 12.dp),
+                modifier =
+                    Modifier.fillMaxWidth()
+                        .clickable(onClick = onAddAccountClick)
+                        .padding(horizontal = 16.dp, vertical = 12.dp),
                 verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.spacedBy(12.dp)
+                horizontalArrangement = Arrangement.spacedBy(12.dp),
             ) {
                 Box(
-                    modifier = Modifier
-                        .size(40.dp)
-                        .clip(CircleShape)
-                        .background(MaterialTheme.colorScheme.surfaceVariant),
-                    contentAlignment = Alignment.Center
+                    modifier =
+                        Modifier.size(40.dp)
+                            .clip(CircleShape)
+                            .background(MaterialTheme.colorScheme.surfaceVariant),
+                    contentAlignment = Alignment.Center,
                 ) {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_plus),
                         contentDescription = null,
                         tint = MaterialTheme.colorScheme.primary,
-                        modifier = Modifier.size(20.dp)
+                        modifier = Modifier.size(20.dp),
                     )
                 }
 
                 Text(
-                    text = if (sessionGroup.sessions.isEmpty()) stringResource(R.string.action_login_server) else stringResource(
-                        R.string.action_add_account
-                    ),
-                    style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.Medium),
+                    text =
+                        if (sessionGroup.sessions.isEmpty())
+                            stringResource(R.string.action_login_server)
+                        else stringResource(R.string.action_add_account),
+                    style =
+                        MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.Medium),
                     color = MaterialTheme.colorScheme.primary,
-                    modifier = Modifier.weight(1f)
+                    modifier = Modifier.weight(1f),
                 )
             }
         }
@@ -233,25 +212,22 @@ private fun ServerSessionGroupItem(
 }
 
 @Composable
-private fun SessionItem(
-    session: UserSession,
-    onClick: () -> Unit,
-    modifier: Modifier = Modifier
-) {
+private fun SessionItem(session: UserSession, onClick: () -> Unit, modifier: Modifier = Modifier) {
     Row(
-        modifier = modifier
-            .fillMaxWidth()
-            .clickable(onClick = onClick, enabled = !session.isCurrent)
-            .padding(horizontal = 16.dp, vertical = 12.dp),
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .clickable(onClick = onClick, enabled = !session.isCurrent)
+                .padding(horizontal = 16.dp, vertical = 12.dp),
         verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(12.dp)
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
     ) {
         Box(
-            modifier = Modifier
-                .size(40.dp)
-                .clip(CircleShape)
-                .background(MaterialTheme.colorScheme.primary),
-            contentAlignment = Alignment.Center
+            modifier =
+                Modifier.size(40.dp)
+                    .clip(CircleShape)
+                    .background(MaterialTheme.colorScheme.primary),
+            contentAlignment = Alignment.Center,
         ) {
             if (session.userAvatar != null) {
                 AsyncImage(
@@ -260,31 +236,33 @@ private fun SessionItem(
                     targetWidth = 40.dp,
                     targetHeight = 40.dp,
                     contentScale = ContentScale.Crop,
-                    modifier = Modifier.size(40.dp)
+                    modifier = Modifier.size(40.dp),
                 )
             } else {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_user),
                     contentDescription = null,
                     tint = MaterialTheme.colorScheme.onPrimary,
-                    modifier = Modifier.size(20.dp)
+                    modifier = Modifier.size(20.dp),
                 )
             }
         }
 
         Text(
             text = session.username,
-            style = MaterialTheme.typography.bodyLarge.copy(
-                fontWeight = if (session.isCurrent) FontWeight.Bold else FontWeight.Normal
-            ),
-            color = if (session.isCurrent) {
-                MaterialTheme.colorScheme.primary
-            } else {
-                MaterialTheme.colorScheme.onSurface
-            },
+            style =
+                MaterialTheme.typography.bodyLarge.copy(
+                    fontWeight = if (session.isCurrent) FontWeight.Bold else FontWeight.Normal
+                ),
+            color =
+                if (session.isCurrent) {
+                    MaterialTheme.colorScheme.primary
+                } else {
+                    MaterialTheme.colorScheme.onSurface
+                },
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
-            modifier = Modifier.weight(1f)
+            modifier = Modifier.weight(1f),
         )
 
         if (session.isCurrent) {
@@ -292,43 +270,41 @@ private fun SessionItem(
                 painter = painterResource(id = R.drawable.ic_circle_check),
                 contentDescription = stringResource(R.string.cd_current_session),
                 tint = MaterialTheme.colorScheme.primary,
-                modifier = Modifier.size(20.dp)
+                modifier = Modifier.size(20.dp),
             )
         } else {
             Icon(
                 painter = painterResource(id = R.drawable.ic_chevron_right),
                 contentDescription = null,
                 tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f),
-                modifier = Modifier.size(20.dp)
+                modifier = Modifier.size(20.dp),
             )
         }
     }
 }
 
 @Composable
-private fun EmptySessionsState(
-    modifier: Modifier = Modifier
-) {
+private fun EmptySessionsState(modifier: Modifier = Modifier) {
     Column(
         modifier = modifier,
         horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.spacedBy(8.dp)
+        verticalArrangement = Arrangement.spacedBy(8.dp),
     ) {
         Icon(
             painter = painterResource(id = R.drawable.ic_user),
             contentDescription = null,
             tint = MaterialTheme.colorScheme.onSurfaceVariant,
-            modifier = Modifier.size(48.dp)
+            modifier = Modifier.size(48.dp),
         )
         Text(
             text = stringResource(R.string.empty_sessions_title),
             style = MaterialTheme.typography.titleMedium,
-            color = MaterialTheme.colorScheme.onSurfaceVariant
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
         )
         Text(
             text = stringResource(R.string.empty_sessions_message),
             style = MaterialTheme.typography.bodyMedium,
-            color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f)
+            color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f),
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/settings/SessionSwitcherViewModel.kt b/app/src/main/java/com/makd/afinity/ui/settings/SessionSwitcherViewModel.kt
index 7700e76d9..ee2f0a725 100644
--- a/app/src/main/java/com/makd/afinity/ui/settings/SessionSwitcherViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/settings/SessionSwitcherViewModel.kt
@@ -14,44 +14,43 @@ import com.makd.afinity.data.repository.auth.AuthRepository
 import com.makd.afinity.data.repository.auth.JellyfinAuthRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import java.util.UUID
+import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import java.util.UUID
-import javax.inject.Inject
 
 data class SessionSwitcherState(
     val sessionGroups: List<ServerSessionGroup> = emptyList(),
     val currentSession: Session? = null,
     val isSwitching: Boolean = false,
     val error: String? = null,
-    val switchSuccess: Boolean = false
+    val switchSuccess: Boolean = false,
 )
 
-data class ServerSessionGroup(
-    val server: Server,
-    val sessions: List<UserSession>
-)
+data class ServerSessionGroup(val server: Server, val sessions: List<UserSession>)
 
 data class UserSession(
     val serverId: String,
     val userId: UUID,
     val username: String,
     val userAvatar: String?,
-    val isCurrent: Boolean
+    val isCurrent: Boolean,
 )
 
 @HiltViewModel
-class SessionSwitcherViewModel @Inject constructor(
+class SessionSwitcherViewModel
+@Inject
+constructor(
     @ApplicationContext private val context: Context,
     private val sessionManager: SessionManager,
     private val databaseRepository: DatabaseRepository,
     private val securePreferencesRepository: SecurePreferencesRepository,
     private val authRepository: AuthRepository,
-    private val appDataRepository: AppDataRepository
+    private val appDataRepository: AppDataRepository,
 ) : ViewModel() {
 
     private val _state = MutableStateFlow(SessionSwitcherState())
@@ -63,75 +62,75 @@ class SessionSwitcherViewModel @Inject constructor(
 
     private fun observeData() {
         viewModelScope.launch {
-            combine(
-                databaseRepository.getAllServersFlow(),
-                sessionManager.currentSession
-            ) { servers, currentSession ->
-                try {
-                    val sessionGroups = servers.map { server ->
-                        val tokens = securePreferencesRepository.getAllServerUserTokens()
-                            .filter { it.serverId == server.id }
-
-                        val userSessions = tokens.mapNotNull { token ->
-                            val user = databaseRepository.getUser(token.userId)
-                            if (user == null) return@mapNotNull null
-
-                            UserSession(
-                                serverId = server.id,
-                                userId = token.userId,
-                                username = token.username,
-                                userAvatar = user.primaryImageTag?.let { tag ->
-                                    "${server.address}/Users/${user.id}/Images/Primary?tag=$tag"
-                                },
-                                isCurrent = currentSession?.serverId == server.id &&
-                                        currentSession.userId == token.userId
-                            )
-                        }
-
-                        ServerSessionGroup(
-                            server = server,
-                            sessions = userSessions
-                        )
+            combine(databaseRepository.getAllServersFlow(), sessionManager.currentSession) {
+                    servers,
+                    currentSession ->
+                    try {
+                        val sessionGroups =
+                            servers.map { server ->
+                                val tokens =
+                                    securePreferencesRepository.getAllServerUserTokens().filter {
+                                        it.serverId == server.id
+                                    }
+
+                                val userSessions =
+                                    tokens.mapNotNull { token ->
+                                        val user = databaseRepository.getUser(token.userId)
+                                        if (user == null) return@mapNotNull null
+
+                                        UserSession(
+                                            serverId = server.id,
+                                            userId = token.userId,
+                                            username = token.username,
+                                            userAvatar =
+                                                user.primaryImageTag?.let { tag ->
+                                                    "${server.address}/Users/${user.id}/Images/Primary?tag=$tag"
+                                                },
+                                            isCurrent =
+                                                currentSession?.serverId == server.id &&
+                                                    currentSession.userId == token.userId,
+                                        )
+                                    }
+
+                                ServerSessionGroup(server = server, sessions = userSessions)
+                            }
+
+                        sessionGroups to currentSession
+                    } catch (e: Exception) {
+                        Timber.e(e, "Error building session groups")
+                        emptyList<ServerSessionGroup>() to currentSession
                     }
-
-                    sessionGroups to currentSession
-                } catch (e: Exception) {
-                    Timber.e(e, "Error building session groups")
-                    emptyList<ServerSessionGroup>() to currentSession
                 }
-            }.collect { (groups, session) ->
-                _state.value = _state.value.copy(
-                    sessionGroups = groups,
-                    currentSession = session
-                )
-            }
+                .collect { (groups, session) ->
+                    _state.value =
+                        _state.value.copy(sessionGroups = groups, currentSession = session)
+                }
         }
     }
 
     fun switchSession(serverId: String, userId: UUID) {
         viewModelScope.launch {
             try {
-                _state.value = _state.value.copy(
-                    isSwitching = true,
-                    error = null,
-                    switchSuccess = false
-                )
+                _state.value =
+                    _state.value.copy(isSwitching = true, error = null, switchSuccess = false)
 
                 val token = securePreferencesRepository.getServerUserToken(serverId, userId)
                 if (token == null) {
-                    _state.value = _state.value.copy(
-                        isSwitching = false,
-                        error = context.getString(R.string.error_session_token_not_found)
-                    )
+                    _state.value =
+                        _state.value.copy(
+                            isSwitching = false,
+                            error = context.getString(R.string.error_session_token_not_found),
+                        )
                     return@launch
                 }
 
                 val server = databaseRepository.getServer(serverId)
                 if (server == null) {
-                    _state.value = _state.value.copy(
-                        isSwitching = false,
-                        error = context.getString(R.string.error_server_not_found)
-                    )
+                    _state.value =
+                        _state.value.copy(
+                            isSwitching = false,
+                            error = context.getString(R.string.error_server_not_found),
+                        )
                     return@launch
                 }
 
@@ -140,33 +139,40 @@ class SessionSwitcherViewModel @Inject constructor(
                     (authRepository as? JellyfinAuthRepository)?.setSessionActive(user)
                 }
 
-                val result = sessionManager.startSession(
-                    serverUrl = server.address,
-                    serverId = serverId,
-                    userId = userId,
-                    accessToken = token,
-                    caller = "SessionSwitcherViewModel.switchSession"
-                )
-
-                result.onSuccess {
-                    Timber.d("Successfully switched to session: $serverId / $userId")
-                    _state.value = _state.value.copy(
-                        isSwitching = false,
-                        switchSuccess = true
+                val result =
+                    sessionManager.startSession(
+                        serverUrl = server.address,
+                        serverId = serverId,
+                        userId = userId,
+                        accessToken = token,
+                        caller = "SessionSwitcherViewModel.switchSession",
                     )
-                }.onFailure { error ->
-                    Timber.e(error, "Failed to switch session")
-                    _state.value = _state.value.copy(
-                        isSwitching = false,
-                        error = context.getString(R.string.error_switch_session_failed_fmt, error.message)
-                    )
-                }
+
+                result
+                    .onSuccess {
+                        Timber.d("Successfully switched to session: $serverId / $userId")
+                        _state.value = _state.value.copy(isSwitching = false, switchSuccess = true)
+                    }
+                    .onFailure { error ->
+                        Timber.e(error, "Failed to switch session")
+                        _state.value =
+                            _state.value.copy(
+                                isSwitching = false,
+                                error =
+                                    context.getString(
+                                        R.string.error_switch_session_failed_fmt,
+                                        error.message,
+                                    ),
+                            )
+                    }
             } catch (e: Exception) {
                 Timber.e(e, "Error switching session")
-                _state.value = _state.value.copy(
-                    isSwitching = false,
-                    error = context.getString(R.string.error_switch_session_error_fmt, e.message)
-                )
+                _state.value =
+                    _state.value.copy(
+                        isSwitching = false,
+                        error =
+                            context.getString(R.string.error_switch_session_error_fmt, e.message),
+                    )
             }
         }
     }
@@ -178,4 +184,4 @@ class SessionSwitcherViewModel @Inject constructor(
     fun resetSwitchSuccess() {
         _state.value = _state.value.copy(switchSuccess = false)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/settings/SettingsScreen.kt b/app/src/main/java/com/makd/afinity/ui/settings/SettingsScreen.kt
index 19a601c08..dda25d672 100644
--- a/app/src/main/java/com/makd/afinity/ui/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/settings/SettingsScreen.kt
@@ -76,7 +76,7 @@ fun SettingsScreen(
     onAppearanceOptionsClick: () -> Unit,
     onServerManagementClick: () -> Unit,
     modifier: Modifier = Modifier,
-    viewModel: SettingsViewModel = hiltViewModel()
+    viewModel: SettingsViewModel = hiltViewModel(),
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val combineLibrarySections by viewModel.combineLibrarySections.collectAsStateWithLifecycle()
@@ -84,13 +84,19 @@ fun SettingsScreen(
     val manualOfflineMode by viewModel.manualOfflineMode.collectAsStateWithLifecycle()
     val effectiveOfflineMode by viewModel.effectiveOfflineMode.collectAsStateWithLifecycle()
     val isNetworkAvailable by viewModel.isNetworkAvailable.collectAsStateWithLifecycle()
-    val isJellyseerrAuthenticated by viewModel.isJellyseerrAuthenticated.collectAsStateWithLifecycle()
+    val isJellyseerrAuthenticated by
+        viewModel.isJellyseerrAuthenticated.collectAsStateWithLifecycle()
+    val isAudiobookshelfAuthenticated by
+        viewModel.isAudiobookshelfAuthenticated.collectAsStateWithLifecycle()
 
     var showLogoutDialog by remember { mutableStateOf(false) }
     var showJellyseerrLogoutDialog by remember { mutableStateOf(false) }
+    var showAudiobookshelfLogoutDialog by remember { mutableStateOf(false) }
     var showJellyseerrBottomSheet by remember { mutableStateOf(false) }
+    var showAudiobookshelfBottomSheet by remember { mutableStateOf(false) }
     var showSessionSwitcherSheet by remember { mutableStateOf(false) }
-    val jellyseerrSheetState = rememberModalBottomSheetState()
+    val jellyseerrSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    val audiobookshelfSheetState = rememberModalBottomSheetState()
     val sessionSwitcherSheetState = rememberModalBottomSheetState()
 
     if (showLogoutDialog) {
@@ -99,7 +105,7 @@ fun SettingsScreen(
                 showLogoutDialog = false
                 viewModel.logout(onLogoutComplete)
             },
-            onDismiss = { showLogoutDialog = false }
+            onDismiss = { showLogoutDialog = false },
         )
     }
 
@@ -109,14 +115,31 @@ fun SettingsScreen(
                 showJellyseerrLogoutDialog = false
                 viewModel.logoutFromJellyseerr()
             },
-            onDismiss = { showJellyseerrLogoutDialog = false }
+            onDismiss = { showJellyseerrLogoutDialog = false },
+        )
+    }
+
+    if (showAudiobookshelfLogoutDialog) {
+        AudiobookshelfLogoutConfirmationDialog(
+            onConfirm = {
+                showAudiobookshelfLogoutDialog = false
+                viewModel.logoutFromAudiobookshelf()
+            },
+            onDismiss = { showAudiobookshelfLogoutDialog = false },
         )
     }
 
     if (showJellyseerrBottomSheet) {
         JellyseerrBottomSheet(
             onDismiss = { showJellyseerrBottomSheet = false },
-            sheetState = jellyseerrSheetState
+            sheetState = jellyseerrSheetState,
+        )
+    }
+
+    if (showAudiobookshelfBottomSheet) {
+        AudiobookshelfBottomSheet(
+            onDismiss = { showAudiobookshelfBottomSheet = false },
+            sheetState = audiobookshelfSheetState,
         )
     }
 
@@ -127,7 +150,7 @@ fun SettingsScreen(
                 showSessionSwitcherSheet = false
                 navController.navigate(Destination.createLoginRoute(serverUrl = server.address))
             },
-            sheetState = sessionSwitcherSheetState
+            sheetState = sessionSwitcherSheetState,
         )
     }
 
@@ -139,13 +162,9 @@ fun SettingsScreen(
             text = { Text(error) },
             confirmButton = {
                 TextButton(onClick = { viewModel.clearError() }) {
-                    Text(
-                        stringResource(
-                            R.string.action_ok
-                        )
-                    )
+                    Text(stringResource(R.string.action_ok))
                 }
-            }
+            },
         )
     }
 
@@ -156,51 +175,49 @@ fun SettingsScreen(
                 title = {
                     Text(
                         text = stringResource(R.string.settings_title),
-                        style = MaterialTheme.typography.headlineMedium.copy(
-                            fontWeight = FontWeight.Bold
-                        )
+                        style =
+                            MaterialTheme.typography.headlineMedium.copy(
+                                fontWeight = FontWeight.Bold
+                            ),
                     )
                 },
                 navigationIcon = {
                     IconButton(onClick = onBackClick) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_chevron_left),
-                            contentDescription = stringResource(R.string.cd_back)
+                            contentDescription = stringResource(R.string.cd_back),
                         )
                     }
                 },
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.surface
-                )
+                colors =
+                    TopAppBarDefaults.topAppBarColors(
+                        containerColor = MaterialTheme.colorScheme.surface
+                    ),
             )
         },
-        containerColor = MaterialTheme.colorScheme.surface
+        containerColor = MaterialTheme.colorScheme.surface,
     ) { innerPadding ->
         if (uiState.isLoading) {
             Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(innerPadding),
-                contentAlignment = Alignment.Center
+                modifier = Modifier.fillMaxSize().padding(innerPadding),
+                contentAlignment = Alignment.Center,
             ) {
                 CircularProgressIndicator()
             }
         } else {
             LazyColumn(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(innerPadding),
+                modifier = Modifier.fillMaxSize().padding(innerPadding),
                 contentPadding = PaddingValues(vertical = 16.dp),
-                verticalArrangement = Arrangement.spacedBy(24.dp)
+                verticalArrangement = Arrangement.spacedBy(24.dp),
             ) {
                 item(key = "profile") {
                     ProfileHeader(
-                        userName = uiState.currentUser?.name
-                            ?: stringResource(R.string.unknown_user),
+                        userName =
+                            uiState.currentUser?.name ?: stringResource(R.string.unknown_user),
                         serverName = uiState.serverName,
                         serverUrl = uiState.serverUrl,
                         userProfileImageUrl = uiState.userProfileImageUrl,
-                        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)
+                        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
                     )
                 }
 
@@ -209,39 +226,57 @@ fun SettingsScreen(
                         SettingsSwitchItem(
                             icon = painterResource(id = R.drawable.ic_cloud_off),
                             title = stringResource(R.string.pref_offline_mode),
-                            subtitle = if (!isNetworkAvailable) stringResource(R.string.offline_mode_no_connection)
-                            else if (manualOfflineMode) stringResource(R.string.offline_mode_manual)
-                            else stringResource(R.string.offline_mode_force),
+                            subtitle =
+                                if (!isNetworkAvailable)
+                                    stringResource(R.string.offline_mode_no_connection)
+                                else if (manualOfflineMode)
+                                    stringResource(R.string.offline_mode_manual)
+                                else stringResource(R.string.offline_mode_force),
                             checked = effectiveOfflineMode,
                             onCheckedChange = viewModel::toggleOfflineMode,
-                            enabled = isNetworkAvailable
+                            enabled = isNetworkAvailable,
                         )
                         SettingsDivider()
                         SettingsSwitchItem(
-                            icon = painterResource(id = R.drawable.ic_request_seerr_dark),
+                            icon = painterResource(id = R.drawable.ic_seerr_logo),
                             title = stringResource(R.string.pref_discovery_requests),
-                            subtitle = if (isJellyseerrAuthenticated) stringResource(R.string.discovery_connected) else stringResource(
-                                R.string.discovery_connect
-                            ),
+                            subtitle =
+                                if (isJellyseerrAuthenticated)
+                                    stringResource(R.string.discovery_connected)
+                                else stringResource(R.string.discovery_connect),
                             checked = isJellyseerrAuthenticated,
                             onCheckedChange = { enabled ->
-                                if (enabled) showJellyseerrBottomSheet =
-                                    true else showJellyseerrLogoutDialog = true
-                            }
+                                if (enabled) showJellyseerrBottomSheet = true
+                                else showJellyseerrLogoutDialog = true
+                            },
+                        )
+                        SettingsDivider()
+                        SettingsSwitchItem(
+                            icon = painterResource(id = R.drawable.ic_audiobookshelf_light),
+                            title = stringResource(R.string.pref_audiobookshelf),
+                            subtitle =
+                                if (isAudiobookshelfAuthenticated)
+                                    stringResource(R.string.audiobookshelf_connected)
+                                else stringResource(R.string.audiobookshelf_connect),
+                            checked = isAudiobookshelfAuthenticated,
+                            onCheckedChange = { enabled ->
+                                if (enabled) showAudiobookshelfBottomSheet = true
+                                else showAudiobookshelfLogoutDialog = true
+                            },
                         )
                         SettingsDivider()
                         SettingsItem(
                             icon = painterResource(id = R.drawable.ic_download),
                             title = stringResource(R.string.pref_downloads),
                             subtitle = stringResource(R.string.pref_downloads_summary),
-                            onClick = onDownloadClick
+                            onClick = onDownloadClick,
                         )
                         SettingsDivider()
                         SettingsItem(
                             icon = painterResource(id = R.drawable.ic_user),
                             title = stringResource(R.string.pref_switch_session),
                             subtitle = stringResource(R.string.pref_switch_session_summary),
-                            onClick = { showSessionSwitcherSheet = true }
+                            onClick = { showSessionSwitcherSheet = true },
                         )
                     }
                 }
@@ -252,7 +287,7 @@ fun SettingsScreen(
                             icon = painterResource(id = R.drawable.ic_server),
                             title = stringResource(R.string.pref_manage_servers),
                             subtitle = stringResource(R.string.pref_manage_servers_summary),
-                            onClick = onServerManagementClick
+                            onClick = onServerManagementClick,
                         )
                     }
                 }
@@ -263,83 +298,83 @@ fun SettingsScreen(
                             icon = painterResource(id = R.drawable.ic_color_swatch),
                             title = stringResource(R.string.pref_appearance),
                             subtitle = stringResource(R.string.pref_appearance_summary),
-                            onClick = onAppearanceOptionsClick
+                            onClick = onAppearanceOptionsClick,
                         )
                         SettingsDivider()
                         SettingsItem(
                             icon = painterResource(id = R.drawable.ic_playback_settings),
                             title = stringResource(R.string.pref_playback),
                             subtitle = stringResource(R.string.pref_playback_summary),
-                            onClick = onPlayerOptionsClick
+                            onClick = onPlayerOptionsClick,
                         )
                     }
                 }
 
-                item {
-                    UpdateSection()
-                }
+                item { UpdateSection() }
 
                 item {
                     SettingsGroup(title = stringResource(R.string.pref_group_about)) {
                         val buildType =
-                            if (AppConstants.IS_DEBUG) stringResource(R.string.build_debug) else stringResource(
-                                R.string.build_release
-                            )
+                            if (AppConstants.IS_DEBUG) stringResource(R.string.build_debug)
+                            else stringResource(R.string.build_release)
                         SettingsItem(
                             icon = painterResource(id = R.drawable.ic_versions),
                             title = stringResource(R.string.pref_version),
-                            subtitle = stringResource(
-                                R.string.version_fmt,
-                                AppConstants.VERSION_NAME,
-                                buildType
-                            ),
-                            onClick = null
+                            subtitle =
+                                stringResource(
+                                    R.string.version_fmt,
+                                    AppConstants.VERSION_NAME,
+                                    buildType,
+                                ),
+                            onClick = null,
                         )
                         SettingsDivider()
                         SettingsItem(
                             icon = painterResource(id = R.drawable.ic_source_code),
                             title = stringResource(R.string.pref_licenses),
                             subtitle = stringResource(R.string.pref_licenses_summary),
-                            onClick = onLicensesClick
+                            onClick = onLicensesClick,
                         )
                     }
                 }
 
                 item {
                     Box(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(horizontal = 24.dp)
-                            .padding(bottom = 32.dp)
+                        modifier =
+                            Modifier.fillMaxWidth()
+                                .padding(horizontal = 24.dp)
+                                .padding(bottom = 32.dp)
                     ) {
                         Button(
                             onClick = { showLogoutDialog = true },
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .height(52.dp),
-                            colors = ButtonDefaults.buttonColors(
-                                containerColor = MaterialTheme.colorScheme.errorContainer,
-                                contentColor = MaterialTheme.colorScheme.onErrorContainer
-                            ),
+                            modifier = Modifier.fillMaxWidth().height(52.dp),
+                            colors =
+                                ButtonDefaults.buttonColors(
+                                    containerColor = MaterialTheme.colorScheme.errorContainer,
+                                    contentColor = MaterialTheme.colorScheme.onErrorContainer,
+                                ),
                             shape = RoundedCornerShape(16.dp),
-                            enabled = !uiState.isLoggingOut
+                            enabled = !uiState.isLoggingOut,
                         ) {
                             if (uiState.isLoggingOut) {
                                 CircularProgressIndicator(
                                     modifier = Modifier.size(20.dp),
                                     color = MaterialTheme.colorScheme.onErrorContainer,
-                                    strokeWidth = 2.dp
+                                    strokeWidth = 2.dp,
                                 )
                             } else {
                                 Icon(
                                     painter = painterResource(id = R.drawable.ic_logout),
                                     contentDescription = null,
-                                    modifier = Modifier.size(18.dp)
+                                    modifier = Modifier.size(18.dp),
                                 )
                                 Spacer(modifier = Modifier.width(8.dp))
                                 Text(
                                     text = stringResource(R.string.action_logout),
-                                    style = MaterialTheme.typography.labelLarge.copy(fontWeight = FontWeight.Bold)
+                                    style =
+                                        MaterialTheme.typography.labelLarge.copy(
+                                            fontWeight = FontWeight.Bold
+                                        ),
                                 )
                             }
                         }
@@ -354,32 +389,24 @@ fun SettingsScreen(
 private fun SettingsGroup(
     title: String? = null,
     modifier: Modifier = Modifier,
-    content: @Composable ColumnScope.() -> Unit
+    content: @Composable ColumnScope.() -> Unit,
 ) {
-    Column(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(horizontal = 16.dp)
-    ) {
+    Column(modifier = modifier.fillMaxWidth().padding(horizontal = 16.dp)) {
         if (title != null) {
             Text(
                 text = title,
                 style = MaterialTheme.typography.titleSmall,
                 color = MaterialTheme.colorScheme.primary,
                 fontWeight = FontWeight.Bold,
-                modifier = Modifier.padding(start = 16.dp, bottom = 8.dp)
+                modifier = Modifier.padding(start = 16.dp, bottom = 8.dp),
             )
         }
         Surface(
             shape = RoundedCornerShape(24.dp),
             color = MaterialTheme.colorScheme.surfaceContainerLow,
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth(),
         ) {
-            Column(
-                modifier = Modifier.padding(vertical = 4.dp)
-            ) {
-                content()
-            }
+            Column(modifier = Modifier.padding(vertical = 4.dp)) { content() }
         }
     }
 }
@@ -388,7 +415,7 @@ private fun SettingsGroup(
 private fun SettingsDivider() {
     HorizontalDivider(
         modifier = Modifier.padding(start = 56.dp, end = 16.dp),
-        color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f)
+        color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f),
     )
 }
 
@@ -398,20 +425,18 @@ fun ProfileHeader(
     serverName: String?,
     serverUrl: String?,
     userProfileImageUrl: String?,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Column(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(top = 24.dp, bottom = 0.dp),
-        horizontalAlignment = Alignment.CenterHorizontally
+        modifier = modifier.fillMaxWidth().padding(top = 24.dp, bottom = 0.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         Box(
-            modifier = Modifier
-                .size(96.dp)
-                .clip(CircleShape)
-                .background(MaterialTheme.colorScheme.surfaceContainerHighest),
-            contentAlignment = Alignment.Center
+            modifier =
+                Modifier.size(96.dp)
+                    .clip(CircleShape)
+                    .background(MaterialTheme.colorScheme.surfaceContainerHighest),
+            contentAlignment = Alignment.Center,
         ) {
             if (userProfileImageUrl != null) {
                 AsyncImage(
@@ -420,13 +445,13 @@ fun ProfileHeader(
                     targetWidth = 96.dp,
                     targetHeight = 96.dp,
                     contentScale = ContentScale.Crop,
-                    modifier = Modifier.fillMaxSize()
+                    modifier = Modifier.fillMaxSize(),
                 )
             } else {
                 Text(
                     text = userName.take(1).uppercase(),
                     style = MaterialTheme.typography.displaySmall,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
         }
@@ -435,37 +460,37 @@ fun ProfileHeader(
         Text(
             text = userName,
             style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.SemiBold),
-            color = MaterialTheme.colorScheme.onSurface
+            color = MaterialTheme.colorScheme.onSurface,
         )
 
         Spacer(modifier = Modifier.height(8.dp))
         Surface(
             color = MaterialTheme.colorScheme.surfaceContainer,
             shape = RoundedCornerShape(50),
-            modifier = Modifier.height(32.dp)
+            modifier = Modifier.height(32.dp),
         ) {
             Row(
                 modifier = Modifier.padding(horizontal = 12.dp),
                 verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.spacedBy(8.dp)
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
             ) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_server),
                     contentDescription = null,
                     modifier = Modifier.size(14.dp),
-                    tint = MaterialTheme.colorScheme.primary
+                    tint = MaterialTheme.colorScheme.primary,
                 )
                 Text(
                     text = serverName ?: stringResource(R.string.unknown_server),
                     style = MaterialTheme.typography.labelLarge,
-                    color = MaterialTheme.colorScheme.onSurface
+                    color = MaterialTheme.colorScheme.onSurface,
                 )
                 if (serverUrl != null) {
                     VerticalDivider(modifier = Modifier.height(12.dp))
                     Text(
                         text = serverUrl,
                         style = MaterialTheme.typography.labelLarge,
-                        color = MaterialTheme.colorScheme.onSurface
+                        color = MaterialTheme.colorScheme.onSurface,
                     )
                 }
             }
@@ -480,32 +505,30 @@ private fun SettingsItem(
     subtitle: String,
     onClick: (() -> Unit)?,
     modifier: Modifier = Modifier,
-    trailing: @Composable (() -> Unit)? = null
+    trailing: @Composable (() -> Unit)? = null,
 ) {
     Row(
-        modifier = modifier
-            .fillMaxWidth()
-            .then(if (onClick != null) Modifier.clickable(onClick = onClick) else Modifier)
-            .padding(horizontal = 16.dp, vertical = 16.dp),
-        verticalAlignment = Alignment.CenterVertically
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .then(if (onClick != null) Modifier.clickable(onClick = onClick) else Modifier)
+                .padding(horizontal = 16.dp, vertical = 16.dp),
+        verticalAlignment = Alignment.CenterVertically,
     ) {
         Icon(
             painter = icon,
             contentDescription = null,
             tint = MaterialTheme.colorScheme.onSurfaceVariant,
-            modifier = Modifier.size(24.dp)
+            modifier = Modifier.size(24.dp),
         )
 
         Spacer(modifier = Modifier.width(16.dp))
 
-        Column(
-            modifier = Modifier.weight(1f),
-            verticalArrangement = Arrangement.Center
-        ) {
+        Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center) {
             Text(
                 text = title,
                 style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium),
-                color = MaterialTheme.colorScheme.onSurface
+                color = MaterialTheme.colorScheme.onSurface,
             )
             if (subtitle.isNotBlank()) {
                 Text(
@@ -514,7 +537,7 @@ private fun SettingsItem(
                     color = MaterialTheme.colorScheme.onSurfaceVariant,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
-                    modifier = Modifier.padding(top = 2.dp)
+                    modifier = Modifier.padding(top = 2.dp),
                 )
             }
         }
@@ -526,7 +549,7 @@ private fun SettingsItem(
                 painter = painterResource(id = R.drawable.ic_chevron_right),
                 contentDescription = null,
                 tint = MaterialTheme.colorScheme.outline.copy(alpha = 0.5f),
-                modifier = Modifier.size(20.dp)
+                modifier = Modifier.size(20.dp),
             )
         }
     }
@@ -540,31 +563,33 @@ private fun SettingsSwitchItem(
     checked: Boolean,
     onCheckedChange: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
-    enabled: Boolean = true
+    enabled: Boolean = true,
 ) {
     SettingsItem(
         icon = icon,
         title = title,
         subtitle = subtitle,
-        onClick = if (enabled) {
-            { onCheckedChange(!checked) }
-        } else null,
+        onClick =
+            if (enabled) {
+                { onCheckedChange(!checked) }
+            } else null,
         modifier = modifier,
         trailing = {
             Switch(
                 checked = checked,
                 onCheckedChange = onCheckedChange,
                 enabled = enabled,
-                colors = SwitchDefaults.colors(
-                    checkedThumbColor = MaterialTheme.colorScheme.onPrimary,
-                    checkedTrackColor = MaterialTheme.colorScheme.primary,
-                    uncheckedThumbColor = MaterialTheme.colorScheme.outline,
-                    uncheckedTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
-                    uncheckedBorderColor = MaterialTheme.colorScheme.outline
-                ),
-                modifier = Modifier.scale(0.8f)
+                colors =
+                    SwitchDefaults.colors(
+                        checkedThumbColor = MaterialTheme.colorScheme.onPrimary,
+                        checkedTrackColor = MaterialTheme.colorScheme.primary,
+                        uncheckedThumbColor = MaterialTheme.colorScheme.outline,
+                        uncheckedTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
+                        uncheckedBorderColor = MaterialTheme.colorScheme.outline,
+                    ),
+                modifier = Modifier.scale(0.8f),
             )
-        }
+        },
     )
 }
 
@@ -576,39 +601,72 @@ private fun LogoutConfirmationDialog(onConfirm: () -> Unit, onDismiss: () -> Uni
             Icon(
                 painter = painterResource(id = R.drawable.ic_logout),
                 contentDescription = null,
-                tint = MaterialTheme.colorScheme.error
+                tint = MaterialTheme.colorScheme.error,
             )
         },
         title = {
             Text(
                 stringResource(R.string.dialog_logout_title),
-                style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold)
+                style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             )
         },
         text = {
             Text(
                 stringResource(R.string.dialog_logout_message),
-                style = MaterialTheme.typography.bodyMedium
+                style = MaterialTheme.typography.bodyMedium,
             )
         },
         confirmButton = {
             Button(
                 onClick = onConfirm,
-                colors = ButtonDefaults.buttonColors(
-                    containerColor = MaterialTheme.colorScheme.error,
-                    contentColor = MaterialTheme.colorScheme.onError
-                )
-            ) { Text(stringResource(R.string.action_logout)) }
-        },
-        dismissButton = {
-            TextButton(
-                onClick = onDismiss
+                colors =
+                    ButtonDefaults.buttonColors(
+                        containerColor = MaterialTheme.colorScheme.error,
+                        contentColor = MaterialTheme.colorScheme.onError,
+                    ),
             ) {
-                Text(stringResource(R.string.action_cancel))
+                Text(stringResource(R.string.action_logout))
             }
         },
+        dismissButton = {
+            TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) }
+        },
+        shape = RoundedCornerShape(28.dp),
+        containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
+    )
+}
+
+@Composable
+private fun AudiobookshelfLogoutConfirmationDialog(onConfirm: () -> Unit, onDismiss: () -> Unit) {
+    AlertDialog(
+        onDismissRequest = onDismiss,
+        icon = {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_audiobookshelf_light),
+                contentDescription = null,
+                tint = MaterialTheme.colorScheme.primary,
+            )
+        },
+        title = {
+            Text(
+                stringResource(R.string.dialog_disconnect_audiobookshelf_title),
+                style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+            )
+        },
+        text = {
+            Text(
+                stringResource(R.string.dialog_disconnect_audiobookshelf_message),
+                style = MaterialTheme.typography.bodyMedium,
+            )
+        },
+        confirmButton = {
+            Button(onClick = onConfirm) { Text(stringResource(R.string.action_disconnect)) }
+        },
+        dismissButton = {
+            TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) }
+        },
         shape = RoundedCornerShape(28.dp),
-        containerColor = MaterialTheme.colorScheme.surfaceContainerHigh
+        containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
     )
 }
 
@@ -618,28 +676,30 @@ private fun JellyseerrLogoutConfirmationDialog(onConfirm: () -> Unit, onDismiss:
         onDismissRequest = onDismiss,
         icon = {
             Icon(
-                painter = painterResource(id = R.drawable.ic_request_seerr_dark),
+                painter = painterResource(id = R.drawable.ic_seerr_logo),
                 contentDescription = null,
-                tint = MaterialTheme.colorScheme.primary
+                tint = MaterialTheme.colorScheme.primary,
             )
         },
         title = {
             Text(
                 stringResource(R.string.dialog_disconnect_seerr_title),
-                style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold)
+                style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             )
         },
         text = {
             Text(
                 stringResource(R.string.dialog_disconnect_seerr_message),
-                style = MaterialTheme.typography.bodyMedium
+                style = MaterialTheme.typography.bodyMedium,
             )
         },
         confirmButton = {
             Button(onClick = onConfirm) { Text(stringResource(R.string.action_disconnect)) }
         },
-        dismissButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) } },
+        dismissButton = {
+            TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) }
+        },
         shape = RoundedCornerShape(28.dp),
-        containerColor = MaterialTheme.colorScheme.surfaceContainerHigh
+        containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/settings/SettingsViewModel.kt b/app/src/main/java/com/makd/afinity/ui/settings/SettingsViewModel.kt
index 9b55f3756..b09e6d6c8 100644
--- a/app/src/main/java/com/makd/afinity/ui/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/settings/SettingsViewModel.kt
@@ -12,13 +12,16 @@ import com.makd.afinity.data.models.player.MpvVideoOutput
 import com.makd.afinity.data.models.player.VideoZoomMode
 import com.makd.afinity.data.models.user.User
 import com.makd.afinity.data.repository.AppDataRepository
+import com.makd.afinity.data.repository.AudiobookshelfRepository
 import com.makd.afinity.data.repository.JellyseerrRepository
 import com.makd.afinity.data.repository.PreferencesRepository
 import com.makd.afinity.data.repository.auth.AuthRepository
 import com.makd.afinity.data.repository.server.ServerRepository
+import com.makd.afinity.player.audiobookshelf.AudiobookshelfPlayer
 import com.makd.afinity.util.NetworkConnectivityMonitor
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -29,10 +32,11 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltViewModel
-class SettingsViewModel @Inject constructor(
+class SettingsViewModel
+@Inject
+constructor(
     @ApplicationContext private val context: Context,
     private val authRepository: AuthRepository,
     private val preferencesRepository: PreferencesRepository,
@@ -40,7 +44,9 @@ class SettingsViewModel @Inject constructor(
     private val serverRepository: ServerRepository,
     private val offlineModeManager: OfflineModeManager,
     private val networkConnectivityMonitor: NetworkConnectivityMonitor,
-    private val jellyseerrRepository: JellyseerrRepository
+    private val jellyseerrRepository: JellyseerrRepository,
+    private val audiobookshelfRepository: AudiobookshelfRepository,
+    private val audiobookshelfPlayer: AudiobookshelfPlayer,
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(SettingsUiState())
@@ -52,12 +58,14 @@ class SettingsViewModel @Inject constructor(
     private val _homeSortByDateAdded = MutableStateFlow(true)
     val homeSortByDateAdded: StateFlow<Boolean> = _homeSortByDateAdded.asStateFlow()
 
-    val episodeLayout: StateFlow<EpisodeLayout> = preferencesRepository.getEpisodeLayoutFlow()
-        .stateIn(
-            scope = viewModelScope,
-            started = SharingStarted.WhileSubscribed(5000),
-            initialValue = EpisodeLayout.HORIZONTAL
-        )
+    val episodeLayout: StateFlow<EpisodeLayout> =
+        preferencesRepository
+            .getEpisodeLayoutFlow()
+            .stateIn(
+                scope = viewModelScope,
+                started = SharingStarted.WhileSubscribed(5000),
+                initialValue = EpisodeLayout.HORIZONTAL,
+            )
 
     private val _manualOfflineMode = MutableStateFlow(false)
     val manualOfflineMode: StateFlow<Boolean> = _manualOfflineMode.asStateFlow()
@@ -65,15 +73,25 @@ class SettingsViewModel @Inject constructor(
     private val _isNetworkAvailable = MutableStateFlow(true)
     val isNetworkAvailable: StateFlow<Boolean> = _isNetworkAvailable.asStateFlow()
 
-    val effectiveOfflineMode: StateFlow<Boolean> = combine(
-        _manualOfflineMode,
-        _isNetworkAvailable
-    ) { manual, networkAvailable ->
-        manual || !networkAvailable
-    }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), false)
+    val effectiveOfflineMode: StateFlow<Boolean> =
+        combine(_manualOfflineMode, _isNetworkAvailable) { manual, networkAvailable ->
+                manual || !networkAvailable
+            }
+            .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), false)
 
-    val isJellyseerrAuthenticated: StateFlow<Boolean> = jellyseerrRepository.isAuthenticated
-        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), false)
+    val isJellyseerrAuthenticated: StateFlow<Boolean> =
+        jellyseerrRepository.isAuthenticated.stateIn(
+            viewModelScope,
+            SharingStarted.WhileSubscribed(5000),
+            false,
+        )
+
+    val isAudiobookshelfAuthenticated: StateFlow<Boolean> =
+        audiobookshelfRepository.isAuthenticated.stateIn(
+            viewModelScope,
+            SharingStarted.WhileSubscribed(5000),
+            false,
+        )
 
     init {
         loadSettings()
@@ -82,22 +100,26 @@ class SettingsViewModel @Inject constructor(
     private fun loadSettings() {
         viewModelScope.launch {
             combine(
-                authRepository.currentUser,
-                appDataRepository.userProfileImageUrl,
-                serverRepository.currentServer
-            ) { user, profileImageUrl, server ->
-                Triple(user, profileImageUrl, server)
-            }.collect { (user, profileImageUrl, server) ->
-                _uiState.value = _uiState.value.copy(
-                    currentUser = user,
-                    userProfileImageUrl = profileImageUrl,
-                    serverName = server?.name,
-                    serverVersion = server?.version,
-                    serverUrl = serverRepository.getBaseUrl().ifEmpty { null },
-                    isLoading = false
-                )
-                Timber.d("SettingsViewModel - Updated uiState: user=${_uiState.value.currentUser?.name}, server=${_uiState.value.serverName}")
-            }
+                    authRepository.currentUser,
+                    appDataRepository.userProfileImageUrl,
+                    serverRepository.currentServer,
+                ) { user, profileImageUrl, server ->
+                    Triple(user, profileImageUrl, server)
+                }
+                .collect { (user, profileImageUrl, server) ->
+                    _uiState.value =
+                        _uiState.value.copy(
+                            currentUser = user,
+                            userProfileImageUrl = profileImageUrl,
+                            serverName = server?.name,
+                            serverVersion = server?.version,
+                            serverUrl = serverRepository.getBaseUrl().ifEmpty { null },
+                            isLoading = false,
+                        )
+                    Timber.d(
+                        "SettingsViewModel - Updated uiState: user=${_uiState.value.currentUser?.name}, server=${_uiState.value.serverName}"
+                    )
+                }
         }
 
         viewModelScope.launch {
@@ -113,28 +135,33 @@ class SettingsViewModel @Inject constructor(
         }
 
         viewModelScope.launch {
-            preferencesRepository.getThemeModeFlow()
-                .collect { _uiState.value = _uiState.value.copy(themeMode = it) }
+            preferencesRepository.getThemeModeFlow().collect {
+                _uiState.value = _uiState.value.copy(themeMode = it)
+            }
         }
 
         viewModelScope.launch {
-            preferencesRepository.getDynamicColorsFlow()
-                .collect { _uiState.value = _uiState.value.copy(dynamicColors = it) }
+            preferencesRepository.getDynamicColorsFlow().collect {
+                _uiState.value = _uiState.value.copy(dynamicColors = it)
+            }
         }
 
         viewModelScope.launch {
-            preferencesRepository.getAutoPlayFlow()
-                .collect { _uiState.value = _uiState.value.copy(autoPlay = it) }
+            preferencesRepository.getAutoPlayFlow().collect {
+                _uiState.value = _uiState.value.copy(autoPlay = it)
+            }
         }
 
         viewModelScope.launch {
-            preferencesRepository.getSkipIntroEnabledFlow()
-                .collect { _uiState.value = _uiState.value.copy(skipIntroEnabled = it) }
+            preferencesRepository.getSkipIntroEnabledFlow().collect {
+                _uiState.value = _uiState.value.copy(skipIntroEnabled = it)
+            }
         }
 
         viewModelScope.launch {
-            preferencesRepository.getSkipOutroEnabledFlow()
-                .collect { _uiState.value = _uiState.value.copy(skipOutroEnabled = it) }
+            preferencesRepository.getSkipOutroEnabledFlow().collect {
+                _uiState.value = _uiState.value.copy(skipOutroEnabled = it)
+            }
         }
 
         viewModelScope.launch {
@@ -156,9 +183,7 @@ class SettingsViewModel @Inject constructor(
         }
 
         viewModelScope.launch {
-            preferencesRepository.getOfflineModeFlow().collect {
-                _manualOfflineMode.value = it
-            }
+            preferencesRepository.getOfflineModeFlow().collect { _manualOfflineMode.value = it }
         }
 
         viewModelScope.launch {
@@ -234,15 +259,11 @@ class SettingsViewModel @Inject constructor(
     }
 
     fun toggleCombineLibrarySections(enabled: Boolean) {
-        viewModelScope.launch {
-            preferencesRepository.setCombineLibrarySections(enabled)
-        }
+        viewModelScope.launch { preferencesRepository.setCombineLibrarySections(enabled) }
     }
 
     fun toggleHomeSortByDateAdded(sortByDateAdded: Boolean) {
-        viewModelScope.launch {
-            preferencesRepository.setHomeSortByDateAdded(sortByDateAdded)
-        }
+        viewModelScope.launch { preferencesRepository.setHomeSortByDateAdded(sortByDateAdded) }
     }
 
     fun toggleAutoPlay(enabled: Boolean) {
@@ -283,26 +304,38 @@ class SettingsViewModel @Inject constructor(
             try {
                 val currentSubtitlePrefs = preferencesRepository.getSubtitlePreferences()
 
-                val updatedPrefs = when {
-                    enabled && currentSubtitlePrefs.outlineStyle == com.makd.afinity.data.models.player.SubtitleOutlineStyle.BACKGROUND_BOX -> {
-                        Timber.d("Switching to ExoPlayer: Resetting BACKGROUND_BOX to NONE")
-                        currentSubtitlePrefs.copy(
-                            outlineStyle = com.makd.afinity.data.models.player.SubtitleOutlineStyle.NONE,
-                            outlineSize = 0f
-                        )
-                    }
-
-                    !enabled && (currentSubtitlePrefs.outlineStyle == com.makd.afinity.data.models.player.SubtitleOutlineStyle.RAISED ||
-                            currentSubtitlePrefs.outlineStyle == com.makd.afinity.data.models.player.SubtitleOutlineStyle.DEPRESSED) -> {
-                        Timber.d("Switching to MPV: Resetting ${currentSubtitlePrefs.outlineStyle} to NONE")
-                        currentSubtitlePrefs.copy(
-                            outlineStyle = com.makd.afinity.data.models.player.SubtitleOutlineStyle.NONE
-                        )
+                val updatedPrefs =
+                    when {
+                        enabled &&
+                            currentSubtitlePrefs.outlineStyle ==
+                                com.makd.afinity.data.models.player.SubtitleOutlineStyle
+                                    .BACKGROUND_BOX -> {
+                            Timber.d("Switching to ExoPlayer: Resetting BACKGROUND_BOX to NONE")
+                            currentSubtitlePrefs.copy(
+                                outlineStyle =
+                                    com.makd.afinity.data.models.player.SubtitleOutlineStyle.NONE,
+                                outlineSize = 0f,
+                            )
+                        }
+
+                        !enabled &&
+                            (currentSubtitlePrefs.outlineStyle ==
+                                com.makd.afinity.data.models.player.SubtitleOutlineStyle.RAISED ||
+                                currentSubtitlePrefs.outlineStyle ==
+                                    com.makd.afinity.data.models.player.SubtitleOutlineStyle
+                                        .DEPRESSED) -> {
+                            Timber.d(
+                                "Switching to MPV: Resetting ${currentSubtitlePrefs.outlineStyle} to NONE"
+                            )
+                            currentSubtitlePrefs.copy(
+                                outlineStyle =
+                                    com.makd.afinity.data.models.player.SubtitleOutlineStyle.NONE
+                            )
+                        }
+
+                        else -> null
                     }
 
-                    else -> null
-                }
-
                 updatedPrefs?.let { preferencesRepository.setSubtitlePreferences(it) }
 
                 preferencesRepository.setUseExoPlayer(enabled)
@@ -449,15 +482,23 @@ class SettingsViewModel @Inject constructor(
                     } catch (e: Exception) {
                         Timber.w(e, "Failed to logout from Jellyseerr during AFinity logout")
                     }
+
+                    try {
+                        audiobookshelfPlayer.release()
+                        audiobookshelfRepository.logout()
+                    } catch (e: Exception) {
+                        Timber.w(e, "Failed to logout from Audiobookshelf during AFinity logout")
+                    }
                 }
 
                 onLogoutComplete()
             } catch (e: Exception) {
                 Timber.e(e, "Logout failed")
-                _uiState.value = _uiState.value.copy(
-                    isLoggingOut = false,
-                    error = context.getString(R.string.error_logout_failed_fmt, e.message)
-                )
+                _uiState.value =
+                    _uiState.value.copy(
+                        isLoggingOut = false,
+                        error = context.getString(R.string.error_logout_failed_fmt, e.message),
+                    )
             }
         }
     }
@@ -469,12 +510,34 @@ class SettingsViewModel @Inject constructor(
                 Timber.d("Jellyseerr logout successful")
             } catch (e: Exception) {
                 Timber.e(e, "Failed to logout from Jellyseerr")
-                _uiState.value = _uiState.value.copy(
-                    error = context.getString(
-                        R.string.error_jellyseerr_logout_failed_fmt,
-                        e.message
+                _uiState.value =
+                    _uiState.value.copy(
+                        error =
+                            context.getString(
+                                R.string.error_jellyseerr_logout_failed_fmt,
+                                e.message,
+                            )
+                    )
+            }
+        }
+    }
+
+    fun logoutFromAudiobookshelf() {
+        viewModelScope.launch {
+            try {
+                audiobookshelfPlayer.release()
+                audiobookshelfRepository.logout()
+                Timber.d("Audiobookshelf logout successful")
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to logout from Audiobookshelf")
+                _uiState.value =
+                    _uiState.value.copy(
+                        error =
+                            context.getString(
+                                R.string.error_audiobookshelf_logout_failed_fmt,
+                                e.message,
+                            )
                     )
-                )
             }
         }
     }
@@ -507,5 +570,5 @@ data class SettingsUiState(
     val preferredSubtitleLanguage: String = "",
     val isLoading: Boolean = true,
     val isLoggingOut: Boolean = false,
-    val error: String? = null
-)
\ No newline at end of file
+    val error: String? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/settings/appearance/AppearanceOptionsScreen.kt b/app/src/main/java/com/makd/afinity/ui/settings/appearance/AppearanceOptionsScreen.kt
index 4abc86d71..854710b18 100644
--- a/app/src/main/java/com/makd/afinity/ui/settings/appearance/AppearanceOptionsScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/settings/appearance/AppearanceOptionsScreen.kt
@@ -56,7 +56,7 @@ import com.makd.afinity.ui.theme.ThemeMode
 fun AppearanceOptionsScreen(
     onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
-    viewModel: SettingsViewModel = hiltViewModel()
+    viewModel: SettingsViewModel = hiltViewModel(),
 ) {
     val uiState by viewModel.uiState.collectAsState()
     val combineLibrarySections by viewModel.combineLibrarySections.collectAsState()
@@ -69,39 +69,39 @@ fun AppearanceOptionsScreen(
                 title = {
                     Text(
                         text = stringResource(R.string.appearance_title),
-                        style = MaterialTheme.typography.headlineMedium.copy(
-                            fontWeight = FontWeight.Bold
-                        )
+                        style =
+                            MaterialTheme.typography.headlineMedium.copy(
+                                fontWeight = FontWeight.Bold
+                            ),
                     )
                 },
                 navigationIcon = {
                     IconButton(onClick = onBackClick) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_chevron_left),
-                            contentDescription = stringResource(R.string.cd_back)
+                            contentDescription = stringResource(R.string.cd_back),
                         )
                     }
                 },
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.surface
-                )
+                colors =
+                    TopAppBarDefaults.topAppBarColors(
+                        containerColor = MaterialTheme.colorScheme.surface
+                    ),
             )
         },
         containerColor = MaterialTheme.colorScheme.surface,
-        modifier = modifier.fillMaxSize()
+        modifier = modifier.fillMaxSize(),
     ) { innerPadding ->
         LazyColumn(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(innerPadding),
+            modifier = Modifier.fillMaxSize().padding(innerPadding),
             contentPadding = PaddingValues(vertical = 16.dp),
-            verticalArrangement = Arrangement.spacedBy(24.dp)
+            verticalArrangement = Arrangement.spacedBy(24.dp),
         ) {
             item {
                 SettingsGroup(title = stringResource(R.string.settings_group_theme)) {
                     ThemeSelectorItem(
                         currentThemeMode = uiState.themeMode,
-                        onThemeModeChange = viewModel::setThemeMode
+                        onThemeModeChange = viewModel::setThemeMode,
                     )
                     SettingsDivider()
                     SettingsSwitchItem(
@@ -109,7 +109,7 @@ fun AppearanceOptionsScreen(
                         title = stringResource(R.string.pref_dynamic_colors_title),
                         subtitle = stringResource(R.string.pref_dynamic_colors_summary),
                         checked = uiState.dynamicColors,
-                        onCheckedChange = viewModel::toggleDynamicColors
+                        onCheckedChange = viewModel::toggleDynamicColors,
                     )
                 }
             }
@@ -121,7 +121,7 @@ fun AppearanceOptionsScreen(
                         title = stringResource(R.string.pref_combine_library_title),
                         subtitle = stringResource(R.string.pref_combine_library_summary),
                         checked = combineLibrarySections,
-                        onCheckedChange = viewModel::toggleCombineLibrarySections
+                        onCheckedChange = viewModel::toggleCombineLibrarySections,
                     )
                     SettingsDivider()
                     SettingsSwitchItem(
@@ -129,7 +129,7 @@ fun AppearanceOptionsScreen(
                         title = stringResource(R.string.pref_sort_date_added_title),
                         subtitle = stringResource(R.string.pref_sort_date_added_summary),
                         checked = homeSortByDateAdded,
-                        onCheckedChange = viewModel::toggleHomeSortByDateAdded
+                        onCheckedChange = viewModel::toggleHomeSortByDateAdded,
                     )
                 }
             }
@@ -138,7 +138,7 @@ fun AppearanceOptionsScreen(
                 SettingsGroup(title = stringResource(R.string.settings_group_content_layout)) {
                     EpisodeLayoutSelectorItem(
                         selectedLayout = episodeLayout,
-                        onLayoutSelected = viewModel::setEpisodeLayout
+                        onLayoutSelected = viewModel::setEpisodeLayout,
                     )
                 }
             }
@@ -150,30 +150,24 @@ fun AppearanceOptionsScreen(
 private fun SettingsGroup(
     title: String? = null,
     modifier: Modifier = Modifier,
-    content: @Composable ColumnScope.() -> Unit
+    content: @Composable ColumnScope.() -> Unit,
 ) {
-    Column(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(horizontal = 16.dp)
-    ) {
+    Column(modifier = modifier.fillMaxWidth().padding(horizontal = 16.dp)) {
         if (title != null) {
             Text(
                 text = title,
                 style = MaterialTheme.typography.titleSmall,
                 color = MaterialTheme.colorScheme.primary,
                 fontWeight = FontWeight.Bold,
-                modifier = Modifier.padding(start = 16.dp, bottom = 8.dp)
+                modifier = Modifier.padding(start = 16.dp, bottom = 8.dp),
             )
         }
         Surface(
             shape = RoundedCornerShape(24.dp),
             color = MaterialTheme.colorScheme.surfaceContainerLow,
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth(),
         ) {
-            Column(modifier = Modifier.padding(vertical = 4.dp)) {
-                content()
-            }
+            Column(modifier = Modifier.padding(vertical = 4.dp)) { content() }
         }
     }
 }
@@ -182,7 +176,7 @@ private fun SettingsGroup(
 private fun SettingsDivider() {
     HorizontalDivider(
         modifier = Modifier.padding(start = 56.dp, end = 16.dp),
-        color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f)
+        color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f),
     )
 }
 
@@ -193,32 +187,30 @@ private fun SettingsItem(
     subtitle: String,
     onClick: (() -> Unit)?,
     modifier: Modifier = Modifier,
-    trailing: @Composable (() -> Unit)? = null
+    trailing: @Composable (() -> Unit)? = null,
 ) {
     Row(
-        modifier = modifier
-            .fillMaxWidth()
-            .then(if (onClick != null) Modifier.clickable(onClick = onClick) else Modifier)
-            .padding(horizontal = 16.dp, vertical = 16.dp),
-        verticalAlignment = Alignment.CenterVertically
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .then(if (onClick != null) Modifier.clickable(onClick = onClick) else Modifier)
+                .padding(horizontal = 16.dp, vertical = 16.dp),
+        verticalAlignment = Alignment.CenterVertically,
     ) {
         Icon(
             painter = icon,
             contentDescription = null,
             tint = MaterialTheme.colorScheme.onSurfaceVariant,
-            modifier = Modifier.size(24.dp)
+            modifier = Modifier.size(24.dp),
         )
 
         Spacer(modifier = Modifier.width(16.dp))
 
-        Column(
-            modifier = Modifier.weight(1f),
-            verticalArrangement = Arrangement.Center
-        ) {
+        Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center) {
             Text(
                 text = title,
                 style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium),
-                color = MaterialTheme.colorScheme.onSurface
+                color = MaterialTheme.colorScheme.onSurface,
             )
             if (subtitle.isNotBlank()) {
                 Text(
@@ -227,7 +219,7 @@ private fun SettingsItem(
                     color = MaterialTheme.colorScheme.onSurfaceVariant,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
-                    modifier = Modifier.padding(top = 2.dp)
+                    modifier = Modifier.padding(top = 2.dp),
                 )
             }
         }
@@ -246,39 +238,38 @@ private fun SettingsSwitchItem(
     checked: Boolean,
     onCheckedChange: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
-    enabled: Boolean = true
+    enabled: Boolean = true,
 ) {
     SettingsItem(
         icon = icon,
         title = title,
         subtitle = subtitle,
-        onClick = if (enabled) {
-            { onCheckedChange(!checked) }
-        } else null,
+        onClick =
+            if (enabled) {
+                { onCheckedChange(!checked) }
+            } else null,
         modifier = modifier,
         trailing = {
             Switch(
                 checked = checked,
                 onCheckedChange = onCheckedChange,
                 enabled = enabled,
-                colors = SwitchDefaults.colors(
-                    checkedThumbColor = MaterialTheme.colorScheme.onPrimary,
-                    checkedTrackColor = MaterialTheme.colorScheme.primary,
-                    uncheckedThumbColor = MaterialTheme.colorScheme.outline,
-                    uncheckedTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
-                    uncheckedBorderColor = MaterialTheme.colorScheme.outline
-                ),
-                modifier = Modifier.scale(0.8f)
+                colors =
+                    SwitchDefaults.colors(
+                        checkedThumbColor = MaterialTheme.colorScheme.onPrimary,
+                        checkedTrackColor = MaterialTheme.colorScheme.primary,
+                        uncheckedThumbColor = MaterialTheme.colorScheme.outline,
+                        uncheckedTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
+                        uncheckedBorderColor = MaterialTheme.colorScheme.outline,
+                    ),
+                modifier = Modifier.scale(0.8f),
             )
-        }
+        },
     )
 }
 
 @Composable
-private fun ThemeSelectorItem(
-    currentThemeMode: String,
-    onThemeModeChange: (String) -> Unit
-) {
+private fun ThemeSelectorItem(currentThemeMode: String, onThemeModeChange: (String) -> Unit) {
     var expanded by remember { mutableStateOf(false) }
     val currentTheme = ThemeMode.fromString(currentThemeMode)
 
@@ -293,34 +284,34 @@ private fun ThemeSelectorItem(
                     painter = painterResource(id = R.drawable.ic_keyboard_arrow_down),
                     contentDescription = null,
                     tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                    modifier = Modifier.size(24.dp)
+                    modifier = Modifier.size(24.dp),
                 )
-            }
+            },
         )
 
         DropdownMenu(
             expanded = expanded,
             onDismissRequest = { expanded = false },
-            modifier = Modifier.background(MaterialTheme.colorScheme.surfaceContainerHigh)
+            modifier = Modifier.background(MaterialTheme.colorScheme.surfaceContainerHigh),
         ) {
             ThemeMode.entries.forEach { mode ->
                 DropdownMenuItem(
                     text = {
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(8.dp)
+                            horizontalArrangement = Arrangement.spacedBy(8.dp),
                         ) {
                             Text(
                                 text = getThemeModeDisplayName(mode),
                                 style = MaterialTheme.typography.bodyLarge,
-                                color = MaterialTheme.colorScheme.onSurface
+                                color = MaterialTheme.colorScheme.onSurface,
                             )
                             if (mode.name == currentThemeMode) {
                                 Icon(
                                     painter = painterResource(id = R.drawable.ic_check),
                                     contentDescription = null,
                                     tint = MaterialTheme.colorScheme.primary,
-                                    modifier = Modifier.size(18.dp)
+                                    modifier = Modifier.size(18.dp),
                                 )
                             }
                         }
@@ -328,7 +319,7 @@ private fun ThemeSelectorItem(
                     onClick = {
                         onThemeModeChange(mode.name)
                         expanded = false
-                    }
+                    },
                 )
             }
         }
@@ -338,7 +329,7 @@ private fun ThemeSelectorItem(
 @Composable
 private fun EpisodeLayoutSelectorItem(
     selectedLayout: EpisodeLayout,
-    onLayoutSelected: (EpisodeLayout) -> Unit
+    onLayoutSelected: (EpisodeLayout) -> Unit,
 ) {
     var expanded by remember { mutableStateOf(false) }
     val layouts = listOf(EpisodeLayout.HORIZONTAL, EpisodeLayout.VERTICAL)
@@ -354,34 +345,34 @@ private fun EpisodeLayoutSelectorItem(
                     painter = painterResource(id = R.drawable.ic_keyboard_arrow_down),
                     contentDescription = null,
                     tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                    modifier = Modifier.size(24.dp)
+                    modifier = Modifier.size(24.dp),
                 )
-            }
+            },
         )
 
         DropdownMenu(
             expanded = expanded,
             onDismissRequest = { expanded = false },
-            modifier = Modifier.background(MaterialTheme.colorScheme.surfaceContainerHigh)
+            modifier = Modifier.background(MaterialTheme.colorScheme.surfaceContainerHigh),
         ) {
             layouts.forEach { layout ->
                 DropdownMenuItem(
                     text = {
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(8.dp)
+                            horizontalArrangement = Arrangement.spacedBy(8.dp),
                         ) {
                             Text(
                                 text = getEpisodeLayoutDisplayName(layout),
                                 style = MaterialTheme.typography.bodyLarge,
-                                color = MaterialTheme.colorScheme.onSurface
+                                color = MaterialTheme.colorScheme.onSurface,
                             )
                             if (layout == selectedLayout) {
                                 Icon(
                                     painter = painterResource(id = R.drawable.ic_check),
                                     contentDescription = null,
                                     tint = MaterialTheme.colorScheme.primary,
-                                    modifier = Modifier.size(18.dp)
+                                    modifier = Modifier.size(18.dp),
                                 )
                             }
                         }
@@ -389,7 +380,7 @@ private fun EpisodeLayoutSelectorItem(
                     onClick = {
                         onLayoutSelected(layout)
                         expanded = false
-                    }
+                    },
                 )
             }
         }
@@ -412,4 +403,4 @@ private fun getEpisodeLayoutDisplayName(layout: EpisodeLayout): String {
         EpisodeLayout.HORIZONTAL -> stringResource(R.string.layout_horizontal)
         EpisodeLayout.VERTICAL -> stringResource(R.string.layout_vertical)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/settings/downloads/DownloadSettingsScreen.kt b/app/src/main/java/com/makd/afinity/ui/settings/downloads/DownloadSettingsScreen.kt
index 5b71fa1bf..77a48fe05 100644
--- a/app/src/main/java/com/makd/afinity/ui/settings/downloads/DownloadSettingsScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/settings/downloads/DownloadSettingsScreen.kt
@@ -67,7 +67,7 @@ fun DownloadSettingsScreen(
     onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
     viewModel: DownloadsViewModel = hiltViewModel(),
-    offlineModeManager: OfflineModeManager
+    offlineModeManager: OfflineModeManager,
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val isOffline by offlineModeManager.isOffline.collectAsStateWithLifecycle(initialValue = false)
@@ -86,30 +86,34 @@ fun DownloadSettingsScreen(
                 title = {
                     Text(
                         text = stringResource(R.string.downloads_title),
-                        style = MaterialTheme.typography.headlineMedium.copy(fontWeight = FontWeight.Bold)
+                        style =
+                            MaterialTheme.typography.headlineMedium.copy(
+                                fontWeight = FontWeight.Bold
+                            ),
                     )
                 },
                 navigationIcon = {
                     IconButton(onClick = onBackClick) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_chevron_left),
-                            contentDescription = stringResource(R.string.cd_back)
+                            contentDescription = stringResource(R.string.cd_back),
                         )
                     }
                 },
-                colors = TopAppBarDefaults.topAppBarColors(containerColor = MaterialTheme.colorScheme.surface)
+                colors =
+                    TopAppBarDefaults.topAppBarColors(
+                        containerColor = MaterialTheme.colorScheme.surface
+                    ),
             )
         },
         snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
         containerColor = MaterialTheme.colorScheme.surface,
-        modifier = modifier.fillMaxSize()
+        modifier = modifier.fillMaxSize(),
     ) { innerPadding ->
         LazyColumn(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(innerPadding),
+            modifier = Modifier.fillMaxSize().padding(innerPadding),
             contentPadding = PaddingValues(bottom = 32.dp),
-            verticalArrangement = Arrangement.spacedBy(24.dp)
+            verticalArrangement = Arrangement.spacedBy(24.dp),
         ) {
             item {
                 StatusHub(
@@ -121,18 +125,19 @@ fun DownloadSettingsScreen(
                     deviceStats = uiState.deviceStorageStats,
                     onWifiOnlyChanged = viewModel::setDownloadOverWifiOnly,
                     formatSize = viewModel::formatStorageSize,
-                    modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)
+                    modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
                 )
             }
 
             if (uiState.activeDownloads.isNotEmpty()) {
                 item {
                     SectionHeader(
-                        title = stringResource(
-                            R.string.active_downloads_header_fmt,
-                            uiState.activeDownloads.size
-                        ),
-                        modifier = Modifier.padding(horizontal = 24.dp)
+                        title =
+                            stringResource(
+                                R.string.active_downloads_header_fmt,
+                                uiState.activeDownloads.size,
+                            ),
+                        modifier = Modifier.padding(horizontal = 24.dp),
                     )
                 }
 
@@ -143,7 +148,7 @@ fun DownloadSettingsScreen(
                         onResume = viewModel::resumeDownload,
                         onCancel = viewModel::cancelDownload,
                         formatSize = viewModel::formatStorageSize,
-                        modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp)
+                        modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
                     )
                 }
             }
@@ -151,11 +156,12 @@ fun DownloadSettingsScreen(
             if (uiState.completedDownloads.isNotEmpty()) {
                 item {
                     SectionHeader(
-                        title = stringResource(
-                            R.string.completed_downloads_header_fmt,
-                            uiState.completedDownloads.size
-                        ),
-                        modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp)
+                        title =
+                            stringResource(
+                                R.string.completed_downloads_header_fmt,
+                                uiState.completedDownloads.size,
+                            ),
+                        modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp),
                     )
                 }
 
@@ -163,15 +169,13 @@ fun DownloadSettingsScreen(
                     CompletedDownloadRow(
                         download = download,
                         onDelete = viewModel::deleteDownload,
-                        formatSize = viewModel::formatStorageSize
+                        formatSize = viewModel::formatStorageSize,
                     )
                 }
             }
 
             if (uiState.activeDownloads.isEmpty() && uiState.completedDownloads.isEmpty()) {
-                item {
-                    EmptyDownloadsState()
-                }
+                item { EmptyDownloadsState() }
             }
         }
     }
@@ -187,7 +191,7 @@ fun StatusHub(
     deviceStats: DownloadsViewModel.DeviceStorageStats?,
     onWifiOnlyChanged: (Boolean) -> Unit,
     formatSize: (Long) -> String,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Surface(
         modifier = modifier.fillMaxWidth(),
@@ -197,12 +201,9 @@ fun StatusHub(
         Column(modifier = Modifier.padding(20.dp)) {
             Row(
                 verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier.fillMaxWidth()
+                modifier = Modifier.fillMaxWidth(),
             ) {
-                Box(
-                    contentAlignment = Alignment.Center,
-                    modifier = Modifier.size(72.dp)
-                ) {
+                Box(contentAlignment = Alignment.Center, modifier = Modifier.size(72.dp)) {
                     CircularProgressIndicator(
                         progress = { 1f },
                         modifier = Modifier.fillMaxSize(),
@@ -215,16 +216,18 @@ fun StatusHub(
                     CircularProgressIndicator(
                         progress = { progress },
                         modifier = Modifier.fillMaxSize(),
-                        color = if (progress > 0.9f) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primary,
+                        color =
+                            if (progress > 0.9f) MaterialTheme.colorScheme.error
+                            else MaterialTheme.colorScheme.primary,
                         strokeWidth = 6.dp,
-                        strokeCap = StrokeCap.Round
+                        strokeCap = StrokeCap.Round,
                     )
 
                     Icon(
                         painter = painterResource(id = R.drawable.ic_storage),
                         contentDescription = null,
                         tint = MaterialTheme.colorScheme.primary,
-                        modifier = Modifier.size(24.dp)
+                        modifier = Modifier.size(24.dp),
                     )
                 }
 
@@ -234,41 +237,43 @@ fun StatusHub(
                     Text(
                         text = stringResource(R.string.storage_this_server),
                         style = MaterialTheme.typography.labelMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
                     Text(
                         text = formatSize(totalStorageUsed),
-                        style = MaterialTheme.typography.headlineLarge.copy(
-                            fontWeight = FontWeight.Bold,
-                            fontSize = 32.sp,
-                            letterSpacing = (-1).sp
-                        ),
-                        color = MaterialTheme.colorScheme.onSurface
+                        style =
+                            MaterialTheme.typography.headlineLarge.copy(
+                                fontWeight = FontWeight.Bold,
+                                fontSize = 32.sp,
+                                letterSpacing = (-1).sp,
+                            ),
+                        color = MaterialTheme.colorScheme.onSurface,
                     )
 
                     if (totalStorageUsedAllServers > totalStorageUsed) {
                         Text(
-                            text = stringResource(
-                                R.string.storage_all_servers_fmt,
-                                formatSize(totalStorageUsedAllServers)
-                            ),
-                            style = MaterialTheme.typography.bodySmall.copy(
-                                fontWeight = FontWeight.Medium
-                            ),
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                            text =
+                                stringResource(
+                                    R.string.storage_all_servers_fmt,
+                                    formatSize(totalStorageUsedAllServers),
+                                ),
+                            style =
+                                MaterialTheme.typography.bodySmall.copy(
+                                    fontWeight = FontWeight.Medium
+                                ),
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
 
                     val freeSpaceText = deviceStats?.freeBytes?.let { formatSize(it) } ?: "..."
                     Text(
                         text = stringResource(R.string.storage_free_on_device_fmt, freeSpaceText),
-                        style = MaterialTheme.typography.bodySmall.copy(
-                            fontWeight = FontWeight.Medium
-                        ),
-                        color = if ((deviceStats?.usagePercentage ?: 0f) > 0.9f)
-                            MaterialTheme.colorScheme.error
-                        else
-                            MaterialTheme.colorScheme.onSurfaceVariant
+                        style =
+                            MaterialTheme.typography.bodySmall.copy(fontWeight = FontWeight.Medium),
+                        color =
+                            if ((deviceStats?.usagePercentage ?: 0f) > 0.9f)
+                                MaterialTheme.colorScheme.error
+                            else MaterialTheme.colorScheme.onSurfaceVariant,
                     )
                 }
             }
@@ -280,29 +285,43 @@ fun StatusHub(
             Row(
                 modifier = Modifier.fillMaxWidth(),
                 horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically
+                verticalAlignment = Alignment.CenterVertically,
             ) {
                 Surface(
                     shape = RoundedCornerShape(100),
-                    color = if (isOffline) MaterialTheme.colorScheme.tertiaryContainer else MaterialTheme.colorScheme.secondaryContainer
+                    color =
+                        if (isOffline) MaterialTheme.colorScheme.tertiaryContainer
+                        else MaterialTheme.colorScheme.secondaryContainer,
                 ) {
                     Row(
                         verticalAlignment = Alignment.CenterVertically,
-                        modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp)
+                        modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
                     ) {
                         Icon(
-                            painter = painterResource(id = if (isOffline) R.drawable.ic_wifi_off else R.drawable.ic_wifi),
+                            painter =
+                                painterResource(
+                                    id =
+                                        if (isOffline) R.drawable.ic_wifi_off
+                                        else R.drawable.ic_wifi
+                                ),
                             contentDescription = null,
                             modifier = Modifier.size(16.dp),
-                            tint = if (isOffline) MaterialTheme.colorScheme.onTertiaryContainer else MaterialTheme.colorScheme.onSecondaryContainer
+                            tint =
+                                if (isOffline) MaterialTheme.colorScheme.onTertiaryContainer
+                                else MaterialTheme.colorScheme.onSecondaryContainer,
                         )
                         Spacer(modifier = Modifier.width(8.dp))
                         Text(
-                            text = if (isOffline) stringResource(R.string.network_status_offline) else stringResource(
-                                R.string.network_status_online
-                            ),
-                            style = MaterialTheme.typography.labelLarge.copy(fontWeight = FontWeight.Bold),
-                            color = if (isOffline) MaterialTheme.colorScheme.onTertiaryContainer else MaterialTheme.colorScheme.onSecondaryContainer
+                            text =
+                                if (isOffline) stringResource(R.string.network_status_offline)
+                                else stringResource(R.string.network_status_online),
+                            style =
+                                MaterialTheme.typography.labelLarge.copy(
+                                    fontWeight = FontWeight.Bold
+                                ),
+                            color =
+                                if (isOffline) MaterialTheme.colorScheme.onTertiaryContainer
+                                else MaterialTheme.colorScheme.onSecondaryContainer,
                         )
                     }
                 }
@@ -310,21 +329,26 @@ fun StatusHub(
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Text(
                         text = stringResource(R.string.pref_download_wifi_only_title),
-                        style = MaterialTheme.typography.labelLarge.copy(fontWeight = FontWeight.Medium),
+                        style =
+                            MaterialTheme.typography.labelLarge.copy(
+                                fontWeight = FontWeight.Medium
+                            ),
                         color = MaterialTheme.colorScheme.onSurfaceVariant,
-                        modifier = Modifier.padding(end = 8.dp)
+                        modifier = Modifier.padding(end = 8.dp),
                     )
                     Switch(
                         checked = wifiOnly,
                         onCheckedChange = onWifiOnlyChanged,
                         modifier = Modifier.scale(0.8f),
-                        colors = SwitchDefaults.colors(
-                            checkedThumbColor = MaterialTheme.colorScheme.onPrimary,
-                            checkedTrackColor = MaterialTheme.colorScheme.primary,
-                            uncheckedThumbColor = MaterialTheme.colorScheme.outline,
-                            uncheckedTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
-                            uncheckedBorderColor = MaterialTheme.colorScheme.outline
-                        ),
+                        colors =
+                            SwitchDefaults.colors(
+                                checkedThumbColor = MaterialTheme.colorScheme.onPrimary,
+                                checkedTrackColor = MaterialTheme.colorScheme.primary,
+                                uncheckedThumbColor = MaterialTheme.colorScheme.outline,
+                                uncheckedTrackColor =
+                                    MaterialTheme.colorScheme.surfaceContainerHighest,
+                                uncheckedBorderColor = MaterialTheme.colorScheme.outline,
+                            ),
                     )
                 }
             }
@@ -339,53 +363,52 @@ fun ActiveDownloadCard(
     onResume: (UUID) -> Unit,
     onCancel: (UUID) -> Unit,
     formatSize: (Long) -> String,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Surface(
         modifier = modifier.fillMaxWidth(),
         shape = RoundedCornerShape(20.dp),
         color = MaterialTheme.colorScheme.surfaceContainer,
-        tonalElevation = 4.dp
+        tonalElevation = 4.dp,
     ) {
-        Column(
-            modifier = Modifier.padding(16.dp)
-        ) {
+        Column(modifier = Modifier.padding(16.dp)) {
             Row(
                 modifier = Modifier.fillMaxWidth(),
                 horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.Top
+                verticalAlignment = Alignment.Top,
             ) {
-                Column(
-                    modifier = Modifier
-                        .weight(1f)
-                        .padding(end = 16.dp)
-                ) {
+                Column(modifier = Modifier.weight(1f).padding(end = 16.dp)) {
                     Text(
                         text = download.itemName,
-                        style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),
+                        style =
+                            MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),
                         maxLines = 1,
-                        overflow = TextOverflow.Ellipsis
+                        overflow = TextOverflow.Ellipsis,
                     )
                     Text(
                         text = download.sourceName,
                         style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.primary
+                        color = MaterialTheme.colorScheme.primary,
                     )
                 }
 
                 Surface(
                     shape = RoundedCornerShape(8.dp),
-                    color = MaterialTheme.colorScheme.surfaceContainerHighest
+                    color = MaterialTheme.colorScheme.surfaceContainerHighest,
                 ) {
                     Text(
-                        text = stringResource(
-                            R.string.download_progress_size_fmt,
-                            formatSize(download.bytesDownloaded),
-                            formatSize(download.totalBytes)
-                        ),
-                        style = MaterialTheme.typography.labelSmall.copy(fontFamily = FontFamily.Monospace),
+                        text =
+                            stringResource(
+                                R.string.download_progress_size_fmt,
+                                formatSize(download.bytesDownloaded),
+                                formatSize(download.totalBytes),
+                            ),
+                        style =
+                            MaterialTheme.typography.labelSmall.copy(
+                                fontFamily = FontFamily.Monospace
+                            ),
                         modifier = Modifier.padding(horizontal = 6.dp, vertical = 4.dp),
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
                 }
             }
@@ -395,11 +418,11 @@ fun ActiveDownloadCard(
             Row(verticalAlignment = Alignment.CenterVertically) {
                 LinearProgressIndicator(
                     progress = { download.progress },
-                    modifier = Modifier
-                        .weight(1f)
-                        .height(12.dp)
-                        .clip(RoundedCornerShape(6.dp)),
-                    color = if (download.status == DownloadStatus.FAILED) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primary,
+                    modifier = Modifier.weight(1f).height(12.dp).clip(RoundedCornerShape(6.dp)),
+                    color =
+                        if (download.status == DownloadStatus.FAILED)
+                            MaterialTheme.colorScheme.error
+                        else MaterialTheme.colorScheme.primary,
                     trackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
                     strokeCap = StrokeCap.Round,
                 )
@@ -410,47 +433,60 @@ fun ActiveDownloadCard(
             Row(
                 modifier = Modifier.fillMaxWidth(),
                 horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically
+                verticalAlignment = Alignment.CenterVertically,
             ) {
                 Text(
-                    text = when (download.status) {
-                        DownloadStatus.QUEUED -> stringResource(R.string.download_status_queued).uppercase()
-                        DownloadStatus.DOWNLOADING -> stringResource(R.string.download_status_downloading).uppercase()
-                        DownloadStatus.PAUSED -> stringResource(R.string.download_status_paused).uppercase()
-                        DownloadStatus.FAILED -> stringResource(
-                            R.string.download_status_failed_fmt,
-                            download.error ?: ""
-                        ).uppercase()
-
-                        else -> ""
-                    },
+                    text =
+                        when (download.status) {
+                            DownloadStatus.QUEUED ->
+                                stringResource(R.string.download_status_queued).uppercase()
+                            DownloadStatus.DOWNLOADING ->
+                                stringResource(R.string.download_status_downloading).uppercase()
+                            DownloadStatus.PAUSED ->
+                                stringResource(R.string.download_status_paused).uppercase()
+                            DownloadStatus.FAILED ->
+                                stringResource(
+                                        R.string.download_status_failed_fmt,
+                                        download.error ?: "",
+                                    )
+                                    .uppercase()
+
+                            else -> ""
+                        },
                     style = MaterialTheme.typography.labelSmall.copy(fontWeight = FontWeight.Bold),
-                    color = if (download.status == DownloadStatus.FAILED) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.onSurfaceVariant.copy(
-                        alpha = 0.7f
-                    )
+                    color =
+                        if (download.status == DownloadStatus.FAILED)
+                            MaterialTheme.colorScheme.error
+                        else MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f),
                 )
 
                 Row {
-                    if (download.status == DownloadStatus.DOWNLOADING || download.status == DownloadStatus.QUEUED) {
+                    if (
+                        download.status == DownloadStatus.DOWNLOADING ||
+                            download.status == DownloadStatus.QUEUED
+                    ) {
                         IconButton(
                             onClick = { onPause(download.id) },
-                            modifier = Modifier.size(32.dp)
+                            modifier = Modifier.size(32.dp),
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_pause_outline),
                                 contentDescription = null,
-                                tint = MaterialTheme.colorScheme.primary
+                                tint = MaterialTheme.colorScheme.primary,
                             )
                         }
-                    } else if (download.status == DownloadStatus.PAUSED || download.status == DownloadStatus.FAILED) {
+                    } else if (
+                        download.status == DownloadStatus.PAUSED ||
+                            download.status == DownloadStatus.FAILED
+                    ) {
                         IconButton(
                             onClick = { onResume(download.id) },
-                            modifier = Modifier.size(32.dp)
+                            modifier = Modifier.size(32.dp),
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_play_arrow),
                                 contentDescription = null,
-                                tint = MaterialTheme.colorScheme.primary
+                                tint = MaterialTheme.colorScheme.primary,
                             )
                         }
                     }
@@ -459,12 +495,12 @@ fun ActiveDownloadCard(
 
                     IconButton(
                         onClick = { onCancel(download.id) },
-                        modifier = Modifier.size(32.dp)
+                        modifier = Modifier.size(32.dp),
                     ) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_cancel),
                             contentDescription = null,
-                            tint = MaterialTheme.colorScheme.onSurfaceVariant
+                            tint = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
                 }
@@ -477,7 +513,7 @@ fun ActiveDownloadCard(
 fun CompletedDownloadRow(
     download: DownloadInfo,
     onDelete: (UUID) -> Unit,
-    formatSize: (Long) -> String
+    formatSize: (Long) -> String,
 ) {
     ListItem(
         headlineContent = {
@@ -485,28 +521,28 @@ fun CompletedDownloadRow(
                 text = download.itemName,
                 style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium),
                 maxLines = 1,
-                overflow = TextOverflow.Ellipsis
+                overflow = TextOverflow.Ellipsis,
             )
         },
         supportingContent = {
             Text(
                 text = formatSize(download.totalBytes),
                 style = MaterialTheme.typography.bodySmall,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
             )
         },
         leadingContent = {
             Surface(
                 shape = CircleShape,
                 color = MaterialTheme.colorScheme.secondaryContainer,
-                modifier = Modifier.size(40.dp)
+                modifier = Modifier.size(40.dp),
             ) {
                 Box(contentAlignment = Alignment.Center) {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_check),
                         contentDescription = null,
                         modifier = Modifier.size(20.dp),
-                        tint = MaterialTheme.colorScheme.onSecondaryContainer
+                        tint = MaterialTheme.colorScheme.onSecondaryContainer,
                     )
                 }
             }
@@ -517,11 +553,11 @@ fun CompletedDownloadRow(
                     painter = painterResource(id = R.drawable.ic_delete),
                     contentDescription = null,
                     tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.6f),
-                    modifier = Modifier.size(20.dp)
+                    modifier = Modifier.size(20.dp),
                 )
             }
         },
-        colors = ListItemDefaults.colors(containerColor = Color.Transparent)
+        colors = ListItemDefaults.colors(containerColor = Color.Transparent),
     )
 }
 
@@ -532,30 +568,28 @@ fun SectionHeader(title: String, modifier: Modifier = Modifier) {
         style = MaterialTheme.typography.titleSmall,
         color = MaterialTheme.colorScheme.primary,
         fontWeight = FontWeight.Bold,
-        modifier = modifier
+        modifier = modifier,
     )
 }
 
 @Composable
 fun EmptyDownloadsState() {
     Column(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(top = 64.dp),
+        modifier = Modifier.fillMaxWidth().padding(top = 64.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center
+        verticalArrangement = Arrangement.Center,
     ) {
         Surface(
             shape = CircleShape,
             color = MaterialTheme.colorScheme.surfaceContainerHighest.copy(alpha = 0.5f),
-            modifier = Modifier.size(120.dp)
+            modifier = Modifier.size(120.dp),
         ) {
             Box(contentAlignment = Alignment.Center) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_download),
                     contentDescription = null,
                     modifier = Modifier.size(48.dp),
-                    tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.4f)
+                    tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.4f),
                 )
             }
         }
@@ -563,14 +597,14 @@ fun EmptyDownloadsState() {
         Text(
             text = stringResource(R.string.empty_downloads_title),
             style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),
-            color = MaterialTheme.colorScheme.onSurface
+            color = MaterialTheme.colorScheme.onSurface,
         )
         Text(
             text = stringResource(R.string.empty_downloads_message),
             style = MaterialTheme.typography.bodyMedium,
             color = MaterialTheme.colorScheme.onSurfaceVariant,
             textAlign = TextAlign.Center,
-            modifier = Modifier.padding(top = 8.dp)
+            modifier = Modifier.padding(top = 8.dp),
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/settings/player/PlayerOptionsScreen.kt b/app/src/main/java/com/makd/afinity/ui/settings/player/PlayerOptionsScreen.kt
index f41856f7d..4d0bb6655 100644
--- a/app/src/main/java/com/makd/afinity/ui/settings/player/PlayerOptionsScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/settings/player/PlayerOptionsScreen.kt
@@ -84,16 +84,16 @@ import com.makd.afinity.data.models.player.VideoZoomMode
 import com.makd.afinity.di.PreferencesEntryPoint
 import com.makd.afinity.ui.settings.SettingsViewModel
 import dagger.hilt.android.EntryPointAccessors
+import java.util.Locale
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import java.util.Locale
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun PlayerOptionsScreen(
     onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
-    viewModel: SettingsViewModel = hiltViewModel()
+    viewModel: SettingsViewModel = hiltViewModel(),
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val scope = rememberCoroutineScope()
@@ -101,12 +101,15 @@ fun PlayerOptionsScreen(
     val context = LocalContext.current
     val preferencesRepository = remember {
         EntryPointAccessors.fromApplication(
-            context.applicationContext,
-            PreferencesEntryPoint::class.java
-        ).preferencesRepository()
+                context.applicationContext,
+                PreferencesEntryPoint::class.java,
+            )
+            .preferencesRepository()
     }
-    val subtitlePrefs by preferencesRepository.getSubtitlePreferencesFlow()
-        .collectAsStateWithLifecycle(initialValue = SubtitlePreferences.DEFAULT)
+    val subtitlePrefs by
+        preferencesRepository
+            .getSubtitlePreferencesFlow()
+            .collectAsStateWithLifecycle(initialValue = SubtitlePreferences.DEFAULT)
 
     Scaffold(
         topBar = {
@@ -114,33 +117,33 @@ fun PlayerOptionsScreen(
                 title = {
                     Text(
                         text = stringResource(R.string.player_options_title),
-                        style = MaterialTheme.typography.headlineMedium.copy(
-                            fontWeight = FontWeight.Bold
-                        )
+                        style =
+                            MaterialTheme.typography.headlineMedium.copy(
+                                fontWeight = FontWeight.Bold
+                            ),
                     )
                 },
                 navigationIcon = {
                     IconButton(onClick = onBackClick) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_chevron_left),
-                            contentDescription = stringResource(R.string.cd_back)
+                            contentDescription = stringResource(R.string.cd_back),
                         )
                     }
                 },
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.surface
-                )
+                colors =
+                    TopAppBarDefaults.topAppBarColors(
+                        containerColor = MaterialTheme.colorScheme.surface
+                    ),
             )
         },
         containerColor = MaterialTheme.colorScheme.surface,
-        modifier = modifier.fillMaxSize()
+        modifier = modifier.fillMaxSize(),
     ) { innerPadding ->
         LazyColumn(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(innerPadding),
+            modifier = Modifier.fillMaxSize().padding(innerPadding),
             contentPadding = PaddingValues(vertical = 16.dp),
-            verticalArrangement = Arrangement.spacedBy(24.dp)
+            verticalArrangement = Arrangement.spacedBy(24.dp),
         ) {
             item {
                 SettingsGroup(title = stringResource(R.string.pref_group_engine)) {
@@ -149,7 +152,7 @@ fun PlayerOptionsScreen(
                         title = stringResource(R.string.pref_use_exoplayer_title),
                         subtitle = stringResource(R.string.pref_use_exoplayer_summary),
                         checked = uiState.useExoPlayer,
-                        onCheckedChange = viewModel::toggleUseExoPlayer
+                        onCheckedChange = viewModel::toggleUseExoPlayer,
                     )
                     SettingsDivider()
                     SettingsSwitchItem(
@@ -157,7 +160,7 @@ fun PlayerOptionsScreen(
                         title = stringResource(R.string.pref_autoplay_title),
                         subtitle = stringResource(R.string.pref_autoplay_summary),
                         checked = uiState.autoPlay,
-                        onCheckedChange = viewModel::toggleAutoPlay
+                        onCheckedChange = viewModel::toggleAutoPlay,
                     )
                 }
             }
@@ -166,11 +169,11 @@ fun PlayerOptionsScreen(
                 AnimatedVisibility(
                     visible = !uiState.useExoPlayer,
                     enter = fadeIn() + expandVertically(),
-                    exit = fadeOut() + shrinkVertically()
+                    exit = fadeOut() + shrinkVertically(),
                 ) {
                     SettingsGroup(
                         title = stringResource(R.string.pref_group_mpv),
-                        modifier = Modifier.padding(bottom = 24.dp)
+                        modifier = Modifier.padding(bottom = 24.dp),
                     ) {
                         SubtitleDropdownItem(
                             title = stringResource(R.string.pref_mpv_hwdec_title),
@@ -178,7 +181,7 @@ fun PlayerOptionsScreen(
                             options = MpvHwDec.entries.toList(),
                             onValueChange = viewModel::setMpvHwDec,
                             labelProvider = { it.getDisplayName() },
-                            icon = painterResource(id = R.drawable.ic_cpu)
+                            icon = painterResource(id = R.drawable.ic_cpu),
                         )
                         SettingsDivider()
                         SubtitleDropdownItem(
@@ -187,7 +190,7 @@ fun PlayerOptionsScreen(
                             options = MpvVideoOutput.entries.toList(),
                             onValueChange = viewModel::setMpvVideoOutput,
                             labelProvider = { it.getDisplayName() },
-                            icon = painterResource(id = R.drawable.ic_video_settings)
+                            icon = painterResource(id = R.drawable.ic_video_settings),
                         )
                         SettingsDivider()
                         SubtitleDropdownItem(
@@ -196,7 +199,7 @@ fun PlayerOptionsScreen(
                             options = MpvAudioOutput.entries.toList(),
                             onValueChange = viewModel::setMpvAudioOutput,
                             labelProvider = { it.getDisplayName() },
-                            icon = painterResource(id = R.drawable.ic_audio)
+                            icon = painterResource(id = R.drawable.ic_audio),
                         )
                     }
                 }
@@ -209,15 +212,16 @@ fun PlayerOptionsScreen(
                         subtitle = stringResource(R.string.pref_preferred_audio_language_summary),
                         selectedCode = uiState.preferredAudioLanguage,
                         onLanguageSelected = viewModel::setPreferredAudioLanguage,
-                        icon = painterResource(id = R.drawable.ic_language)
+                        icon = painterResource(id = R.drawable.ic_language),
                     )
                     SettingsDivider()
                     LanguageSelectorItem(
                         title = stringResource(R.string.pref_preferred_subtitle_language_title),
-                        subtitle = stringResource(R.string.pref_preferred_subtitle_language_summary),
+                        subtitle =
+                            stringResource(R.string.pref_preferred_subtitle_language_summary),
                         selectedCode = uiState.preferredSubtitleLanguage,
                         onLanguageSelected = viewModel::setPreferredSubtitleLanguage,
-                        icon = painterResource(id = R.drawable.ic_subtitles)
+                        icon = painterResource(id = R.drawable.ic_subtitles),
                     )
                 }
             }
@@ -229,7 +233,7 @@ fun PlayerOptionsScreen(
                         title = stringResource(R.string.pref_pip_gesture_title),
                         subtitle = stringResource(R.string.pref_pip_gesture_summary),
                         checked = uiState.pipGestureEnabled,
-                        onCheckedChange = viewModel::togglePipGesture
+                        onCheckedChange = viewModel::togglePipGesture,
                     )
                     SettingsDivider()
                     SettingsSwitchItem(
@@ -237,7 +241,7 @@ fun PlayerOptionsScreen(
                         title = stringResource(R.string.pref_pip_background_title),
                         subtitle = stringResource(R.string.pref_pip_background_summary),
                         checked = uiState.pipBackgroundPlay,
-                        onCheckedChange = viewModel::togglePipBackgroundPlay
+                        onCheckedChange = viewModel::togglePipBackgroundPlay,
                     )
                 }
             }
@@ -249,7 +253,7 @@ fun PlayerOptionsScreen(
                         title = stringResource(R.string.pref_skip_intro_title),
                         subtitle = stringResource(R.string.pref_skip_intro_summary),
                         checked = uiState.skipIntroEnabled,
-                        onCheckedChange = viewModel::toggleSkipIntro
+                        onCheckedChange = viewModel::toggleSkipIntro,
                     )
                     SettingsDivider()
                     SettingsSwitchItem(
@@ -257,7 +261,7 @@ fun PlayerOptionsScreen(
                         title = stringResource(R.string.pref_skip_outro_title),
                         subtitle = stringResource(R.string.pref_skip_outro_summary),
                         checked = uiState.skipOutroEnabled,
-                        onCheckedChange = viewModel::toggleSkipOutro
+                        onCheckedChange = viewModel::toggleSkipOutro,
                     )
                     SettingsDivider()
                     SettingsSwitchItem(
@@ -265,12 +269,12 @@ fun PlayerOptionsScreen(
                         title = stringResource(R.string.pref_autohide_logo_title),
                         subtitle = stringResource(R.string.pref_autohide_logo_summary),
                         checked = uiState.logoAutoHide,
-                        onCheckedChange = viewModel::toggleLogoAutoHide
+                        onCheckedChange = viewModel::toggleLogoAutoHide,
                     )
                     SettingsDivider()
                     VideoZoomModeSelectorItem(
                         selectedMode = uiState.defaultVideoZoomMode,
-                        onModeSelected = viewModel::setDefaultVideoZoomMode
+                        onModeSelected = viewModel::setDefaultVideoZoomMode,
                     )
                 }
             }
@@ -280,7 +284,7 @@ fun PlayerOptionsScreen(
                     Box(modifier = Modifier.padding(16.dp)) {
                         SubtitlePreview(
                             subtitlePrefs = subtitlePrefs,
-                            useExoPlayer = uiState.useExoPlayer
+                            useExoPlayer = uiState.useExoPlayer,
                         )
                     }
 
@@ -293,7 +297,7 @@ fun PlayerOptionsScreen(
                             scope.launch(Dispatchers.IO) {
                                 preferencesRepository.setSubtitlePreferences(updatedPrefs)
                             }
-                        }
+                        },
                     )
                 }
             }
@@ -305,30 +309,24 @@ fun PlayerOptionsScreen(
 private fun SettingsGroup(
     title: String? = null,
     modifier: Modifier = Modifier,
-    content: @Composable ColumnScope.() -> Unit
+    content: @Composable ColumnScope.() -> Unit,
 ) {
-    Column(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(horizontal = 16.dp)
-    ) {
+    Column(modifier = modifier.fillMaxWidth().padding(horizontal = 16.dp)) {
         if (title != null) {
             Text(
                 text = title,
                 style = MaterialTheme.typography.titleSmall,
                 color = MaterialTheme.colorScheme.primary,
                 fontWeight = FontWeight.Bold,
-                modifier = Modifier.padding(start = 16.dp, bottom = 8.dp)
+                modifier = Modifier.padding(start = 16.dp, bottom = 8.dp),
             )
         }
         Surface(
             shape = RoundedCornerShape(24.dp),
             color = MaterialTheme.colorScheme.surfaceContainerLow,
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth(),
         ) {
-            Column(modifier = Modifier.padding(vertical = 4.dp)) {
-                content()
-            }
+            Column(modifier = Modifier.padding(vertical = 4.dp)) { content() }
         }
     }
 }
@@ -337,7 +335,7 @@ private fun SettingsGroup(
 private fun SettingsDivider() {
     HorizontalDivider(
         modifier = Modifier.padding(start = 56.dp, end = 16.dp),
-        color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f)
+        color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f),
     )
 }
 
@@ -348,33 +346,31 @@ private fun SettingsItem(
     subtitle: String? = null,
     onClick: (() -> Unit)? = null,
     modifier: Modifier = Modifier,
-    trailing: @Composable (() -> Unit)? = null
+    trailing: @Composable (() -> Unit)? = null,
 ) {
     Row(
-        modifier = modifier
-            .fillMaxWidth()
-            .then(if (onClick != null) Modifier.clickable(onClick = onClick) else Modifier)
-            .padding(horizontal = 16.dp, vertical = 16.dp),
-        verticalAlignment = Alignment.CenterVertically
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .then(if (onClick != null) Modifier.clickable(onClick = onClick) else Modifier)
+                .padding(horizontal = 16.dp, vertical = 16.dp),
+        verticalAlignment = Alignment.CenterVertically,
     ) {
         if (icon != null) {
             Icon(
                 painter = icon,
                 contentDescription = null,
                 tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                modifier = Modifier.size(24.dp)
+                modifier = Modifier.size(24.dp),
             )
             Spacer(modifier = Modifier.width(16.dp))
         }
 
-        Column(
-            modifier = Modifier.weight(1f),
-            verticalArrangement = Arrangement.Center
-        ) {
+        Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center) {
             Text(
                 text = title,
                 style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium),
-                color = MaterialTheme.colorScheme.onSurface
+                color = MaterialTheme.colorScheme.onSurface,
             )
             if (subtitle != null) {
                 Text(
@@ -383,7 +379,7 @@ private fun SettingsItem(
                     color = MaterialTheme.colorScheme.onSurfaceVariant,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
-                    modifier = Modifier.padding(top = 2.dp)
+                    modifier = Modifier.padding(top = 2.dp),
                 )
             }
         }
@@ -395,7 +391,7 @@ private fun SettingsItem(
                 painter = painterResource(id = R.drawable.ic_chevron_right),
                 contentDescription = null,
                 tint = MaterialTheme.colorScheme.outline.copy(alpha = 0.5f),
-                modifier = Modifier.size(20.dp)
+                modifier = Modifier.size(20.dp),
             )
         }
     }
@@ -409,38 +405,40 @@ private fun SettingsSwitchItem(
     checked: Boolean,
     onCheckedChange: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
-    enabled: Boolean = true
+    enabled: Boolean = true,
 ) {
     SettingsItem(
         icon = icon,
         title = title,
         subtitle = subtitle,
-        onClick = if (enabled) {
-            { onCheckedChange(!checked) }
-        } else null,
+        onClick =
+            if (enabled) {
+                { onCheckedChange(!checked) }
+            } else null,
         modifier = modifier,
         trailing = {
             Switch(
                 checked = checked,
                 onCheckedChange = onCheckedChange,
                 enabled = enabled,
-                colors = SwitchDefaults.colors(
-                    checkedThumbColor = MaterialTheme.colorScheme.onPrimary,
-                    checkedTrackColor = MaterialTheme.colorScheme.primary,
-                    uncheckedThumbColor = MaterialTheme.colorScheme.outline,
-                    uncheckedTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
-                    uncheckedBorderColor = MaterialTheme.colorScheme.outline
-                ),
-                modifier = Modifier.scale(0.8f)
+                colors =
+                    SwitchDefaults.colors(
+                        checkedThumbColor = MaterialTheme.colorScheme.onPrimary,
+                        checkedTrackColor = MaterialTheme.colorScheme.primary,
+                        uncheckedThumbColor = MaterialTheme.colorScheme.outline,
+                        uncheckedTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
+                        uncheckedBorderColor = MaterialTheme.colorScheme.outline,
+                    ),
+                modifier = Modifier.scale(0.8f),
             )
-        }
+        },
     )
 }
 
 @Composable
 private fun VideoZoomModeSelectorItem(
     selectedMode: VideoZoomMode,
-    onModeSelected: (VideoZoomMode) -> Unit
+    onModeSelected: (VideoZoomMode) -> Unit,
 ) {
     var expanded by remember { mutableStateOf(false) }
     val modes = listOf(VideoZoomMode.FIT, VideoZoomMode.ZOOM, VideoZoomMode.STRETCH)
@@ -456,15 +454,15 @@ private fun VideoZoomModeSelectorItem(
                     painter = painterResource(id = R.drawable.ic_keyboard_arrow_down),
                     contentDescription = null,
                     tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                    modifier = Modifier.size(24.dp)
+                    modifier = Modifier.size(24.dp),
                 )
-            }
+            },
         )
 
         DropdownMenu(
             expanded = expanded,
             onDismissRequest = { expanded = false },
-            modifier = Modifier.background(MaterialTheme.colorScheme.surfaceContainerHigh)
+            modifier = Modifier.background(MaterialTheme.colorScheme.surfaceContainerHigh),
         ) {
             modes.forEach { mode ->
                 DropdownMenuItem(
@@ -473,15 +471,16 @@ private fun VideoZoomModeSelectorItem(
                         onModeSelected(mode)
                         expanded = false
                     },
-                    leadingIcon = if (selectedMode == mode) {
-                        {
-                            Icon(
-                                painter = painterResource(id = R.drawable.ic_check),
-                                contentDescription = null,
-                                tint = MaterialTheme.colorScheme.primary
-                            )
-                        }
-                    } else null
+                    leadingIcon =
+                        if (selectedMode == mode) {
+                            {
+                                Icon(
+                                    painter = painterResource(id = R.drawable.ic_check),
+                                    contentDescription = null,
+                                    tint = MaterialTheme.colorScheme.primary,
+                                )
+                            }
+                        } else null,
                 )
             }
         }
@@ -492,12 +491,12 @@ private fun VideoZoomModeSelectorItem(
 private fun SubtitleCustomizationContent(
     subtitlePrefs: SubtitlePreferences,
     useExoPlayer: Boolean,
-    onUpdate: (SubtitlePreferences) -> Unit
+    onUpdate: (SubtitlePreferences) -> Unit,
 ) {
     ColorPickerItem(
         title = stringResource(R.string.pref_sub_text_color),
         color = subtitlePrefs.textColor,
-        onColorChange = { onUpdate(subtitlePrefs.copy(textColor = it)) }
+        onColorChange = { onUpdate(subtitlePrefs.copy(textColor = it)) },
     )
 
     SettingsDivider()
@@ -506,7 +505,7 @@ private fun SubtitleCustomizationContent(
         title = stringResource(R.string.pref_sub_text_size),
         value = subtitlePrefs.textSize,
         valueRange = 0.5f..2.0f,
-        onValueChange = { onUpdate(subtitlePrefs.copy(textSize = it)) }
+        onValueChange = { onUpdate(subtitlePrefs.copy(textSize = it)) },
     )
 
     SettingsDivider()
@@ -516,13 +515,13 @@ private fun SubtitleCustomizationContent(
         title = stringResource(R.string.pref_sub_bold),
         subtitle = stringResource(R.string.pref_sub_bold_summary),
         checked = subtitlePrefs.bold,
-        onCheckedChange = { onUpdate(subtitlePrefs.copy(bold = it)) }
+        onCheckedChange = { onUpdate(subtitlePrefs.copy(bold = it)) },
     )
 
     AnimatedVisibility(
         visible = !useExoPlayer,
         enter = fadeIn() + expandVertically(),
-        exit = fadeOut() + shrinkVertically()
+        exit = fadeOut() + shrinkVertically(),
     ) {
         Column {
             SettingsDivider()
@@ -531,7 +530,7 @@ private fun SubtitleCustomizationContent(
                 title = stringResource(R.string.pref_sub_italic),
                 subtitle = stringResource(R.string.pref_sub_italic_summary),
                 checked = subtitlePrefs.italic,
-                onCheckedChange = { onUpdate(subtitlePrefs.copy(italic = it)) }
+                onCheckedChange = { onUpdate(subtitlePrefs.copy(italic = it)) },
             )
         }
     }
@@ -541,45 +540,48 @@ private fun SubtitleCustomizationContent(
     SubtitleDropdownItem(
         title = stringResource(R.string.pref_sub_outline_style),
         selectedOption = subtitlePrefs.outlineStyle,
-        options = SubtitleOutlineStyle.entries.filter { style ->
-            when (style) {
-                SubtitleOutlineStyle.BACKGROUND_BOX -> !useExoPlayer
-                SubtitleOutlineStyle.RAISED, SubtitleOutlineStyle.DEPRESSED -> useExoPlayer
-                else -> true
-            }
-        },
+        options =
+            SubtitleOutlineStyle.entries.filter { style ->
+                when (style) {
+                    SubtitleOutlineStyle.BACKGROUND_BOX -> !useExoPlayer
+                    SubtitleOutlineStyle.RAISED,
+                    SubtitleOutlineStyle.DEPRESSED -> useExoPlayer
+                    else -> true
+                }
+            },
         onValueChange = { style -> onUpdate(subtitlePrefs.copy(outlineStyle = style)) },
         labelProvider = { getSubtitleOutlineStyleDisplayName(it) },
-        icon = painterResource(id = R.drawable.ic_texture)
+        icon = painterResource(id = R.drawable.ic_texture),
     )
 
     AnimatedVisibility(
-        visible = subtitlePrefs.outlineStyle == SubtitleOutlineStyle.OUTLINE ||
+        visible =
+            subtitlePrefs.outlineStyle == SubtitleOutlineStyle.OUTLINE ||
                 subtitlePrefs.outlineStyle == SubtitleOutlineStyle.DROP_SHADOW,
         enter = fadeIn() + expandVertically(),
-        exit = fadeOut() + shrinkVertically()
+        exit = fadeOut() + shrinkVertically(),
     ) {
         Column {
             SettingsDivider()
             ColorPickerItem(
-                title = if (subtitlePrefs.outlineStyle == SubtitleOutlineStyle.DROP_SHADOW)
-                    stringResource(R.string.pref_sub_shadow_color)
-                else
-                    stringResource(R.string.pref_sub_outline_color),
+                title =
+                    if (subtitlePrefs.outlineStyle == SubtitleOutlineStyle.DROP_SHADOW)
+                        stringResource(R.string.pref_sub_shadow_color)
+                    else stringResource(R.string.pref_sub_outline_color),
                 color = subtitlePrefs.outlineColor,
-                onColorChange = { onUpdate(subtitlePrefs.copy(outlineColor = it)) }
+                onColorChange = { onUpdate(subtitlePrefs.copy(outlineColor = it)) },
             )
 
             if (!useExoPlayer) {
                 SettingsDivider()
                 SubtitleSliderItem(
-                    title = if (subtitlePrefs.outlineStyle == SubtitleOutlineStyle.DROP_SHADOW)
-                        stringResource(R.string.pref_sub_shadow_size)
-                    else
-                        stringResource(R.string.pref_sub_outline_size),
+                    title =
+                        if (subtitlePrefs.outlineStyle == SubtitleOutlineStyle.DROP_SHADOW)
+                            stringResource(R.string.pref_sub_shadow_size)
+                        else stringResource(R.string.pref_sub_outline_size),
                     value = subtitlePrefs.outlineSize,
                     valueRange = 0f..10f,
-                    onValueChange = { onUpdate(subtitlePrefs.copy(outlineSize = it)) }
+                    onValueChange = { onUpdate(subtitlePrefs.copy(outlineSize = it)) },
                 )
             }
         }
@@ -588,14 +590,14 @@ private fun SubtitleCustomizationContent(
     AnimatedVisibility(
         visible = subtitlePrefs.outlineStyle == SubtitleOutlineStyle.BACKGROUND_BOX,
         enter = fadeIn() + expandVertically(),
-        exit = fadeOut() + shrinkVertically()
+        exit = fadeOut() + shrinkVertically(),
     ) {
         Column {
             SettingsDivider()
             ColorPickerItem(
                 title = stringResource(R.string.pref_sub_background_color),
                 color = subtitlePrefs.backgroundColor,
-                onColorChange = { onUpdate(subtitlePrefs.copy(backgroundColor = it)) }
+                onColorChange = { onUpdate(subtitlePrefs.copy(backgroundColor = it)) },
             )
         }
     }
@@ -603,14 +605,14 @@ private fun SubtitleCustomizationContent(
     AnimatedVisibility(
         visible = useExoPlayer,
         enter = fadeIn() + expandVertically(),
-        exit = fadeOut() + shrinkVertically()
+        exit = fadeOut() + shrinkVertically(),
     ) {
         Column {
             SettingsDivider()
             ColorPickerItem(
                 title = stringResource(R.string.pref_sub_window_color),
                 color = subtitlePrefs.windowColor,
-                onColorChange = { onUpdate(subtitlePrefs.copy(windowColor = it)) }
+                onColorChange = { onUpdate(subtitlePrefs.copy(windowColor = it)) },
             )
         }
     }
@@ -618,7 +620,7 @@ private fun SubtitleCustomizationContent(
     AnimatedVisibility(
         visible = !useExoPlayer,
         enter = fadeIn() + expandVertically(),
-        exit = fadeOut() + shrinkVertically()
+        exit = fadeOut() + shrinkVertically(),
     ) {
         Column {
             SettingsDivider()
@@ -628,7 +630,7 @@ private fun SubtitleCustomizationContent(
                 options = SubtitleVerticalPosition.entries,
                 onValueChange = { pos -> onUpdate(subtitlePrefs.copy(verticalPosition = pos)) },
                 labelProvider = { getSubtitleVerticalPositionDisplayName(it) },
-                icon = painterResource(id = R.drawable.ic_vertical)
+                icon = painterResource(id = R.drawable.ic_vertical),
             )
 
             SettingsDivider()
@@ -637,9 +639,11 @@ private fun SubtitleCustomizationContent(
                 title = stringResource(R.string.pref_sub_horizontal_align),
                 selectedOption = subtitlePrefs.horizontalAlignment,
                 options = SubtitleHorizontalAlignment.entries,
-                onValueChange = { align -> onUpdate(subtitlePrefs.copy(horizontalAlignment = align)) },
+                onValueChange = { align ->
+                    onUpdate(subtitlePrefs.copy(horizontalAlignment = align))
+                },
                 labelProvider = { getSubtitleHorizontalAlignmentDisplayName(it) },
-                icon = painterResource(id = R.drawable.ic_horizontal)
+                icon = painterResource(id = R.drawable.ic_horizontal),
             )
         }
     }
@@ -648,12 +652,13 @@ private fun SubtitleCustomizationContent(
         OutlinedButton(
             onClick = { onUpdate(SubtitlePreferences.DEFAULT) },
             modifier = Modifier.fillMaxWidth(),
-            colors = ButtonDefaults.outlinedButtonColors(contentColor = MaterialTheme.colorScheme.error)
+            colors =
+                ButtonDefaults.outlinedButtonColors(contentColor = MaterialTheme.colorScheme.error),
         ) {
             Icon(
                 painter = painterResource(id = R.drawable.ic_refresh),
                 contentDescription = null,
-                modifier = Modifier.size(18.dp)
+                modifier = Modifier.size(18.dp),
             )
             Spacer(modifier = Modifier.width(8.dp))
             Text(stringResource(R.string.action_reset_defaults))
@@ -662,32 +667,28 @@ private fun SubtitleCustomizationContent(
 }
 
 @Composable
-private fun ColorPickerItem(
-    title: String,
-    color: Int,
-    onColorChange: (Int) -> Unit
-) {
+private fun ColorPickerItem(title: String, color: Int, onColorChange: (Int) -> Unit) {
     var showDialog by remember { mutableStateOf(false) }
 
     Row(
-        modifier = Modifier
-            .fillMaxWidth()
-            .clickable { showDialog = true }
-            .padding(horizontal = 16.dp, vertical = 16.dp),
-        verticalAlignment = Alignment.CenterVertically
+        modifier =
+            Modifier.fillMaxWidth()
+                .clickable { showDialog = true }
+                .padding(horizontal = 16.dp, vertical = 16.dp),
+        verticalAlignment = Alignment.CenterVertically,
     ) {
         Box(
-            modifier = Modifier
-                .size(32.dp)
-                .clip(CircleShape)
-                .background(Color(color))
-                .border(1.dp, MaterialTheme.colorScheme.outline, CircleShape)
+            modifier =
+                Modifier.size(32.dp)
+                    .clip(CircleShape)
+                    .background(Color(color))
+                    .border(1.dp, MaterialTheme.colorScheme.outline, CircleShape)
         )
         Spacer(modifier = Modifier.width(16.dp))
         Text(
             text = title,
             style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium),
-            color = MaterialTheme.colorScheme.onSurface
+            color = MaterialTheme.colorScheme.onSurface,
         )
     }
 
@@ -698,7 +699,7 @@ private fun ColorPickerItem(
                 onColorChange(it)
                 showDialog = false
             },
-            onDismiss = { showDialog = false }
+            onDismiss = { showDialog = false },
         )
     }
 }
@@ -708,33 +709,31 @@ private fun SubtitleSliderItem(
     title: String,
     value: Float,
     valueRange: ClosedFloatingPointRange<Float>,
-    onValueChange: (Float) -> Unit
+    onValueChange: (Float) -> Unit,
 ) {
     Column(modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp)) {
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween
-        ) {
+        Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
             Text(
                 text = title,
                 style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium),
-                color = MaterialTheme.colorScheme.onSurface
+                color = MaterialTheme.colorScheme.onSurface,
             )
             Text(
                 text = String.format(Locale.US, "%.1f", value),
                 style = MaterialTheme.typography.bodyMedium,
-                color = MaterialTheme.colorScheme.primary
+                color = MaterialTheme.colorScheme.primary,
             )
         }
         Slider(
             value = value,
             onValueChange = onValueChange,
             valueRange = valueRange,
-            colors = SliderDefaults.colors(
-                thumbColor = MaterialTheme.colorScheme.primary,
-                activeTrackColor = MaterialTheme.colorScheme.primary
-            ),
-            modifier = Modifier.height(24.dp)
+            colors =
+                SliderDefaults.colors(
+                    thumbColor = MaterialTheme.colorScheme.primary,
+                    activeTrackColor = MaterialTheme.colorScheme.primary,
+                ),
+            modifier = Modifier.height(24.dp),
         )
     }
 }
@@ -746,7 +745,7 @@ private fun <T> SubtitleDropdownItem(
     options: List<T>,
     onValueChange: (T) -> Unit,
     labelProvider: @Composable (T) -> String,
-    icon: Painter
+    icon: Painter,
 ) {
     var expanded by remember { mutableStateOf(false) }
 
@@ -760,15 +759,15 @@ private fun <T> SubtitleDropdownItem(
                 Icon(
                     painter = painterResource(id = R.drawable.ic_keyboard_arrow_down),
                     contentDescription = null,
-                    tint = MaterialTheme.colorScheme.onSurfaceVariant
+                    tint = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
-            }
+            },
         )
 
         DropdownMenu(
             expanded = expanded,
             onDismissRequest = { expanded = false },
-            modifier = Modifier.background(MaterialTheme.colorScheme.surfaceContainerHigh)
+            modifier = Modifier.background(MaterialTheme.colorScheme.surfaceContainerHigh),
         ) {
             options.forEach { option ->
                 DropdownMenuItem(
@@ -777,15 +776,16 @@ private fun <T> SubtitleDropdownItem(
                         onValueChange(option)
                         expanded = false
                     },
-                    leadingIcon = if (selectedOption == option) {
-                        {
-                            Icon(
-                                painterResource(id = R.drawable.ic_check),
-                                null,
-                                tint = MaterialTheme.colorScheme.primary
-                            )
-                        }
-                    } else null
+                    leadingIcon =
+                        if (selectedOption == option) {
+                            {
+                                Icon(
+                                    painterResource(id = R.drawable.ic_check),
+                                    null,
+                                    tint = MaterialTheme.colorScheme.primary,
+                                )
+                            }
+                        } else null,
                 )
             }
         }
@@ -798,7 +798,7 @@ private fun LanguageSelectorItem(
     subtitle: String,
     selectedCode: String,
     onLanguageSelected: (String) -> Unit,
-    icon: Painter
+    icon: Painter,
 ) {
     val context = LocalContext.current
     val languages = remember { context.resources.getStringArray(R.array.languages) }
@@ -818,9 +818,9 @@ private fun LanguageSelectorItem(
             Icon(
                 painter = painterResource(id = R.drawable.ic_keyboard_arrow_down),
                 contentDescription = null,
-                tint = MaterialTheme.colorScheme.onSurfaceVariant
+                tint = MaterialTheme.colorScheme.onSurfaceVariant,
             )
-        }
+        },
     )
 
     if (showDialog) {
@@ -832,7 +832,7 @@ private fun LanguageSelectorItem(
                 onLanguageSelected(code)
                 showDialog = false
             },
-            onDismiss = { showDialog = false }
+            onDismiss = { showDialog = false },
         )
     }
 }
@@ -843,19 +843,20 @@ private fun LanguagePickerDialog(
     languageCodes: Array<String>,
     selectedCode: String,
     onSelect: (String) -> Unit,
-    onDismiss: () -> Unit
+    onDismiss: () -> Unit,
 ) {
     var searchQuery by remember { mutableStateOf("") }
 
-    val filteredIndices = remember(searchQuery) {
-        if (searchQuery.isBlank()) {
-            languages.indices.toList()
-        } else {
-            languages.indices.filter { i ->
-                languages[i].contains(searchQuery, ignoreCase = true)
+    val filteredIndices =
+        remember(searchQuery) {
+            if (searchQuery.isBlank()) {
+                languages.indices.toList()
+            } else {
+                languages.indices.filter { i ->
+                    languages[i].contains(searchQuery, ignoreCase = true)
+                }
             }
         }
-    }
 
     AlertDialog(
         onDismissRequest = onDismiss,
@@ -863,90 +864,87 @@ private fun LanguagePickerDialog(
         text = {
             Column {
                 Box(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(bottom = 12.dp)
-                        .clip(RoundedCornerShape(28.dp))
-                        .background(MaterialTheme.colorScheme.surfaceContainerHighest)
+                    modifier =
+                        Modifier.fillMaxWidth()
+                            .padding(bottom = 12.dp)
+                            .clip(RoundedCornerShape(28.dp))
+                            .background(MaterialTheme.colorScheme.surfaceContainerHighest)
                 ) {
                     Row(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(horizontal = 16.dp),
-                        verticalAlignment = Alignment.CenterVertically
+                        modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp),
+                        verticalAlignment = Alignment.CenterVertically,
                     ) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_search),
                             contentDescription = null,
                             tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                            modifier = Modifier.size(20.dp)
+                            modifier = Modifier.size(20.dp),
                         )
                         Spacer(modifier = Modifier.width(12.dp))
                         androidx.compose.foundation.text.BasicTextField(
                             value = searchQuery,
                             onValueChange = { searchQuery = it },
-                            textStyle = MaterialTheme.typography.bodyLarge.copy(
-                                color = MaterialTheme.colorScheme.onSurface
-                            ),
+                            textStyle =
+                                MaterialTheme.typography.bodyLarge.copy(
+                                    color = MaterialTheme.colorScheme.onSurface
+                                ),
                             singleLine = true,
-                            modifier = Modifier
-                                .weight(1f)
-                                .padding(vertical = 12.dp),
+                            modifier = Modifier.weight(1f).padding(vertical = 12.dp),
                             decorationBox = { innerTextField ->
                                 if (searchQuery.isEmpty()) {
                                     Text(
                                         text = stringResource(R.string.pref_language_search_hint),
                                         style = MaterialTheme.typography.bodyLarge,
-                                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                                     )
                                 }
                                 innerTextField()
-                            }
+                            },
                         )
                         if (searchQuery.isNotEmpty()) {
                             IconButton(
                                 onClick = { searchQuery = "" },
-                                modifier = Modifier.size(32.dp)
+                                modifier = Modifier.size(32.dp),
                             ) {
                                 Icon(
                                     painter = painterResource(id = R.drawable.ic_clear),
                                     contentDescription = null,
                                     tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                                    modifier = Modifier.size(18.dp)
+                                    modifier = Modifier.size(18.dp),
                                 )
                             }
                         }
                     }
                 }
 
-                LazyColumn(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(400.dp)
-                ) {
+                LazyColumn(modifier = Modifier.fillMaxWidth().height(400.dp)) {
                     items(filteredIndices.size) { filterIdx ->
                         val idx = filteredIndices[filterIdx]
                         val isSelected = languageCodes[idx] == selectedCode
 
                         Row(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .clip(RoundedCornerShape(12.dp))
-                                .then(
-                                    if (isSelected) Modifier.background(
-                                        MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.3f)
-                                    ) else Modifier
-                                )
-                                .clickable { onSelect(languageCodes[idx]) }
-                                .padding(horizontal = 12.dp, vertical = 14.dp),
-                            verticalAlignment = Alignment.CenterVertically
+                            modifier =
+                                Modifier.fillMaxWidth()
+                                    .clip(RoundedCornerShape(12.dp))
+                                    .then(
+                                        if (isSelected)
+                                            Modifier.background(
+                                                MaterialTheme.colorScheme.primaryContainer.copy(
+                                                    alpha = 0.3f
+                                                )
+                                            )
+                                        else Modifier
+                                    )
+                                    .clickable { onSelect(languageCodes[idx]) }
+                                    .padding(horizontal = 12.dp, vertical = 14.dp),
+                            verticalAlignment = Alignment.CenterVertically,
                         ) {
                             if (isSelected) {
                                 Icon(
                                     painter = painterResource(id = R.drawable.ic_check),
                                     contentDescription = null,
                                     tint = MaterialTheme.colorScheme.primary,
-                                    modifier = Modifier.size(20.dp)
+                                    modifier = Modifier.size(20.dp),
                                 )
                             } else {
                                 Spacer(modifier = Modifier.size(20.dp))
@@ -955,8 +953,9 @@ private fun LanguagePickerDialog(
                             Text(
                                 text = languages[idx],
                                 style = MaterialTheme.typography.bodyLarge,
-                                color = if (isSelected) MaterialTheme.colorScheme.primary
-                                else MaterialTheme.colorScheme.onSurface
+                                color =
+                                    if (isSelected) MaterialTheme.colorScheme.primary
+                                    else MaterialTheme.colorScheme.onSurface,
                             )
                         }
                     }
@@ -965,10 +964,8 @@ private fun LanguagePickerDialog(
         },
         confirmButton = {},
         dismissButton = {
-            TextButton(onClick = onDismiss) {
-                Text(stringResource(R.string.action_cancel))
-            }
-        }
+            TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) }
+        },
     )
 }
 
@@ -976,17 +973,23 @@ private fun LanguagePickerDialog(
 private fun SimpleColorPickerDialog(
     initialColor: Int,
     onColorSelected: (Int) -> Unit,
-    onDismiss: () -> Unit
+    onDismiss: () -> Unit,
 ) {
-    val presetColors = listOf(
-        Color.WHITE, Color.BLACK, Color.RED, Color.GREEN, Color.BLUE,
-        Color.YELLOW, Color.CYAN, Color.MAGENTA, Color.GRAY,
-        Color.TRANSPARENT
-    )
+    val presetColors =
+        listOf(
+            Color.WHITE,
+            Color.BLACK,
+            Color.RED,
+            Color.GREEN,
+            Color.BLUE,
+            Color.YELLOW,
+            Color.CYAN,
+            Color.MAGENTA,
+            Color.GRAY,
+            Color.TRANSPARENT,
+        )
 
-    var hexInput by remember {
-        mutableStateOf(String.format("#%08X", initialColor))
-    }
+    var hexInput by remember { mutableStateOf(String.format("#%08X", initialColor)) }
     var isValidHex by remember { mutableStateOf(true) }
 
     fun parseHexColor(hex: String): Int? {
@@ -1006,36 +1009,34 @@ private fun SimpleColorPickerDialog(
         onDismissRequest = onDismiss,
         title = { Text(stringResource(R.string.color_picker_title)) },
         text = {
-            Column(
-                verticalArrangement = Arrangement.spacedBy(16.dp)
-            ) {
+            Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
                 Column {
                     Text(
                         stringResource(R.string.color_picker_presets),
                         style = MaterialTheme.typography.titleSmall,
-                        modifier = Modifier.padding(bottom = 8.dp)
+                        modifier = Modifier.padding(bottom = 8.dp),
                     )
                     FlowRow(
                         modifier = Modifier.fillMaxWidth(),
                         horizontalArrangement = Arrangement.spacedBy(8.dp),
-                        verticalArrangement = Arrangement.spacedBy(8.dp)
+                        verticalArrangement = Arrangement.spacedBy(8.dp),
                     ) {
                         presetColors.forEach { presetColor ->
                             Box(
-                                modifier = Modifier
-                                    .size(48.dp)
-                                    .clip(CircleShape)
-                                    .background(Color(presetColor))
-                                    .border(
-                                        2.dp,
-                                        if (presetColor == initialColor) {
-                                            MaterialTheme.colorScheme.primary
-                                        } else {
-                                            MaterialTheme.colorScheme.outline
-                                        },
-                                        CircleShape
-                                    )
-                                    .clickable { onColorSelected(presetColor) }
+                                modifier =
+                                    Modifier.size(48.dp)
+                                        .clip(CircleShape)
+                                        .background(Color(presetColor))
+                                        .border(
+                                            2.dp,
+                                            if (presetColor == initialColor) {
+                                                MaterialTheme.colorScheme.primary
+                                            } else {
+                                                MaterialTheme.colorScheme.outline
+                                            },
+                                            CircleShape,
+                                        )
+                                        .clickable { onColorSelected(presetColor) }
                             )
                         }
                     }
@@ -1043,17 +1044,15 @@ private fun SimpleColorPickerDialog(
 
                 HorizontalDivider()
 
-                Column(
-                    verticalArrangement = Arrangement.spacedBy(8.dp)
-                ) {
+                Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
                     Text(
                         stringResource(R.string.color_picker_custom),
-                        style = MaterialTheme.typography.titleSmall
+                        style = MaterialTheme.typography.titleSmall,
                     )
 
                     Row(
                         horizontalArrangement = Arrangement.spacedBy(8.dp),
-                        verticalAlignment = Alignment.CenterVertically
+                        verticalAlignment = Alignment.CenterVertically,
                     ) {
                         OutlinedTextField(
                             value = hexInput,
@@ -1065,45 +1064,40 @@ private fun SimpleColorPickerDialog(
                             label = { Text(stringResource(R.string.color_picker_hex_label)) },
                             placeholder = { Text(stringResource(R.string.color_picker_hex_hint)) },
                             isError = !isValidHex,
-                            supportingText = if (!isValidHex) {
-                                {
-                                    Text(
-                                        stringResource(R.string.color_picker_invalid),
-                                        color = MaterialTheme.colorScheme.error
-                                    )
-                                }
-                            } else null,
+                            supportingText =
+                                if (!isValidHex) {
+                                    {
+                                        Text(
+                                            stringResource(R.string.color_picker_invalid),
+                                            color = MaterialTheme.colorScheme.error,
+                                        )
+                                    }
+                                } else null,
                             singleLine = true,
-                            modifier = Modifier.weight(1f)
+                            modifier = Modifier.weight(1f),
                         )
 
                         Box(
-                            modifier = Modifier
-                                .size(48.dp)
-                                .clip(CircleShape)
-                                .background(
-                                    if (isValidHex) {
-                                        Color(parseHexColor(hexInput) ?: initialColor)
-                                    } else {
-                                        MaterialTheme.colorScheme.surfaceVariant
-                                    }
-                                )
-                                .border(
-                                    2.dp,
-                                    MaterialTheme.colorScheme.outline,
-                                    CircleShape
-                                )
+                            modifier =
+                                Modifier.size(48.dp)
+                                    .clip(CircleShape)
+                                    .background(
+                                        if (isValidHex) {
+                                            Color(parseHexColor(hexInput) ?: initialColor)
+                                        } else {
+                                            MaterialTheme.colorScheme.surfaceVariant
+                                        }
+                                    )
+                                    .border(2.dp, MaterialTheme.colorScheme.outline, CircleShape)
                         )
                     }
 
                     Button(
                         onClick = {
-                            parseHexColor(hexInput)?.let { color ->
-                                onColorSelected(color)
-                            }
+                            parseHexColor(hexInput)?.let { color -> onColorSelected(color) }
                         },
                         enabled = isValidHex,
-                        modifier = Modifier.fillMaxWidth()
+                        modifier = Modifier.fillMaxWidth(),
                     ) {
                         Text(stringResource(R.string.color_picker_apply))
                     }
@@ -1112,10 +1106,8 @@ private fun SimpleColorPickerDialog(
         },
         confirmButton = {},
         dismissButton = {
-            TextButton(onClick = onDismiss) {
-                Text(stringResource(R.string.action_cancel))
-            }
-        }
+            TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) }
+        },
     )
 }
 
@@ -1123,71 +1115,77 @@ private fun SimpleColorPickerDialog(
 private fun SubtitlePreview(
     subtitlePrefs: SubtitlePreferences,
     useExoPlayer: Boolean,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Box(
-        modifier = modifier
-            .fillMaxWidth()
-            .height(100.dp)
-            .background(
-                androidx.compose.ui.graphics.Color.DarkGray,
-                RoundedCornerShape(12.dp)
-            ),
-        contentAlignment = Alignment.Center
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .height(100.dp)
+                .background(androidx.compose.ui.graphics.Color.DarkGray, RoundedCornerShape(12.dp)),
+        contentAlignment = Alignment.Center,
     ) {
-        val textStyle = MaterialTheme.typography.headlineSmall.copy(
-            fontWeight = if (subtitlePrefs.bold) FontWeight.Bold else FontWeight.Normal,
-            fontStyle = if (subtitlePrefs.italic) FontStyle.Italic else FontStyle.Normal,
-            fontSize = MaterialTheme.typography.headlineSmall.fontSize * 1.15f * subtitlePrefs.textSize
-        )
+        val textStyle =
+            MaterialTheme.typography.headlineSmall.copy(
+                fontWeight = if (subtitlePrefs.bold) FontWeight.Bold else FontWeight.Normal,
+                fontStyle = if (subtitlePrefs.italic) FontStyle.Italic else FontStyle.Normal,
+                fontSize =
+                    MaterialTheme.typography.headlineSmall.fontSize * 1.15f * subtitlePrefs.textSize,
+            )
 
         Box(
-            modifier = Modifier
-                .background(
-                    if (useExoPlayer) {
-                        Color(subtitlePrefs.windowColor)
-                    } else {
-                        androidx.compose.ui.graphics.Color.Transparent
-                    },
-                    RoundedCornerShape(6.dp)
-                )
-                .padding(
-                    horizontal = if (useExoPlayer) 4.dp else 0.dp,
-                    vertical = if (useExoPlayer) 2.dp else 0.dp
-                )
-        ) {
-            Box(
-                modifier = Modifier
-                    .background(
-                        when (subtitlePrefs.outlineStyle) {
-                            SubtitleOutlineStyle.BACKGROUND_BOX -> Color(subtitlePrefs.backgroundColor)
-                            else -> androidx.compose.ui.graphics.Color.Transparent
+            modifier =
+                Modifier.background(
+                        if (useExoPlayer) {
+                            Color(subtitlePrefs.windowColor)
+                        } else {
+                            androidx.compose.ui.graphics.Color.Transparent
                         },
-                        RoundedCornerShape(4.dp)
+                        RoundedCornerShape(6.dp),
+                    )
+                    .padding(
+                        horizontal = if (useExoPlayer) 4.dp else 0.dp,
+                        vertical = if (useExoPlayer) 2.dp else 0.dp,
                     )
-                    .padding(horizontal = 8.dp, vertical = 4.dp)
+        ) {
+            Box(
+                modifier =
+                    Modifier.background(
+                            when (subtitlePrefs.outlineStyle) {
+                                SubtitleOutlineStyle.BACKGROUND_BOX ->
+                                    Color(subtitlePrefs.backgroundColor)
+                                else -> androidx.compose.ui.graphics.Color.Transparent
+                            },
+                            RoundedCornerShape(4.dp),
+                        )
+                        .padding(horizontal = 8.dp, vertical = 4.dp)
             ) {
-                if (!useExoPlayer && subtitlePrefs.outlineStyle == SubtitleOutlineStyle.OUTLINE && subtitlePrefs.outlineSize > 0f) {
+                if (
+                    !useExoPlayer &&
+                        subtitlePrefs.outlineStyle == SubtitleOutlineStyle.OUTLINE &&
+                        subtitlePrefs.outlineSize > 0f
+                ) {
                     val outlineColor = Color(subtitlePrefs.outlineColor)
                     val offsetStep = (subtitlePrefs.outlineSize * 0.3f).coerceAtMost(2f)
 
                     listOf(
-                        Offset(-offsetStep, -offsetStep),
-                        Offset(0f, -offsetStep),
-                        Offset(offsetStep, -offsetStep),
-                        Offset(-offsetStep, 0f),
-                        Offset(offsetStep, 0f),
-                        Offset(-offsetStep, offsetStep),
-                        Offset(0f, offsetStep),
-                        Offset(offsetStep, offsetStep)
-                    ).forEach { offset ->
-                        Text(
-                            text = stringResource(R.string.subtitle_preview_text),
-                            style = textStyle,
-                            color = outlineColor,
-                            modifier = Modifier.offset(offset.x.dp, offset.y.dp)
+                            Offset(-offsetStep, -offsetStep),
+                            Offset(0f, -offsetStep),
+                            Offset(offsetStep, -offsetStep),
+                            Offset(-offsetStep, 0f),
+                            Offset(offsetStep, 0f),
+                            Offset(-offsetStep, offsetStep),
+                            Offset(0f, offsetStep),
+                            Offset(offsetStep, offsetStep),
                         )
-                    }
+                        .forEach { offset ->
+                            Text(
+                                text = stringResource(R.string.subtitle_preview_text),
+                                style = textStyle,
+                                color = outlineColor,
+                                modifier = Modifier.offset(offset.x.dp, offset.y.dp),
+                            )
+                        }
                 }
 
                 if (useExoPlayer && subtitlePrefs.outlineStyle == SubtitleOutlineStyle.OUTLINE) {
@@ -1195,65 +1193,83 @@ private fun SubtitlePreview(
                     val offsetStep = 1.5f
 
                     listOf(
-                        Offset(-offsetStep, -offsetStep),
-                        Offset(0f, -offsetStep),
-                        Offset(offsetStep, -offsetStep),
-                        Offset(-offsetStep, 0f),
-                        Offset(offsetStep, 0f),
-                        Offset(-offsetStep, offsetStep),
-                        Offset(0f, offsetStep),
-                        Offset(offsetStep, offsetStep)
-                    ).forEach { offset ->
-                        Text(
-                            text = stringResource(R.string.subtitle_preview_text),
-                            style = textStyle,
-                            color = outlineColor,
-                            modifier = Modifier.offset(offset.x.dp, offset.y.dp)
+                            Offset(-offsetStep, -offsetStep),
+                            Offset(0f, -offsetStep),
+                            Offset(offsetStep, -offsetStep),
+                            Offset(-offsetStep, 0f),
+                            Offset(offsetStep, 0f),
+                            Offset(-offsetStep, offsetStep),
+                            Offset(0f, offsetStep),
+                            Offset(offsetStep, offsetStep),
                         )
-                    }
+                        .forEach { offset ->
+                            Text(
+                                text = stringResource(R.string.subtitle_preview_text),
+                                style = textStyle,
+                                color = outlineColor,
+                                modifier = Modifier.offset(offset.x.dp, offset.y.dp),
+                            )
+                        }
                 }
 
                 Text(
                     text = stringResource(R.string.subtitle_preview_text),
-                    style = textStyle.copy(
-                        shadow = when {
-                            !useExoPlayer && subtitlePrefs.outlineStyle == SubtitleOutlineStyle.DROP_SHADOW && subtitlePrefs.outlineSize > 0f -> {
-                                val shadowOffset = subtitlePrefs.outlineSize
-                                Shadow(
-                                    color = Color(subtitlePrefs.outlineColor),
-                                    offset = Offset(shadowOffset, shadowOffset),
-                                    blurRadius = shadowOffset * 1.2f
-                                )
-                            }
+                    style =
+                        textStyle.copy(
+                            shadow =
+                                when {
+                                    !useExoPlayer &&
+                                        subtitlePrefs.outlineStyle ==
+                                            SubtitleOutlineStyle.DROP_SHADOW &&
+                                        subtitlePrefs.outlineSize > 0f -> {
+                                        val shadowOffset = subtitlePrefs.outlineSize
+                                        Shadow(
+                                            color = Color(subtitlePrefs.outlineColor),
+                                            offset = Offset(shadowOffset, shadowOffset),
+                                            blurRadius = shadowOffset * 1.2f,
+                                        )
+                                    }
 
-                            useExoPlayer && subtitlePrefs.outlineStyle == SubtitleOutlineStyle.DROP_SHADOW -> {
-                                Shadow(
-                                    color = Color(subtitlePrefs.outlineColor),
-                                    offset = Offset(3f, 3f),
-                                    blurRadius = 4f
-                                )
-                            }
+                                    useExoPlayer &&
+                                        subtitlePrefs.outlineStyle ==
+                                            SubtitleOutlineStyle.DROP_SHADOW -> {
+                                        Shadow(
+                                            color = Color(subtitlePrefs.outlineColor),
+                                            offset = Offset(3f, 3f),
+                                            blurRadius = 4f,
+                                        )
+                                    }
 
-                            useExoPlayer && subtitlePrefs.outlineStyle == SubtitleOutlineStyle.RAISED -> {
-                                Shadow(
-                                    color = androidx.compose.ui.graphics.Color.White.copy(alpha = 0.5f),
-                                    offset = Offset(-1f, -1f),
-                                    blurRadius = 2f
-                                )
-                            }
+                                    useExoPlayer &&
+                                        subtitlePrefs.outlineStyle ==
+                                            SubtitleOutlineStyle.RAISED -> {
+                                        Shadow(
+                                            color =
+                                                androidx.compose.ui.graphics.Color.White.copy(
+                                                    alpha = 0.5f
+                                                ),
+                                            offset = Offset(-1f, -1f),
+                                            blurRadius = 2f,
+                                        )
+                                    }
 
-                            useExoPlayer && subtitlePrefs.outlineStyle == SubtitleOutlineStyle.DEPRESSED -> {
-                                Shadow(
-                                    color = androidx.compose.ui.graphics.Color.Black.copy(alpha = 0.5f),
-                                    offset = Offset(-1f, -1f),
-                                    blurRadius = 2f
-                                )
-                            }
+                                    useExoPlayer &&
+                                        subtitlePrefs.outlineStyle ==
+                                            SubtitleOutlineStyle.DEPRESSED -> {
+                                        Shadow(
+                                            color =
+                                                androidx.compose.ui.graphics.Color.Black.copy(
+                                                    alpha = 0.5f
+                                                ),
+                                            offset = Offset(-1f, -1f),
+                                            blurRadius = 2f,
+                                        )
+                                    }
 
-                            else -> null
-                        }
-                    ),
-                    color = Color(subtitlePrefs.textColor)
+                                    else -> null
+                                }
+                        ),
+                    color = Color(subtitlePrefs.textColor),
                 )
             }
         }
@@ -1291,10 +1307,12 @@ private fun getSubtitleVerticalPositionDisplayName(position: SubtitleVerticalPos
 }
 
 @Composable
-private fun getSubtitleHorizontalAlignmentDisplayName(alignment: SubtitleHorizontalAlignment): String {
+private fun getSubtitleHorizontalAlignmentDisplayName(
+    alignment: SubtitleHorizontalAlignment
+): String {
     return when (alignment) {
         SubtitleHorizontalAlignment.LEFT -> stringResource(R.string.align_left)
         SubtitleHorizontalAlignment.CENTER -> stringResource(R.string.align_center)
         SubtitleHorizontalAlignment.RIGHT -> stringResource(R.string.align_right)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/settings/servers/AddEditServerScreen.kt b/app/src/main/java/com/makd/afinity/ui/settings/servers/AddEditServerScreen.kt
index 4a30fe735..9eeabfe66 100644
--- a/app/src/main/java/com/makd/afinity/ui/settings/servers/AddEditServerScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/settings/servers/AddEditServerScreen.kt
@@ -63,7 +63,7 @@ import com.makd.afinity.R
 fun AddEditServerScreen(
     onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
-    viewModel: AddEditServerViewModel = hiltViewModel()
+    viewModel: AddEditServerViewModel = hiltViewModel(),
 ) {
     val state by viewModel.state.collectAsStateWithLifecycle()
     val snackbarHostState = remember { SnackbarHostState() }
@@ -84,63 +84,57 @@ fun AddEditServerScreen(
     Scaffold(
         topBar = {
             TopAppBar(
-                title = { },
+                title = {},
                 navigationIcon = {
                     IconButton(onClick = onBackClick) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_chevron_left),
-                            contentDescription = stringResource(R.string.cd_back)
+                            contentDescription = stringResource(R.string.cd_back),
                         )
                     }
                 },
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = Color.Transparent
-                )
+                colors = TopAppBarDefaults.topAppBarColors(containerColor = Color.Transparent),
             )
         },
-        snackbarHost = {
-            SnackbarHost(hostState = snackbarHostState)
-        },
-        modifier = modifier.fillMaxSize()
+        snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
+        modifier = modifier.fillMaxSize(),
     ) { paddingValues ->
         Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(paddingValues)
-                .verticalScroll(rememberScrollState())
-                .padding(horizontal = 24.dp)
-                .imePadding(),
-            horizontalAlignment = Alignment.CenterHorizontally
+            modifier =
+                Modifier.fillMaxSize()
+                    .padding(paddingValues)
+                    .verticalScroll(rememberScrollState())
+                    .padding(horizontal = 24.dp)
+                    .imePadding(),
+            horizontalAlignment = Alignment.CenterHorizontally,
         ) {
             Spacer(modifier = Modifier.height(24.dp))
 
             Box(
-                modifier = Modifier
-                    .size(80.dp)
-                    .background(
-                        color = MaterialTheme.colorScheme.primaryContainer,
-                        shape = CircleShape
-                    ),
-                contentAlignment = Alignment.Center
+                modifier =
+                    Modifier.size(80.dp)
+                        .background(
+                            color = MaterialTheme.colorScheme.primaryContainer,
+                            shape = CircleShape,
+                        ),
+                contentAlignment = Alignment.Center,
             ) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_server),
                     contentDescription = null,
                     modifier = Modifier.size(40.dp),
-                    tint = MaterialTheme.colorScheme.onPrimaryContainer
+                    tint = MaterialTheme.colorScheme.onPrimaryContainer,
                 )
             }
 
             Spacer(modifier = Modifier.height(24.dp))
 
             Text(
-                text = if (state.serverId != null) stringResource(R.string.title_edit_server) else stringResource(
-                    R.string.title_add_server
-                ),
-                style = MaterialTheme.typography.headlineMedium.copy(
-                    fontWeight = FontWeight.Bold
-                ),
-                color = MaterialTheme.colorScheme.onSurface
+                text =
+                    if (state.serverId != null) stringResource(R.string.title_edit_server)
+                    else stringResource(R.string.title_add_server),
+                style = MaterialTheme.typography.headlineMedium.copy(fontWeight = FontWeight.Bold),
+                color = MaterialTheme.colorScheme.onSurface,
             )
 
             Text(
@@ -148,7 +142,7 @@ fun AddEditServerScreen(
                 style = MaterialTheme.typography.bodyLarge,
                 color = MaterialTheme.colorScheme.onSurfaceVariant,
                 textAlign = TextAlign.Center,
-                modifier = Modifier.padding(top = 8.dp)
+                modifier = Modifier.padding(top = 8.dp),
             )
 
             Spacer(modifier = Modifier.height(32.dp))
@@ -161,16 +155,14 @@ fun AddEditServerScreen(
                 leadingIcon = {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_link_rotated),
-                        contentDescription = null
+                        contentDescription = null,
                     )
                 },
-                keyboardOptions = KeyboardOptions(
-                    keyboardType = KeyboardType.Uri,
-                    imeAction = ImeAction.Next
-                ),
+                keyboardOptions =
+                    KeyboardOptions(keyboardType = KeyboardType.Uri, imeAction = ImeAction.Next),
                 shape = RoundedCornerShape(16.dp),
                 singleLine = true,
-                modifier = Modifier.fillMaxWidth()
+                modifier = Modifier.fillMaxWidth(),
             )
 
             Spacer(modifier = Modifier.height(16.dp))
@@ -183,19 +175,15 @@ fun AddEditServerScreen(
                 leadingIcon = {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_edit),
-                        contentDescription = null
+                        contentDescription = null,
                     )
                 },
-                keyboardOptions = KeyboardOptions(
-                    keyboardType = KeyboardType.Text,
-                    imeAction = ImeAction.Done
-                ),
-                keyboardActions = KeyboardActions(
-                    onDone = { viewModel.testConnection() }
-                ),
+                keyboardOptions =
+                    KeyboardOptions(keyboardType = KeyboardType.Text, imeAction = ImeAction.Done),
+                keyboardActions = KeyboardActions(onDone = { viewModel.testConnection() }),
                 shape = RoundedCornerShape(16.dp),
                 singleLine = true,
-                modifier = Modifier.fillMaxWidth()
+                modifier = Modifier.fillMaxWidth(),
             )
 
             Spacer(modifier = Modifier.height(16.dp))
@@ -203,7 +191,7 @@ fun AddEditServerScreen(
             AnimatedVisibility(
                 visible = state.connectionTestResult != null,
                 enter = fadeIn() + expandVertically(),
-                exit = fadeOut() + shrinkVertically()
+                exit = fadeOut() + shrinkVertically(),
             ) {
                 state.connectionTestResult?.let { result ->
                     when (result) {
@@ -223,17 +211,17 @@ fun AddEditServerScreen(
             Row(
                 modifier = Modifier.fillMaxWidth(),
                 verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.End
+                horizontalArrangement = Arrangement.End,
             ) {
                 TextButton(
                     onClick = viewModel::testConnection,
                     enabled = !state.isTestingConnection && state.serverUrl.isNotBlank(),
-                    shape = RoundedCornerShape(12.dp)
+                    shape = RoundedCornerShape(12.dp),
                 ) {
                     if (state.isTestingConnection) {
                         CircularProgressIndicator(
                             modifier = Modifier.size(16.dp),
-                            strokeWidth = 2.dp
+                            strokeWidth = 2.dp,
                         )
                         Spacer(modifier = Modifier.width(8.dp))
                         Text(stringResource(R.string.btn_testing))
@@ -247,29 +235,26 @@ fun AddEditServerScreen(
 
             Button(
                 onClick = viewModel::saveServer,
-                enabled = !state.isSaving && state.connectionTestResult is ConnectionTestResult.Success,
+                enabled =
+                    !state.isSaving && state.connectionTestResult is ConnectionTestResult.Success,
                 shape = RoundedCornerShape(16.dp),
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(56.dp),
-                colors = ButtonDefaults.buttonColors(
-                    containerColor = MaterialTheme.colorScheme.primary
-                )
+                modifier = Modifier.fillMaxWidth().height(56.dp),
+                colors =
+                    ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.primary),
             ) {
                 if (state.isSaving) {
                     CircularProgressIndicator(
                         modifier = Modifier.size(24.dp),
                         strokeWidth = 2.dp,
-                        color = MaterialTheme.colorScheme.onPrimary
+                        color = MaterialTheme.colorScheme.onPrimary,
                     )
                 } else {
                     Text(
-                        text = if (state.serverId != null) stringResource(R.string.btn_save_changes) else stringResource(
-                            R.string.btn_save_server
-                        ),
-                        style = MaterialTheme.typography.titleMedium.copy(
-                            fontWeight = FontWeight.Bold
-                        )
+                        text =
+                            if (state.serverId != null) stringResource(R.string.btn_save_changes)
+                            else stringResource(R.string.btn_save_server),
+                        style =
+                            MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),
                     )
                 }
             }
@@ -280,59 +265,51 @@ fun AddEditServerScreen(
 }
 
 @Composable
-private fun ConnectionSuccessCard(
-    serverInfo: ServerInfo,
-    modifier: Modifier = Modifier
-) {
+private fun ConnectionSuccessCard(serverInfo: ServerInfo, modifier: Modifier = Modifier) {
     Surface(
         modifier = modifier.fillMaxWidth(),
         shape = RoundedCornerShape(16.dp),
         color = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.5f),
-        border = androidx.compose.foundation.BorderStroke(
-            1.dp,
-            MaterialTheme.colorScheme.primary.copy(alpha = 0.5f)
-        )
+        border =
+            androidx.compose.foundation.BorderStroke(
+                1.dp,
+                MaterialTheme.colorScheme.primary.copy(alpha = 0.5f),
+            ),
     ) {
         Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(16.dp),
-            verticalAlignment = Alignment.CenterVertically
+            modifier = Modifier.fillMaxWidth().padding(16.dp),
+            verticalAlignment = Alignment.CenterVertically,
         ) {
             Box(
-                modifier = Modifier
-                    .size(40.dp)
-                    .background(MaterialTheme.colorScheme.primary, CircleShape),
-                contentAlignment = Alignment.Center
+                modifier =
+                    Modifier.size(40.dp).background(MaterialTheme.colorScheme.primary, CircleShape),
+                contentAlignment = Alignment.Center,
             ) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_check),
                     contentDescription = null,
                     tint = MaterialTheme.colorScheme.onPrimary,
-                    modifier = Modifier.size(24.dp)
+                    modifier = Modifier.size(24.dp),
                 )
             }
 
             Spacer(modifier = Modifier.width(16.dp))
 
-            Column(
-                modifier = Modifier.weight(1f)
-            ) {
+            Column(modifier = Modifier.weight(1f)) {
                 Text(
                     text = stringResource(R.string.connection_success_title),
-                    style = MaterialTheme.typography.titleSmall.copy(
-                        fontWeight = FontWeight.Bold
-                    ),
-                    color = MaterialTheme.colorScheme.onSurface
+                    style = MaterialTheme.typography.titleSmall.copy(fontWeight = FontWeight.Bold),
+                    color = MaterialTheme.colorScheme.onSurface,
                 )
                 Text(
-                    text = stringResource(
-                        R.string.connection_success_fmt,
-                        serverInfo.name,
-                        serverInfo.version
-                    ),
+                    text =
+                        stringResource(
+                            R.string.connection_success_fmt,
+                            serverInfo.name,
+                            serverInfo.version,
+                        ),
                     style = MaterialTheme.typography.bodySmall,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
         }
@@ -340,58 +317,49 @@ private fun ConnectionSuccessCard(
 }
 
 @Composable
-private fun ConnectionErrorCard(
-    errorMessage: String,
-    modifier: Modifier = Modifier
-) {
+private fun ConnectionErrorCard(errorMessage: String, modifier: Modifier = Modifier) {
     Surface(
         modifier = modifier.fillMaxWidth(),
         shape = RoundedCornerShape(16.dp),
         color = MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.5f),
-        border = androidx.compose.foundation.BorderStroke(
-            1.dp,
-            MaterialTheme.colorScheme.error.copy(alpha = 0.5f)
-        )
+        border =
+            androidx.compose.foundation.BorderStroke(
+                1.dp,
+                MaterialTheme.colorScheme.error.copy(alpha = 0.5f),
+            ),
     ) {
         Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(16.dp),
-            verticalAlignment = Alignment.CenterVertically
+            modifier = Modifier.fillMaxWidth().padding(16.dp),
+            verticalAlignment = Alignment.CenterVertically,
         ) {
             Box(
-                modifier = Modifier
-                    .size(40.dp)
-                    .background(MaterialTheme.colorScheme.error, CircleShape),
-                contentAlignment = Alignment.Center
+                modifier =
+                    Modifier.size(40.dp).background(MaterialTheme.colorScheme.error, CircleShape),
+                contentAlignment = Alignment.Center,
             ) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_close),
                     contentDescription = null,
                     tint = MaterialTheme.colorScheme.onError,
-                    modifier = Modifier.size(24.dp)
+                    modifier = Modifier.size(24.dp),
                 )
             }
 
             Spacer(modifier = Modifier.width(16.dp))
 
-            Column(
-                modifier = Modifier.weight(1f)
-            ) {
+            Column(modifier = Modifier.weight(1f)) {
                 Text(
                     text = stringResource(R.string.connection_failed_title),
-                    style = MaterialTheme.typography.titleSmall.copy(
-                        fontWeight = FontWeight.Bold
-                    ),
-                    color = MaterialTheme.colorScheme.onSurface
+                    style = MaterialTheme.typography.titleSmall.copy(fontWeight = FontWeight.Bold),
+                    color = MaterialTheme.colorScheme.onSurface,
                 )
                 Text(
                     text = errorMessage,
                     style = MaterialTheme.typography.bodySmall,
                     color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    maxLines = 2
+                    maxLines = 2,
                 )
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/settings/servers/AddEditServerViewModel.kt b/app/src/main/java/com/makd/afinity/ui/settings/servers/AddEditServerViewModel.kt
index 7600a56c1..8314ea38a 100644
--- a/app/src/main/java/com/makd/afinity/ui/settings/servers/AddEditServerViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/settings/servers/AddEditServerViewModel.kt
@@ -11,12 +11,12 @@ import com.makd.afinity.data.repository.server.JellyfinServerRepository
 import com.makd.afinity.data.repository.server.ServerRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 data class AddEditServerState(
     val serverId: String? = null,
@@ -26,32 +26,25 @@ data class AddEditServerState(
     val connectionTestResult: ConnectionTestResult? = null,
     val isSaving: Boolean = false,
     val error: String? = null,
-    val saveSuccess: Boolean = false
+    val saveSuccess: Boolean = false,
 )
 
 sealed class ConnectionTestResult {
-    data class Success(
-        val serverInfo: ServerInfo
-    ) : ConnectionTestResult()
+    data class Success(val serverInfo: ServerInfo) : ConnectionTestResult()
 
-    data class Error(
-        val message: String
-    ) : ConnectionTestResult()
+    data class Error(val message: String) : ConnectionTestResult()
 }
 
-data class ServerInfo(
-    val id: String,
-    val name: String,
-    val version: String,
-    val address: String
-)
+data class ServerInfo(val id: String, val name: String, val version: String, val address: String)
 
 @HiltViewModel
-class AddEditServerViewModel @Inject constructor(
+class AddEditServerViewModel
+@Inject
+constructor(
     @ApplicationContext private val context: Context,
     private val serverRepository: ServerRepository,
     private val databaseRepository: DatabaseRepository,
-    savedStateHandle: SavedStateHandle
+    savedStateHandle: SavedStateHandle,
 ) : ViewModel() {
 
     private val serverId: String? =
@@ -69,25 +62,21 @@ class AddEditServerViewModel @Inject constructor(
             try {
                 val server = databaseRepository.getServer(serverId)
                 if (server != null) {
-                    _state.value = _state.value.copy(
-                        serverUrl = server.address,
-                        serverName = server.name
-                    )
+                    _state.value =
+                        _state.value.copy(serverUrl = server.address, serverName = server.name)
                 }
             } catch (e: Exception) {
                 Timber.e(e, "Error loading server")
-                _state.value = _state.value.copy(
-                    error = context.getString(R.string.error_load_server_failed_fmt, e.message)
-                )
+                _state.value =
+                    _state.value.copy(
+                        error = context.getString(R.string.error_load_server_failed_fmt, e.message)
+                    )
             }
         }
     }
 
     fun updateServerUrl(url: String) {
-        _state.value = _state.value.copy(
-            serverUrl = url,
-            connectionTestResult = null
-        )
+        _state.value = _state.value.copy(serverUrl = url, connectionTestResult = null)
     }
 
     fun updateServerName(name: String) {
@@ -97,55 +86,65 @@ class AddEditServerViewModel @Inject constructor(
     fun testConnection() {
         val url = _state.value.serverUrl.trim()
         if (url.isBlank()) {
-            _state.value = _state.value.copy(
-                connectionTestResult = ConnectionTestResult.Error(context.getString(R.string.error_enter_server_url))
-            )
+            _state.value =
+                _state.value.copy(
+                    connectionTestResult =
+                        ConnectionTestResult.Error(
+                            context.getString(R.string.error_enter_server_url)
+                        )
+                )
             return
         }
 
         viewModelScope.launch {
             try {
-                _state.value = _state.value.copy(
-                    isTestingConnection = true,
-                    connectionTestResult = null,
-                    error = null
-                )
+                _state.value =
+                    _state.value.copy(
+                        isTestingConnection = true,
+                        connectionTestResult = null,
+                        error = null,
+                    )
 
                 when (val result = serverRepository.testServerConnection(url)) {
                     is JellyfinServerRepository.ServerConnectionResult.Success -> {
-                        val serverInfo = ServerInfo(
-                            id = result.server.id,
-                            name = result.server.name,
-                            version = result.version,
-                            address = result.serverAddress
-                        )
+                        val serverInfo =
+                            ServerInfo(
+                                id = result.server.id,
+                                name = result.server.name,
+                                version = result.version,
+                                address = result.serverAddress,
+                            )
 
                         val currentName = _state.value.serverName
-                        _state.value = _state.value.copy(
-                            isTestingConnection = false,
-                            connectionTestResult = ConnectionTestResult.Success(serverInfo),
-                            serverName = currentName.ifBlank { serverInfo.name }
-                        )
+                        _state.value =
+                            _state.value.copy(
+                                isTestingConnection = false,
+                                connectionTestResult = ConnectionTestResult.Success(serverInfo),
+                                serverName = currentName.ifBlank { serverInfo.name },
+                            )
                     }
 
                     is JellyfinServerRepository.ServerConnectionResult.Error -> {
-                        _state.value = _state.value.copy(
-                            isTestingConnection = false,
-                            connectionTestResult = ConnectionTestResult.Error(result.message)
-                        )
+                        _state.value =
+                            _state.value.copy(
+                                isTestingConnection = false,
+                                connectionTestResult = ConnectionTestResult.Error(result.message),
+                            )
                     }
                 }
             } catch (e: Exception) {
                 Timber.e(e, "Error testing connection")
-                _state.value = _state.value.copy(
-                    isTestingConnection = false,
-                    connectionTestResult = ConnectionTestResult.Error(
-                        context.getString(
-                            R.string.error_connection_test_failed_fmt,
-                            e.message ?: context.getString(R.string.error_unknown)
-                        )
+                _state.value =
+                    _state.value.copy(
+                        isTestingConnection = false,
+                        connectionTestResult =
+                            ConnectionTestResult.Error(
+                                context.getString(
+                                    R.string.error_connection_test_failed_fmt,
+                                    e.message ?: context.getString(R.string.error_unknown),
+                                )
+                            ),
                     )
-                )
             }
         }
     }
@@ -162,26 +161,23 @@ class AddEditServerViewModel @Inject constructor(
 
         val testResult = currentState.connectionTestResult
         if (testResult !is ConnectionTestResult.Success) {
-            _state.value = _state.value.copy(
-                error = context.getString(R.string.error_test_connection_first)
-            )
+            _state.value =
+                _state.value.copy(error = context.getString(R.string.error_test_connection_first))
             return
         }
 
         viewModelScope.launch {
             try {
-                _state.value = _state.value.copy(
-                    isSaving = true,
-                    error = null
-                )
+                _state.value = _state.value.copy(isSaving = true, error = null)
 
                 val serverInfo = testResult.serverInfo
-                val server = Server(
-                    id = currentState.serverId ?: serverInfo.id,
-                    name = name.ifBlank { serverInfo.name },
-                    version = serverInfo.version,
-                    address = url
-                )
+                val server =
+                    Server(
+                        id = currentState.serverId ?: serverInfo.id,
+                        name = name.ifBlank { serverInfo.name },
+                        version = serverInfo.version,
+                        address = url,
+                    )
 
                 if (currentState.serverId != null) {
                     databaseRepository.updateServer(server)
@@ -191,16 +187,14 @@ class AddEditServerViewModel @Inject constructor(
                     Timber.d("Server saved: ${server.name}")
                 }
 
-                _state.value = _state.value.copy(
-                    isSaving = false,
-                    saveSuccess = true
-                )
+                _state.value = _state.value.copy(isSaving = false, saveSuccess = true)
             } catch (e: Exception) {
                 Timber.e(e, "Error saving server")
-                _state.value = _state.value.copy(
-                    isSaving = false,
-                    error = context.getString(R.string.error_save_server_failed_fmt, e.message)
-                )
+                _state.value =
+                    _state.value.copy(
+                        isSaving = false,
+                        error = context.getString(R.string.error_save_server_failed_fmt, e.message),
+                    )
             }
         }
     }
@@ -208,4 +202,4 @@ class AddEditServerViewModel @Inject constructor(
     fun clearError() {
         _state.value = _state.value.copy(error = null)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/settings/servers/ServerManagementScreen.kt b/app/src/main/java/com/makd/afinity/ui/settings/servers/ServerManagementScreen.kt
index f50c9dc8d..4702b5747 100644
--- a/app/src/main/java/com/makd/afinity/ui/settings/servers/ServerManagementScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/settings/servers/ServerManagementScreen.kt
@@ -59,14 +59,12 @@ fun ServerManagementScreen(
     onAddServerClick: () -> Unit,
     onEditServerClick: (serverId: String) -> Unit,
     modifier: Modifier = Modifier,
-    viewModel: ServerManagementViewModel = hiltViewModel()
+    viewModel: ServerManagementViewModel = hiltViewModel(),
 ) {
     val state by viewModel.state.collectAsStateWithLifecycle()
     val snackbarHostState = remember { SnackbarHostState() }
 
-    LaunchedEffect(Unit) {
-        viewModel.loadServers()
-    }
+    LaunchedEffect(Unit) { viewModel.loadServers() }
 
     LaunchedEffect(state.error) {
         state.error?.let { error ->
@@ -81,78 +79,60 @@ fun ServerManagementScreen(
                 title = {
                     Text(
                         text = stringResource(R.string.server_management_title),
-                        style = MaterialTheme.typography.headlineMedium.copy(
-                            fontWeight = FontWeight.Bold
-                        )
+                        style =
+                            MaterialTheme.typography.headlineMedium.copy(
+                                fontWeight = FontWeight.Bold
+                            ),
                     )
                 },
                 navigationIcon = {
                     IconButton(onClick = onBackClick) {
                         Icon(
                             painter = painterResource(id = R.drawable.ic_chevron_left),
-                            contentDescription = stringResource(R.string.cd_back)
+                            contentDescription = stringResource(R.string.cd_back),
                         )
                     }
                 },
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = Color.Transparent
-                )
+                colors = TopAppBarDefaults.topAppBarColors(containerColor = Color.Transparent),
             )
         },
         floatingActionButton = {
             FloatingActionButton(
                 onClick = onAddServerClick,
                 containerColor = MaterialTheme.colorScheme.primary,
-                contentColor = MaterialTheme.colorScheme.onPrimary
+                contentColor = MaterialTheme.colorScheme.onPrimary,
             ) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_add),
-                    contentDescription = stringResource(R.string.cd_add_server)
+                    contentDescription = stringResource(R.string.cd_add_server),
                 )
             }
         },
-        snackbarHost = {
-            SnackbarHost(hostState = snackbarHostState)
-        },
-        modifier = modifier.fillMaxSize()
+        snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
+        modifier = modifier.fillMaxSize(),
     ) { paddingValues ->
         if (state.isLoading && state.servers.isEmpty()) {
             Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(paddingValues),
-                contentAlignment = Alignment.Center
+                modifier = Modifier.fillMaxSize().padding(paddingValues),
+                contentAlignment = Alignment.Center,
             ) {
                 CircularProgressIndicator()
             }
         } else if (state.servers.isEmpty()) {
-            EmptyServersState(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(paddingValues)
-            )
+            EmptyServersState(modifier = Modifier.fillMaxSize().padding(paddingValues))
         } else {
             LazyColumn(
-                contentPadding = PaddingValues(
-                    top = 16.dp,
-                    start = 16.dp,
-                    end = 16.dp,
-                    bottom = 80.dp
-                ),
+                contentPadding =
+                    PaddingValues(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 80.dp),
                 verticalArrangement = Arrangement.spacedBy(16.dp),
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(paddingValues)
+                modifier = Modifier.fillMaxSize().padding(paddingValues),
             ) {
-                items(
-                    items = state.servers,
-                    key = { it.server.id }
-                ) { serverWithCount ->
+                items(items = state.servers, key = { it.server.id }) { serverWithCount ->
                     ServerCard(
                         serverWithCount = serverWithCount,
                         onEditClick = { onEditServerClick(serverWithCount.server.id) },
                         onDeleteClick = { viewModel.showDeleteConfirmation(serverWithCount) },
-                        modifier = Modifier.fillMaxWidth()
+                        modifier = Modifier.fillMaxWidth(),
                     )
                 }
             }
@@ -162,7 +142,7 @@ fun ServerManagementScreen(
             DeleteServerConfirmationDialog(
                 serverWithCount = serverToDelete,
                 onConfirm = { viewModel.deleteServer(serverToDelete.server.id) },
-                onDismiss = { viewModel.hideDeleteConfirmation() }
+                onDismiss = { viewModel.hideDeleteConfirmation() },
             )
         }
     }
@@ -173,36 +153,33 @@ private fun ServerCard(
     serverWithCount: ServerWithUserCount,
     onEditClick: () -> Unit,
     onDeleteClick: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Card(
         modifier = modifier,
         shape = RoundedCornerShape(16.dp),
-        colors = CardDefaults.cardColors(
-            containerColor = MaterialTheme.colorScheme.surfaceContainer
-        ),
-        elevation = CardDefaults.cardElevation(0.dp)
+        colors =
+            CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainer),
+        elevation = CardDefaults.cardElevation(0.dp),
     ) {
         Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(16.dp),
-            verticalAlignment = Alignment.CenterVertically
+            modifier = Modifier.fillMaxWidth().padding(16.dp),
+            verticalAlignment = Alignment.CenterVertically,
         ) {
             Box(
-                modifier = Modifier
-                    .size(48.dp)
-                    .background(
-                        MaterialTheme.colorScheme.primaryContainer,
-                        RoundedCornerShape(12.dp)
-                    ),
-                contentAlignment = Alignment.Center
+                modifier =
+                    Modifier.size(48.dp)
+                        .background(
+                            MaterialTheme.colorScheme.primaryContainer,
+                            RoundedCornerShape(12.dp),
+                        ),
+                contentAlignment = Alignment.Center,
             ) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_server),
                     contentDescription = null,
                     tint = MaterialTheme.colorScheme.onPrimaryContainer,
-                    modifier = Modifier.size(24.dp)
+                    modifier = Modifier.size(24.dp),
                 )
             }
 
@@ -210,60 +187,56 @@ private fun ServerCard(
 
             Column(
                 modifier = Modifier.weight(1f),
-                verticalArrangement = Arrangement.spacedBy(2.dp)
+                verticalArrangement = Arrangement.spacedBy(2.dp),
             ) {
                 Text(
                     text = serverWithCount.server.name,
-                    style = MaterialTheme.typography.titleMedium.copy(
-                        fontWeight = FontWeight.Bold
-                    ),
+                    style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
-                    color = MaterialTheme.colorScheme.onSurface
+                    color = MaterialTheme.colorScheme.onSurface,
                 )
                 Text(
                     text = serverWithCount.server.address,
                     style = MaterialTheme.typography.bodySmall,
                     color = MaterialTheme.colorScheme.onSurfaceVariant,
                     maxLines = 1,
-                    overflow = TextOverflow.Ellipsis
+                    overflow = TextOverflow.Ellipsis,
                 )
 
                 if (serverWithCount.userCount > 0) {
                     Spacer(modifier = Modifier.height(4.dp))
-                    val userText = if (serverWithCount.userCount == 1)
-                        stringResource(R.string.user_singular)
-                    else
-                        stringResource(R.string.user_plural)
+                    val userText =
+                        if (serverWithCount.userCount == 1) stringResource(R.string.user_singular)
+                        else stringResource(R.string.user_plural)
 
                     Text(
-                        text = stringResource(
-                            R.string.user_count_fmt,
-                            serverWithCount.userCount,
-                            userText
-                        ),
+                        text =
+                            stringResource(
+                                R.string.user_count_fmt,
+                                serverWithCount.userCount,
+                                userText,
+                            ),
                         style = MaterialTheme.typography.labelSmall,
                         color = MaterialTheme.colorScheme.primary,
-                        fontWeight = FontWeight.Medium
+                        fontWeight = FontWeight.Medium,
                     )
                 }
             }
 
-            Row(
-                verticalAlignment = Alignment.CenterVertically
-            ) {
+            Row(verticalAlignment = Alignment.CenterVertically) {
                 IconButton(onClick = onEditClick) {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_edit),
                         contentDescription = stringResource(R.string.cd_edit_server),
-                        tint = MaterialTheme.colorScheme.onSurfaceVariant
+                        tint = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
                 }
                 IconButton(onClick = onDeleteClick) {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_delete),
                         contentDescription = stringResource(R.string.cd_delete_server),
-                        tint = MaterialTheme.colorScheme.error.copy(alpha = 0.8f)
+                        tint = MaterialTheme.colorScheme.error.copy(alpha = 0.8f),
                     )
                 }
             }
@@ -272,47 +245,37 @@ private fun ServerCard(
 }
 
 @Composable
-private fun EmptyServersState(
-    modifier: Modifier = Modifier
-) {
-    Box(
-        modifier = modifier,
-        contentAlignment = Alignment.Center
-    ) {
+private fun EmptyServersState(modifier: Modifier = Modifier) {
+    Box(modifier = modifier, contentAlignment = Alignment.Center) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.spacedBy(16.dp),
-            modifier = Modifier.padding(32.dp)
+            modifier = Modifier.padding(32.dp),
         ) {
             Box(
-                modifier = Modifier
-                    .size(100.dp)
-                    .background(
-                        MaterialTheme.colorScheme.surfaceContainerHigh,
-                        CircleShape
-                    ),
-                contentAlignment = Alignment.Center
+                modifier =
+                    Modifier.size(100.dp)
+                        .background(MaterialTheme.colorScheme.surfaceContainerHigh, CircleShape),
+                contentAlignment = Alignment.Center,
             ) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_server),
                     contentDescription = null,
                     modifier = Modifier.size(48.dp),
-                    tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f)
+                    tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f),
                 )
             }
 
             Text(
                 text = stringResource(R.string.empty_servers_title),
-                style = MaterialTheme.typography.titleLarge.copy(
-                    fontWeight = FontWeight.Bold
-                ),
-                color = MaterialTheme.colorScheme.onSurface
+                style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.Bold),
+                color = MaterialTheme.colorScheme.onSurface,
             )
             Text(
                 text = stringResource(R.string.empty_servers_message),
                 style = MaterialTheme.typography.bodyLarge,
                 color = MaterialTheme.colorScheme.onSurfaceVariant,
-                textAlign = TextAlign.Center
+                textAlign = TextAlign.Center,
             )
         }
     }
@@ -322,7 +285,7 @@ private fun EmptyServersState(
 private fun DeleteServerConfirmationDialog(
     serverWithCount: ServerWithUserCount,
     onConfirm: () -> Unit,
-    onDismiss: () -> Unit
+    onDismiss: () -> Unit,
 ) {
     AlertDialog(
         onDismissRequest = onDismiss,
@@ -330,53 +293,55 @@ private fun DeleteServerConfirmationDialog(
             Icon(
                 painter = painterResource(id = R.drawable.ic_delete),
                 contentDescription = null,
-                tint = MaterialTheme.colorScheme.error
+                tint = MaterialTheme.colorScheme.error,
             )
         },
         title = {
             Text(
                 text = stringResource(R.string.dialog_delete_server_title),
-                style = MaterialTheme.typography.headlineSmall.copy(
-                    fontWeight = FontWeight.Bold
-                )
+                style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
             )
         },
         text = {
             Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
                 Text(
-                    text = stringResource(
-                        R.string.dialog_delete_server_message_fmt,
-                        serverWithCount.server.name
-                    ),
-                    style = MaterialTheme.typography.bodyLarge
+                    text =
+                        stringResource(
+                            R.string.dialog_delete_server_message_fmt,
+                            serverWithCount.server.name,
+                        ),
+                    style = MaterialTheme.typography.bodyLarge,
                 )
                 if (serverWithCount.userCount > 0) {
                     Card(
-                        colors = CardDefaults.cardColors(
-                            containerColor = MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.5f)
-                        ),
+                        colors =
+                            CardDefaults.cardColors(
+                                containerColor =
+                                    MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.5f)
+                            ),
                         shape = RoundedCornerShape(8.dp),
-                        modifier = Modifier.fillMaxWidth()
+                        modifier = Modifier.fillMaxWidth(),
                     ) {
                         Row(
                             modifier = Modifier.padding(12.dp),
-                            verticalAlignment = Alignment.CenterVertically
+                            verticalAlignment = Alignment.CenterVertically,
                         ) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_exclamation_circle),
                                 contentDescription = null,
                                 tint = MaterialTheme.colorScheme.onErrorContainer,
-                                modifier = Modifier.size(20.dp)
+                                modifier = Modifier.size(20.dp),
                             )
                             Spacer(modifier = Modifier.width(8.dp))
                             Text(
-                                text = stringResource(
-                                    R.string.dialog_delete_server_warning_fmt,
-                                    serverWithCount.userCount
-                                ),
+                                text =
+                                    stringResource(
+                                        R.string.dialog_delete_server_warning_fmt,
+                                        serverWithCount.userCount,
+                                    ),
                                 style = MaterialTheme.typography.bodySmall,
                                 color = MaterialTheme.colorScheme.onErrorContainer,
-                                fontWeight = FontWeight.Medium
+                                fontWeight = FontWeight.Medium,
                             )
                         }
                     }
@@ -386,19 +351,18 @@ private fun DeleteServerConfirmationDialog(
         confirmButton = {
             Button(
                 onClick = onConfirm,
-                colors = ButtonDefaults.buttonColors(
-                    containerColor = MaterialTheme.colorScheme.error,
-                    contentColor = MaterialTheme.colorScheme.onError
-                )
+                colors =
+                    ButtonDefaults.buttonColors(
+                        containerColor = MaterialTheme.colorScheme.error,
+                        contentColor = MaterialTheme.colorScheme.onError,
+                    ),
             ) {
                 Text(stringResource(R.string.action_delete))
             }
         },
         dismissButton = {
-            TextButton(onClick = onDismiss) {
-                Text(stringResource(R.string.action_cancel))
-            }
+            TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) }
         },
-        shape = RoundedCornerShape(24.dp)
+        shape = RoundedCornerShape(24.dp),
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/settings/servers/ServerManagementViewModel.kt b/app/src/main/java/com/makd/afinity/ui/settings/servers/ServerManagementViewModel.kt
index 89efb8784..3e54cc6cd 100644
--- a/app/src/main/java/com/makd/afinity/ui/settings/servers/ServerManagementViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/settings/servers/ServerManagementViewModel.kt
@@ -9,30 +9,29 @@ import com.makd.afinity.data.models.server.Server
 import com.makd.afinity.data.repository.DatabaseRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 data class ServerManagementState(
     val servers: List<ServerWithUserCount> = emptyList(),
     val isLoading: Boolean = false,
     val error: String? = null,
-    val serverToDelete: ServerWithUserCount? = null
+    val serverToDelete: ServerWithUserCount? = null,
 )
 
-data class ServerWithUserCount(
-    val server: Server,
-    val userCount: Int
-)
+data class ServerWithUserCount(val server: Server, val userCount: Int)
 
 @HiltViewModel
-class ServerManagementViewModel @Inject constructor(
+class ServerManagementViewModel
+@Inject
+constructor(
     @ApplicationContext private val context: Context,
     private val sessionManager: SessionManager,
-    private val databaseRepository: DatabaseRepository
+    private val databaseRepository: DatabaseRepository,
 ) : ViewModel() {
 
     private val _state = MutableStateFlow(ServerManagementState())
@@ -48,24 +47,20 @@ class ServerManagementViewModel @Inject constructor(
                 _state.value = _state.value.copy(isLoading = true, error = null)
 
                 val servers = databaseRepository.getAllServers()
-                val serversWithCounts = servers.map { server ->
-                    val users = databaseRepository.getUsersForServer(server.id)
-                    ServerWithUserCount(
-                        server = server,
-                        userCount = users.size
-                    )
-                }
+                val serversWithCounts =
+                    servers.map { server ->
+                        val users = databaseRepository.getUsersForServer(server.id)
+                        ServerWithUserCount(server = server, userCount = users.size)
+                    }
 
-                _state.value = _state.value.copy(
-                    servers = serversWithCounts,
-                    isLoading = false
-                )
+                _state.value = _state.value.copy(servers = serversWithCounts, isLoading = false)
             } catch (e: Exception) {
                 Timber.e(e, "Error loading servers")
-                _state.value = _state.value.copy(
-                    error = e.message ?: context.getString(R.string.error_load_servers_failed),
-                    isLoading = false
-                )
+                _state.value =
+                    _state.value.copy(
+                        error = e.message ?: context.getString(R.string.error_load_servers_failed),
+                        isLoading = false,
+                    )
             }
         }
     }
@@ -81,14 +76,16 @@ class ServerManagementViewModel @Inject constructor(
     fun deleteServer(serverId: String) {
         viewModelScope.launch {
             try {
-                _state.value = _state.value.copy(isLoading = true, error = null, serverToDelete = null)
+                _state.value =
+                    _state.value.copy(isLoading = true, error = null, serverToDelete = null)
 
                 val currentSession = sessionManager.currentSession.value
                 if (currentSession?.serverId == serverId) {
-                    _state.value = _state.value.copy(
-                        error = context.getString(R.string.error_delete_active_server),
-                        isLoading = false
-                    )
+                    _state.value =
+                        _state.value.copy(
+                            error = context.getString(R.string.error_delete_active_server),
+                            isLoading = false,
+                        )
                     return@launch
                 }
 
@@ -101,10 +98,11 @@ class ServerManagementViewModel @Inject constructor(
                 Timber.d("Server deleted successfully: $serverId")
             } catch (e: Exception) {
                 Timber.e(e, "Error deleting server")
-                _state.value = _state.value.copy(
-                    error = e.message ?: context.getString(R.string.error_delete_server_failed),
-                    isLoading = false
-                )
+                _state.value =
+                    _state.value.copy(
+                        error = e.message ?: context.getString(R.string.error_delete_server_failed),
+                        isLoading = false,
+                    )
             }
         }
     }
@@ -112,4 +110,4 @@ class ServerManagementViewModel @Inject constructor(
     fun clearError() {
         _state.value = _state.value.copy(error = null)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/settings/update/GlobalUpdateDialog.kt b/app/src/main/java/com/makd/afinity/ui/settings/update/GlobalUpdateDialog.kt
index 5b62c8afe..6d37a8de4 100644
--- a/app/src/main/java/com/makd/afinity/ui/settings/update/GlobalUpdateDialog.kt
+++ b/app/src/main/java/com/makd/afinity/ui/settings/update/GlobalUpdateDialog.kt
@@ -11,9 +11,7 @@ import com.makd.afinity.data.updater.UpdateManager
 import com.makd.afinity.data.updater.models.UpdateState
 
 @Composable
-fun GlobalUpdateDialog(
-    updateManager: UpdateManager
-) {
+fun GlobalUpdateDialog(updateManager: UpdateManager) {
     val updateState by updateManager.updateState.collectAsStateWithLifecycle()
 
     var showDialog by remember { mutableStateOf(false) }
@@ -34,7 +32,8 @@ fun GlobalUpdateDialog(
             }
         }
 
-        UpdateState.Idle, UpdateState.UpToDate -> {
+        UpdateState.Idle,
+        UpdateState.UpToDate -> {
             hasShownForCurrentUpdate = false
         }
 
@@ -44,16 +43,18 @@ fun GlobalUpdateDialog(
     }
 
     if (showDialog) {
-        val release = when (val state = updateState) {
-            is UpdateState.Available -> state.release
-            is UpdateState.Downloaded -> state.release
-            else -> null
-        }
+        val release =
+            when (val state = updateState) {
+                is UpdateState.Available -> state.release
+                is UpdateState.Downloaded -> state.release
+                else -> null
+            }
 
-        val downloadedFile = when (val state = updateState) {
-            is UpdateState.Downloaded -> state.file
-            else -> null
-        }
+        val downloadedFile =
+            when (val state = updateState) {
+                is UpdateState.Downloaded -> state.file
+                else -> null
+            }
 
         if (release != null) {
             UpdateAvailableDialog(
@@ -61,9 +62,7 @@ fun GlobalUpdateDialog(
                 release = release,
                 downloadedFile = downloadedFile,
                 isDownloading = updateState is UpdateState.Downloading,
-                onDownload = {
-                    updateManager.downloadUpdate(release)
-                },
+                onDownload = { updateManager.downloadUpdate(release) },
                 onInstall = { file ->
                     updateManager.installUpdate(file)
                     showDialog = false
@@ -72,8 +71,8 @@ fun GlobalUpdateDialog(
                 onDismiss = {
                     showDialog = false
                     updateManager.resetState()
-                }
+                },
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/settings/update/UpdateAvailableDialog.kt b/app/src/main/java/com/makd/afinity/ui/settings/update/UpdateAvailableDialog.kt
index 86173b6de..419053b7e 100644
--- a/app/src/main/java/com/makd/afinity/ui/settings/update/UpdateAvailableDialog.kt
+++ b/app/src/main/java/com/makd/afinity/ui/settings/update/UpdateAvailableDialog.kt
@@ -52,7 +52,7 @@ fun UpdateAvailableDialog(
     isDownloading: Boolean,
     onDownload: () -> Unit,
     onInstall: (File) -> Unit,
-    onDismiss: () -> Unit
+    onDismiss: () -> Unit,
 ) {
     AlertDialog(
         onDismissRequest = onDismiss,
@@ -62,20 +62,19 @@ fun UpdateAvailableDialog(
                 painter = painterResource(id = R.drawable.ic_system_update),
                 contentDescription = null,
                 tint = MaterialTheme.colorScheme.primary,
-                modifier = Modifier.size(28.dp)
+                modifier = Modifier.size(28.dp),
             )
         },
-
         title = {
             Column(
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.Center,
-                modifier = Modifier.fillMaxWidth()
+                modifier = Modifier.fillMaxWidth(),
             ) {
                 Text(
                     text = stringResource(R.string.update_available_title),
                     style = MaterialTheme.typography.headlineSmall,
-                    fontWeight = FontWeight.Bold
+                    fontWeight = FontWeight.Bold,
                 )
 
                 Spacer(modifier = Modifier.height(8.dp))
@@ -83,17 +82,17 @@ fun UpdateAvailableDialog(
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
                     horizontalArrangement = Arrangement.Center,
-                    modifier = Modifier
-                        .background(
-                            color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f),
-                            shape = RoundedCornerShape(16.dp)
-                        )
-                        .padding(horizontal = 12.dp, vertical = 6.dp)
+                    modifier =
+                        Modifier.background(
+                                color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f),
+                                shape = RoundedCornerShape(16.dp),
+                            )
+                            .padding(horizontal = 12.dp, vertical = 6.dp),
                 ) {
                     Text(
                         text = stringResource(R.string.update_version_fmt, currentVersionName),
                         style = MaterialTheme.typography.labelLarge,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f)
+                        color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f),
                     )
 
                     Spacer(modifier = Modifier.width(8.dp))
@@ -102,7 +101,7 @@ fun UpdateAvailableDialog(
                         painter = painterResource(id = R.drawable.ic_chevron_right),
                         contentDescription = null,
                         modifier = Modifier.size(16.dp),
-                        tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f)
+                        tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f),
                     )
 
                     Spacer(modifier = Modifier.width(8.dp))
@@ -111,7 +110,7 @@ fun UpdateAvailableDialog(
                         text = release.tagName,
                         style = MaterialTheme.typography.labelLarge,
                         fontWeight = FontWeight.Bold,
-                        color = MaterialTheme.colorScheme.primary
+                        color = MaterialTheme.colorScheme.primary,
                     )
                 }
             }
@@ -119,32 +118,27 @@ fun UpdateAvailableDialog(
         text = {
             Column(
                 modifier = Modifier.fillMaxWidth(),
-                verticalArrangement = Arrangement.spacedBy(12.dp)
+                verticalArrangement = Arrangement.spacedBy(12.dp),
             ) {
                 Text(
                     text = stringResource(R.string.update_whats_new),
                     style = MaterialTheme.typography.titleSmall,
-                    color = MaterialTheme.colorScheme.primary
+                    color = MaterialTheme.colorScheme.primary,
                 )
 
                 Surface(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .weight(1f, fill = false)
-                        .height(400.dp),
+                    modifier = Modifier.fillMaxWidth().weight(1f, fill = false).height(400.dp),
                     shape = RoundedCornerShape(16.dp),
                     color = MaterialTheme.colorScheme.surfaceContainerLow,
                 ) {
                     Box(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(12.dp)
-                            .verticalScroll(rememberScrollState())
+                        modifier =
+                            Modifier.fillMaxWidth()
+                                .padding(12.dp)
+                                .verticalScroll(rememberScrollState())
                     ) {
                         ProvideTextStyle(value = MaterialTheme.typography.bodyMedium) {
-                            RichText(
-                                modifier = Modifier.fillMaxWidth()
-                            ) {
+                            RichText(modifier = Modifier.fillMaxWidth()) {
                                 Markdown(content = formatChangelog(release.body ?: ""))
                             }
                         }
@@ -162,30 +156,31 @@ fun UpdateAvailableDialog(
                     }
                 },
                 enabled = downloadedFile != null || !isDownloading,
-                modifier = Modifier.fillMaxWidth()
+                modifier = Modifier.fillMaxWidth(),
             ) {
                 AnimatedContent(
-                    targetState = when {
-                        downloadedFile != null -> UpdateButtonState.INSTALL
-                        isDownloading -> UpdateButtonState.DOWNLOADING
-                        else -> UpdateButtonState.DOWNLOAD
-                    },
+                    targetState =
+                        when {
+                            downloadedFile != null -> UpdateButtonState.INSTALL
+                            isDownloading -> UpdateButtonState.DOWNLOADING
+                            else -> UpdateButtonState.DOWNLOAD
+                        },
                     label = "ButtonAnimation",
                     transitionSpec = {
                         slideInVertically { height -> height } + fadeIn() togetherWith
-                                slideOutVertically { height -> -height } + fadeOut()
-                    }
+                            slideOutVertically { height -> -height } + fadeOut()
+                    },
                 ) { state ->
                     Row(
                         verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.Center
+                        horizontalArrangement = Arrangement.Center,
                     ) {
                         when (state) {
                             UpdateButtonState.INSTALL -> {
                                 Icon(
                                     painter = painterResource(id = R.drawable.ic_system_update),
                                     contentDescription = null,
-                                    modifier = Modifier.size(18.dp)
+                                    modifier = Modifier.size(18.dp),
                                 )
                                 Spacer(modifier = Modifier.width(8.dp))
                                 Text(stringResource(R.string.btn_install_restart))
@@ -195,7 +190,7 @@ fun UpdateAvailableDialog(
                                 CircularProgressIndicator(
                                     modifier = Modifier.size(16.dp),
                                     strokeWidth = 2.dp,
-                                    color = MaterialTheme.colorScheme.onPrimary
+                                    color = MaterialTheme.colorScheme.onPrimary,
                                 )
                                 Spacer(modifier = Modifier.width(8.dp))
                                 Text(stringResource(R.string.btn_downloading))
@@ -205,7 +200,7 @@ fun UpdateAvailableDialog(
                                 Icon(
                                     painter = painterResource(id = R.drawable.ic_download_arrow),
                                     contentDescription = null,
-                                    modifier = Modifier.size(18.dp)
+                                    modifier = Modifier.size(18.dp),
                                 )
                                 Spacer(modifier = Modifier.width(8.dp))
                                 Text(stringResource(R.string.btn_download_update))
@@ -216,49 +211,53 @@ fun UpdateAvailableDialog(
             }
         },
         dismissButton = {
-            TextButton(onClick = onDismiss) {
-                Text(stringResource(R.string.action_not_now))
-            }
-        }
+            TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_not_now)) }
+        },
     )
 }
 
 private enum class UpdateButtonState {
-    DOWNLOAD, DOWNLOADING, INSTALL
+    DOWNLOAD,
+    DOWNLOADING,
+    INSTALL,
 }
 
 private fun formatChangelog(text: String): String {
     var formatted = text
 
     val issueRegex = "https://github\\.com/[^/]+/[^/]+/(?:pull|issues)/(\\d+)".toRegex()
-    formatted = issueRegex.replace(formatted) { matchResult ->
-        val url = matchResult.value
-        val number = matchResult.groupValues[1]
-        "[$number]($url)"
-    }
+    formatted =
+        issueRegex.replace(formatted) { matchResult ->
+            val url = matchResult.value
+            val number = matchResult.groupValues[1]
+            "[$number]($url)"
+        }
 
     val commitRegex = "https://github\\.com/[^/]+/[^/]+/commit/([0-9a-f]{7})[0-9a-f]*".toRegex()
-    formatted = commitRegex.replace(formatted) { matchResult ->
-        val url = matchResult.value
-        val shortHash = matchResult.groupValues[1]
-        "[`$shortHash`]($url)"
-    }
+    formatted =
+        commitRegex.replace(formatted) { matchResult ->
+            val url = matchResult.value
+            val shortHash = matchResult.groupValues[1]
+            "[`$shortHash`]($url)"
+        }
 
     val compareRegex =
         "https://github\\.com/[^/]+/[^/]+/compare/([\\w\\d\\.-]+)\\.\\.\\.([\\w\\d\\.-]+)".toRegex()
-    formatted = compareRegex.replace(formatted) { matchResult ->
-        val url = matchResult.value
-        val oldVersion = matchResult.groupValues[1]
-        val newVersion = matchResult.groupValues[2]
-        "[$oldVersion...$newVersion]($url)"
-    }
+    formatted =
+        compareRegex.replace(formatted) { matchResult ->
+            val url = matchResult.value
+            val oldVersion = matchResult.groupValues[1]
+            val newVersion = matchResult.groupValues[2]
+            "[$oldVersion...$newVersion]($url)"
+        }
 
     val userRegex = "https://github\\.com/([a-zA-Z0-9-]+)(?=[\\s)]|$)".toRegex()
-    formatted = userRegex.replace(formatted) { matchResult ->
-        val url = matchResult.value
-        val user = matchResult.groupValues[1]
-        "[@$user]($url)"
-    }
+    formatted =
+        userRegex.replace(formatted) { matchResult ->
+            val url = matchResult.value
+            val user = matchResult.groupValues[1]
+            "[@$user]($url)"
+        }
 
     return formatted
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/settings/update/UpdateSection.kt b/app/src/main/java/com/makd/afinity/ui/settings/update/UpdateSection.kt
index 334f6b2c6..7bf49899b 100644
--- a/app/src/main/java/com/makd/afinity/ui/settings/update/UpdateSection.kt
+++ b/app/src/main/java/com/makd/afinity/ui/settings/update/UpdateSection.kt
@@ -1,12 +1,6 @@
 package com.makd.afinity.ui.settings.update
 
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.core.LinearEasing
-import androidx.compose.animation.core.RepeatMode
-import androidx.compose.animation.core.animateFloat
-import androidx.compose.animation.core.infiniteRepeatable
-import androidx.compose.animation.core.rememberInfiniteTransition
-import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.background
@@ -38,7 +32,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
@@ -53,10 +46,7 @@ import com.makd.afinity.data.updater.models.UpdateCheckFrequency
 import com.makd.afinity.data.updater.models.UpdateState
 
 @Composable
-fun UpdateSection(
-    modifier: Modifier = Modifier,
-    viewModel: UpdateViewModel = hiltViewModel()
-) {
+fun UpdateSection(modifier: Modifier = Modifier, viewModel: UpdateViewModel = hiltViewModel()) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val updateState by viewModel.updateState.collectAsStateWithLifecycle()
 
@@ -77,7 +67,10 @@ fun UpdateSection(
         UpdateAvailableDialog(
             currentVersionName = BuildConfig.VERSION_NAME,
             release = pendingRelease!!,
-            downloadedFile = if (updateState is UpdateState.Downloaded) (updateState as UpdateState.Downloaded).file else null,
+            downloadedFile =
+                if (updateState is UpdateState.Downloaded)
+                    (updateState as UpdateState.Downloaded).file
+                else null,
             isDownloading = updateState is UpdateState.Downloading,
             onDownload = { viewModel.downloadUpdate(pendingRelease!!) },
             onInstall = { file ->
@@ -90,7 +83,7 @@ fun UpdateSection(
                 showUpdateDialog = false
                 viewModel.dismissUpdate()
                 pendingRelease = null
-            }
+            },
         )
     }
 
@@ -98,14 +91,14 @@ fun UpdateSection(
         CheckForUpdatesItem(
             updateState = updateState,
             lastCheckTime = uiState.lastCheckTime,
-            onCheckClick = { viewModel.checkForUpdates() }
+            onCheckClick = { viewModel.checkForUpdates() },
         )
 
         SettingsDivider()
 
         UpdateFrequencySelector(
             currentFrequency = uiState.checkFrequency,
-            onFrequencySelected = { viewModel.setCheckFrequency(it) }
+            onFrequencySelected = { viewModel.setCheckFrequency(it) },
         )
     }
 }
@@ -114,30 +107,24 @@ fun UpdateSection(
 private fun SettingsGroup(
     title: String? = null,
     modifier: Modifier = Modifier,
-    content: @Composable ColumnScope.() -> Unit
+    content: @Composable ColumnScope.() -> Unit,
 ) {
-    Column(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(horizontal = 16.dp)
-    ) {
+    Column(modifier = modifier.fillMaxWidth().padding(horizontal = 16.dp)) {
         if (title != null) {
             Text(
                 text = title,
                 style = MaterialTheme.typography.titleSmall,
                 color = MaterialTheme.colorScheme.primary,
                 fontWeight = FontWeight.Bold,
-                modifier = Modifier.padding(start = 16.dp, bottom = 8.dp)
+                modifier = Modifier.padding(start = 16.dp, bottom = 8.dp),
             )
         }
         Surface(
             shape = RoundedCornerShape(24.dp),
             color = MaterialTheme.colorScheme.surfaceContainerLow,
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth(),
         ) {
-            Column(modifier = Modifier.padding(vertical = 4.dp)) {
-                content()
-            }
+            Column(modifier = Modifier.padding(vertical = 4.dp)) { content() }
         }
     }
 }
@@ -146,7 +133,7 @@ private fun SettingsGroup(
 private fun SettingsDivider() {
     HorizontalDivider(
         modifier = Modifier.padding(start = 56.dp, end = 16.dp),
-        color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f)
+        color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f),
     )
 }
 
@@ -155,68 +142,65 @@ private fun CheckForUpdatesItem(
     updateState: UpdateState,
     lastCheckTime: String,
     onCheckClick: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val isChecking = updateState is UpdateState.Checking
     val isDownloading = updateState is UpdateState.Downloading
 
     Row(
-        modifier = modifier
-            .fillMaxWidth()
-            .clickable(enabled = !isChecking && !isDownloading) { onCheckClick() }
-            .padding(horizontal = 16.dp, vertical = 16.dp),
-        verticalAlignment = Alignment.CenterVertically
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .clickable(enabled = !isChecking && !isDownloading) { onCheckClick() }
+                .padding(horizontal = 16.dp, vertical = 16.dp),
+        verticalAlignment = Alignment.CenterVertically,
     ) {
         Icon(
             painter = painterResource(id = R.drawable.ic_system_update),
             contentDescription = null,
-            tint = if (isChecking) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurfaceVariant,
-            modifier = Modifier
-                .size(24.dp)
+            tint =
+                if (isChecking) MaterialTheme.colorScheme.primary
+                else MaterialTheme.colorScheme.onSurfaceVariant,
+            modifier = Modifier.size(24.dp),
         )
 
         Spacer(modifier = Modifier.width(16.dp))
 
-        Column(
-            modifier = Modifier.weight(1f),
-            verticalArrangement = Arrangement.Center
-        ) {
+        Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center) {
             Text(
                 text = stringResource(R.string.pref_check_updates_title),
                 style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium),
-                color = MaterialTheme.colorScheme.onSurface
+                color = MaterialTheme.colorScheme.onSurface,
             )
 
             AnimatedVisibility(
                 visible = updateState is UpdateState.Downloading,
                 enter = fadeIn(),
-                exit = fadeOut()
+                exit = fadeOut(),
             ) {
                 Column(modifier = Modifier.padding(top = 4.dp)) {
                     val progress = (updateState as? UpdateState.Downloading)?.progress ?: 0
                     Row(
                         modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.SpaceBetween
+                        horizontalArrangement = Arrangement.SpaceBetween,
                     ) {
                         Text(
                             text = stringResource(R.string.update_status_downloading),
                             style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.primary
+                            color = MaterialTheme.colorScheme.primary,
                         )
                         Text(
                             text = stringResource(R.string.update_progress_fmt, progress),
                             style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.primary
+                            color = MaterialTheme.colorScheme.primary,
                         )
                     }
                     Spacer(modifier = Modifier.height(4.dp))
                     LinearProgressIndicator(
                         progress = { progress / 100f },
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(4.dp),
+                        modifier = Modifier.fillMaxWidth().height(4.dp),
                         trackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
-                        color = MaterialTheme.colorScheme.primary
+                        color = MaterialTheme.colorScheme.primary,
                     )
                 }
             }
@@ -224,33 +208,33 @@ private fun CheckForUpdatesItem(
             AnimatedVisibility(
                 visible = updateState !is UpdateState.Downloading,
                 enter = fadeIn(),
-                exit = fadeOut()
+                exit = fadeOut(),
             ) {
                 Text(
-                    text = when (updateState) {
-                        is UpdateState.Checking -> stringResource(R.string.update_status_checking)
-                        is UpdateState.UpToDate -> stringResource(
-                            R.string.update_status_uptodate_fmt,
-                            lastCheckTime
-                        )
+                    text =
+                        when (updateState) {
+                            is UpdateState.Checking ->
+                                stringResource(R.string.update_status_checking)
+                            is UpdateState.UpToDate ->
+                                stringResource(R.string.update_status_uptodate_fmt, lastCheckTime)
 
-                        is UpdateState.Error -> stringResource(
-                            R.string.update_status_failed_fmt,
-                            lastCheckTime
-                        )
+                            is UpdateState.Error ->
+                                stringResource(R.string.update_status_failed_fmt, lastCheckTime)
 
-                        else -> stringResource(R.string.update_status_last_check_fmt, lastCheckTime)
-                    },
+                            else ->
+                                stringResource(R.string.update_status_last_check_fmt, lastCheckTime)
+                        },
                     style = MaterialTheme.typography.bodyMedium,
-                    color = when (updateState) {
-                        is UpdateState.Checking -> MaterialTheme.colorScheme.primary
-                        is UpdateState.UpToDate -> MaterialTheme.colorScheme.tertiary
-                        is UpdateState.Error -> MaterialTheme.colorScheme.error
-                        else -> MaterialTheme.colorScheme.onSurfaceVariant
-                    },
+                    color =
+                        when (updateState) {
+                            is UpdateState.Checking -> MaterialTheme.colorScheme.primary
+                            is UpdateState.UpToDate -> MaterialTheme.colorScheme.tertiary
+                            is UpdateState.Error -> MaterialTheme.colorScheme.error
+                            else -> MaterialTheme.colorScheme.onSurfaceVariant
+                        },
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
-                    modifier = Modifier.padding(top = 2.dp)
+                    modifier = Modifier.padding(top = 2.dp),
                 )
             }
         }
@@ -261,41 +245,38 @@ private fun CheckForUpdatesItem(
 private fun UpdateFrequencySelector(
     currentFrequency: UpdateCheckFrequency,
     onFrequencySelected: (UpdateCheckFrequency) -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     var expanded by remember { mutableStateOf(false) }
 
     Box(modifier = modifier.fillMaxWidth()) {
         Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .clickable { expanded = true }
-                .padding(horizontal = 16.dp, vertical = 16.dp),
-            verticalAlignment = Alignment.CenterVertically
+            modifier =
+                Modifier.fillMaxWidth()
+                    .clickable { expanded = true }
+                    .padding(horizontal = 16.dp, vertical = 16.dp),
+            verticalAlignment = Alignment.CenterVertically,
         ) {
             Icon(
                 painter = painterResource(id = R.drawable.ic_schedule),
                 contentDescription = null,
                 tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                modifier = Modifier.size(24.dp)
+                modifier = Modifier.size(24.dp),
             )
 
             Spacer(modifier = Modifier.width(16.dp))
 
-            Column(
-                modifier = Modifier.weight(1f),
-                verticalArrangement = Arrangement.Center
-            ) {
+            Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center) {
                 Text(
                     text = stringResource(R.string.pref_check_frequency_title),
                     style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium),
-                    color = MaterialTheme.colorScheme.onSurface
+                    color = MaterialTheme.colorScheme.onSurface,
                 )
                 Text(
                     text = getUpdateCheckFrequencyDisplayName(currentFrequency),
                     style = MaterialTheme.typography.bodyMedium,
                     color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    modifier = Modifier.padding(top = 2.dp)
+                    modifier = Modifier.padding(top = 2.dp),
                 )
             }
         }
@@ -303,26 +284,26 @@ private fun UpdateFrequencySelector(
         DropdownMenu(
             expanded = expanded,
             onDismissRequest = { expanded = false },
-            modifier = Modifier.background(MaterialTheme.colorScheme.surfaceContainerHigh)
+            modifier = Modifier.background(MaterialTheme.colorScheme.surfaceContainerHigh),
         ) {
             UpdateCheckFrequency.entries.forEach { frequency ->
                 DropdownMenuItem(
                     text = {
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(8.dp)
+                            horizontalArrangement = Arrangement.spacedBy(8.dp),
                         ) {
                             Text(
                                 text = getUpdateCheckFrequencyDisplayName(frequency),
                                 style = MaterialTheme.typography.bodyLarge,
-                                color = MaterialTheme.colorScheme.onSurface
+                                color = MaterialTheme.colorScheme.onSurface,
                             )
                             if (frequency == currentFrequency) {
                                 Icon(
                                     painter = painterResource(id = R.drawable.ic_circle_check),
                                     contentDescription = null,
                                     tint = MaterialTheme.colorScheme.primary,
-                                    modifier = Modifier.size(18.dp)
+                                    modifier = Modifier.size(18.dp),
                                 )
                             }
                         }
@@ -330,7 +311,7 @@ private fun UpdateFrequencySelector(
                     onClick = {
                         onFrequencySelected(frequency)
                         expanded = false
-                    }
+                    },
                 )
             }
         }
@@ -345,4 +326,4 @@ private fun getUpdateCheckFrequencyDisplayName(frequency: UpdateCheckFrequency):
         UpdateCheckFrequency.TWELVE_HOURS -> stringResource(R.string.freq_12_hours)
         UpdateCheckFrequency.TWENTY_FOUR_HOURS -> stringResource(R.string.freq_24_hours)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/settings/update/UpdateViewModel.kt b/app/src/main/java/com/makd/afinity/ui/settings/update/UpdateViewModel.kt
index 60e68fe3a..6dab6e88b 100644
--- a/app/src/main/java/com/makd/afinity/ui/settings/update/UpdateViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/settings/update/UpdateViewModel.kt
@@ -13,22 +13,24 @@ import com.makd.afinity.data.updater.models.UpdateCheckFrequency
 import com.makd.afinity.data.updater.models.UpdateState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-import javax.inject.Inject
 
 @HiltViewModel
-class UpdateViewModel @Inject constructor(
+class UpdateViewModel
+@Inject
+constructor(
     @ApplicationContext private val context: Context,
     private val updateManager: UpdateManager,
     private val updateScheduler: UpdateScheduler,
-    private val preferencesRepository: PreferencesRepository
+    private val preferencesRepository: PreferencesRepository,
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(UpdateUiState())
@@ -43,18 +45,19 @@ class UpdateViewModel @Inject constructor(
     private fun loadUpdatePreferences() {
         viewModelScope.launch {
             preferencesRepository.getUpdateCheckFrequencyFlow().collect { hours ->
-                _uiState.value = _uiState.value.copy(
-                    checkFrequency = UpdateCheckFrequency.fromHours(hours)
-                )
+                _uiState.value =
+                    _uiState.value.copy(checkFrequency = UpdateCheckFrequency.fromHours(hours))
             }
         }
 
         viewModelScope.launch {
             val lastCheck = preferencesRepository.getLastUpdateCheck()
-            _uiState.value = _uiState.value.copy(
-                lastCheckTime = if (lastCheck > 0) formatTimestamp(lastCheck) else context.getString(
-                    R.string.update_never_checked)
-            )
+            _uiState.value =
+                _uiState.value.copy(
+                    lastCheckTime =
+                        if (lastCheck > 0) formatTimestamp(lastCheck)
+                        else context.getString(R.string.update_never_checked)
+                )
         }
     }
 
@@ -63,9 +66,7 @@ class UpdateViewModel @Inject constructor(
             try {
                 val release = updateManager.checkForUpdates()
                 val lastCheck = preferencesRepository.getLastUpdateCheck()
-                _uiState.value = _uiState.value.copy(
-                    lastCheckTime = formatTimestamp(lastCheck)
-                )
+                _uiState.value = _uiState.value.copy(lastCheckTime = formatTimestamp(lastCheck))
             } catch (e: Exception) {
                 Timber.e(e, "Failed to check for updates")
             }
@@ -102,5 +103,5 @@ class UpdateViewModel @Inject constructor(
 data class UpdateUiState(
     val currentVersion: String = BuildConfig.VERSION_NAME,
     val checkFrequency: UpdateCheckFrequency = UpdateCheckFrequency.ON_APP_OPEN,
-    val lastCheckTime: String = ""
-)
\ No newline at end of file
+    val lastCheckTime: String = "",
+)
diff --git a/app/src/main/java/com/makd/afinity/ui/theme/CardDimensions.kt b/app/src/main/java/com/makd/afinity/ui/theme/CardDimensions.kt
index 46ec5b8a7..cc1a5754a 100644
--- a/app/src/main/java/com/makd/afinity/ui/theme/CardDimensions.kt
+++ b/app/src/main/java/com/makd/afinity/ui/theme/CardDimensions.kt
@@ -24,28 +24,31 @@ object CardDimensions {
     }
 
     val WindowWidthSizeClass.portraitWidth: Dp
-        get() = when (this) {
-            WindowWidthSizeClass.Compact -> Values.PortraitCompact
-            WindowWidthSizeClass.Medium -> Values.PortraitMedium
-            WindowWidthSizeClass.Expanded -> Values.PortraitExpanded
-            else -> Values.PortraitCompact
-        }
+        get() =
+            when (this) {
+                WindowWidthSizeClass.Compact -> Values.PortraitCompact
+                WindowWidthSizeClass.Medium -> Values.PortraitMedium
+                WindowWidthSizeClass.Expanded -> Values.PortraitExpanded
+                else -> Values.PortraitCompact
+            }
 
     val WindowWidthSizeClass.landscapeWidth: Dp
-        get() = when (this) {
-            WindowWidthSizeClass.Compact -> Values.LandscapeCompact
-            WindowWidthSizeClass.Medium -> Values.LandscapeMedium
-            WindowWidthSizeClass.Expanded -> Values.LandscapeExpanded
-            else -> Values.LandscapeCompact
-        }
+        get() =
+            when (this) {
+                WindowWidthSizeClass.Compact -> Values.LandscapeCompact
+                WindowWidthSizeClass.Medium -> Values.LandscapeMedium
+                WindowWidthSizeClass.Expanded -> Values.LandscapeExpanded
+                else -> Values.LandscapeCompact
+            }
 
     val WindowWidthSizeClass.gridMinSize: Dp
-        get() = when (this) {
-            WindowWidthSizeClass.Compact -> Values.GridCompact
-            WindowWidthSizeClass.Medium -> Values.GridMedium
-            WindowWidthSizeClass.Expanded -> Values.GridExpanded
-            else -> Values.GridCompact
-        }
+        get() =
+            when (this) {
+                WindowWidthSizeClass.Compact -> Values.GridCompact
+                WindowWidthSizeClass.Medium -> Values.GridMedium
+                WindowWidthSizeClass.Expanded -> Values.GridExpanded
+                else -> Values.GridCompact
+            }
 
     fun calculateHeight(width: Dp, aspectRatio: Float): Dp = width / aspectRatio
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/theme/Color.kt b/app/src/main/java/com/makd/afinity/ui/theme/Color.kt
index c837d7193..5a268a243 100644
--- a/app/src/main/java/com/makd/afinity/ui/theme/Color.kt
+++ b/app/src/main/java/com/makd/afinity/ui/theme/Color.kt
@@ -8,4 +8,4 @@ val Pink80 = Color(0xFFEFB8C8)
 
 val Purple40 = Color(0xFF6650a4)
 val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)
\ No newline at end of file
+val Pink40 = Color(0xFF7D5260)
diff --git a/app/src/main/java/com/makd/afinity/ui/theme/Theme.kt b/app/src/main/java/com/makd/afinity/ui/theme/Theme.kt
index 608c82d13..eb8824530 100644
--- a/app/src/main/java/com/makd/afinity/ui/theme/Theme.kt
+++ b/app/src/main/java/com/makd/afinity/ui/theme/Theme.kt
@@ -11,66 +11,61 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 
-private val DarkColorScheme = darkColorScheme(
-    primary = Purple80,
-    secondary = PurpleGrey80,
-    tertiary = Pink80
-)
+private val DarkColorScheme =
+    darkColorScheme(primary = Purple80, secondary = PurpleGrey80, tertiary = Pink80)
 
-private val LightColorScheme = lightColorScheme(
-    primary = Purple40,
-    secondary = PurpleGrey40,
-    tertiary = Pink40
-)
+private val LightColorScheme =
+    lightColorScheme(primary = Purple40, secondary = PurpleGrey40, tertiary = Pink40)
 
-private val AmoledColorScheme = darkColorScheme(
-    primary = Purple80,
-    secondary = PurpleGrey80,
-    tertiary = Pink80,
-    background = Color.Black,
-    surface = Color.Black,
-    surfaceVariant = Color(0xFF1C1C1C)
-)
+private val AmoledColorScheme =
+    darkColorScheme(
+        primary = Purple80,
+        secondary = PurpleGrey80,
+        tertiary = Pink80,
+        background = Color.Black,
+        surface = Color.Black,
+        surfaceVariant = Color(0xFF1C1C1C),
+    )
 
 @Composable
 fun AFinityTheme(
     themeMode: String = ThemeMode.SYSTEM.name,
     dynamicColor: Boolean = true,
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
     val mode = ThemeMode.fromString(themeMode)
     val systemInDarkTheme = isSystemInDarkTheme()
 
-    val darkTheme = when (mode) {
-        ThemeMode.SYSTEM -> systemInDarkTheme
-        ThemeMode.LIGHT -> false
-        ThemeMode.DARK -> true
-        ThemeMode.AMOLED -> true
-    }
+    val darkTheme =
+        when (mode) {
+            ThemeMode.SYSTEM -> systemInDarkTheme
+            ThemeMode.LIGHT -> false
+            ThemeMode.DARK -> true
+            ThemeMode.AMOLED -> true
+        }
 
-    val colorScheme = when {
-        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-            val context = LocalContext.current
-            val baseDynamicScheme = if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+    val colorScheme =
+        when {
+            dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+                val context = LocalContext.current
+                val baseDynamicScheme =
+                    if (darkTheme) dynamicDarkColorScheme(context)
+                    else dynamicLightColorScheme(context)
 
-            if (mode == ThemeMode.AMOLED) {
-                baseDynamicScheme.copy(
-                    background = Color.Black,
-                    surface = Color.Black,
-                    surfaceVariant = Color(0xFF1C1C1C)
-                )
-            } else {
-                baseDynamicScheme
+                if (mode == ThemeMode.AMOLED) {
+                    baseDynamicScheme.copy(
+                        background = Color.Black,
+                        surface = Color.Black,
+                        surfaceVariant = Color(0xFF1C1C1C),
+                    )
+                } else {
+                    baseDynamicScheme
+                }
             }
+            mode == ThemeMode.AMOLED -> AmoledColorScheme
+            darkTheme -> DarkColorScheme
+            else -> LightColorScheme
         }
-        mode == ThemeMode.AMOLED -> AmoledColorScheme
-        darkTheme -> DarkColorScheme
-        else -> LightColorScheme
-    }
 
-    MaterialTheme(
-        colorScheme = colorScheme,
-        typography = Typography,
-        content = content
-    )
-}
\ No newline at end of file
+    MaterialTheme(colorScheme = colorScheme, typography = Typography, content = content)
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/theme/ThemeMode.kt b/app/src/main/java/com/makd/afinity/ui/theme/ThemeMode.kt
index ecc586286..c3c2c122e 100644
--- a/app/src/main/java/com/makd/afinity/ui/theme/ThemeMode.kt
+++ b/app/src/main/java/com/makd/afinity/ui/theme/ThemeMode.kt
@@ -11,4 +11,4 @@ enum class ThemeMode(val displayName: String) {
             return entries.find { it.name == value } ?: SYSTEM
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/theme/Type.kt b/app/src/main/java/com/makd/afinity/ui/theme/Type.kt
index 603f0f12d..86c3e13cb 100644
--- a/app/src/main/java/com/makd/afinity/ui/theme/Type.kt
+++ b/app/src/main/java/com/makd/afinity/ui/theme/Type.kt
@@ -6,28 +6,30 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
 
-val Typography = Typography(
-    bodyLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 16.sp,
-        lineHeight = 24.sp,
-        letterSpacing = 0.5.sp
+val Typography =
+    Typography(
+        bodyLarge =
+            TextStyle(
+                fontFamily = FontFamily.Default,
+                fontWeight = FontWeight.Normal,
+                fontSize = 16.sp,
+                lineHeight = 24.sp,
+                letterSpacing = 0.5.sp,
+            )
+        /* Other default text styles to override
+        titleLarge = TextStyle(
+            fontFamily = FontFamily.Default,
+            fontWeight = FontWeight.Normal,
+            fontSize = 22.sp,
+            lineHeight = 28.sp,
+            letterSpacing = 0.sp
+        ),
+        labelSmall = TextStyle(
+            fontFamily = FontFamily.Default,
+            fontWeight = FontWeight.Medium,
+            fontSize = 11.sp,
+            lineHeight = 16.sp,
+            letterSpacing = 0.5.sp
+        )
+        */
     )
-    /* Other default text styles to override
-    titleLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 22.sp,
-        lineHeight = 28.sp,
-        letterSpacing = 0.sp
-    ),
-    labelSmall = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Medium,
-        fontSize = 11.sp,
-        lineHeight = 16.sp,
-        letterSpacing = 0.5.sp
-    )
-    */
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/makd/afinity/ui/utils/HtmlTextUtils.kt b/app/src/main/java/com/makd/afinity/ui/utils/HtmlTextUtils.kt
index ed1dc84ed..bdf213f55 100644
--- a/app/src/main/java/com/makd/afinity/ui/utils/HtmlTextUtils.kt
+++ b/app/src/main/java/com/makd/afinity/ui/utils/HtmlTextUtils.kt
@@ -12,11 +12,7 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.withLink
 import androidx.core.text.HtmlCompat
 
-
-fun htmlToAnnotatedString(
-    html: String,
-    linkColor: Color = Color(0xFF6495ED)
-): AnnotatedString {
+fun htmlToAnnotatedString(html: String, linkColor: Color = Color(0xFF6495ED)): AnnotatedString {
     val spanned = HtmlCompat.fromHtml(html, HtmlCompat.FROM_HTML_MODE_COMPACT)
     return spannedToAnnotatedString(spanned, linkColor)
 }
@@ -41,12 +37,14 @@ private fun spannedToAnnotatedString(spanned: Spanned, linkColor: Color): Annota
             withLink(
                 LinkAnnotation.Url(
                     url = urlSpan.url,
-                    styles = TextLinkStyles(
-                        style = SpanStyle(
-                            color = linkColor,
-                            textDecoration = TextDecoration.Underline
-                        )
-                    )
+                    styles =
+                        TextLinkStyles(
+                            style =
+                                SpanStyle(
+                                    color = linkColor,
+                                    textDecoration = TextDecoration.Underline,
+                                )
+                        ),
                 )
             ) {
                 append(text.substring(start, end))
@@ -59,4 +57,4 @@ private fun spannedToAnnotatedString(spanned: Spanned, linkColor: Color): Annota
             append(text.substring(currentIndex))
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/utils/IntentUtils.kt b/app/src/main/java/com/makd/afinity/ui/utils/IntentUtils.kt
index 0e85f830c..c00fddd7e 100644
--- a/app/src/main/java/com/makd/afinity/ui/utils/IntentUtils.kt
+++ b/app/src/main/java/com/makd/afinity/ui/utils/IntentUtils.kt
@@ -43,10 +43,12 @@ object IntentUtils {
     }
 
     private fun extractYouTubeVideoId(url: String): String? {
-        val patterns = listOf(
-            "(?:youtube\\.com/watch\\?v=|youtu\\.be/|youtube\\.com/embed/)([a-zA-Z0-9_-]{11})".toRegex(),
-            "v=([a-zA-Z0-9_-]{11})".toRegex()
-        )
+        val patterns =
+            listOf(
+                "(?:youtube\\.com/watch\\?v=|youtu\\.be/|youtube\\.com/embed/)([a-zA-Z0-9_-]{11})"
+                    .toRegex(),
+                "v=([a-zA-Z0-9_-]{11})".toRegex(),
+            )
 
         for (pattern in patterns) {
             val matchResult = pattern.find(url)
@@ -57,4 +59,4 @@ object IntentUtils {
 
         return null
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/watchlist/WatchlistScreen.kt b/app/src/main/java/com/makd/afinity/ui/watchlist/WatchlistScreen.kt
index 1deddc348..55e47e73a 100644
--- a/app/src/main/java/com/makd/afinity/ui/watchlist/WatchlistScreen.kt
+++ b/app/src/main/java/com/makd/afinity/ui/watchlist/WatchlistScreen.kt
@@ -48,18 +48,18 @@ fun WatchlistScreen(
     navController: NavController,
     modifier: Modifier = Modifier,
     viewModel: WatchlistViewModel = hiltViewModel(),
-    widthSizeClass: WindowWidthSizeClass
+    widthSizeClass: WindowWidthSizeClass,
 ) {
     val context = LocalContext.current
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val selectedEpisode by viewModel.selectedEpisode.collectAsStateWithLifecycle()
     val isLoadingEpisode by viewModel.isLoadingEpisode.collectAsStateWithLifecycle()
-    val selectedEpisodeWatchlistStatus by viewModel.selectedEpisodeWatchlistStatus.collectAsStateWithLifecycle()
-    val selectedEpisodeDownloadInfo by viewModel.selectedEpisodeDownloadInfo.collectAsStateWithLifecycle()
+    val selectedEpisodeWatchlistStatus by
+        viewModel.selectedEpisodeWatchlistStatus.collectAsStateWithLifecycle()
+    val selectedEpisodeDownloadInfo by
+        viewModel.selectedEpisodeDownloadInfo.collectAsStateWithLifecycle()
 
-    LaunchedEffect(Unit) {
-        viewModel.loadWatchlist()
-    }
+    LaunchedEffect(Unit) { viewModel.loadWatchlist() }
 
     val portraitWidth = widthSizeClass.portraitWidth
     val landscapeWidth = widthSizeClass.landscapeWidth
@@ -70,10 +70,11 @@ fun WatchlistScreen(
                 title = {
                     Text(
                         text = stringResource(R.string.watchlist_title),
-                        style = MaterialTheme.typography.headlineLarge.copy(
-                            fontWeight = FontWeight.Bold
-                        ),
-                        color = MaterialTheme.colorScheme.onBackground
+                        style =
+                            MaterialTheme.typography.headlineLarge.copy(
+                                fontWeight = FontWeight.Bold
+                            ),
+                        color = MaterialTheme.colorScheme.onBackground,
                     )
                 },
                 onSearchClick = {
@@ -84,18 +85,16 @@ fun WatchlistScreen(
                     val route = Destination.createSettingsRoute()
                     navController.navigate(route)
                 },
-                userProfileImageUrl = mainUiState.userProfileImageUrl
+                userProfileImageUrl = mainUiState.userProfileImageUrl,
             )
         },
-        modifier = modifier
+        modifier = modifier,
     ) { innerPadding ->
         when {
             uiState.isLoading -> {
                 Box(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(innerPadding),
-                    contentAlignment = Alignment.Center
+                    modifier = Modifier.fillMaxSize().padding(innerPadding),
+                    contentAlignment = Alignment.Center,
                 ) {
                     CircularProgressIndicator()
                 }
@@ -103,41 +102,38 @@ fun WatchlistScreen(
 
             uiState.error != null -> {
                 Box(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(innerPadding),
-                    contentAlignment = Alignment.Center
+                    modifier = Modifier.fillMaxSize().padding(innerPadding),
+                    contentAlignment = Alignment.Center,
                 ) {
                     Text(
                         text = uiState.error ?: stringResource(R.string.error_unknown),
                         color = MaterialTheme.colorScheme.error,
-                        style = MaterialTheme.typography.bodyLarge
+                        style = MaterialTheme.typography.bodyLarge,
                     )
                 }
             }
 
-            uiState.movies.isEmpty() && uiState.shows.isEmpty() && uiState.seasons.isEmpty() && uiState.episodes.isEmpty() -> {
+            uiState.movies.isEmpty() &&
+                uiState.shows.isEmpty() &&
+                uiState.seasons.isEmpty() &&
+                uiState.episodes.isEmpty() -> {
                 Box(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(innerPadding),
-                    contentAlignment = Alignment.Center
+                    modifier = Modifier.fillMaxSize().padding(innerPadding),
+                    contentAlignment = Alignment.Center,
                 ) {
                     Text(
                         text = stringResource(R.string.watchlist_empty),
                         style = MaterialTheme.typography.bodyLarge,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
                     )
                 }
             }
 
             else -> {
                 LazyColumn(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(innerPadding),
+                    modifier = Modifier.fillMaxSize().padding(innerPadding),
                     contentPadding = PaddingValues(16.dp),
-                    verticalArrangement = Arrangement.spacedBy(24.dp)
+                    verticalArrangement = Arrangement.spacedBy(24.dp),
                 ) {
                     if (uiState.movies.isNotEmpty()) {
                         item {
@@ -145,7 +141,7 @@ fun WatchlistScreen(
                                 title = stringResource(R.string.section_movies),
                                 items = uiState.movies,
                                 onItemClick = onItemClick,
-                                cardWidth = portraitWidth
+                                cardWidth = portraitWidth,
                             )
                         }
                     }
@@ -156,7 +152,7 @@ fun WatchlistScreen(
                                 title = stringResource(R.string.section_tv_shows),
                                 items = uiState.shows,
                                 onItemClick = onItemClick,
-                                cardWidth = portraitWidth
+                                cardWidth = portraitWidth,
                             )
                         }
                     }
@@ -167,7 +163,7 @@ fun WatchlistScreen(
                                 title = stringResource(R.string.section_seasons),
                                 items = uiState.seasons,
                                 onItemClick = onItemClick,
-                                cardWidth = portraitWidth
+                                cardWidth = portraitWidth,
                             )
                         }
                     }
@@ -177,10 +173,8 @@ fun WatchlistScreen(
                             WatchlistEpisodesSection(
                                 title = stringResource(R.string.section_episodes),
                                 episodes = uiState.episodes,
-                                onEpisodeClick = { episode ->
-                                    viewModel.selectEpisode(episode)
-                                },
-                                cardWidth = landscapeWidth
+                                onEpisodeClick = { episode -> viewModel.selectEpisode(episode) },
+                                cardWidth = landscapeWidth,
                             )
                         }
                     }
@@ -194,9 +188,7 @@ fun WatchlistScreen(
             episode = episode,
             isInWatchlist = selectedEpisodeWatchlistStatus,
             downloadInfo = selectedEpisodeDownloadInfo,
-            onDismiss = {
-                viewModel.clearSelectedEpisode()
-            },
+            onDismiss = { viewModel.clearSelectedEpisode() },
             onPlayClick = { episodeToPlay, selection ->
                 viewModel.clearSelectedEpisode()
                 com.makd.afinity.ui.player.PlayerLauncher.launch(
@@ -205,37 +197,23 @@ fun WatchlistScreen(
                     mediaSourceId = selection.mediaSourceId,
                     audioStreamIndex = selection.audioStreamIndex,
                     subtitleStreamIndex = selection.subtitleStreamIndex,
-                    startPositionMs = selection.startPositionMs
+                    startPositionMs = selection.startPositionMs,
                 )
             },
-            onToggleFavorite = {
-                viewModel.toggleEpisodeFavorite(episode)
-            },
-            onToggleWatchlist = {
-                viewModel.toggleEpisodeWatchlist(episode)
-            },
-            onToggleWatched = {
-                viewModel.toggleEpisodeWatched(episode)
-            },
-            onDownloadClick = {
-                viewModel.onDownloadClick()
-            },
-            onPauseDownload = {
-                viewModel.pauseDownload()
-            },
-            onResumeDownload = {
-                viewModel.resumeDownload()
-            },
-            onCancelDownload = {
-                viewModel.cancelDownload()
-            },
+            onToggleFavorite = { viewModel.toggleEpisodeFavorite(episode) },
+            onToggleWatchlist = { viewModel.toggleEpisodeWatchlist(episode) },
+            onToggleWatched = { viewModel.toggleEpisodeWatched(episode) },
+            onDownloadClick = { viewModel.onDownloadClick() },
+            onPauseDownload = { viewModel.pauseDownload() },
+            onResumeDownload = { viewModel.resumeDownload() },
+            onCancelDownload = { viewModel.cancelDownload() },
             onGoToSeries = {
                 viewModel.clearSelectedEpisode()
                 episode.seriesId?.let { seriesId ->
                     val route = Destination.createItemDetailRoute(seriesId.toString())
                     navController.navigate(route)
                 }
-            }
+            },
         )
     }
 }
@@ -245,29 +223,21 @@ private fun WatchlistSection(
     title: String,
     items: List<AfinityItem>,
     onItemClick: (AfinityItem) -> Unit,
-    cardWidth: Dp
+    cardWidth: Dp,
 ) {
-    Column(
-        verticalArrangement = Arrangement.spacedBy(16.dp)
-    ) {
+    Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
         Text(
             text = stringResource(R.string.watchlist_section_header_fmt, title, items.size),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
-            color = MaterialTheme.colorScheme.onBackground
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+            color = MaterialTheme.colorScheme.onBackground,
         )
 
         LazyRow(
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
             items(items) { item ->
-                MediaItemCard(
-                    item = item,
-                    onClick = { onItemClick(item) },
-                    cardWidth = cardWidth
-                )
+                MediaItemCard(item = item, onClick = { onItemClick(item) }, cardWidth = cardWidth)
             }
         }
     }
@@ -278,30 +248,26 @@ private fun WatchlistEpisodesSection(
     title: String,
     episodes: List<AfinityEpisode>,
     onEpisodeClick: (AfinityEpisode) -> Unit,
-    cardWidth: Dp
+    cardWidth: Dp,
 ) {
-    Column(
-        verticalArrangement = Arrangement.spacedBy(16.dp)
-    ) {
+    Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
         Text(
             text = stringResource(R.string.watchlist_section_header_fmt, title, episodes.size),
-            style = MaterialTheme.typography.headlineSmall.copy(
-                fontWeight = FontWeight.Bold
-            ),
-            color = MaterialTheme.colorScheme.onBackground
+            style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold),
+            color = MaterialTheme.colorScheme.onBackground,
         )
 
         LazyRow(
             horizontalArrangement = Arrangement.spacedBy(12.dp),
-            contentPadding = PaddingValues(horizontal = 0.dp)
+            contentPadding = PaddingValues(horizontal = 0.dp),
         ) {
             items(episodes) { episode ->
                 ContinueWatchingCard(
                     item = episode,
                     onClick = { onEpisodeClick(episode) },
-                    cardWidth = cardWidth
+                    cardWidth = cardWidth,
                 )
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/ui/watchlist/WatchlistViewModel.kt b/app/src/main/java/com/makd/afinity/ui/watchlist/WatchlistViewModel.kt
index e6337a3bd..91eb2e7a4 100644
--- a/app/src/main/java/com/makd/afinity/ui/watchlist/WatchlistViewModel.kt
+++ b/app/src/main/java/com/makd/afinity/ui/watchlist/WatchlistViewModel.kt
@@ -19,6 +19,7 @@ import com.makd.afinity.data.repository.media.MediaRepository
 import com.makd.afinity.data.repository.userdata.UserDataRepository
 import com.makd.afinity.data.repository.watchlist.WatchlistRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -26,17 +27,18 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltViewModel
-class WatchlistViewModel @Inject constructor(
+class WatchlistViewModel
+@Inject
+constructor(
     private val jellyfinRepository: JellyfinRepository,
     private val watchlistRepository: WatchlistRepository,
     private val userDataRepository: UserDataRepository,
     private val downloadRepository: DownloadRepository,
     private val appDataRepository: AppDataRepository,
     private val mediaRepository: MediaRepository,
-    private val playbackStateManager: PlaybackStateManager
+    private val playbackStateManager: PlaybackStateManager,
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(WatchlistUiState())
@@ -92,26 +94,27 @@ class WatchlistViewModel @Inject constructor(
                     val seasons = seasonsDeferred.await()
                     val episodes = episodesDeferred.await()
 
-                    _uiState.value = _uiState.value.copy(
-                        isLoading = false,
-                        movies = movies.sortedBy { it.name },
-                        shows = shows.sortedBy { it.name },
-                        seasons = seasons.sortedBy { it.name },
-                        episodes = episodes.sortedBy { it.name },
-                        error = null,
-                    )
+                    _uiState.value =
+                        _uiState.value.copy(
+                            isLoading = false,
+                            movies = movies.sortedBy { it.name },
+                            shows = shows.sortedBy { it.name },
+                            seasons = seasons.sortedBy { it.name },
+                            episodes = episodes.sortedBy { it.name },
+                            error = null,
+                        )
                 }
             } catch (e: Exception) {
                 Timber.e(e, "Failed to load watchlist")
-                _uiState.value = _uiState.value.copy(
-                    isLoading = false,
-                    error = "Failed to load watchlist: ${e.message}"
-                )
+                _uiState.value =
+                    _uiState.value.copy(
+                        isLoading = false,
+                        error = "Failed to load watchlist: ${e.message}",
+                    )
             }
         }
     }
 
-
     fun onItemClick(item: AfinityItem) {
         Timber.d("Watchlist item clicked: ${item.name} (${item.id})")
     }
@@ -121,10 +124,10 @@ class WatchlistViewModel @Inject constructor(
             try {
                 _isLoadingEpisode.value = true
 
-                val fullEpisode = jellyfinRepository.getItem(
-                    episode.id,
-                    fields = FieldSets.ITEM_DETAIL
-                )?.toAfinityEpisode(jellyfinRepository, null)
+                val fullEpisode =
+                    jellyfinRepository
+                        .getItem(episode.id, fields = FieldSets.ITEM_DETAIL)
+                        ?.toAfinityEpisode(jellyfinRepository, null)
 
                 if (fullEpisode != null) {
                     _selectedEpisode.value = fullEpisode
@@ -154,11 +157,12 @@ class WatchlistViewModel @Inject constructor(
     fun toggleEpisodeFavorite(episode: AfinityEpisode) {
         viewModelScope.launch {
             try {
-                val success = if (episode.favorite) {
-                    userDataRepository.removeFromFavorites(episode.id)
-                } else {
-                    userDataRepository.addToFavorites(episode.id)
-                }
+                val success =
+                    if (episode.favorite) {
+                        userDataRepository.removeFromFavorites(episode.id)
+                    } else {
+                        userDataRepository.addToFavorites(episode.id)
+                    }
 
                 if (success) {
                     _selectedEpisode.value = episode.copy(favorite = !episode.favorite)
@@ -175,11 +179,12 @@ class WatchlistViewModel @Inject constructor(
                 val isInWatchlist = _selectedEpisodeWatchlistStatus.value
                 _selectedEpisodeWatchlistStatus.value = !isInWatchlist
 
-                val success = if (isInWatchlist) {
-                    watchlistRepository.removeFromWatchlist(episode.id)
-                } else {
-                    watchlistRepository.addToWatchlist(episode.id, "EPISODE")
-                }
+                val success =
+                    if (isInWatchlist) {
+                        watchlistRepository.removeFromWatchlist(episode.id)
+                    } else {
+                        watchlistRepository.addToWatchlist(episode.id, "EPISODE")
+                    }
 
                 if (!success) {
                     _selectedEpisodeWatchlistStatus.value = isInWatchlist
@@ -202,11 +207,12 @@ class WatchlistViewModel @Inject constructor(
     fun toggleEpisodeWatched(episode: AfinityEpisode) {
         viewModelScope.launch {
             try {
-                val success = if (episode.played) {
-                    userDataRepository.markUnwatched(episode.id)
-                } else {
-                    userDataRepository.markWatched(episode.id)
-                }
+                val success =
+                    if (episode.played) {
+                        userDataRepository.markUnwatched(episode.id)
+                    } else {
+                        userDataRepository.markWatched(episode.id)
+                    }
 
                 if (success) {
                     _selectedEpisode.value = episode.copy(played = !episode.played)
@@ -223,22 +229,27 @@ class WatchlistViewModel @Inject constructor(
         viewModelScope.launch {
             try {
                 val episode = _selectedEpisode.value ?: return@launch
-                val sources = episode.sources.filter {
-                    it.type == com.makd.afinity.data.models.media.AfinitySourceType.REMOTE
-                }
+                val sources =
+                    episode.sources.filter {
+                        it.type == com.makd.afinity.data.models.media.AfinitySourceType.REMOTE
+                    }
 
                 if (sources.isEmpty()) {
-                    Timber.w("No remote sources available for download for episode: ${episode.name}")
+                    Timber.w(
+                        "No remote sources available for download for episode: ${episode.name}"
+                    )
                     return@launch
                 }
 
                 if (sources.size == 1) {
                     val result = downloadRepository.startDownload(episode.id, sources.first().id)
-                    result.onSuccess {
-                        Timber.i("Download started successfully for episode: ${episode.name}")
-                    }.onFailure { error ->
-                        Timber.e(error, "Failed to start download for episode: ${episode.name}")
-                    }
+                    result
+                        .onSuccess {
+                            Timber.i("Download started successfully for episode: ${episode.name}")
+                        }
+                        .onFailure { error ->
+                            Timber.e(error, "Failed to start download for episode: ${episode.name}")
+                        }
                 }
             } catch (e: Exception) {
                 Timber.e(e, "Error starting download")
@@ -251,9 +262,7 @@ class WatchlistViewModel @Inject constructor(
             try {
                 val downloadInfo = _selectedEpisodeDownloadInfo.value ?: return@launch
                 val result = downloadRepository.pauseDownload(downloadInfo.id)
-                result.onFailure { error ->
-                    Timber.e(error, "Failed to pause download")
-                }
+                result.onFailure { error -> Timber.e(error, "Failed to pause download") }
             } catch (e: Exception) {
                 Timber.e(e, "Error pausing download")
             }
@@ -265,9 +274,7 @@ class WatchlistViewModel @Inject constructor(
             try {
                 val downloadInfo = _selectedEpisodeDownloadInfo.value ?: return@launch
                 val result = downloadRepository.resumeDownload(downloadInfo.id)
-                result.onFailure { error ->
-                    Timber.e(error, "Failed to resume download")
-                }
+                result.onFailure { error -> Timber.e(error, "Failed to resume download") }
             } catch (e: Exception) {
                 Timber.e(e, "Error resuming download")
             }
@@ -279,11 +286,9 @@ class WatchlistViewModel @Inject constructor(
             try {
                 val downloadInfo = _selectedEpisodeDownloadInfo.value ?: return@launch
                 val result = downloadRepository.cancelDownload(downloadInfo.id)
-                result.onSuccess {
-                    Timber.i("Download cancelled successfully")
-                }.onFailure { error ->
-                    Timber.e(error, "Failed to cancel download")
-                }
+                result
+                    .onSuccess { Timber.i("Download cancelled successfully") }
+                    .onFailure { error -> Timber.e(error, "Failed to cancel download") }
             } catch (e: Exception) {
                 Timber.e(e, "Error cancelling download")
             }
@@ -298,5 +303,5 @@ data class WatchlistUiState(
     val episodes: List<AfinityEpisode> = emptyList(),
     val isLoading: Boolean = false,
     val error: String? = null,
-    val userProfileImageUrl: String? = null
-)
\ No newline at end of file
+    val userProfileImageUrl: String? = null,
+)
diff --git a/app/src/main/java/com/makd/afinity/util/BackdropTracker.kt b/app/src/main/java/com/makd/afinity/util/BackdropTracker.kt
index 4d47c9798..ee4d927d7 100644
--- a/app/src/main/java/com/makd/afinity/util/BackdropTracker.kt
+++ b/app/src/main/java/com/makd/afinity/util/BackdropTracker.kt
@@ -13,27 +13,30 @@ class BackdropTracker {
     fun selectNextBackdrop(
         availableBackdrops: List<String>?,
         genreId: Int,
-        isMovie: Boolean = true
+        isMovie: Boolean = true,
     ): String? {
         synchronized(lock) {
             if (availableBackdrops.isNullOrEmpty()) return null
 
             val key = GenreKey(genreId, isMovie)
 
-            genreBackdropAssignments[key]?.let { return it }
+            genreBackdropAssignments[key]?.let {
+                return it
+            }
 
             val unusedBackdrop = availableBackdrops.firstOrNull { it !in usedBackdrops }
 
-            val selectedBackdrop = if (unusedBackdrop != null) {
-                usedBackdrops.add(unusedBackdrop)
-                unusedBackdrop
-            } else {
-                val index =
-                    (genreId.absoluteValue + if (isMovie) 0 else 1000) % availableBackdrops.size
-                val backdrop = availableBackdrops[index]
-                usedBackdrops.add(backdrop)
-                backdrop
-            }
+            val selectedBackdrop =
+                if (unusedBackdrop != null) {
+                    usedBackdrops.add(unusedBackdrop)
+                    unusedBackdrop
+                } else {
+                    val index =
+                        (genreId.absoluteValue + if (isMovie) 0 else 1000) % availableBackdrops.size
+                    val backdrop = availableBackdrops[index]
+                    usedBackdrops.add(backdrop)
+                    backdrop
+                }
 
             genreBackdropAssignments[key] = selectedBackdrop
             return selectedBackdrop
@@ -52,4 +55,4 @@ class BackdropTracker {
             return usedBackdrops.size
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/util/ComposeHiltExt.kt b/app/src/main/java/com/makd/afinity/util/ComposeHiltExt.kt
index 79283b156..763cb665a 100644
--- a/app/src/main/java/com/makd/afinity/util/ComposeHiltExt.kt
+++ b/app/src/main/java/com/makd/afinity/util/ComposeHiltExt.kt
@@ -19,8 +19,6 @@ interface PreferencesRepositoryEntryPoint {
 fun rememberPreferencesRepository(
     context: Context = LocalContext.current.applicationContext
 ): PreferencesRepository {
-    return EntryPointAccessors.fromApplication(
-        context,
-        PreferencesRepositoryEntryPoint::class.java
-    ).preferencesRepository()
-}
\ No newline at end of file
+    return EntryPointAccessors.fromApplication(context, PreferencesRepositoryEntryPoint::class.java)
+        .preferencesRepository()
+}
diff --git a/app/src/main/java/com/makd/afinity/util/GenreDuotoneColorGenerator.kt b/app/src/main/java/com/makd/afinity/util/GenreDuotoneColorGenerator.kt
index da04acaa9..6192d0a17 100644
--- a/app/src/main/java/com/makd/afinity/util/GenreDuotoneColorGenerator.kt
+++ b/app/src/main/java/com/makd/afinity/util/GenreDuotoneColorGenerator.kt
@@ -4,22 +4,23 @@ import kotlin.math.absoluteValue
 
 object GenreDuotoneColorGenerator {
 
-    private val COLOR_PALETTES = listOf(
-        Pair("991B1B", "FCA5A5"),
-        Pair("480c8b", "a96bef"),
-        Pair("92400E", "FCD34D"),
-        Pair("1F2937", "2864d2"),
-        Pair("065F46", "6EE7B7"),
-        Pair("9D174D", "F9A8D4"),
-        Pair("777e0d", "e4ed55"),
-        Pair("1F2937", "60A5FA"),
-        Pair("1F2937", "D1D5DB"),
-        Pair("032541", "01b4e4"),
-        Pair("5B21B6", "C4B5FD"),
-        Pair("1F2937", "F87171"),
-        Pair("552c01", "d47c1d"),
-        Pair("132440", "5A7ACD")
-    )
+    private val COLOR_PALETTES =
+        listOf(
+            Pair("991B1B", "FCA5A5"),
+            Pair("480c8b", "a96bef"),
+            Pair("92400E", "FCD34D"),
+            Pair("1F2937", "2864d2"),
+            Pair("065F46", "6EE7B7"),
+            Pair("9D174D", "F9A8D4"),
+            Pair("777e0d", "e4ed55"),
+            Pair("1F2937", "60A5FA"),
+            Pair("1F2937", "D1D5DB"),
+            Pair("032541", "01b4e4"),
+            Pair("5B21B6", "C4B5FD"),
+            Pair("1F2937", "F87171"),
+            Pair("552c01", "d47c1d"),
+            Pair("132440", "5A7ACD"),
+        )
 
     fun getColorsForGenre(genreId: Int): Pair<String, String> {
         val hash = (genreId * 31 + genreId.toString().hashCode()).absoluteValue
@@ -31,4 +32,4 @@ object GenreDuotoneColorGenerator {
         val (primary, secondary) = getColorsForGenre(genreId)
         return "https://image.tmdb.org/t/p/${width}_filter(duotone,$primary,$secondary)"
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/util/JellyfinImageUrlBuilder.kt b/app/src/main/java/com/makd/afinity/util/JellyfinImageUrlBuilder.kt
index 150ba803d..49b56ef7e 100644
--- a/app/src/main/java/com/makd/afinity/util/JellyfinImageUrlBuilder.kt
+++ b/app/src/main/java/com/makd/afinity/util/JellyfinImageUrlBuilder.kt
@@ -17,7 +17,7 @@ class JellyfinImageUrlBuilder @Inject constructor() {
         maxHeight: Int? = null,
         quality: Int = 90,
         format: String = "webp",
-        endpoint: String = "Items"
+        endpoint: String = "Items",
     ): String {
         return buildString {
             append(baseUrl.trimEnd('/'))
@@ -43,51 +43,54 @@ class JellyfinImageUrlBuilder @Inject constructor() {
         tag: String? = null,
         maxWidth: Int? = null,
         maxHeight: Int? = null,
-        quality: Int = 90
-    ): String = buildOptimizedImageUrl(
-        baseUrl = baseUrl,
-        itemId = itemId,
-        imageType = "Primary",
-        tag = tag,
-        maxWidth = maxWidth,
-        maxHeight = maxHeight,
-        quality = quality,
-        endpoint = "Items"
-    )
+        quality: Int = 90,
+    ): String =
+        buildOptimizedImageUrl(
+            baseUrl = baseUrl,
+            itemId = itemId,
+            imageType = "Primary",
+            tag = tag,
+            maxWidth = maxWidth,
+            maxHeight = maxHeight,
+            quality = quality,
+            endpoint = "Items",
+        )
 
     fun buildUserPrimaryImageUrl(
         baseUrl: String,
         userId: String,
         tag: String? = null,
         maxWidth: Int? = null,
-        quality: Int = 90
-    ): String = buildOptimizedImageUrl(
-        baseUrl = baseUrl,
-        itemId = userId,
-        imageType = "Primary",
-        tag = tag,
-        maxWidth = maxWidth,
-        quality = quality,
-        endpoint = "Users"
-    )
+        quality: Int = 90,
+    ): String =
+        buildOptimizedImageUrl(
+            baseUrl = baseUrl,
+            itemId = userId,
+            imageType = "Primary",
+            tag = tag,
+            maxWidth = maxWidth,
+            quality = quality,
+            endpoint = "Users",
+        )
 
     fun buildBackdropUrl(
         baseUrl: String,
         itemId: String,
         tag: String? = null,
         maxWidth: Int = 1920,
-        quality: Int = 85
-    ): String = buildOptimizedImageUrl(
-        baseUrl = baseUrl,
-        itemId = itemId,
-        imageType = "Backdrop",
-        tag = tag,
-        maxWidth = maxWidth,
-        quality = quality,
-        endpoint = "Items"
-    )
+        quality: Int = 85,
+    ): String =
+        buildOptimizedImageUrl(
+            baseUrl = baseUrl,
+            itemId = itemId,
+            imageType = "Backdrop",
+            tag = tag,
+            maxWidth = maxWidth,
+            quality = quality,
+            endpoint = "Items",
+        )
 
     fun dpToPx(dp: Dp, density: Density): Int {
         return with(density) { (dp.toPx() * 1.2f).toInt() }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/makd/afinity/util/NetworkConnectivityMonitor.kt b/app/src/main/java/com/makd/afinity/util/NetworkConnectivityMonitor.kt
index 23bad7fcf..03e7e2eb1 100644
--- a/app/src/main/java/com/makd/afinity/util/NetworkConnectivityMonitor.kt
+++ b/app/src/main/java/com/makd/afinity/util/NetworkConnectivityMonitor.kt
@@ -6,69 +6,81 @@ import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
 import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @Singleton
-class NetworkConnectivityMonitor @Inject constructor(
-    @ApplicationContext private val context: Context
-) {
+class NetworkConnectivityMonitor
+@Inject
+constructor(@ApplicationContext private val context: Context) {
     private val connectivityManager =
         context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
-    val isNetworkAvailable: Flow<Boolean> = callbackFlow {
-        val callback = object : ConnectivityManager.NetworkCallback() {
-            private val networks = mutableSetOf<Network>()
+    val isNetworkAvailable: Flow<Boolean> =
+        callbackFlow {
+                val callback =
+                    object : ConnectivityManager.NetworkCallback() {
+                        private val networks = mutableSetOf<Network>()
 
-            override fun onAvailable(network: Network) {
-                networks.add(network)
-                trySend(true)
-                Timber.d("Network available: $network, Total networks: ${networks.size}")
-            }
+                        override fun onAvailable(network: Network) {
+                            networks.add(network)
+                            trySend(true)
+                            Timber.d(
+                                "Network available: $network, Total networks: ${networks.size}"
+                            )
+                        }
 
-            override fun onLost(network: Network) {
-                networks.remove(network)
-                trySend(networks.isNotEmpty())
-                Timber.d("Network lost: $network, Remaining networks: ${networks.size}")
-            }
+                        override fun onLost(network: Network) {
+                            networks.remove(network)
+                            trySend(networks.isNotEmpty())
+                            Timber.d("Network lost: $network, Remaining networks: ${networks.size}")
+                        }
 
-            override fun onCapabilitiesChanged(
-                network: Network,
-                networkCapabilities: NetworkCapabilities
-            ) {
-                val hasInternet =
-                    networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-                val isValidated =
-                    networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-                Timber.d("Network capabilities changed: hasInternet=$hasInternet, isValidated=$isValidated")
-            }
-        }
+                        override fun onCapabilitiesChanged(
+                            network: Network,
+                            networkCapabilities: NetworkCapabilities,
+                        ) {
+                            val hasInternet =
+                                networkCapabilities.hasCapability(
+                                    NetworkCapabilities.NET_CAPABILITY_INTERNET
+                                )
+                            val isValidated =
+                                networkCapabilities.hasCapability(
+                                    NetworkCapabilities.NET_CAPABILITY_VALIDATED
+                                )
+                            Timber.d(
+                                "Network capabilities changed: hasInternet=$hasInternet, isValidated=$isValidated"
+                            )
+                        }
+                    }
 
-        val networkRequest = NetworkRequest.Builder()
-            .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-            .addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-            .build()
+                val networkRequest =
+                    NetworkRequest.Builder()
+                        .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+                        .addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+                        .build()
 
-        connectivityManager.registerNetworkCallback(networkRequest, callback)
+                connectivityManager.registerNetworkCallback(networkRequest, callback)
 
-        trySend(isCurrentlyConnected())
+                trySend(isCurrentlyConnected())
 
-        awaitClose {
-            Timber.d("Unregistering network callback")
-            connectivityManager.unregisterNetworkCallback(callback)
-        }
-    }.distinctUntilChanged()
+                awaitClose {
+                    Timber.d("Unregistering network callback")
+                    connectivityManager.unregisterNetworkCallback(callback)
+                }
+            }
+            .distinctUntilChanged()
 
     fun isCurrentlyConnected(): Boolean {
         val network = connectivityManager.activeNetwork ?: return false
         val capabilities = connectivityManager.getNetworkCapabilities(network) ?: return false
 
         return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
-                capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+            capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
     }
 }
diff --git a/app/src/main/res/drawable/ic_apple_podcast.xml b/app/src/main/res/drawable/ic_apple_podcast.xml
new file mode 100644
index 000000000..d5df5b672
--- /dev/null
+++ b/app/src/main/res/drawable/ic_apple_podcast.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M18.364,18.364a9,9 0 1,0 -12.728,0" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M11.766,22h0.468a2,2 0 0,0 1.985,-1.752l0.5,-4a2,2 0 0,0 -1.985,-2.248h-1.468a2,2 0 0,0 -1.985,2.248l0.5,4a2,2 0 0,0 1.985,1.752Z" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M12,9m-2,0a2,2 0 1,0 4,0a2,2 0 1,0 -4,0" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrows_output.xml b/app/src/main/res/drawable/ic_arrows_output.xml
index f621f2e5a..b55cd786f 100644
--- a/app/src/main/res/drawable/ic_arrows_output.xml
+++ b/app/src/main/res/drawable/ic_arrows_output.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="960dp"
+    android:height="960dp"
     android:viewportWidth="960"
     android:viewportHeight="960">
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M480,560q-33,0 -56.5,-23.5T400,480q0,-33 23.5,-56.5T480,400q33,0 56.5,23.5T560,480q0,33 -23.5,56.5T480,560ZM256,760h64q17,0 28.5,11.5T360,800q0,17 -11.5,28.5T320,840H160q-17,0 -28.5,-11.5T120,800v-160q0,-17 11.5,-28.5T160,600q17,0 28.5,11.5T200,640v64l96,-96q11,-11 28,-11t28,11q11,11 11,28t-11,28l-96,96Zm448,0l-96,-96q-11,-11 -11,-28t11,-28q11,-11 28,-11t28,11l96,96v-64q0,-17 11.5,-28.5T800,600q17,0 28.5,11.5T840,640v160q0,17 -11.5,28.5T800,840H640q-17,0 -28.5,-11.5T600,800q0,-17 11.5,-28.5T640,760h64ZM200,256v64q0,17 -11.5,28.5T160,360q-17,0 -28.5,-11.5T120,320v-160q0,-17 11.5,-28.5T160,120h160q17,0 28.5,11.5T360,160q0,17 -11.5,28.5T320,200h-64l96,96q11,11 11,28t-11,28q-11,11 -28,11t-28,-11l-96,-96Zm560,0l-96,96q-11,11 -28,11t-28,-11q-11,-11 -11,-28t11,-28l96,-96h-64q-17,0 -28.5,-11.5T600,160q0,-17 11.5,-28.5T640,120h160q17,0 28.5,11.5T840,160v160q0,17 -11.5,28.5T800,360q-17,0 -28.5,-11.5T760,320v-64Z" />
-</vector>
\ No newline at end of file
+  <path
+      android:pathData="m313,480 l59,59q11,11 11,27.5T372,595q-12,12 -28.5,12T315,595l-87,-87q-12,-12 -12,-28t12,-28l88,-88q12,-12 28,-11.5t28,12.5q11,12 11.5,28T372,421l-59,59ZM647,480 L588,421q-11,-11 -11,-27.5t11,-28.5q12,-12 28.5,-12t28.5,12l87,87q12,12 12,28t-12,28l-88,88q-12,12 -28,11.5T588,595q-11,-12 -11.5,-28t11.5,-28l59,-59ZM200,840q-33,0 -56.5,-23.5T120,760v-120q0,-17 11.5,-28.5T160,600q17,0 28.5,11.5T200,640v120h120q17,0 28.5,11.5T360,800q0,17 -11.5,28.5T320,840L200,840ZM760,840L640,840q-17,0 -28.5,-11.5T600,800q0,-17 11.5,-28.5T640,760h120v-120q0,-17 11.5,-28.5T800,600q17,0 28.5,11.5T840,640v120q0,33 -23.5,56.5T760,840ZM120,320v-120q0,-33 23.5,-56.5T200,120h120q17,0 28.5,11.5T360,160q0,17 -11.5,28.5T320,200L200,200v120q0,17 -11.5,28.5T160,360q-17,0 -28.5,-11.5T120,320ZM760,320v-120L640,200q-17,0 -28.5,-11.5T600,160q0,-17 11.5,-28.5T640,120h120q33,0 56.5,23.5T840,200v120q0,17 -11.5,28.5T800,360q-17,0 -28.5,-11.5T760,320Z"
+      android:fillColor="@color/white"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_audiobookshelf_light.xml b/app/src/main/res/drawable/ic_audiobookshelf_light.xml
new file mode 100644
index 000000000..57e5625bf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_audiobookshelf_light.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <path
+      android:pathData="M326.8,401.3c9.9,0 17.9,-8 17.9,-17.9L344.7,182.8c0,-9.9 -8,-17.9 -17.9,-17.9h-18.5c-9.9,0 -17.9,8 -17.9,17.9v200.6c0,9.9 8,17.9 17.9,17.9zM297.1,213h40.8v4.3h-40.8zM264.7,401.3c9.9,0 17.9,-8 17.9,-17.9L282.6,182.8c0,-9.9 -8,-17.9 -17.9,-17.9h-18.5c-9.9,0 -17.9,8 -17.9,17.9v200.6c0,9.9 8,17.9 17.9,17.9zM235.1,213h40.8v4.3h-40.8zM375.6,407.5L135.4,407.5c-7.5,0 -13.5,6 -13.5,13.5s6.1,13.5 13.5,13.5h240.2c7.5,0 13.5,-6.1 13.5,-13.5 0,-7.5 -6.1,-13.5 -13.5,-13.5m-172.9,-6.2c9.9,0 17.9,-8 17.9,-17.9L220.6,182.8c0,-9.9 -8,-17.9 -17.9,-17.9h-18.5c-9.9,0 -17.9,8 -17.9,17.9v200.6c0,9.9 8,17.9 17.9,17.9zM173.1,213h40.8v4.3h-40.8zM256,0C114.6,0 0,114.6 0,256s114.6,256 256,256 256,-114.6 256,-256S397.4,0 256,0m-0.5,503.4C118.9,503.4 8.1,392.6 8.1,256S118.9,8.6 255.5,8.6 502.9,119.4 502.9,256 392.1,503.4 255.5,503.4m160.7,-265.8c-2,-1.7 -5.1,-4.1 -9.4,-7v-32.8c0,-83.6 -67.7,-151.3 -151.3,-151.3s-151.3,67.7 -151.3,151.3v32.8c-4.2,2.9 -7.3,5.4 -9.4,7 -1.7,1.4 -2.7,3.5 -2.7,5.8v39.3c0,2.2 1,4.3 2.7,5.8 4.7,3.9 15.4,12 32.1,20.4v3.8c0,10.3 6.6,18.6 14.8,18.6s14.8,-8.4 14.8,-18.6v-94.2c0,-10.3 -6.6,-18.6 -14.8,-18.6 -7.9,0 -14.3,7.7 -14.8,17.3v-19.4c0,-71 57.6,-128.6 128.6,-128.6 71.1,0 128.6,57.6 128.6,128.6v19.4c-0.5,-9.7 -7,-17.3 -14.8,-17.3 -8.2,0 -14.8,8.4 -14.8,18.6v94.2c0,10.3 6.6,18.6 14.8,18.6s14.8,-8.4 14.8,-18.6v-3.8c16.7,-8.4 27.4,-16.5 32.1,-20.4 1.7,-1.4 2.7,-3.6 2.7,-5.8v-39.3c-0.1,-2.3 -1,-4.4 -2.7,-5.8"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_book.xml b/app/src/main/res/drawable/ic_book.xml
new file mode 100644
index 000000000..8dc7809d5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_book.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M19,4v16h-12a2,2 0 0,1 -2,-2v-12a2,2 0 0,1 2,-2h12Z" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M19,16h-12a2,2 0 0,0 -2,2" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M9,8h6" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_book_audio.xml b/app/src/main/res/drawable/ic_book_audio.xml
new file mode 100644
index 000000000..c13af0026
--- /dev/null
+++ b/app/src/main/res/drawable/ic_book_audio.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M12,6v7" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M16,8v3" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M4,19.5v-15A2.5,2.5 0 0,1 6.5,2H19a1,1 0 0,1 1,1v18a1,1 0 0,1 -1,1H6.5a1,1 0 0,1 0,-5H20" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M8,8v3" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_book_series.xml b/app/src/main/res/drawable/ic_book_series.xml
new file mode 100644
index 000000000..48862cd41
--- /dev/null
+++ b/app/src/main/res/drawable/ic_book_series.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M4,3H10A1,1 0 0,1 11,4V20A1,1 0 0,1 10,21H4A1,1 0 0,1 3,20V4A1,1 0 0,1 4,3Z" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M7,3v18" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M20.4,18.9c0.2,0.5 -0.1,1.1 -0.6,1.3l-1.9,0.7c-0.5,0.2 -1.1,-0.1 -1.3,-0.6L11.1,5.1c-0.2,-0.5 0.1,-1.1 0.6,-1.3l1.9,-0.7c0.5,-0.2 1.1,0.1 1.3,0.6Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_books.xml b/app/src/main/res/drawable/ic_books.xml
index f5c45b73f..a2e4b8545 100644
--- a/app/src/main/res/drawable/ic_books.xml
+++ b/app/src/main/res/drawable/ic_books.xml
@@ -1,10 +1,36 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M120,800Q103,800 91.5,788.5Q80,777 80,760Q80,743 91.5,731.5Q103,720 120,720L840,720Q857,720 868.5,731.5Q880,743 880,760Q880,777 868.5,788.5Q857,800 840,800L120,800ZM200,640Q183,640 171.5,628.5Q160,617 160,600L160,360Q160,343 171.5,331.5Q183,320 200,320Q217,320 228.5,331.5Q240,343 240,360L240,600Q240,617 228.5,628.5Q217,640 200,640ZM360,640Q343,640 331.5,628.5Q320,617 320,600L320,200Q320,183 331.5,171.5Q343,160 360,160Q377,160 388.5,171.5Q400,183 400,200L400,600Q400,617 388.5,628.5Q377,640 360,640ZM520,640Q503,640 491.5,628.5Q480,617 480,600L480,200Q480,183 491.5,171.5Q503,160 520,160Q537,160 548.5,171.5Q560,183 560,200L560,600Q560,617 548.5,628.5Q537,640 520,640ZM795,620Q781,628 764.5,623.5Q748,619 740,605L620,395Q612,381 616.5,364.5Q621,348 635,340Q649,332 665.5,336.5Q682,341 690,355L810,565Q818,579 813.5,595.5Q809,612 795,620Z"/>
-</vector>
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M3,19a9,9 0 0,1 9,0a9,9 0 0,1 9,0" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M3,6a9,9 0 0,1 9,0a9,9 0 0,1 9,0" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M3,6l0,13" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M12,6l0,13" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M21,6l0,13" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_books_filled.xml b/app/src/main/res/drawable/ic_books_filled.xml
new file mode 100644
index 000000000..fb02561c9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_books_filled.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M21.5,5.134a1,1 0 0,1 0.493,0.748l0.007,0.118v13a1,1 0 0,1 -1.5,0.866a8,8 0 0,0 -7.5,-0.266v-15.174a10,10 0 0,1 8.5,0.708m-10.5,-0.707l0.001,15.174a8,8 0 0,0 -7.234,0.117l-0.327,0.18l-0.103,0.044l-0.049,0.016l-0.11,0.026l-0.061,0.01l-0.117,0.006h-0.042l-0.11,-0.012l-0.077,-0.014l-0.108,-0.032l-0.126,-0.056l-0.095,-0.056l-0.089,-0.067l-0.06,-0.056l-0.073,-0.082l-0.064,-0.089l-0.022,-0.036l-0.032,-0.06l-0.044,-0.103l-0.016,-0.049l-0.026,-0.11l-0.01,-0.061l-0.004,-0.049l-0.002,-13.068a1,1 0 0,1 0.5,-0.866a10,10 0 0,1 8.5,-0.707" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_clock_off.xml b/app/src/main/res/drawable/ic_clock_off.xml
new file mode 100644
index 000000000..9297410c9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_clock_off.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M5.633,5.64a9,9 0 1,0 12.735,12.72m1.674,-2.32a9,9 0 0,0 -12.082,-12.082" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M12,7v1" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M3,3l18,18" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_clock_outline.xml b/app/src/main/res/drawable/ic_clock_outline.xml
new file mode 100644
index 000000000..996f290d2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_clock_outline.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M3,12a9,9 0 1,0 18,0a9,9 0 0,0 -18,0" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M12,7v5l3,3" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml
new file mode 100644
index 000000000..932452df5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_collection.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="@color/white"
+        android:strokeWidth="1.5"
+        android:pathData="M6,6.878V6a2.25,2.25 0 0,1 2.25,-2.25h7.5A2.25,2.25 0 0,1 18,6v0.878m-12,0c0.235,-0.083 0.487,-0.128 0.75,-0.128h10.5c0.263,0 0.515,0.045 0.75,0.128m-12,0A2.25,2.25 0 0,0 4.5,9v0.878m13.5,-3A2.25,2.25 0 0,1 19.5,9v0.878m0,0a2.246,2.246 0 0,0 -0.75,-0.128H5.25c-0.263,0 -0.515,0.045 -0.75,0.128m15,0A2.25,2.25 0 0,1 21,12v6a2.25,2.25 0 0,1 -2.25,2.25H5.25A2.25,2.25 0 0,1 3,18v-6c0,-0.98 0.626,-1.813 1.5,-2.122" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_headphones_filled.xml b/app/src/main/res/drawable/ic_headphones_filled.xml
new file mode 100644
index 000000000..2dd7d5e44
--- /dev/null
+++ b/app/src/main/res/drawable/ic_headphones_filled.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M12,1a9,9 0 0,0 -9,9v3h0.022A4.5,4.5 0 0,1 7.5,9.022V10a2,2 0 0,1 2,2v6a2,2 0 0,1 -2,2h-1.5A4.5,4.5 0 0,1 3,15.5V10a9,9 0 0,1 18,0v5.5A4.5,4.5 0 0,1 16.5,20H15a2,2 0 0,1 -2,-2v-6a2,2 0 0,1 2,-2h0.5a4.5,4.5 0 0,1 4.478,4.022H20V10a9,9 0 0,0 -8,-8.945Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M21,18a3,3 0 0,1 -2.824,2.995l-0.176,0.005h-1a3,3 0 0,1 -2.995,-2.824l-0.005,-0.176v-3a3,3 0 0,1 2.824,-2.995l0.176,-0.005h1c0.351,0 0.688,0.06 1,0.171v-0.171a7,7 0 0,0 -13.996,-0.24l-0.004,0.24v0.17c0.25,-0.088 0.516,-0.144 0.791,-0.163l0.209,-0.007h1a3,3 0 0,1 2.995,2.824l0.005,0.176v3a3,3 0 0,1 -2.824,2.995l-0.176,0.005h-1a3,3 0 0,1 -2.995,-2.824l-0.005,-0.176v-6a9,9 0 0,1 17.996,-0.265l0.004,0.265v6Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_minus.xml b/app/src/main/res/drawable/ic_minus.xml
new file mode 100644
index 000000000..210ea9c2f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_minus.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M9,12h6" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M12,3c7.2,0 9,1.8 9,9s-1.8,9 -9,9s-9,-1.8 -9,-9s1.8,-9 9,-9Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_minus_alt.xml b/app/src/main/res/drawable/ic_minus_alt.xml
new file mode 100644
index 000000000..e2180c4fe
--- /dev/null
+++ b/app/src/main/res/drawable/ic_minus_alt.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M5,12l14,0" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_minus_filled.xml b/app/src/main/res/drawable/ic_minus_filled.xml
new file mode 100644
index 000000000..3b93cad85
--- /dev/null
+++ b/app/src/main/res/drawable/ic_minus_filled.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M12,2l0.324,0.001l0.318,0.004l0.616,0.017l0.299,0.013l0.579,0.034l0.553,0.046c4.785,0.464 6.732,2.411 7.196,7.196l0.046,0.553l0.034,0.579c0.005,0.098 0.01,0.198 0.013,0.299l0.017,0.616l0.005,0.642l-0.005,0.642l-0.017,0.616l-0.013,0.299l-0.034,0.579l-0.046,0.553c-0.464,4.785 -2.411,6.732 -7.196,7.196l-0.553,0.046l-0.579,0.034c-0.098,0.005 -0.198,0.01 -0.299,0.013l-0.616,0.017l-0.642,0.005l-0.642,-0.005l-0.616,-0.017l-0.299,-0.013l-0.579,-0.034l-0.553,-0.046c-4.785,-0.464 -6.732,-2.411 -7.196,-7.196l-0.046,-0.553l-0.034,-0.579a28.058,28.058 0 0,1 -0.013,-0.299l-0.017,-0.616c-0.003,-0.21 -0.005,-0.424 -0.005,-0.642l0.001,-0.324l0.004,-0.318l0.017,-0.616l0.013,-0.299l0.034,-0.579l0.046,-0.553c0.464,-4.785 2.411,-6.732 7.196,-7.196l0.553,-0.046l0.579,-0.034c0.098,-0.005 0.198,-0.01 0.299,-0.013l0.616,-0.017c0.21,-0.003 0.424,-0.005 0.642,-0.005Zm3,9h-6l-0.117,0.007a1,1 0 0,0 0.117,1.993h6l0.117,-0.007a1,1 0 0,0 -0.117,-1.993Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_moon.xml b/app/src/main/res/drawable/ic_moon.xml
new file mode 100644
index 000000000..6cff03dc4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_moon.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M12,3c0.132,0 0.263,0 0.393,0a7.5,7.5 0 0,0 7.92,12.446a9,9 0 1,1 -8.313,-12.454Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_moon_filled.xml b/app/src/main/res/drawable/ic_moon_filled.xml
new file mode 100644
index 000000000..2b75f8a6c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_moon_filled.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M12,1.992a10,10 0 1,0 9.236,13.838c0.341,-0.82 -0.476,-1.644 -1.298,-1.31a6.5,6.5 0 0,1 -6.864,-10.787l0.077,-0.08c0.551,-0.63 0.113,-1.653 -0.758,-1.653h-0.266l-0.068,-0.006l-0.06,-0.002Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_options.xml b/app/src/main/res/drawable/ic_options.xml
new file mode 100644
index 000000000..8bb8dea9a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_options.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M5,12m-1,0a1,1 0 1,0 2,0a1,1 0 1,0 -2,0" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M12,12m-1,0a1,1 0 1,0 2,0a1,1 0 1,0 -2,0" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M19,12m-1,0a1,1 0 1,0 2,0a1,1 0 1,0 -2,0" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_playback_settings.xml b/app/src/main/res/drawable/ic_playback_settings.xml
index 9fbb5f2b6..8a8178ac5 100644
--- a/app/src/main/res/drawable/ic_playback_settings.xml
+++ b/app/src/main/res/drawable/ic_playback_settings.xml
@@ -13,6 +13,6 @@
         android:strokeColor="@color/white"
         android:strokeLineCap="round"
         android:strokeLineJoin="round"
-        android:strokeWidth="1.5"
+        android:strokeWidth="1.7"
         android:pathData="M10,9v6l5,-3Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_playlist_alt.xml b/app/src/main/res/drawable/ic_playlist_alt.xml
new file mode 100644
index 000000000..4874cdb8b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_playlist_alt.xml
@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M14,17m-3,0a3,3 0 1,0 6,0a3,3 0 1,0 -6,0" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M17,17v-13h4" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M13,5h-10" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M3,9l10,0" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M9,13h-6" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_plus_alt.xml b/app/src/main/res/drawable/ic_plus_alt.xml
new file mode 100644
index 000000000..faf558c36
--- /dev/null
+++ b/app/src/main/res/drawable/ic_plus_alt.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M12,5l0,14" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M5,12l14,0" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_request_seerr_dark.xml b/app/src/main/res/drawable/ic_request_seerr_dark.xml
deleted file mode 100644
index 5a678e6fe..000000000
--- a/app/src/main/res/drawable/ic_request_seerr_dark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M423,172.2V165C423,77.9 350.3,0 260.5,0S86.8,85.5 89,186.8c0.7,31.5 24,62.6 30.7,74.5 10.7,18.7 -17.9,26.7 -9,37.2 3.3,3.9 19.6,-3.2 37.9,-10.2 -4.2,35.5 -7.4,72.4 -5.8,103.8 3.2,60 19.6,117.7 24.9,117.7 5.4,-0.1 -2.9,-36.8 0.9,-117.7 1.7,-36.5 9.8,-71.7 16.6,-113 0.5,0 1.1,0.1 1.6,0.1 -1.8,11.6 -5,32.7 -6.4,45.3 -3.4,28.8 -7.5,68.7 -5.9,99.2 1.8,33.6 10.9,65.9 14,65.9s-1.6,-20.6 0.4,-65.8c1.3,-30.2 6.4,-66.4 12.4,-99.2 0.4,-2.3 1,-4.9 1.6,-7.6 -0.4,17.2 -0.2,33.9 0.6,49.3 3.8,71.3 23.2,139.7 29.7,139.7 6.4,0.1 -3.4,-43.5 1,-139.6 1.2,-26.9 5.1,-53 9.4,-80.7 8.1,-2.3 16.6,-5.3 23.8,-7.1 0.5,30.1 1.3,60.7 1.2,92 -0.2,52.9 8.7,141.4 13.3,141.4s19.5,-114 22.6,-182.2c0,-0.6 0,-1.3 0.1,-1.9 2.9,27.9 6.7,52.2 7.9,77.3 2.8,60 -3.3,87.1 0.6,87.1s16.2,-42.8 18.5,-87.2c1.9,-34 0.8,-77.4 -5.6,-112.4 1,-0.2 2.2,-0.4 3.5,-0.6 3.9,25.8 7.4,50.5 8.6,75.7 4.4,96 -5.5,139.6 1,139.6s25.9,-68.5 29.7,-139.7c1.3,-23.4 1.1,-49.5 -0.4,-76.1 21.2,6.5 18.1,16.7 29.6,10.7 10.1,-5.2 -14.9,-19.8 -2.6,-38.5 17.1,-26.1 27.6,-29.9 27.6,-91.6m-295.7,-30.3c-5.5,0 -9.9,-4.4 -9.9,-9.9 0,-60 77.4,-119.5 137.4,-119.5 5.5,0 9.9,4.4 9.9,9.9s-4.5,9.8 -9.9,9.8c-49,-0.1 -117.6,50.7 -117.6,99.8 0,5.5 -4.4,9.9 -9.9,9.9m45.1,43.5c-0.7,-18.1 10.1,-37 18.5,-51.4 7.1,-12.3 19.3,-33.4 35.4,-41.8 32.8,-17.2 77,1 99.1,40.9 6.4,11.6 10.5,24.2 11.8,36.9 1,4.1 1.6,8.3 1.6,12.6 0.1,10.9 -3.1,21.8 -9.2,31.4 -0.6,1.3 -1.3,2.4 -2,3.6 0,0.1 -0.1,0.1 -0.1,0.1 -5.2,8.5 -12.3,15.3 -20.6,20 -3.6,2 -7.4,3.5 -11.3,4.7 -11.8,5.3 -24.9,8.1 -38.2,8.3 -45.6,0.8 -83.5,-28.4 -85,-65.3m134.4,-7c0,28.3 -23.1,51.4 -51.4,51.4s-51.4,-23 -51.4,-51.4c0,-5.3 0.8,-10.3 2.2,-15.2 4,9 13,15.2 23.4,15.2 14.2,0 25.7,-11.6 25.7,-25.7 0,-10.4 -6.2,-19.5 -15.2,-23.4 4.9,-1.5 10,-2.2 15.3,-2.3 28.4,0 51.4,23.1 51.4,51.4"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_rewind_backward_30.xml b/app/src/main/res/drawable/ic_rewind_backward_30.xml
new file mode 100644
index 000000000..81847b5bf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_rewind_backward_30.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M19.007,16.466a6,6 0 0,0 -4.007,-10.466h-11" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M12,15.5v3a1.5,1.5 0 0,0 3,0v-3a1.5,1.5 0 0,0 -3,0Z" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M6,14h1.5a1.5,1.5 0 0,1 0,3h-0.5h0.5a1.5,1.5 0 0,1 0,3h-1.5" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M7,9l-3,-3l3,-3" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_seerr_logo.xml b/app/src/main/res/drawable/ic_seerr_logo.xml
new file mode 100644
index 000000000..16a71e3cf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_seerr_logo.xml
@@ -0,0 +1,137 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="96dp"
+    android:height="96dp"
+    android:viewportWidth="96"
+    android:viewportHeight="96">
+  <group>
+    <clip-path
+        android:pathData="M96,48c0,26.31 -21.18,47.71 -47.48,48C22.21,96.28 0.58,75.33 0,49.03 -0.55,22.73 20.16,0.87 46.46,0.03c26.3,-0.85 48.37,19.63 49.5,45.92l0.04,2.05Z"/>
+    <path
+        android:pathData="M37.95,70.69l-5.06,-1.13s-1.17,7.43 -1.61,11.15c-0.71,6.02 -1.57,14.34 -1.23,20.71 0.37,7.01 2.29,13.76 2.92,13.76s-0.34,-4.29 0.1,-13.75c0.29,-6.3 1.33,-13.87 2.58,-20.72 0.62,-3.38 2.42,-10.02 2.42,-10.02h-0.12Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="34.995"
+            android:startY="72.385"
+            android:endX="30.568"
+            android:endY="115.103"
+            android:type="linear">
+          <item android:offset="0" android:color="#FF502D95"/>
+          <item android:offset="0.1" android:color="#FF6D37AC"/>
+          <item android:offset="0.57" android:color="#FF6786D1"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M59.31,70.16h1.55c2.08,7.76 2.47,18.96 2.02,27.4 -0.49,9.29 -3.03,18.23 -3.87,18.23s0.45,-5.69 -0.13,-18.21c-0.39,-8.35 -2.16,-16.2 -2.35,-27.41h2.78Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="60.668"
+            android:startY="75.028"
+            android:endX="56.24"
+            android:endY="117.763"
+            android:type="linear">
+          <item android:offset="0" android:color="#FF502D95"/>
+          <item android:offset="0.1" android:color="#FF6D37AC"/>
+          <item android:offset="0.57" android:color="#FF6786D1"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M46.97,39.46c5.94,0 10.75,4.81 10.75,10.75s-4.81,10.75 -10.75,10.75 -10.75,-4.81 -10.75,-10.75c0,-1.1 0.16,-2.16 0.47,-3.17 0.84,1.87 2.72,3.17 4.9,3.17 2.97,0 5.37,-2.41 5.37,-5.37 0,-2.18 -1.3,-4.06 -3.17,-4.9 1,-0.31 2.06,-0.47 3.17,-0.47h0.01Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="39.394"
+            android:startY="42.486"
+            android:endX="56.74"
+            android:endY="60.189"
+            android:type="linear">
+          <item android:offset="0" android:color="#FF0043A2"/>
+          <item android:offset="1" android:color="#FF00133A"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M28.8,94.86c0.43,-9.3 2.86,-18.22 4.35,-29.53h-2.63v-25.82h3.33l-4.44,-1.58s-2.08,13.26 -2.87,19.92c-1.26,10.75 -3.75,25.61 -3.14,36.99 0.67,12.53 4.09,24.58 5.22,24.58s-0.6,-7.67 0.18,-24.56Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="28.58"
+            android:startY="89.24"
+            android:endX="28.58"
+            android:endY="36.74"
+            android:type="linear">
+          <item android:offset="0" android:color="#FF763DCD"/>
+          <item android:offset="0.22" android:color="#FF8D61EB"/>
+          <item android:offset="0.37" android:color="#FF8C86EC"/>
+          <item android:offset="0.64" android:color="#FF748CE8"/>
+          <item android:offset="0.9" android:color="#FF6BA1E6"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M42.52,89.5c0.37,-7.91 1.84,-15.55 3.04,-24.17h-8.71c-0.86,8.29 -1.13,16.86 -0.75,24.14 0.79,14.88 4.85,29.2 6.2,29.2s-0.71,-9.11 0.21,-29.17Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="40.75"
+            android:startY="98.92"
+            android:endX="40.75"
+            android:endY="64.55"
+            android:type="linear">
+          <item android:offset="0" android:color="#FF763DCD"/>
+          <item android:offset="0.22" android:color="#FF8D61EB"/>
+          <item android:offset="0.37" android:color="#FF8C86EC"/>
+          <item android:offset="0.64" android:color="#FF748CE8"/>
+          <item android:offset="0.9" android:color="#FF6BA1E6"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M66.48,45.86h-1.19v19.47h-4.13c1.21,8.74 2.71,16.45 3.08,24.44 0.92,20.06 -1.14,29.17 0.21,29.17s5.41,-14.32 6.2,-29.2c0.72,-13.52 -0.84,-31.46 -4.17,-43.88Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="65.99"
+            android:startY="91.88"
+            android:endX="65.99"
+            android:endY="44.79"
+            android:type="linear">
+          <item android:offset="0" android:color="#FF763DCD"/>
+          <item android:offset="0.22" android:color="#FF8D61EB"/>
+          <item android:offset="0.37" android:color="#FF8C86EC"/>
+          <item android:offset="0.64" android:color="#FF748CE8"/>
+          <item android:offset="0.9" android:color="#FF6BA1E6"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M49.4,65.33c0.06,8.18 0.33,16.45 0.31,25.01 -0.03,11.05 1.81,29.55 2.77,29.55s4.06,-23.82 4.72,-38.06c0.28,-6.12 -0.2,-11.75 -0.65,-16.5h-7.15Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="53.34"
+            android:startY="99.68"
+            android:endX="53.34"
+            android:endY="64.53"
+            android:type="linear">
+          <item android:offset="0" android:color="#FF763DCD"/>
+          <item android:offset="0.22" android:color="#FF8D61EB"/>
+          <item android:offset="0.37" android:color="#FF8C86EC"/>
+          <item android:offset="0.64" android:color="#FF748CE8"/>
+          <item android:offset="0.9" android:color="#FF6BA1E6"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M77.13,68.03c3.59,-5.47 5.78,-6.25 5.78,-19.15l-0.02,-1.47c0,-18.21 -15.18,-34.49 -33.95,-34.49S12.65,30.79 13.1,51.95c0.14,6.58 5.01,13.09 6.41,15.56 2.22,3.9 -3.76,5.57 -1.88,7.76 0.98,1.15 7.45,-2.35 12.81,-3.79 4.52,-1.21 8.07,1.75 11.46,1.75s8.96,-2.96 11.23,-2.35c1.53,0.41 7.26,3.6 9.14,3.24 1.9,-0.37 6.59,-1 8.74,-0.43 4.96,1.33 4.17,3.67 6.67,2.38 2.09,-1.08 -3.13,-4.12 -0.55,-8.04ZM23.19,40.49c0,1.14 -0.92,2.06 -2.06,2.06s-2.06,-0.92 -2.06,-2.06c0,-12.52 16.17,-24.98 28.7,-24.98 1.14,0 2.06,0.92 2.06,2.06s-0.92,2.06 -2.06,2.06c-10.25,0 -24.58,10.61 -24.58,20.86ZM63.38,57.66c-0.13,0.26 -0.27,0.51 -0.42,0.75h-0.02c-1.09,1.78 -2.57,3.21 -4.32,4.19 -0.75,0.41 -1.54,0.74 -2.36,0.98 -2.45,1.1 -5.2,1.69 -7.99,1.75 -9.53,0.17 -17.44,-5.92 -17.75,-13.65 -0.15,-3.79 2.11,-7.72 3.86,-10.75 1.48,-2.56 4.03,-6.97 7.39,-8.73 6.85,-3.6 16.08,0.21 20.7,8.55 1.34,2.42 2.19,5.07 2.48,7.71 0.21,0.86 0.33,1.74 0.34,2.62 0.03,2.29 -0.63,4.55 -1.91,6.58Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="33.4"
+            android:startY="69.61"
+            android:endX="84.05"
+            android:endY="13.34"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFC395FC"/>
+          <item android:offset="1" android:color="#FF4F65F5"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_timer.xml b/app/src/main/res/drawable/ic_timer.xml
new file mode 100644
index 000000000..868d051bc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_timer.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M10,2L14,2" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M12,14L15,11" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M20,14A8,8 0 0,1 12,22A8,8 0 0,1 4,14A8,8 0 0,1 20,14Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_timer_off.xml b/app/src/main/res/drawable/ic_timer_off.xml
new file mode 100644
index 000000000..377aba6aa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_timer_off.xml
@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M10,2h4" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M4.6,11a8,8 0 0,0 1.7,8.7a8,8 0 0,0 8.7,1.7" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M7.4,7.4a8,8 0 0,1 10.3,1a8,8 0 0,1 0.9,10.2" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="m2,2l20,20" />
+    <path
+        android:strokeColor="@color/white"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:pathData="M12,12v-2" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1a7fb3d1b..465091d1c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -275,6 +275,7 @@
     <string name="track_none">None</string>
     <string name="track_number_fmt">Track %1$d</string>
     <string name="audio_channel_fmt"> (%1$dch)</string>
+    <string name="playback_channel_name">AFinity Audiobook Playback</string>
 
     <string name="cd_logo">Logo</string>
     <string name="cd_series_logo">Series Logo</string>
@@ -377,15 +378,21 @@
     <string name="tab_tv_shows">TV Shows</string>
     <string name="empty_genre_movies">No movies found in this genre</string>
     <string name="empty_genre_tv">No TV shows found in this genre</string>
+    <string name="empty_genre_audiobooks">No audiobooks found in this genre</string>
+    <string name="empty_genre_podcasts">No podcasts found in this genre</string>
     <string name="error_unknown_occurred">Unknown error occurred</string>
 
     <string name="search_no_results">No results found</string>
     <string name="search_placeholder">Search movies and TV shows</string>
     <string name="cd_clear">Clear</string>
     <string name="filter_request">Request</string>
+    <string name="filter_audiobooks">Audiobooks</string>
     <string name="explore_genres">Explore Genres</string>
     <string name="search_results_count_fmt">%1$d results found</string>
     <string name="cd_watched">Watched</string>
+    <string name="cd_finished">Finished</string>
+    <string name="media_type_book">Book</string>
+    <string name="media_type_podcast">Podcast</string>
 
     <string name="media_type_movie">Movie</string>
     <string name="media_type_tv_show">TV Show</string>
@@ -646,6 +653,18 @@
     <string name="discovery_connected">Connected via Seerr</string>
     <string name="discovery_connect">Connect to request content</string>
 
+    <string name="pref_audiobookshelf">Audiobookshelf</string>
+    <string name="audiobookshelf_connected">Connected to Audiobookshelf</string>
+    <string name="audiobookshelf_connect">Connect to browse audiobooks</string>
+    <string name="dialog_disconnect_audiobookshelf_title">Disconnect Audiobookshelf</string>
+    <string name="dialog_disconnect_audiobookshelf_message">Disconnecting will remove your Audiobookshelf configuration. You can reconnect at any time.</string>
+    <string name="error_audiobookshelf_logout_failed_fmt">Failed to disconnect from Audiobookshelf: %1$s</string>
+
+    <string name="notification_permission_title">Enable Notifications</string>
+    <string name="notification_permission_message">AFinity needs notification permission to show the media player in your notification panel and lock screen while playing audiobooks or podcasts.\n\nIf you change your mind later, you can enable it manually from App Info → Permissions → Notifications.</string>
+    <string name="notification_permission_yes">Allow</string>
+    <string name="notification_permission_no">No Thanks</string>
+
     <string name="pref_downloads">Downloads</string>
     <string name="pref_downloads_summary">Manage offline content</string>
 
diff --git a/build.gradle.kts b/build.gradle.kts
index a97d15688..1ecf866d7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,16 @@ plugins {
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.compose) apply false
     alias(libs.plugins.kotlin.serialization) apply false
+    alias(libs.plugins.ktfmt) apply false
     alias(libs.plugins.aboutlibraries.android) apply false
     alias(libs.plugins.hilt.android) apply false
     alias(libs.plugins.ksp) apply false
+}
+
+subprojects {
+    apply(plugin = "com.ncorti.ktfmt.gradle")
+
+    configure<com.ncorti.ktfmt.gradle.KtfmtExtension> {
+        kotlinLangStyle()
+    }
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index e893161df..af7009f29 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,5 +23,15 @@ kotlin.code.style=official
 android.nonTransitiveRClass=true
 # App Configuration
 app.name=AFinity
-app.versionName=0.5.4-beta
-app.versionCode=35
\ No newline at end of file
+app.versionName=0.6.0-beta
+app.versionCode=36
+android.defaults.buildfeatures.resvalues=true
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+android.enableAppCompileTimeRClass=false
+android.usesSdkInManifest.disallowed=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
+android.builtInKotlin=false
+android.newDsl=false
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index afc998e04..d9384de46 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,45 +1,47 @@
 [versions]
 aboutlibrariesCore = "13.2.1"
 android-desugar-jdk-libs = "2.1.5"
-agp = "8.13.2"
+agp = "9.0.0"
 blurhash = "0.3.0"
 coilCompose = "3.3.0"
 composePagerIndicator = "0.0.8"
 lottieCompose = "6.7.1"
 material3WindowSizeClass = "1.4.0"
+paletteKtx = "1.0.0"
 richtext = "0.20.0"
 coreSplashscreen = "1.2.0"
 jellyfinCore = "1.7.1"
 kotlin = "2.3.0"
 coreKtx = "1.17.0"
-kotlinxSerializationJson = "1.9.0"
+kotlinxSerializationJson = "1.10.0"
 lifecycleRuntimeCompose = "2.10.0"
 lifecycleRuntimeKtx = "2.10.0"
-activityCompose = "1.12.2"
-composeBom = "2025.12.01"
-hilt = "2.57.2"
+activityCompose = "1.12.3"
+composeBom = "2026.01.01"
+hilt = "2.59.1"
 hilt-navigation-compose = "1.3.0"
 ksp = "2.3.4"
+ktfmt = "0.25.0"
 material3 = "1.4.0"
 material3AdaptiveNavigationSuite = "1.4.0"
-media3ExoplayerHls = "1.9.0"
-media3Session = "1.9.0"
+media3ExoplayerHls = "1.9.1"
+media3Session = "1.9.1"
 timber = "5.0.1"
 libmpv = "0.5.1"
 media3-ffmpeg-decoder = "1.9.0+1"
-navigation = "2.9.6"
+navigation = "2.9.7"
 okhttp = "5.3.2"
 retrofit = "3.0.0"
-media3 = "1.9.0"
+media3 = "1.9.1"
 preference = "1.2.1"
 room = "2.8.4"
 datastore = "1.2.0"
 okhttp-logging = "5.3.2"
-paging = "3.3.6"
+paging = "3.4.0"
 tinkAndroid = "1.20.0"
-work = "2.11.0"
+work = "2.11.1"
 hilt-work = "1.3.0"
-ui = "1.10.0"
+ui = "1.10.2"
 
 [libraries]
 aboutlibraries-core = { module = "com.mikepenz:aboutlibraries-core", version.ref = "aboutlibrariesCore" }
@@ -56,6 +58,7 @@ androidx-media3-exoplayer-hls = { module = "androidx.media3:media3-exoplayer-hls
 androidx-media3-session = { module = "androidx.media3:media3-session", version.ref = "media3Session" }
 androidx-media3-ui-compose = { group = "androidx.media3", name = "media3-ui-compose", version.ref = "media3" }
 androidx-media3-ui-compose-material3 = { group = "androidx.media3", name = "media3-ui-compose-material3", version.ref = "media3" }
+androidx-palette-ktx = { module = "androidx.palette:palette-ktx", version.ref = "paletteKtx" }
 blurhash = { module = "com.vanniktech:blurhash", version.ref = "blurhash" }
 coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coilCompose" }
 coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coilCompose" }
@@ -112,4 +115,5 @@ kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "ko
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+ktfmt = { id = "com.ncorti.ktfmt.gradle", version.ref = "ktfmt" }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 719a2719c..eff1adfc0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Sep 04 16:21:38 IST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists