diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 62e3ec054..67b5936c0 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -10,7 +10,7 @@ runs:
       with:
         python-version: '3.14'
     - name: Set up JDK
-      uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
+      uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6
       with:
         distribution: zulu
         java-version: '21'
@@ -21,7 +21,7 @@ runs:
         echo "BUILD_TOOLS_VERSION=36.0.0" >> $GITHUB_ENV
         echo "NDK_VERSION=29.0.14206865" >> $GITHUB_ENV
     - name: Set up Android SDK
-      uses: android-actions/setup-android@40fd30fb8d7440372e1316f5d1809ec01dcd3699 # v4
+      uses: android-actions/setup-android@be39fa834029ff78f1a44aa3bb0819b8fc2bd8fd # v4
       with:
         packages: "platform-tools platforms;android-37.0 build-tools;${{ env.BUILD_TOOLS_VERSION }} ndk;${{ env.NDK_VERSION }}"
     - name: Add NDK tools to PATH
diff --git a/Intents.md b/Intents.md
index 6e428ab60..af13f29d2 100644
--- a/Intents.md
+++ b/Intents.md
@@ -63,7 +63,7 @@ Action: `android.intent.action.VIEW`
 Shorthand action: `view`
 
 Parameters:
-- `itemId` - Required, the UUID of the media item
+- `itemId` - Optional, the UUID of the media item, if not set, goes to home screen
 
 
 ### Examples
@@ -135,12 +135,20 @@ adb shell am start -d 'mosaic://play?itemId=5cf8f8e7-2a5f-4aa9-8c12-ddf63d42ee6d
 
 Full format
 ```bash
+# Switch user, go to item
 adb shell am start \
   -a android.intent.action.VIEW \
   -n 'com.github.damontecres.wholphin/.MainActivity' \
   --es itemId "5cf8f8e7-2a5f-4aa9-8c12-ddf63d42ee6d" \
   --es serverId "341880f9-ca88-4038-8718-f6b2407950b1" \
   --es userId "5c8575e0-468d-44fb-8c70-00aa79160587"
+
+# Switch user, go to home screen
+adb shell am start \
+  -a android.intent.action.VIEW \
+  -n 'com.github.damontecres.wholphin/.MainActivity' \
+  --es serverId "341880f9-ca88-4038-8718-f6b2407950b1" \
+  --es userId "5c8575e0-468d-44fb-8c70-00aa79160587"
 ```
 
 URI based
diff --git a/app/src/main/java/com/github/damontecres/wholphin/data/model/BaseItem.kt b/app/src/main/java/com/github/damontecres/wholphin/data/model/BaseItem.kt
index dd1236a49..eefb001b8 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/data/model/BaseItem.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/data/model/BaseItem.kt
@@ -237,21 +237,30 @@ data class BaseItem(
             // Redirect episodes & seasons to their series if possible
             when (type) {
                 BaseItemKind.EPISODE -> {
-                    data.seasonId?.let { seasonId ->
+                    val seasonId = data.seasonId
+                    val seriesId = data.seriesId
+                    if (seasonId != null && seriesId != null) {
                         Destination.SeriesOverview(
-                            data.seriesId!!,
+                            seriesId,
                             BaseItemKind.SERIES,
                             SeasonEpisodeIds(seasonId, data.parentIndexNumber, id, indexNumber),
                         )
-                    } ?: Destination.MediaItem(this)
+                    } else {
+                        Destination.MediaItem(this)
+                    }
                 }
 
                 BaseItemKind.SEASON -> {
-                    Destination.SeriesOverview(
-                        data.seriesId!!,
-                        BaseItemKind.SERIES,
-                        SeasonEpisodeIds(id, indexNumber, null, null),
-                    )
+                    val seriesId = data.seriesId
+                    if (seriesId != null) {
+                        Destination.SeriesOverview(
+                            seriesId,
+                            BaseItemKind.SERIES,
+                            SeasonEpisodeIds(id, indexNumber, null, null),
+                        )
+                    } else {
+                        Destination.MediaItem(this)
+                    }
                 }
 
                 BaseItemKind.TV_CHANNEL -> {
diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/HomeSettingsService.kt b/app/src/main/java/com/github/damontecres/wholphin/services/HomeSettingsService.kt
index e7b5db000..3371f45eb 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/services/HomeSettingsService.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/services/HomeSettingsService.kt
@@ -245,7 +245,7 @@ class HomeSettingsService
                         settings.rows.mapIndexed { index, config ->
                             resolve(index, config)
                         }
-                    HomePageResolvedSettings(resolvedRows)
+                    HomePageResolvedSettings(userId, resolvedRows)
                 } else {
                     createDefault(userId)
                 }
@@ -256,12 +256,15 @@ class HomeSettingsService
         /**
          * Resolve the settings and set them to be the current settings
          */
-        suspend fun updateCurrent(settings: HomePageSettings) {
+        suspend fun updateCurrent(
+            userId: UUID,
+            settings: HomePageSettings,
+        ) {
             val resolvedRows =
                 settings.rows.mapIndexed { index, config ->
                     resolve(index, config)
                 }
-            val resolvedSettings = HomePageResolvedSettings(resolvedRows)
+            val resolvedSettings = HomePageResolvedSettings(userId, resolvedRows)
             currentSettings.update { resolvedSettings }
         }
 
@@ -312,7 +315,7 @@ class HomeSettingsService
                     ),
                 )
             val rowConfig = continueWatchingRow + includedIds
-            return HomePageResolvedSettings(rowConfig)
+            return HomePageResolvedSettings(userId, rowConfig)
         }
 
         /**
@@ -428,7 +431,7 @@ class HomeSettingsService
                                 null
                             }
                         }.flatten()
-                HomePageResolvedSettings(rowConfigs)
+                HomePageResolvedSettings(userId, rowConfigs)
             } else {
                 null
             }
@@ -1224,10 +1227,11 @@ data class HomeRowConfigDisplay(
  * @see HomePageSettings
  */
 data class HomePageResolvedSettings(
+    val userId: UUID,
     val rows: List<HomeRowConfigDisplay>,
 ) {
     companion object {
-        val EMPTY = HomePageResolvedSettings(listOf())
+        val EMPTY = HomePageResolvedSettings(UUID.randomUUID(), emptyList())
     }
 }
 
diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/IntentService.kt b/app/src/main/java/com/github/damontecres/wholphin/services/IntentService.kt
index 68678a6da..88ac02990 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/services/IntentService.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/services/IntentService.kt
@@ -56,30 +56,37 @@ class IntentService
                 val query = intent.getStringParam(SearchManager.QUERY)
                 return IntentResult.Target(listOf(Destination.Search(query ?: "")))
             }
-            val itemId =
-                intent.getStringParam("itemId")?.toUUIDOrNull()
-                    ?: return IntentResult.Error("No item id provided")
 
+            val itemId = intent.getStringParam("itemId")?.toUUIDOrNull()
             val item =
-                try {
-                    api.userLibraryApi
-                        .getItem(itemId)
-                        .content
-                        .let { BaseItem(it) }
-                } catch (ex: Exception) {
-                    Timber.w(ex, "Error fetching item %s", itemId)
-                    return IntentResult.Error("Could not fetch item $itemId")
+                itemId?.let {
+                    try {
+                        api.userLibraryApi
+                            .getItem(itemId)
+                            .content
+                            .let { BaseItem(it) }
+                    } catch (ex: Exception) {
+                        Timber.w(ex, "Error fetching item %s", itemId)
+                        return IntentResult.Error("Could not fetch item $itemId")
+                    }
                 }
-
-            val itemDestination = item.destination()
+            val itemDestination = item?.destination()
 
             val destinations =
                 when (action) {
                     Intent.ACTION_VIEW, "view" -> {
-                        listOf(itemDestination)
+                        if (itemDestination != null) {
+                            listOf(itemDestination)
+                        } else {
+                            // Will go to the home page
+                            emptyList()
+                        }
                     }
 
                     "${BuildConfig.APPLICATION_ID}.PLAYBACK", "com.github.damontecres.wholphin.PLAYBACK", "play" -> {
+                        if (itemId == null || itemDestination == null) {
+                            return IntentResult.Error("Cannot start playback with no itemId")
+                        }
                         val position = intent.getLongParam("position")?.coerceAtLeast(0)
                         val shuffle = intent.getBooleanExtra("shuffle", false)
 
@@ -105,7 +112,7 @@ class IntentService
                     }
                 }
 
-            return IntentResult.Target(destinations)
+            return IntentResult.Target(destinations, true)
         }
 
         internal suspend fun prepare(intent: Intent): IntentResult? {
@@ -196,6 +203,8 @@ class IntentService
             const val INTENT_SEASON_ID = "seaId"
             const val INTENT_SERVER_ID = "serverId"
             const val INTENT_USER_ID = "userId"
+
+            const val ACTION_PLAYBACK = "com.github.damontecres.wholphin.PLAYBACK"
         }
     }
 
diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/ScreensaverService.kt b/app/src/main/java/com/github/damontecres/wholphin/services/ScreensaverService.kt
index 09aa29a82..c3fcb4786 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/services/ScreensaverService.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/services/ScreensaverService.kt
@@ -173,9 +173,10 @@ class ScreensaverService
          */
         fun keepScreenOn(keep: Boolean) {
             scope.launchDefault {
-                val screensaverEnabled = _state.value.run { enabled || dimEnabled }
+                val screensaverEnabled = state.value.enabled
+                val dimEnabled = state.value.dimEnabled
                 Timber.d("Keep screen on: %s, screensaverEnabled=%s", keep, screensaverEnabled)
-                if (screensaverEnabled) {
+                if (screensaverEnabled || dimEnabled) {
                     // Page is requesting to keep screen on, so we don't wait to show the screensaver
                     _state.update {
                         it.copy(
@@ -187,7 +188,9 @@ class ScreensaverService
                     if (!keep) {
                         pulse()
                     }
-                } else {
+                }
+                if (!screensaverEnabled) {
+                    // If in-app screensaver is not enabled, send keep screen on to the OS
                     keepScreenOnInternal(keep)
                 }
             }
diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/SetupNavigationManager.kt b/app/src/main/java/com/github/damontecres/wholphin/services/SetupNavigationManager.kt
index fa42469e4..abe39959e 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/services/SetupNavigationManager.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/services/SetupNavigationManager.kt
@@ -27,9 +27,6 @@ class SetupNavigationManager
         fun navigateTo(destination: SetupDestination) {
             backStack[0] = destination
             log()
-            if (destination !is SetupDestination.AppContent) {
-                navigationManager.reloadHome()
-            }
         }
 
         private fun log() {
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/FavoritesViewModel.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/FavoritesViewModel.kt
index 8471c40dc..adbd9a44b 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/FavoritesViewModel.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/FavoritesViewModel.kt
@@ -787,7 +787,9 @@ fun List<Library>.possibleFavoriteTypes(sort: Boolean) =
     flatMap { it.collectionType.baseItemKinds }
         .distinct()
         .filter { it in favoriteOptions }
-        .let { list ->
+        .let {
+            // No library for persons, so always include it
+            val list = it + listOf(BaseItemKind.PERSON)
             if (sort) {
                 list.sortedWith(compareBy { favoriteOptions.indexOf(it) })
             } else {
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/main/HomeViewModel.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/main/HomeViewModel.kt
index 5b74c8d8b..a4d83ee3e 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/main/HomeViewModel.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/main/HomeViewModel.kt
@@ -21,6 +21,8 @@ import com.github.damontecres.wholphin.services.ServerReportService
 import com.github.damontecres.wholphin.services.UserPreferencesService
 import com.github.damontecres.wholphin.services.deleteItem
 import com.github.damontecres.wholphin.services.tvAccess
+import com.github.damontecres.wholphin.ui.collectLatestIn
+import com.github.damontecres.wholphin.ui.combinePair
 import com.github.damontecres.wholphin.ui.data.RowColumn
 import com.github.damontecres.wholphin.ui.launchDefault
 import com.github.damontecres.wholphin.ui.launchIO
@@ -32,6 +34,8 @@ import com.github.damontecres.wholphin.util.LoadingState
 import com.github.damontecres.wholphin.util.WholphinDispatchers
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -45,6 +49,7 @@ import kotlinx.coroutines.sync.withPermit
 import kotlinx.coroutines.withContext
 import org.jellyfin.sdk.api.client.exception.InvalidStatusException
 import org.jellyfin.sdk.model.api.BaseItemKind
+import org.jellyfin.sdk.model.api.UserDto
 import timber.log.Timber
 import java.util.UUID
 import javax.inject.Inject
@@ -70,6 +75,8 @@ class HomeViewModel
         private val _state = MutableStateFlow(HomeState.EMPTY)
         val state: StateFlow<HomeState> = _state
 
+        private var dataLoadingJob: Job? = null
+
         init {
             datePlayedService.invalidateAll()
             viewModelScope.launch {
@@ -77,148 +84,200 @@ class HomeViewModel
                     _state.update { it.copy(acquiringItems = acquiring.items) }
                 }
             }
-//            init()
+            serverRepository.currentUserDtoFlow
+                .combinePair(homeSettingsService.currentSettings)
+                .collectLatestIn(viewModelScope) { (userDto, settings) ->
+                    Timber.v(
+                        "Got new userDto & settings, userId=%s, settings?=%s",
+                        userDto?.id,
+                        settings != HomePageResolvedSettings.EMPTY,
+                    )
+                    _state.update { HomeState.EMPTY.copy(acquiringItems = it.acquiringItems) }
+                    dataLoadingJob?.cancel()
+                    if (userDto == null) {
+                        Timber.d("UserDto is null")
+                        return@collectLatestIn
+                    }
+                    if (settings == HomePageResolvedSettings.EMPTY) {
+                        Timber.d("Home settings are empty")
+                        return@collectLatestIn
+                    }
+                    if (userDto.id != settings.userId) {
+                        Timber.d("User IDs don't match: %s vs %s", userDto.id, settings.userId)
+                        return@collectLatestIn
+                    }
+                    dataLoadingJob =
+                        viewModelScope.launchIO {
+                            loadHomeRows(userDto, settings)
+                        }
+                }
         }
 
         fun init() {
             viewModelScope.launchIO {
                 Timber.d("init HomeViewModel")
-                try {
-                    val preferences = userPreferencesService.getCurrent()
-                    val prefs = preferences.appPreferences.homePagePreferences
-
-                    serverRepository.currentUserDto?.let { userDto ->
-                        val libraries =
-                            navDrawerService.getAllUserLibraries(userDto.id, userDto.tvAccess)
+                serverRepository.currentUserDto?.let { userDto ->
+                    if (dataLoadingJob?.isActive == false) {
                         val settings =
                             homeSettingsService.currentSettings.first { it != HomePageResolvedSettings.EMPTY }
-                        val state = state.value
-
-                        // Refreshing if a load has already occurred and the rows haven't significantly changed
-                        val refresh =
-                            state.loadingState == LoadingState.Success && state.settings == settings
-                        Timber.v(
-                            "refresh=%s, state.loadingState=%s, %s rows",
-                            refresh,
-                            state.loadingState,
-                            settings.rows.size,
-                        )
-                        _state.update {
-                            it.copy(
-                                loadingState = if (refresh) LoadingState.Success else LoadingState.Loading,
-                                refreshState = LoadingState.Loading,
-                                settings = settings,
-                                homeRows =
-                                    if (refresh) {
-                                        it.homeRows
-                                    } else {
-                                        List(settings.rows.size) {
-                                            HomeRowLoadingState.Pending(EmptyStringProvider)
-                                        }
-                                    },
+                        if (userDto.id == settings.userId) {
+                            dataLoadingJob =
+                                viewModelScope.launchIO {
+                                    loadHomeRows(userDto, settings)
+                                }
+                        } else {
+                            Timber.d(
+                                "Init user IDs don't match: %s vs %s",
+                                userDto.id,
+                                settings.userId,
                             )
                         }
+                    } else {
+                        Timber.v("Data loading job is active")
+                    }
+                }
+            }
+        }
 
-                        val semaphore = Semaphore(4)
+        suspend fun loadHomeRows(
+            userDto: UserDto,
+            settings: HomePageResolvedSettings,
+        ) {
+            Timber.i("Starting loadHomeRows")
+            try {
+                val preferences = userPreferencesService.getCurrent()
+                val prefs = preferences.appPreferences.homePagePreferences
 
-                        val deferred =
-                            settings.rows
-                                .map { row ->
-                                    viewModelScope.async(WholphinDispatchers.IO) {
-                                        semaphore.withPermit {
-                                            Timber.v("Fetching row: %s", row)
-                                            try {
-                                                homeSettingsService.fetchDataForRow(
-                                                    row = row.config,
-                                                    scope = viewModelScope,
-                                                    prefs = prefs,
-                                                    userDto = userDto,
-                                                    libraries = libraries,
-                                                    limit = prefs.maxItemsPerRow,
-                                                    isRefresh = refresh,
-                                                )
-                                            } catch (ex: InvalidStatusException) {
-                                                if (ex.status == 404) {
-                                                    Timber.w(ex, "404 on row %s", row)
-                                                    HomeRowLoadingState.Success(
-                                                        row.title,
-                                                        emptyList(),
-                                                    )
-                                                } else {
-                                                    Timber.e(
-                                                        ex,
-                                                        "Error %s on row %s",
-                                                        ex.status,
-                                                        row,
-                                                    )
-                                                    HomeRowLoadingState.Error(
-                                                        row.title,
-                                                        exception = ex,
-                                                    )
-                                                }
-                                            } catch (ex: Exception) {
-                                                Timber.e(ex, "Error on row %s", row)
-                                                HomeRowLoadingState.Error(
-                                                    row.title,
-                                                    exception = ex,
-                                                )
-                                            }
-                                        }
-                                    }
+                val libraries =
+                    navDrawerService.getAllUserLibraries(userDto.id, userDto.tvAccess)
+
+                val state = state.value
+
+                // Refreshing if a load has already occurred and the rows haven't significantly changed
+                val refresh =
+                    state.loadingState == LoadingState.Success && state.settings == settings
+                Timber.v(
+                    "refresh=%s, state.loadingState=%s, %s rows",
+                    refresh,
+                    state.loadingState,
+                    settings.rows.size,
+                )
+                _state.update {
+                    it.copy(
+                        loadingState = if (refresh) LoadingState.Success else LoadingState.Loading,
+                        refreshState = LoadingState.Loading,
+                        settings = settings,
+                        homeRows =
+                            if (refresh) {
+                                it.homeRows
+                            } else {
+                                List(settings.rows.size) {
+                                    HomeRowLoadingState.Pending(EmptyStringProvider)
                                 }
+                            },
+                    )
+                }
 
-                        if (refresh) {
-                            // Replace rows as they complete
-                            val remaining = deferred.withIndex().toMutableList()
-                            while (remaining.isNotEmpty()) {
-                                val (rowIndex, rowData) =
-                                    select {
-                                        // "Return" the first remaining that is completed
-                                        remaining
-                                            .forEach { (rowIndex, deferred) ->
-                                                deferred.onAwait { rowIndex to it }
-                                            }
-                                    }
-                                Timber.v("Got row data index=%s", rowIndex)
-                                remaining.removeIf { it.index == rowIndex }
-                                _state.update { state ->
-                                    val newRows =
-                                        state.homeRows.toMutableList().apply {
-                                            set(rowIndex, rowData)
+                val semaphore = Semaphore(4)
+
+                val deferred =
+                    settings.rows
+                        .map { row ->
+                            viewModelScope.async(WholphinDispatchers.IO) {
+                                semaphore.withPermit {
+                                    Timber.v("Fetching row: %s", row)
+                                    try {
+                                        homeSettingsService.fetchDataForRow(
+                                            row = row.config,
+                                            scope = viewModelScope,
+                                            prefs = prefs,
+                                            userDto = userDto,
+                                            libraries = libraries,
+                                            limit = prefs.maxItemsPerRow,
+                                            isRefresh = refresh,
+                                        )
+                                    } catch (ex: InvalidStatusException) {
+                                        if (ex.status == 404) {
+                                            Timber.w(ex, "404 on row %s", row)
+                                            HomeRowLoadingState.Success(
+                                                row.title,
+                                                emptyList(),
+                                            )
+                                        } else {
+                                            Timber.e(
+                                                ex,
+                                                "Error %s on row %s",
+                                                ex.status,
+                                                row,
+                                            )
+                                            HomeRowLoadingState.Error(
+                                                row.title,
+                                                exception = ex,
+                                            )
                                         }
-                                    state.copy(
-                                        homeRows = newRows,
-                                    )
+                                    } catch (ex: Exception) {
+                                        Timber.e(ex, "Error on row %s", row)
+                                        HomeRowLoadingState.Error(
+                                            row.title,
+                                            exception = ex,
+                                        )
+                                    }
                                 }
                             }
-                            _state.update {
-                                it.copy(
-                                    loadingState = LoadingState.Success,
-                                    refreshState = LoadingState.Success,
-                                )
-                            }
-                        } else {
-                            val rows = deferred.awaitAll()
-                            Timber.v("Got all rows")
-                            _state.update {
-                                it.copy(
-                                    loadingState = LoadingState.Success,
-                                    refreshState = LoadingState.Success,
-                                    homeRows = rows,
-                                )
+                        }
+
+                if (refresh) {
+                    // Replace rows as they complete
+                    val remaining = deferred.withIndex().toMutableList()
+                    while (remaining.isNotEmpty()) {
+                        val (rowIndex, rowData) =
+                            select {
+                                // "Return" the first remaining that is completed
+                                remaining
+                                    .forEach { (rowIndex, deferred) ->
+                                        deferred.onAwait { rowIndex to it }
+                                    }
                             }
+                        Timber.v("Got row data index=%s", rowIndex)
+                        remaining.removeIf { it.index == rowIndex }
+                        _state.update { state ->
+                            val newRows =
+                                state.homeRows.toMutableList().apply {
+                                    set(rowIndex, rowData)
+                                }
+                            state.copy(
+                                homeRows = newRows,
+                            )
                         }
-                        Timber.d("Home page load complete")
                     }
-                } catch (ex: Exception) {
-                    Timber.e(ex, "Exception during home page loading")
-                    if (state.value.loadingState == LoadingState.Success) {
-                        showToast(context, "Error refreshing home: ${ex.localizedMessage}")
-                        _state.update { it.copy(refreshState = LoadingState.Error(ex)) }
-                    } else {
-                        _state.update {
-                            it.copy(loadingState = LoadingState.Error(ex))
-                        }
+                    _state.update {
+                        it.copy(
+                            loadingState = LoadingState.Success,
+                            refreshState = LoadingState.Success,
+                        )
+                    }
+                } else {
+                    val rows = deferred.awaitAll()
+                    Timber.v("Got all rows")
+                    _state.update {
+                        it.copy(
+                            loadingState = LoadingState.Success,
+                            refreshState = LoadingState.Success,
+                            homeRows = rows,
+                        )
+                    }
+                }
+                Timber.d("Home page load complete")
+            } catch (ex: CancellationException) {
+                throw ex
+            } catch (ex: Exception) {
+                Timber.e(ex, "Exception during home page loading")
+                if (state.value.loadingState == LoadingState.Success) {
+                    showToast(context, "Error refreshing home: ${ex.localizedMessage}")
+                    _state.update { it.copy(refreshState = LoadingState.Error(ex)) }
+                } else {
+                    _state.update {
+                        it.copy(loadingState = LoadingState.Error(ex))
                     }
                 }
             }
@@ -312,7 +371,7 @@ data class HomeState(
             HomeState(
                 LoadingState.Pending,
                 LoadingState.Pending,
-                listOf(),
+                emptyList(),
                 HomePageResolvedSettings.EMPTY,
             )
     }
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsViewModel.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsViewModel.kt
index 64c0308ed..e3eafcbb8 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsViewModel.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/main/settings/HomeSettingsViewModel.kt
@@ -595,7 +595,7 @@ class HomeSettingsViewModel
                             }
                         if (shouldSave) {
                             homeSettingsService.saveToLocal(user.id, settings)
-                            homeSettingsService.updateCurrent(settings)
+                            homeSettingsService.updateCurrent(user.id, settings)
                             showSaveToast()
                         } else {
                             Timber.d("No changes")
@@ -616,7 +616,11 @@ class HomeSettingsViewModel
             _state.update {
                 update.invoke(it)
             }
-            homeSettingsService.currentSettings.update { HomePageResolvedSettings(state.value.rows) }
+            serverRepository.currentUser?.id?.let { userId ->
+                homeSettingsService.currentSettings.update {
+                    HomePageResolvedSettings(userId, state.value.rows)
+                }
+            }
         }
 
         fun resizeCards(relative: Int) {
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/search/SearchPage.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/search/SearchPage.kt
index e353287db..f20222d96 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/search/SearchPage.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/search/SearchPage.kt
@@ -113,7 +113,7 @@ fun SearchPage(
     val focusRequesters =
         remember(state.includedSearchableTypes.size) { List(RESULTS_START + state.includedSearchableTypes.size) { FocusRequester() } }
 
-    val seerrActive by viewModel.seerrActive.collectAsState(initial = false)
+    val seerrActive by viewModel.seerrActive.collectAsState()
     var selectedTab by rememberSaveable(seerrActive, state.discoverEnabled) { mutableIntStateOf(0) }
     var showViewOptions by rememberSaveable { mutableStateOf(false) }
     var showFilterTypeDialog by rememberSaveable { mutableStateOf(false) }
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/search/SearchViewModel.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/search/SearchViewModel.kt
index 81dfa95fd..044178b2b 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/search/SearchViewModel.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/search/SearchViewModel.kt
@@ -43,9 +43,11 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import org.jellyfin.sdk.api.client.ApiClient
@@ -79,7 +81,12 @@ class SearchViewModel
         private val navDrawerService: NavDrawerService,
     ) : ViewModel(),
         ContextMenuProvider {
-        val seerrActive = seerrService.active
+        val seerrActive =
+            seerrService.active.stateIn(
+                scope = viewModelScope,
+                started = SharingStarted.Eagerly,
+                initialValue = false,
+            )
 
         private val _state = MutableStateFlow(SearchState())
         val state: StateFlow<SearchState> = _state
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchUserViewModel.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchUserViewModel.kt
index c47b86c54..e1a6dd962 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchUserViewModel.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchUserViewModel.kt
@@ -132,6 +132,7 @@ class SwitchUserViewModel
             viewModelScope.async(WholphinDispatchers.IO) {
                 try {
                     val current = serverRepository.changeUser(server, user)
+                    navigationManager.reloadHome()
                     setupNavigationManager.navigateTo(SetupDestination.AppContent(current))
                     SwitchUserResult.Success
                 } catch (ex: InvalidStatusException) {
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 72c7ab266..9a76ef527 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -707,4 +707,6 @@
     <string name="dim_after_delay">Dæmp skærmen efter ventetid</string>
     <string name="dim_percentage">Dæmpning (%)</string>
     <string name="dim_screen">Dæmp skærmen</string>
+    <string name="photo_albums">Fotoalbummer</string>
+    <string name="no_favorites_found">Ingen favoritter fundet!</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2e447e0e3..def327d3e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -704,4 +704,16 @@
     <string name="server_version_not_supported">Nicht unterstützte Server-Version</string>
     <string name="disable_audio_offload">Audio-Hardware-Offload deaktivieren</string>
     <string name="disable_audio_offload_summary">Das Auslagern der Audio Decodierung zu deaktivieren könnte Wiedergabeprobleme auf einigen Gräten beheben</string>
+    <string name="duration_hours_seconds">%1$dh %2$ds</string>
+    <string name="season_episode_number">S%1$d F%2$d</string>
+    <string name="season_episode_number_range">S%1$d F%2$d-E%3$d</string>
+    <string name="season_episode_number_padded">S%1$02dF%2$02d</string>
+    <string name="season_episode_number_padded_range">S%1$02dF%2$02d-E%3$02d</string>
+    <string name="episode_number_short">F%1$d</string>
+    <string name="season_number">Staffel %1$d</string>
+    <string name="dim_after_delay">Bildschirm nach Verzögerung dimmen</string>
+    <string name="dim_percentage">Dimmen in Prozent</string>
+    <string name="dim_screen">Bildschirm dimmen</string>
+    <string name="photo_albums">Fotoalben</string>
+    <string name="no_favorites_found">Keine Favoriten vorhanden!</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index a4070ecab..732ffe5da 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -18,20 +18,20 @@
     <string name="videos">Τα βίντεο</string>
     <string name="background">Παρασκήνιο</string>
     <plurals name="theme_songs">
-        <item quantity="one">Θεματικά τραγούδια</item>
+        <item quantity="one">Θεματικό τραγούδι</item>
         <item quantity="other">Θεματικά τραγούδια</item>
     </plurals>
     <plurals name="theme_videos">
-        <item quantity="one">Θεματικά βίντεο</item>
+        <item quantity="one">Θεματικό βίντεο</item>
         <item quantity="other">Θεματικά βίντεο</item>
     </plurals>
-    <string name="next_up">Επόμενο</string>
-    <string name="rewatch_next_up">Ενεργοποιήστε την επανάληψη παρακολούθησης στα \'Επόμενα\'</string>
+    <string name="next_up">Επόμενα</string>
+    <string name="rewatch_next_up">Ενεργοποιήστε την επαναπροβολή στα \'Επόμενα\'</string>
     <string name="font">Γραμματοσειρά</string>
     <string name="font_size">Μέγεθος Κειμένου</string>
     <string name="font_color">Χρώμα Κειμένου</string>
-    <string name="bold_font">Φωτεινότητα κειμένου</string>
-    <string name="library">Βιβλιοθήκης</string>
+    <string name="bold_font">Έντονη γραμματοσειρά</string>
+    <string name="library">Βιβλιοθήκη</string>
     <string name="tv_shows_title">Σειρές</string>
     <string name="genres">Είδη</string>
     <string name="collection">Συλλογή</string>
@@ -43,25 +43,25 @@
     <string name="studios">Στούντιο</string>
     <string name="sdr">SDR</string>
     <string name="cast_and_crew">Ηθοποιοί και Συνεργείο</string>
-    <string name="more_like_this">Περισσότερα Σαν Αυτό</string>
+    <string name="more_like_this">Παραπλήσια</string>
     <string name="episodes">Επεισόδια</string>
     <string name="jump_letters">#ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩ</string>
     <plurals name="downloads">
         <item quantity="one">%s λήψη</item>
         <item quantity="other">%s λήψεις</item>
     </plurals>
-    <string name="downloading">λήψη…</string>
+    <string name="downloading">Γίνεται λήψη…</string>
     <string name="path">Διαδρομή</string>
     <string name="name">Όνομα</string>
-    <string name="container">Δοχείο</string>
+    <string name="container">Κοντέινερ</string>
     <string name="file_size">Μέγεθος</string>
     <string name="codec">Κωδικοποιητής</string>
     <string name="avc">AVC</string>
     <string name="bitrate">Ρυθμός bit</string>
     <string name="bit_depth">Βάθος bit</string>
     <string name="bit_unit">bit</string>
-    <string name="forced_track">Εξαναγκασμός</string>
-    <string name="layout">Σχέδιο</string>
+    <string name="forced_track">Αναγκαστικό</string>
+    <string name="layout">Διάταξη</string>
     <string name="default_track">Προεπιλογή</string>
     <string name="external_track">Εξωτερικό</string>
     <string name="add_user">Προσθήκη χρήστη</string>
@@ -69,25 +69,25 @@
     <string name="chapters">Κεφάλαια</string>
     <string name="choose_stream">Διάλεξε %1$s</string>
     <string name="add_server">Προσθήκη διακομιστή</string>
-    <string name="cancel_recording">Ακύρωση καταχώρησης</string>
-    <string name="cancel_series_recording">Ακύρωση σειρά καταχώρησης</string>
+    <string name="cancel_recording">Ακύρωση καταγραφής</string>
+    <string name="cancel_series_recording">Ακύρωση καταγραφής σειράς</string>
     <string name="clear_image_cache">Καθαρισμός μνήμης εικόνας</string>
     <string name="commercial">Διαφήμιση</string>
     <string name="community_rating">Αξιολόγηση κοινού</string>
     <string name="compose_error_message_title">Ένα σφάλμα εμφανίστηκε! Πατήστε το κομπί για να στείλετε αρχείο καταγραφής στο διακομιστή.</string>
     <string name="confirm">Επικύρωση</string>
-    <string name="continue_watching">Συνεχίστε να βλέπετε</string>
+    <string name="continue_watching">Συνέχεια προβολής</string>
     <string name="critic_rating">Κριτική</string>
-    <string name="decimal_seconds">%.1f δευτερόλεπτα</string>
+    <string name="decimal_seconds">%.2f δευτερόλεπτα</string>
     <string name="delete">Διαγραφή</string>
     <string name="died">Πέθανε</string>
     <string name="directed_by">Σκηνοθετήθηκε από %1$s</string>
-    <string name="disabled">Απενεργοποιημένος</string>
-    <string name="enabled">Ενεργοποιημένος</string>
-    <string name="enter_server_url">Καταχώρηση διακομιστή IP or URL</string>
+    <string name="disabled">Απενεργοποιημένο</string>
+    <string name="enabled">Ενεργοποιημένο</string>
+    <string name="enter_server_url">Δώσε την IP ή το URL του διακομιστή</string>
     <string name="error_loading_collection">Σφάλμα φόρτωσης συλλογής %1$s</string>
-    <string name="go_to_series">Πηγαίνετε στις σειρές</string>
-    <string name="go_to">Πηγαίνετε στο</string>
+    <string name="go_to_series">Πήγαινε στη σειρά</string>
+    <string name="go_to">Πήγαινε σε αυτό</string>
     <string name="hide_controller_timeout">Απόκρυψη χειρισμού αναπαραγωγής</string>
     <string name="hide_debug_info">Απόκρυψη πληροφοριών εντοπισμού σφαλμάτων</string>
     <string name="hide">Απόκρυψη</string>
@@ -96,15 +96,15 @@
     <string name="license_info">Πληροφορίες άδειας</string>
     <string name="live_tv">Ζωντανή Τηλεόραση</string>
     <string name="loading">Φόρτωση…</string>
-    <string name="mark_entire_series_as_played">Επισήμανση ολόκληρης σειράς ως αναπαραγμένης?</string>
-    <string name="mark_entire_series_as_unplayed">Επισήμανση ολόκληρης σειράς ως μη αναπαραγμένης?</string>
+    <string name="mark_entire_series_as_played">Επισήμανση ολόκληρης σειράς ως αναπαραγμένης;</string>
+    <string name="mark_entire_series_as_unplayed">Επισήμανση ολόκληρης σειράς ως μη αναπαραγμένης;</string>
     <string name="mark_unwatched">Επισήμανση ως μη ολοκληρωμένο</string>
     <string name="mark_watched">Επισήμανση ως ολοκληρωμένο</string>
     <string name="max_bitrate">Μέγιστος ρυθμός μετάδοσης δεδομένων</string>
     <string name="more">Περισσότερα</string>
     <string name="no_data">Χωρίς δεδομένα</string>
     <string name="no_results">Χωρίς αποτελέσματα</string>
-    <string name="no_scheduled_recordings">Χωρίς προγραμματισμένες καταχωρήσεις</string>
+    <string name="no_scheduled_recordings">Χωρίς προγραμματισμένες καταγραφές</string>
     <string name="no_update_available">Χωρίς διαθέσιμη ενημέρωση</string>
     <string name="play_from_here">Έναρξη από εδώ</string>
     <string name="play">Έναρξη</string>
@@ -117,16 +117,16 @@
     <string name="profile_specific_settings">Ρυθμίσεις προφίλ χρήστη</string>
     <string name="queue">Ουρά</string>
     <string name="recap">Ανακεφαλαίωση</string>
-    <string name="recently_added_in">Πρόσφατα πρόσθετα σε %1$s</string>
-    <string name="recently_added">Πρόσφατα πρόσθετα</string>
+    <string name="recently_added_in">Πρόσφατες προσθήκες σε %1$s</string>
+    <string name="recently_added">Πρόσφατες προσθήκες</string>
     <string name="recently_recorded">Πρόσφατα καταγεγραμμένο</string>
-    <string name="recently_released">Πρόσφατα κυκλοφόρησε</string>
+    <string name="recently_released">Πρόσφατης κυκλοφορίας</string>
     <string name="recommended">Προτεινόμενο</string>
-    <string name="record_program">Πρόγραμμα καταγραφής</string>
-    <string name="record_series">Σειρά καταγραφής</string>
-    <string name="remove_favorite">Κατάργηση από τα αγαπημένα</string>
+    <string name="record_program">Καταγραφή προγράμματος</string>
+    <string name="record_series">Καταγραφή σειράς</string>
+    <string name="remove_favorite">Αναίρεση αγαπημένου</string>
     <string name="restart">Επανεκκίνηση</string>
-    <string name="resume">Περίληψη</string>
+    <string name="resume">Συνέχισε</string>
     <string name="save">Αποθήκευση</string>
     <string name="search">Αναζήτηση</string>
     <string name="searching">Αναζήτηση…</string>
@@ -136,9 +136,9 @@
     <string name="show_next_up_when">Εμφάνιση επόμενου</string>
     <string name="show">Εμφάνιση</string>
     <string name="shuffle">Τυχαία αναπαραγωγή</string>
-    <string name="skip">Αναπήδηση</string>
-    <string name="sort_by_date_added">Προσθήκη ημερομηνίας</string>
-    <string name="sort_by_date_episode_added">Προσθήκη ημερομηνίας επεισοδίου</string>
+    <string name="skip">Παράλειψε</string>
+    <string name="sort_by_date_added">Ημερομηνία Προσθήκης</string>
+    <string name="sort_by_date_episode_added">Ημερομηνία Προσθήκης Επεισοδίου</string>
     <string name="sort_by_date_played">Ημερομηνία αναπαραγωγής</string>
     <string name="sort_by_date_released">Ημερομηνία κυκλοφορίας</string>
     <string name="sort_by_name">Όνομα</string>
@@ -146,17 +146,17 @@
     <string name="submit">Υποβολή</string>
     <string name="active_recordings">Ενεργές καταγραφές</string>
     <string name="none">Κανένας</string>
-    <string name="playback_debug_info">Εμφάνιση πληροφοριών αναπαραγωγής σφαλμάτων</string>
-    <string name="subtitle_download_too_long">Λήψη αρχείων διαρκεί πολύ χρονο, ίσως χρειαστεί να επανεκκινήσετε την αναπαραγωγή</string>
+    <string name="playback_debug_info">Εμφάνιση πληροφοριών σφαλμάτων αναπαραγωγής</string>
+    <string name="subtitle_download_too_long">Καθυστέρηση της λήψης, ίσως απαιτείται επανεκκίνηση αναπαραγωγής</string>
     <string name="switch_servers">Αλλαγή διακομιστή</string>
-    <string name="switch_user">Αντικατάσταση</string>
-    <string name="top_unwatched">Κορυφαίες βαθμολογίες σε ταινίες που δεν έχω δει</string>
+    <string name="switch_user">Αλλαγή</string>
+    <string name="top_unwatched">Κορυφαίας βαθμολογίας που δεν έχουν προβληθεί</string>
     <string name="tv_guide">Οδηγός</string>
     <string name="tv_season">Σεζόν</string>
     <string name="tv_seasons">Περισσότερες Σεζόν</string>
     <string name="unknown">Άγνωστο</string>
     <string name="updates">Αναβαθμίσεις</string>
-    <string name="version">Εκδοχή</string>
+    <string name="version">Έκδοση</string>
     <string name="video_scale">Κλίμακα βίντεο</string>
     <string name="watch_live">Ζωντανή μετάδοση</string>
     <string name="media_information">Πληροφορίες μέσων</string>
@@ -167,46 +167,227 @@
     <string name="italic_font">Πλάγια γραμματοσειρά</string>
     <string name="success">Επιτυχής</string>
     <string name="official_rating">Γονεική αξιολόγηση</string>
-    <string name="runtime_sort">Χρόνος εκτέλεσης</string>
+    <string name="runtime_sort">Διάρκεια</string>
     <string name="extras_title">Επιπρόσθετα</string>
     <plurals name="other_extras">
         <item quantity="one">Άλλο</item>
-        <item quantity="other">Άλλο</item>
+        <item quantity="other">Άλλα</item>
     </plurals>
     <plurals name="behind_the_scenes">
-        <item quantity="one">Παρασκήνια</item>
+        <item quantity="one">Παρασκήνιο</item>
         <item quantity="other">Παρασκήνια</item>
     </plurals>
     <plurals name="clips">
-        <item quantity="one">Αποσπάσματα</item>
+        <item quantity="one">Απόσπασμα</item>
         <item quantity="other">Αποσπάσματα</item>
     </plurals>
     <plurals name="deleted_scenes">
-        <item quantity="one">Διαγραμμένες σκηνές</item>
+        <item quantity="one">Διαγραμμένη σκηνή</item>
         <item quantity="other">Διαγραμμένες σκηνές</item>
     </plurals>
     <plurals name="interviews">
-        <item quantity="one">Συνεντεύξεις</item>
+        <item quantity="one">Συνέντευξη</item>
         <item quantity="other">Συνεντεύξεις</item>
     </plurals>
     <plurals name="scenes">
-        <item quantity="one">Σκηνές</item>
+        <item quantity="one">Σκηνή</item>
         <item quantity="other">Σκηνές</item>
     </plurals>
     <plurals name="samples">
-        <item quantity="one">Δείγματα</item>
+        <item quantity="one">Δείγμα</item>
         <item quantity="other">Δείγματα</item>
     </plurals>
     <plurals name="featurettes">
-        <item quantity="one">Χαρακτηριστικά</item>
-        <item quantity="other">Χαρακτηριστικά</item>
+        <item quantity="one">Προωθητικό βίντεο</item>
+        <item quantity="other">Προωθητικά βίντεο</item>
     </plurals>
     <string name="auto_check_for_updates">Αυτόματος έλεγχος για ενημερώσεις</string>
     <string name="auto_play_next_delay">Καθυστέρηση πριν την έναρξη του επόμενου</string>
     <string name="auto_play_next">Αυτόματη έναρξη επόμενου</string>
     <string name="check_for_updates">Έλεχγος για ενημερώσεις</string>
     <string name="combine_continue_next_summary">Ισχύει μόνο για τηλεοπτικές σειρές</string>
-    <string name="global_content_scale">Προεπιλεγμένη αναπαραγωγή περιεχομένου</string>
+    <string name="global_content_scale">Προεπιλεγμένη κλίμακα περιεχομένου</string>
     <string name="install_update">Εγκατάσταση ενημέρωσης</string>
-    <string name="installed_version">Εγκατεστημένη εκδοχή</string>
+    <string name="installed_version">Εγκατεστημένη έκδοση</string>
+    <string name="about">Πληροφορίες</string>
+    <string name="duration_hours_minutes_seconds">%1$dω %2$dλ %3$dδ</string>
+    <string name="duration_hours_minutes">%1$dω %2$dλ</string>
+    <string name="duration_minutes_seconds">%1$dλ %2$dδ</string>
+    <string name="duration_hours">%1$dω</string>
+    <string name="duration_minutes">%1$dλ</string>
+    <string name="duration_seconds">%1$dδ</string>
+    <string name="time_left">%1$s απέμεινε</string>
+    <string name="duration_hours_seconds">%1$dω %2$dδ</string>
+    <string name="discovered_servers">Εντοπισμένοι διακομιστές</string>
+    <string name="ends_at">Τελειώνει σε %1$s</string>
+    <string name="resolution_switching">Εναλλαγή ανάλυσης</string>
+    <string name="local">Τοπικό</string>
+    <string name="play_trailer">Αναπαραγωγή τρέιλερ</string>
+    <string name="no_trailers">Λείπει τρέιλερ</string>
+    <string name="clear_track_choices">Καθαρισμός επιλογών καναλιού</string>
+    <string name="enter_server_address">Δώσε την διεύθυνση διακομιστή</string>
+    <string name="no_servers_found">Δεν βρέθηκαν διακομιστές</string>
+    <string name="play_count">Μετρητής προβολών</string>
+    <string name="only_forced_subtitles">Μόνο αναγκαστικοί υπότιτλοι</string>
+    <string name="outro">Τίτλοι τέλους</string>
+    <string name="voice_error_audio">Σφάλμα καταγραφής ήχου</string>
+    <string name="visualizer_rationale">Η οπτικοποίηση του ήχου αναπαραγωγής απαιτεί άδεια καταγραφής ήχου.</string>
+    <string name="recordings">Καταγραφές</string>
+    <string name="profile_specific_settings_from_server">Ρυθμίσεις του προφίλ χρήστη στο διακομιστή</string>
+    <string name="subtitle_mode">Λειτουργία υποτίτλων</string>
+    <string name="use_user_profile">Χρήση των ρυθμίσεων του προφίλ</string>
+    <string name="subtitle_mode_default">Προεπιλογή</string>
+    <string name="subtitle_mode_smart">Έξυπνο</string>
+    <string name="subtitle_mode_only_forced">Μόνο αναγκαστικοί</string>
+    <string name="subtitle_mode_always">Πάντα</string>
+    <string name="subtitle_mode_none">Κανένα</string>
+    <string name="preferred_subtitle_language">Προτιμώμενη γλώσσα υποτίτλων</string>
+    <string name="preferred_audio_language">Προτιμώμενη γλώσσα ήχου</string>
+    <string name="override_user_profile_settings">Περισσότερες ρυθμίσεις του προφίλ χρήστη</string>
+    <string name="override_user_profile_settings_summary">Παράκαμψη των ρυθμίσεων του προφίλ χρήστη στον διακομιστή</string>
+    <string name="any_language">Οποιαδήποτε γλώσσα</string>
+    <string name="cinema_mode">Λειτουργία σινεμά</string>
+    <string name="download_and_update"><![CDATA[Λήψη και ενημέρωση]]></string>
+    <plurals name="movies">
+        <item quantity="one">Ταινία</item>
+        <item quantity="other">Ταινίες</item>
+    </plurals>
+    <plurals name="people">
+        <item quantity="one">Άτομο</item>
+        <item quantity="other">Άτομα</item>
+    </plurals>
+    <string name="search_and_download"><![CDATA[Αναζήτηση και λήψη]]></string>
+    <plurals name="trailers">
+        <item quantity="one">Τρέιλερ</item>
+        <item quantity="other">Τρέιλερ</item>
+    </plurals>
+    <string name="tv_dvr_schedule">Προγραμματισμός DVR</string>
+    <plurals name="tv_shows">
+        <item quantity="one">Σειρά</item>
+        <item quantity="other">Σειρές</item>
+    </plurals>
+    <string name="ui_interface">Διεπαφή</string>
+    <plurals name="years_old">
+        <item quantity="one">%1$d έτους</item>
+        <item quantity="other">%1$d ετών</item>
+    </plurals>
+    <string name="play_with_transcoding">Αναπαραγωγή με μετατροπή</string>
+    <string name="aired_episode_order">Σειρά τηλεοπτικής προβολής</string>
+    <string name="one_click_pause_summary_on">Παύση/Αναπαραγωγή με το κεντρικό κουμπί του σταυρού πλοήγησης</string>
+    <plurals name="shorts">
+        <item quantity="one">Μικρού μήκους</item>
+        <item quantity="other">Μικρού μήκους</item>
+    </plurals>
+    <plurals name="hours">
+        <item quantity="one">%d ώρα</item>
+        <item quantity="other">%d ώρες</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="one">%d αντικείμενο</item>
+        <item quantity="other">%d αντικείμενα</item>
+    </plurals>
+    <plurals name="seconds">
+        <item quantity="one">%d δευτερόλεπτο</item>
+        <item quantity="other">%d δευτερόλεπτα</item>
+    </plurals>
+    <string name="ac3_supported">Η συσκευή υποστηρίζει AC3/Dolby Digital</string>
+    <string name="advanced_ui">Προηγμένη διεπαφή</string>
+    <string name="combine_continue_next"><![CDATA[Συγχώνευση Συνέχεια προβολής και Επόμενα]]></string>
+    <string name="max_days_next_up">Ανώτατο όριο ημερών στα Επόμενα</string>
+    <string name="next_up_playback_end">Στο τέλος της αναπαραγωγής</string>
+    <string name="next_up_outro">Κατά τη διάρκεια των τίτλων τέλους</string>
+    <string name="remove_next_up">Αφαίρεση σειράς από τα Επόμενα</string>
+    <string name="view_removed_next_up">Εμφάνιση σειρών που αφαιρέθηκαν από τα Επόμενα</string>
+    <string name="next_up_never">Ποτέ</string>
+    <string name="continue_watching_click_behavior">Συμπεριφορά επιλογής του Συνέχεια προβολής/Επόμενο</string>
+    <string name="remove_continue_watching">Αφαίρεση από συνέχεια προβολής</string>
+    <string name="continue_watching_click_summary_on">Αναπαραγωγή κατά την επιλογή</string>
+    <string name="continue_watching_click_summary_off">Προβολή λεπτομέρειον κατά την επιλογή</string>
+    <string name="direct_play_ass">Χρήση libass για ASS υπότιτλους</string>
+    <string name="direct_play_pgs">Απευθείας αναπαραγωγή PGS υπότιτλων</string>
+    <string name="downmix_stereo">Πάντα υποβιβασμός σε στέρεο</string>
+    <string name="ffmpeg_extension_pref">Χρήση αποκωδικοποιητή FFmpeg</string>
+    <string name="max_homepage_items">Ανώτατο όριο αντικειμένων στις γραμμές της αρχικής</string>
+    <string name="nav_drawer_pins_summary">Διάλεξε τα προεπιλεγμένα αντικείμενα για εμφάνιση, θα γίνει απόκρυψη των υπόλοιπων</string>
+    <string name="remember_selected_tab">Απομνημόνευση επιλεγμένων καρτελών</string>
+    <string name="settings">Ρυθμίσεις</string>
+    <string name="discover">Ανακάλυψε</string>
+    <string name="request">Αίτημα</string>
+    <string name="pending">Εκκρεμί</string>
+    <string name="password">Κωδικός</string>
+    <string name="username">Όνομα χρήστη</string>
+    <string name="trending">Τάσεις</string>
+    <string name="red">Κόκκινο</string>
+    <string name="green">Πράσινο</string>
+    <string name="blue">Μπλε</string>
+    <string name="blur">Θόλωση</string>
+    <string name="height">Ύψος</string>
+    <string name="content_scale_fit">Προσαρμογή</string>
+    <string name="content_scale_crop">Περικοπή</string>
+    <string name="content_scale_fill">Γέμισμα</string>
+    <string name="volume_lowest">Χαμηλότερο</string>
+    <string name="volume_low">Χαμηλό</string>
+    <string name="volume_medium">Μεσαίο</string>
+    <string name="volume_high">Υψηλό</string>
+    <string name="volume_full">Τέρμα</string>
+    <string name="purple">Μωβ</string>
+    <string name="orange">Πορτοκαλί</string>
+    <string name="black">Μαύρο</string>
+    <string name="skip_ignore">Αγνόηση</string>
+    <string name="white">Άσπρο</string>
+    <string name="yellow">Κίτρινο</string>
+    <string name="cyan">Κυανό</string>
+    <string name="magenta">Πορφυρώ</string>
+    <string name="subtitle_edge_outline">Περίγραμμα</string>
+    <string name="subtitle_edge_shadow">Σκιά</string>
+    <string name="background_style_wrap">Αναδίπλωση</string>
+    <string name="background_style_boxed">Πλαίσιο</string>
+    <string name="duration">Διάρκεια</string>
+    <string name="screensaver">Προστασία οθόνης</string>
+    <string name="photos">Φωτογραφίες</string>
+    <string name="actor">Ηθοποιός</string>
+    <string name="composer">Συνθέτης</string>
+    <string name="writer">Συγγραφέας</string>
+    <string name="producer">Παραγωγός</string>
+    <string name="conductor">Μαέστρος</string>
+    <string name="lyricist">Στιχουργός</string>
+    <string name="arranger">Ενορχηστρωτής</string>
+    <string name="mixer">Υπεύθυνος μίξης</string>
+    <string name="creator">Δημιουργός</string>
+    <string name="artist">Καλλιτέχνης</string>
+    <string name="albums">Άλμπουμ</string>
+    <string name="artists">Καλλιτέχνες</string>
+    <string name="songs">Τραγούδια</string>
+    <string name="album">Άλμπουμ</string>
+    <string name="lyrics">Στίχοι</string>
+    <string name="continue_string">Συνεχεία</string>
+    <string name="transcoding">Μετατροπή</string>
+    <string name="reset">Επαναφορά</string>
+    <string name="played">Παίχτηκε</string>
+    <string name="filter">Φίλτρο</string>
+    <string name="year">Έτος</string>
+    <string name="decade">Δεκαετία</string>
+    <string name="remove">Αφαίρεση</string>
+    <string name="subtitle_margin">Περιθώριο</string>
+    <string name="incorrect">Λανθασμένο</string>
+    <string name="columns">Στήλες</string>
+    <string name="spacing">Διάστιχο</string>
+    <string name="automatic">Αυτόματα</string>
+    <string name="login">Σύνδεση</string>
+    <string name="general">Γενικά</string>
+    <string name="title">Τίτλος</string>
+    <string name="level">Επίπεδο</string>
+    <string name="resolution">Ανάλυση</string>
+    <string name="anamorphic">Αναμορφικό</string>
+    <string name="interlaced">Πεπλεγμένο</string>
+    <string name="framerate">Ρυθμός ανανέωσης</string>
+    <string name="live_tv_repeat">Επανάληψη</string>
+    <string name="retry">Επανάλαβε</string>
+    <string name="brightness">Φωτεινότητα</string>
+    <string name="contrast">Αντίθεση</string>
+    <string name="saturation">Κορεσμός</string>
+    <string name="hue">Απόχρωση</string>
+    <string name="subtitle_delay">Καθυστέρηση υποτίτλων</string>
+    <string name="discover_movies">Ανακάλυψε ταινίες</string>
+    <string name="discover_tv">Ανακάλυψε σειρές</string>
 </resources>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 417bac6b7..6f57641a1 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -36,4 +36,20 @@
     <string name="skip_behavior">Skip behaviour</string>
     <string name="display_toggles_summary">Customise which to display</string>
     <string name="continue_watching_click_behavior">Continue watching/Next up click behaviour</string>
+    <string name="about">About</string>
+    <string name="active_recordings">Active Recordings</string>
+    <string name="add_server">Add Server</string>
+    <string name="add_user">Add User</string>
+    <string name="audio">Audio</string>
+    <string name="birthplace">Birthplace</string>
+    <string name="bitrate">Bitrate</string>
+    <string name="born">Born</string>
+    <string name="cancel_recording">Cancel Recording</string>
+    <string name="cancel_series_recording">Cancel Series Recording</string>
+    <string name="duration_hours_seconds">%1$dh %2$ds</string>
+    <string name="duration_minutes_seconds">%1$dm %2$ds</string>
+    <string name="duration_hours">%1$dh</string>
+    <string name="cancel">Cancel</string>
+    <string name="chapters">Chapters</string>
+    <string name="choose_stream">Choose %1$s</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5eee727c4..cb3513a80 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -726,4 +726,16 @@
     <string name="appears_on">Aparece en</string>
     <string name="disable_audio_offload">Desactivar el procesamiento de audio por hardware</string>
     <string name="disable_audio_offload_summary">Desactivar el procesamiento de audio por hardware puede solucionar los bloqueos de reproducción en algunos dispositivos</string>
+    <string name="dim_after_delay">Atenuar la pantalla tras un tiempo de inactividad</string>
+    <string name="dim_percentage">Porcentaje de atenuación</string>
+    <string name="dim_screen">Atenuar pantalla</string>
+    <string name="photo_albums">Álbumes de fotos</string>
+    <string name="no_favorites_found">¡No se encontraron favoritos!</string>
+    <string name="duration_hours_seconds">%1$dh %2$ds</string>
+    <string name="season_episode_number">T%1$d E%2$d</string>
+    <string name="season_episode_number_range">T%1$d E%2$d-E%3$d</string>
+    <string name="season_episode_number_padded">T%1$02dE%2$02d</string>
+    <string name="season_episode_number_padded_range">T%1$02dE%2$02d-E%3$02d</string>
+    <string name="episode_number_short">E%1$d</string>
+    <string name="season_number">Temporada %1$d</string>
 </resources>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 74cc50555..2e3548f8d 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -704,4 +704,17 @@
     <string name="appears_on">On osalenud siin:</string>
     <string name="disable_audio_offload">Lülita graafikaprotsessori kasutamine heli töötluseks välja</string>
     <string name="disable_audio_offload_summary">Kui lülita graafikaprotsessori kasutamise heli töötluseks välja, siis see võib mõnede seadmete puhul parandada taasesituse hangumise vead</string>
+    <string name="dim_after_delay">Hämarda ekraani peale viivitust</string>
+    <string name="dim_percentage">Hämardamise protsent</string>
+    <string name="dim_screen">Hämarda ekraani</string>
+    <string name="photo_albums">Fotoalbumid</string>
+    <string name="no_favorites_found">Ühtegi lemmikut ei leidu!</string>
+    <string name="duration_hours_seconds">%1$d t %2$d sek</string>
+    <string name="season_episode_number">S%1$d E%2$d</string>
+    <string name="season_episode_number_range">S%1$d E%2$d-E%3$d</string>
+    <string name="season_episode_number_padded">S%1$02dE%2$02d</string>
+    <string name="season_episode_number_padded_range">S%1$02dE%2$02d-E%3$02d</string>
+    <string name="episode_number_short">E%1$d</string>
+    <string name="season_number">%1$d. hooaeg</string>
+    <string name="remove_from_playlist">Eemalda esitusloendist</string>
 </resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 45442137c..e01773c79 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -729,4 +729,13 @@
     <string name="dim_after_delay">Zatamni zaslon nakon odgode</string>
     <string name="dim_percentage">Postotak zatamnjenja</string>
     <string name="dim_screen">Zatamni zaslon</string>
+    <string name="duration_hours_seconds">%1$dh %2$ds</string>
+    <string name="season_episode_number">S%1$d E%2$d</string>
+    <string name="season_episode_number_range">S%1$d E%2$d-E%3$d</string>
+    <string name="season_episode_number_padded">S%1$02dE%2$02d</string>
+    <string name="season_episode_number_padded_range">S%1$02dE%2$02d-E%3$02d</string>
+    <string name="episode_number_short">E%1$d</string>
+    <string name="season_number">Sezona %1$d</string>
+    <string name="photo_albums">Albumi slika</string>
+    <string name="no_favorites_found">Nijedan favorit nije pronađen!</string>
 </resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 573230c37..b6f315ddd 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -664,4 +664,34 @@
     <string name="any_language">Semua bahasa</string>
     <string name="brown">Cokelat</string>
     <string name="d_pad_seek_mode_title">Mode bilah geser D-Pad</string>
+    <string name="duration_hours_seconds">%1$dj %2$dd</string>
+    <string name="season_episode_number">S%1$d E%2$d</string>
+    <string name="season_episode_number_range">S%1$d E%2$d-E%3$d</string>
+    <string name="season_episode_number_padded">S%1$02dE%2$02d</string>
+    <string name="season_episode_number_padded_range">S%1$02dE%2$02d-E%3$02d</string>
+    <string name="episode_number_short">E%1$d</string>
+    <string name="season_number">Season %1$d</string>
+    <string name="disable_audio_offload">Nonaktifkan offload audio hardware</string>
+    <string name="disable_audio_offload_summary">Menonaktifkan dekode audio offload dapat mengatasi masalah pemutaran macet pada beberapa perangkat</string>
+    <string name="dpad_seek_mode_minimal">Minimal</string>
+    <string name="dpad_seek_mode_trickplay">Trickplay</string>
+    <string name="dpad_seek_mode_minimal_summary">Bilah geser kecil di sepanjang bawah layar (default)</string>
+    <string name="dpad_seek_mode_trickplay_summary">Bilah geser dengan gambar pratinjau trickplay</string>
+    <string name="dpad_seek_mode_none_summary">Tanpa bilah geser</string>
+    <string name="blocklisted">Daftar blokir</string>
+    <string name="hash_matches">Hash sesuai</string>
+    <string name="subtitles_hearing_impaired">SDH</string>
+    <string name="programs">Acara TV</string>
+    <string name="recordings">Rekaman</string>
+    <string name="folders_title">Folder</string>
+    <string name="user_views">Tampilan pengguna</string>
+    <string name="books">Buku</string>
+    <string name="audio_books">Buku audio</string>
+    <string name="server_version_not_supported">Versi server tidak didukung</string>
+    <string name="appears_on">Tampil pada</string>
+    <string name="dim_after_delay">Redupkan layar setelah penundaan</string>
+    <string name="dim_percentage">Persentase redup</string>
+    <string name="dim_screen">Redupkan layar</string>
+    <string name="photo_albums">Album foto</string>
+    <string name="no_favorites_found">Favorit tidak ditemukan!</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e973af469..b7d7acaeb 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -726,4 +726,19 @@
     <string name="appears_on">Appare in</string>
     <string name="disable_audio_offload">Disabilita offload hardware audio</string>
     <string name="disable_audio_offload_summary">Disabilitare l’offload della decodifica audio può risolvere i blocchi di riproduzione su alcuni dispositivi</string>
+    <string name="dim_after_delay">Scurisci lo schermo dopo un ritardo</string>
+    <string name="dim_percentage">Percentuale di oscuramento</string>
+    <string name="dim_screen">Scurisci schermo</string>
+    <string name="photo_albums">Album fotografici</string>
+    <string name="no_favorites_found">Nessun preferito trovato!</string>
+    <string name="duration_hours_seconds">%1$do %2$ds</string>
+    <string name="season_episode_number">S%1$d E%2$d</string>
+    <string name="season_episode_number_range">S%1$d E%2$d-E%3$d</string>
+    <string name="season_episode_number_padded">S%1$02dE%2$02d</string>
+    <string name="season_episode_number_padded_range">S%1$02dE%2$02d-E%3$02d</string>
+    <string name="episode_number_short">E%1$d</string>
+    <string name="season_number">Stagione %1$d</string>
+    <string name="remove_from_playlist">Rimuovi dalla playlist</string>
+    <string name="login_credentials_expired">Credenziali scadute, effettua di nuovo l’accesso</string>
+    <string name="login_not_authorized">Non sei autorizzato ad accedere al server in questo momento</string>
 </resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index c8d4ef228..38df9e364 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -726,4 +726,16 @@
     <string name="appears_on">מופיע ב־</string>
     <string name="disable_audio_offload_summary">השבתת פענוח אודיו בהורדה עשויה לתקן קפיאות בניגון במכשירים מסוימים</string>
     <string name="disable_audio_offload">השבתת פענוח אודיו בהורדה</string>
+    <string name="dim_after_delay">עמעם תצוגה אחרי השהייה</string>
+    <string name="dim_percentage">עוצמת העמעום</string>
+    <string name="dim_screen">עמעם תצוגה</string>
+    <string name="photo_albums">אלבומי תמונות</string>
+    <string name="no_favorites_found">לא נמצאו מועדפים!</string>
+    <string name="duration_hours_seconds">%1$d שע\' %2$d שנ\'</string>
+    <string name="season_episode_number">עונה %1$d פרק %2$d</string>
+    <string name="season_episode_number_range">עונה %1$d פרקים %2$d-%3$d</string>
+    <string name="season_episode_number_padded">עונה %1$02d פרק %2$02d</string>
+    <string name="season_episode_number_padded_range">עונה %1$02d פרקים %2$02d-%3$02d</string>
+    <string name="episode_number_short">פרק %1$d</string>
+    <string name="season_number">עונה %1$d</string>
 </resources>
diff --git a/app/src/main/res/values-lo/strings.xml b/app/src/main/res/values-lo/strings.xml
new file mode 100644
index 000000000..045e125f3
--- /dev/null
+++ b/app/src/main/res/values-lo/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 9ddb6c770..9e26efccd 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -23,7 +23,7 @@
     <string name="confirm">Bekreft</string>
     <string name="continue_watching">Fortsett å se</string>
     <string name="critic_rating">Kritikervurdering</string>
-    <string name="decimal_seconds">%.1f sekunder</string>
+    <string name="decimal_seconds">%.2f sekunder</string>
     <string name="director">Regissør</string>
     <string name="disabled">Deaktivert</string>
     <string name="discovered_servers">Oppdagede servere</string>
@@ -120,7 +120,7 @@
     <string name="switch_user">Bytt bruker</string>
     <string name="top_unwatched">Best vurderte usette</string>
     <plurals name="trailers">
-        <item quantity="one">Trailere</item>
+        <item quantity="one">Trailer</item>
         <item quantity="other">Trailere</item>
     </plurals>
     <string name="tv_dvr_schedule">DVR-plan</string>
@@ -137,6 +137,7 @@
     <string name="videos">Videoer</string>
     <string name="watch_live">Se direkte</string>
     <plurals name="years_old">
+        <item quantity="one">%1$d år gammel</item>
         <item quantity="other">%1$d år gammel</item>
     </plurals>
     <string name="play_with_transcoding">Spill av med transkoding</string>
@@ -163,39 +164,39 @@
         <item quantity="other">Bak kulissene</item>
     </plurals>
     <plurals name="theme_songs">
-        <item quantity="one">Temasanger</item>
-        <item quantity="other">Temasanger</item>
+        <item quantity="one">Kjenningsmelodi</item>
+        <item quantity="other">Kjenningsmelodier</item>
     </plurals>
     <plurals name="theme_videos">
-        <item quantity="one">Temavideoer</item>
-        <item quantity="other">Temavideoer</item>
+        <item quantity="one">Kjenningsvideo</item>
+        <item quantity="other">Kjenningsvideoer</item>
     </plurals>
     <plurals name="clips">
         <item quantity="one">Klipp</item>
         <item quantity="other">Klipp</item>
     </plurals>
     <plurals name="deleted_scenes">
-        <item quantity="one">Slettede scener</item>
+        <item quantity="one">Slettet scene</item>
         <item quantity="other">Slettede scener</item>
     </plurals>
     <plurals name="interviews">
-        <item quantity="one">Intervjuer</item>
+        <item quantity="one">Intervju</item>
         <item quantity="other">Intervjuer</item>
     </plurals>
     <plurals name="scenes">
-        <item quantity="one">Scener</item>
+        <item quantity="one">Scene</item>
         <item quantity="other">Scener</item>
     </plurals>
     <plurals name="samples">
-        <item quantity="one">Smakebiter</item>
+        <item quantity="one">Smakebit</item>
         <item quantity="other">Smakebiter</item>
     </plurals>
     <plurals name="featurettes">
-        <item quantity="one">Bakomfilmer</item>
-        <item quantity="other">Bakomfilmer</item>
+        <item quantity="one">Novellefilm</item>
+        <item quantity="other">Novellefilmer</item>
     </plurals>
     <plurals name="shorts">
-        <item quantity="one">Kortfilmer</item>
+        <item quantity="one">Kortfilm</item>
         <item quantity="other">Kortfilmer</item>
     </plurals>
     <plurals name="downloads">
@@ -223,7 +224,7 @@
     <string name="check_for_updates">Sjekk etter oppdateringer</string>
     <string name="combine_continue_next_summary">Gjelder kun TV-serier</string>
     <string name="combine_continue_next">Slå sammen \'Fortsett å se\' og \'Neste\'</string>
-    <string name="direct_play_ass">Direkteavspilling av ASS-undertekster</string>
+    <string name="direct_play_ass">Bruk libass for ASS-undertekster</string>
     <string name="direct_play_pgs">Direkteavspilling av PGS-undertekster</string>
     <string name="downmix_stereo">Alltid nedmiks til stereo</string>
     <string name="ffmpeg_extension_pref">Bruk FFmpeg-dekodermodul</string>
@@ -365,4 +366,347 @@
     <string name="play_trailer">Spill trailer</string>
     <string name="no_trailers">Ingen trailere</string>
     <string name="clear_track_choices">Fjern valg av spor</string>
+    <string name="duration_hours_minutes_seconds">%1$dh %2$dm %3$ds</string>
+    <string name="duration_hours_minutes">%1$dt %2$dmin</string>
+    <string name="duration_minutes_seconds">%1$dmin %2$ds</string>
+    <string name="duration_hours">%1$dt</string>
+    <string name="duration_minutes">%1$dmin</string>
+    <string name="duration_seconds">%1$ds</string>
+    <string name="only_forced_subtitles">Bare Tvungne Undertekster</string>
+    <string name="profile_specific_settings_from_server">Brukerprofil instillinger fra server</string>
+    <string name="voice_search">Stemmesøk</string>
+    <string name="voice_starting">Begynner</string>
+    <string name="voice_search_prompt">Snakk for å søke</string>
+    <string name="processing">Behandler</string>
+    <string name="press_back_to_cancel">Trykk tilbake for å avbryte</string>
+    <string name="voice_error_audio">Lydopptaksfeil</string>
+    <string name="voice_error_client">Stemmegjenkjenningsfeil</string>
+    <string name="voice_error_permissions">Mikrofonadgang nødvendig</string>
+    <string name="voice_error_network">Nettverksfeil</string>
+    <string name="voice_error_network_timeout">Nettverksavbrudd</string>
+    <string name="voice_error_no_match">Ingen tale gjenkjent</string>
+    <string name="voice_error_busy">Stemmegjenkjenning opptatt</string>
+    <string name="voice_error_server">Tjenerfeil</string>
+    <string name="voice_error_speech_timeout">Ingen tale oppdaget</string>
+    <string name="voice_error_unknown">Ukjent feil</string>
+    <string name="voice_error_start_failed">Feil ved oppstart av stemmegjenkjenning</string>
+    <string name="voice_error_timeout">Tidsavbrudd ved stemmegjenkjenning</string>
+    <string name="retry">Prøv igjen</string>
+    <string name="time_left">%1$s gjenstår</string>
+    <string name="trailers_title">Trailere</string>
+    <string name="other_extras_title">Annet</string>
+    <string name="behind_the_scenes_title">Bak kulissene</string>
+    <string name="theme_songs_title">Kjenningsmelodier</string>
+    <string name="theme_videos_title">Kjenningsvideoer</string>
+    <string name="clips_title">Klipp</string>
+    <string name="deleted_scenes_title">Slettede Scener</string>
+    <string name="interviews_title">Intervju</string>
+    <string name="scenes_title">Scener</string>
+    <string name="samples_title">Prøver</string>
+    <string name="featurettes_title">Novellefilmer</string>
+    <string name="shorts_title">Kortfilmer</string>
+    <string name="favorite_items_title">Favoritt %s</string>
+    <plurals name="days">
+        <item quantity="one">%s dag</item>
+        <item quantity="other">%s dager</item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="one">%s minutt</item>
+        <item quantity="other">%s minutter</item>
+    </plurals>
+    <plurals name="movies">
+        <item quantity="one">Film</item>
+        <item quantity="other">Filmer</item>
+    </plurals>
+    <plurals name="tv_shows">
+        <item quantity="one">Serie</item>
+        <item quantity="other">Serier</item>
+    </plurals>
+    <plurals name="people">
+        <item quantity="one">Person</item>
+        <item quantity="other">Personer</item>
+    </plurals>
+    <string name="require_login">Krev innlogging for profil</string>
+    <string name="pin_digits_hint">[0-9]</string>
+    <string name="disable_audio_offload">Deaktiver avlasting av lydmaskinvare</string>
+    <string name="disable_audio_offload_summary">Deaktivering av lyddekodingavlasting kan fikse fryst bilde ved avspilling på noen enheter</string>
+    <string name="combined_search_results">Kombinert søkeresultater</string>
+    <string name="combined_search_results_on">Vis alle resultater i én liste</string>
+    <string name="combined_search_results_off">Vis resultater etter kategori</string>
+    <string name="show_voice_search_button">Vis knapp for stemmesøk</string>
+    <string name="visible_ui">Synlig</string>
+    <string name="hidden_ui">Skjult</string>
+    <string name="results">Resultater</string>
+    <string name="dts_x">DTS:X</string>
+    <string name="dts_hd">DTS:HD</string>
+    <string name="dts_hd_ma">DTS:HD MA</string>
+    <string name="truehd">TrueHD</string>
+    <string name="dolby_digital">DD</string>
+    <string name="dolby_digital_plus">DD+</string>
+    <string name="dts">DTS</string>
+    <string name="force_dovi_profile_7">Direct play Dolby Vision Profile 7</string>
+    <string name="force_dovi_profile_7_summary">Ignorer kompatibilitetsjekk av enheten</string>
+    <string name="discover">Oppdag</string>
+    <string name="request">Forespørsel</string>
+    <string name="pending">Venter</string>
+    <string name="seerr_integration">Seerr integrering</string>
+    <string name="remove_seerr_server">Fjern Seerr Tjener</string>
+    <string name="seerr_server_added">Seerr tjener lagt til</string>
+    <string name="quick_connect">Rask Tilkobling</string>
+    <string name="quick_connect_summary">Autoriser annen enhet til å logge på kontoen din</string>
+    <string name="for_episodes">For episoder</string>
+    <string name="suggestions_for">Forslag for %1$s</string>
+    <string name="increase_all_cards_size">Øk størrelsen for alle kort</string>
+    <string name="decrease_all_cards_size">Reduser størrelsen for alle kort</string>
+    <string name="use_thumb_images">Bruk miniatyrbilder</string>
+    <string name="settings_saved">Instillinger lagret</string>
+    <string name="display_presets">Vis forhåndsinnstillinger</string>
+    <string name="display_presets_description">Innebygde forhåndsinnstillinger for å raskt style alle rader</string>
+    <string name="customize_home_summary">Velg rader og bilder på hjemmesiden</string>
+    <string name="prefer_ac3_for_surround_summary"><![CDATA[Transkode ikke-stereo lyd til AV3/Dolby Digital]]></string>
+    <string name="prefer_ac3_for_surround">Bruk AC3 for surround sound lyd</string>
+    <string name="start_after">Start etter</string>
+    <string name="animate">Animer</string>
+    <string name="max_age_rating">Maks aldersgrense</string>
+    <string name="no_max">Ingen maks</string>
+    <string name="for_all_ages">For alle aldre</string>
+    <string name="up_to_age">Opp til %s år</string>
+    <string name="screensaver">Skjermsparer</string>
+    <string name="screensaver_settings">Innstillinger for skjermsparer</string>
+    <string name="start_screensaver">Start skjermsparer</string>
+    <string name="duration">Varighet</string>
+    <string name="photos">Bilder</string>
+    <string name="include_types">Inkluder typer</string>
+    <string name="include_types_summary">Hvilke elementer å vise bilder for</string>
+    <string name="content_scale_fit">Tilpass</string>
+    <string name="content_scale_crop">Beskjær</string>
+    <string name="content_scale_fill">Fyll</string>
+    <string name="content_scale_fill_width">Fyll bredde</string>
+    <string name="content_scale_fill_height">Fyll høyde</string>
+    <string name="display_preset_default">Wholphin Standard</string>
+    <string name="display_preset_compact">Wholphin Kompakt</string>
+    <string name="display_preset_series_thumb">Serieminiatyrbilder</string>
+    <string name="display_preset_episode_thumbnails">Episodeminiatyrbilder</string>
+    <string name="volume_lowest">Lavest</string>
+    <string name="volume_low">Lav</string>
+    <string name="volume_medium">Middels</string>
+    <string name="volume_high">Høy</string>
+    <string name="volume_full">Full</string>
+    <string name="purple">Lilla</string>
+    <string name="orange">Oransje</string>
+    <string name="bold_blue">Dristig Blå</string>
+    <string name="black">Svart</string>
+    <string name="brown">Brun</string>
+    <string name="skip_ignore">Ignorer</string>
+    <string name="skip_automatically">Hopp over automatisk</string>
+    <string name="skip_ask">Spør om å hoppe over</string>
+    <string name="ffmpeg_fallback">Bare bruk FFmpeg dersom ingen innebygd dekoder eksisterer</string>
+    <string name="ffmpeg_prefer">Foretrekk å bruke FFmpeg over innebygde dekodere</string>
+    <string name="ffmpeg_never">Aldri bruk FFmpeg dekodere</string>
+    <string name="next_up_playback_end">Ved slutten av avspilling</string>
+    <string name="next_up_outro">Under rulletekst/avslutning</string>
+    <string name="next_up_never">Aldri</string>
+    <string name="white">Hvit</string>
+    <string name="light_gray">Lysegrå</string>
+    <string name="dark_gray">Mørkegrå</string>
+    <string name="yellow">Gul</string>
+    <string name="cyan">Cyan</string>
+    <string name="magenta">Magenta</string>
+    <string name="subtitle_edge_outline">Kant</string>
+    <string name="subtitle_edge_shadow">Skygge</string>
+    <string name="background_style_wrap">Innpakning</string>
+    <string name="background_style_boxed">Innebokset</string>
+    <string name="prefer_mpv">Foretrekk MPV</string>
+    <string name="external_player">Ekstern Spiller</string>
+    <string name="player_backend_options_subtitles_prefer_mpv">Bruk ExoPlayer for avspilling av HDR</string>
+    <string name="aspect_ratios_poster">Plakat (2:3)</string>
+    <string name="aspect_ratios_16_9">16:9</string>
+    <string name="aspect_ratios_4_3">4:3</string>
+    <string name="aspect_ratios_square">Kvadrat (1:1)</string>
+    <string name="image_type_primary">Primær</string>
+    <string name="image_type_thumb">Miniatyr</string>
+    <string name="view_options_type_grid">Rutenett</string>
+    <string name="view_options_type_list">Liste</string>
+    <string name="view_options_type_list_compact">Kompakt Liste</string>
+    <string name="backdrop_style_dynamic">Bilde med dynamisk farge</string>
+    <string name="backdrop_style_image">Bare bilde</string>
+    <string name="enter_url_api_key"><![CDATA[Skriv inn URL &amp; API-nøkkel]]></string>
+    <string name="api_key">API-nøkkel</string>
+    <string name="seerr_login">Logg inn på Seerr-tjener</string>
+    <string name="seerr_jellyfin_user">Jellyfinbruker</string>
+    <string name="seerr_local_user">Lokal bruker</string>
+    <string name="search_and_download_subtitles"><![CDATA[Søk og last ned undertekst]]></string>
+    <string name="no_subtitles_found">Ingen eksterne undertekster ble funnet</string>
+    <string name="series_continueing">Nåværende</string>
+    <string name="in_app_screensaver">Bruk appens skjermsparer</string>
+    <string name="delete_item">Er du sikker på at du vil slette dette elementet?</string>
+    <string name="show_media_management">Vis alternativ for behandling av medier</string>
+    <string name="search_for">Søk %s</string>
+    <string name="actor">Skuespiller</string>
+    <string name="composer">Komponist</string>
+    <string name="writer">Forfatter</string>
+    <string name="guest_star">Gjesteartist</string>
+    <string name="producer">Produsent</string>
+    <string name="conductor">Dirigent</string>
+    <string name="lyricist">Sangtekstforfatter</string>
+    <string name="arranger">Arrangør</string>
+    <string name="engineer">Ingeniør</string>
+    <string name="mixer">Lydmikser</string>
+    <string name="creator">Skaper</string>
+    <string name="artist">Artist</string>
+    <string name="album_artist">Albumartist</string>
+    <string name="album">Album</string>
+    <string name="popular_songs">Populære sanger</string>
+    <string name="play_next">Spill av neste</string>
+    <string name="music_videos">Musikkvideoer</string>
+    <string name="lyrics">Sangtekst</string>
+    <string name="hide_lyrics">Skjul sangtekst</string>
+    <string name="show_lyrics">Vis sangtekst</string>
+    <string name="song_has_lyrics">Låt har sangtekst</string>
+    <string name="remove_from_queue">Fjern fra kø</string>
+    <string name="show_album_cover">Vis albumomslag</string>
+    <string name="show_visualizer">Vis visualizer</string>
+    <string name="show_backdrop">Vis bakgrunn</string>
+    <string name="play_as_type">Spill av som?</string>
+    <string name="visualizer_rationale">Visualisering av lyden som spilles av, krever tillatelse til å ta opp lyd.</string>
+    <string name="continue_string">Fortsett</string>
+    <string name="select_all">Velg alle</string>
+    <string name="separate_types">Seperate typer</string>
+    <string name="prefer_logos">Foretrekk å vise logoer for titler</string>
+    <string name="updated_toast">Wholphin oppdatert til %s</string>
+    <string name="remove_continue_watching">Fjern fra fortsett å se</string>
+    <string name="remove_next_up">Fjern serier fra neste</string>
+    <string name="view_removed_next_up">Vis serier fjernet fra neste</string>
+    <string name="view_more">Vis mer</string>
+    <string name="discover_tv">Oppdag TV-serier</string>
+    <string name="discover_movies">Oppdag Filmer</string>
+    <string name="studios_in">Studioer i %1$s</string>
+    <string name="last_played">Sist avspilt</string>
+    <string name="system_default">System standard</string>
+    <string name="ass_subtitle_mode_libass">Direkteavspilling med libass</string>
+    <string name="ass_subtitle_mode_exoplayer">Direkteavspilling med ExoPlayer innebygd</string>
+    <string name="ass_subtitle_mode_transcode">Brenn/transkode på tjener</string>
+    <string name="ass_subtitle_playback">SSA/ASS avspilling av undertekst</string>
+    <string name="cinema_mode">Kinomodus</string>
+    <string name="show_more">Vis %1$s mer</string>
+    <string name="skip_behavior">Hopp over oppførsel</string>
+    <string name="skip_behavior_summary">For introer, rulletekst, etc</string>
+    <string name="play_with">Spill med</string>
+    <string name="transcoding">Transkoding</string>
+    <string name="user_interface_language">Språk på brukergrensesnitt</string>
+    <string name="display_toggles_title">Visning av anmeldelser</string>
+    <string name="display_toggles_summary">Tilpass hva å vise</string>
+    <string name="profile_protection">Profilbeskyttelse</string>
+    <string name="continue_watching_click_behavior">Fortsett å se/Neste klikkoppførsel</string>
+    <string name="continue_watching_click_summary_on">Spill av ved klikk</string>
+    <string name="continue_watching_click_summary_off">Vis detaljer ved klikk</string>
+    <string name="stars">Stjerner</string>
+    <string name="tomatoes">Tomater</string>
+    <string name="sort">Sorter</string>
+    <string name="split_into_separate_rows">Del inn i separate rader</string>
+    <string name="genre_movies">%1$s Filmer</string>
+    <string name="genre_tv_shows">%1$s TV-Serier</string>
+    <string name="quality_profile">Kvalitetsprofil</string>
+    <string name="is_default">Standard</string>
+    <string name="root_folder">Root-mappe</string>
+    <string name="popularity">Populæritet</string>
+    <string name="production_status">Produksjonstatus</string>
+    <string name="different_for_hdr">Bruk annen stil for HDR</string>
+    <string name="experimental_settings">Eksperimentelle innstillinger</string>
+    <string name="confirm_enable_experimental_title">Aktiver eksperimentelle innstillinger?</string>
+    <string name="confirm_enable_experimental_body">Eksperimentelle innstillinger kan være ustabile!\n\nDisse kan fjernes eller endre i hvilken som helst versjon.</string>
+    <string name="quick_connect_code">Skriv inn Quick Connect kode</string>
+    <string name="quick_connect_code_error">Kode må være 6 siffer</string>
+    <string name="quick_connect_success">Enhet autorisering vellykket</string>
+    <string name="password">Passord</string>
+    <string name="username">Brukernavn</string>
+    <string name="url">URL</string>
+    <string name="trending">Trender</string>
+    <string name="upcoming_movies">Kommende Filmer</string>
+    <string name="upcoming_tv">Kommende TV-Serier</string>
+    <string name="request_4k">Forespør i 4K</string>
+    <string name="software_decoding_av1">AV1 programvaredekoding</string>
+    <string name="upgrade_mpv_toast">MPV er nå standardspiller utenom for HDR.\nDu kan endre dette i innstillinger.</string>
+    <string name="hdr_subtitle_style">HDR undertekststil</string>
+    <string name="image_subtitle_opacity">Bildeundertekst ugjennomsiktighet</string>
+    <string name="brightness">Lysstyrke</string>
+    <string name="contrast">Kontrast</string>
+    <string name="saturation">Metning</string>
+    <string name="hue">Tone</string>
+    <string name="red">Rød</string>
+    <string name="green">Grønn</string>
+    <string name="blue">Blå</string>
+    <string name="blur">Uklarhet</string>
+    <string name="save_for_album">Lagre for album</string>
+    <string name="play_slideshow">Start lysbildefremvisning</string>
+    <string name="stop_slideshow">Stans lysbildefremvisning</string>
+    <string name="slideshow_at_beginning">Ved start</string>
+    <string name="no_more_images">Ingen flere bilder</string>
+    <string name="rotate_left">Roter venstre</string>
+    <string name="rotate_right">Roter høyre</string>
+    <string name="zoom_in">Zoom inn</string>
+    <string name="zoom_out">Zoom ut</string>
+    <string name="slideshow_duration">Lysbildefremvisningens varighet</string>
+    <string name="play_videos_during_slideshow">Spill av video under lysbildefremvisning</string>
+    <string name="send_media_info_log_to_server">Send mediainformasjonslogg til tjener</string>
+    <string name="no_limit">Ingen grense</string>
+    <string name="max_days_next_up">Maks dager i Neste</string>
+    <string name="albums">Album</string>
+    <string name="artists">Artister</string>
+    <string name="songs">Sanger</string>
+    <string name="go_to_artist">Gå til artist</string>
+    <string name="now_playing">Spilles nå</string>
+    <string name="instant_mix">Øyeblikkelig miks</string>
+    <string name="go_to_album">Gå til album</string>
+    <string name="add_to_queue">Legg til i kø</string>
+    <string name="add_row">Legg til rad</string>
+    <string name="genres_in">Sjangre i %1$s</string>
+    <string name="recently_released_in">Nylig utgitt i %1$s</string>
+    <string name="height">Høyde</string>
+    <string name="apply_all_rows">Bruk på alle rader</string>
+    <string name="customize_home">Tilpass hjemmesiden</string>
+    <string name="home_rows">Hjemmerader</string>
+    <string name="load_from_server">Last inn fra tjeners brukerprofil</string>
+    <string name="save_to_server">Lagre på tjeners brukerprofil</string>
+    <string name="load_from_web_client">Last inn fra web-client</string>
+    <string name="use_series">Bruk seriebilde</string>
+    <string name="add_row_for">Legg til rad for %1$s</string>
+    <string name="overwrite_server_settings">Overskriv innstillinger på tjener?</string>
+    <string name="overwrite_local_settings">Overskriv lokale innstillinger?</string>
+    <string name="video_tunneling">Videotunnelering</string>
+    <string name="d_pad_seek_mode_title">D-Pad søkelinjemodus</string>
+    <string name="dpad_seek_mode_minimal">Minimal</string>
+    <string name="dpad_seek_mode_trickplay">Lurespilling</string>
+    <string name="dpad_seek_mode_minimal_summary">Liten søkelinje langs bunnen av skjermen (standard)</string>
+    <string name="dpad_seek_mode_trickplay_summary">Søkelinje med lurespilling forhåndsvisningsbilde</string>
+    <string name="dpad_seek_mode_none_summary">Ingen søkelinje</string>
+    <string name="blocklisted">Blokkeringslistet</string>
+    <string name="unavailable">Utilgjengelig</string>
+    <string name="subtitle_mode">Undertekstmodus</string>
+    <string name="use_user_profile">Din brukerprofilinnstilling</string>
+    <string name="subtitle_mode_default">Standard</string>
+    <string name="subtitle_mode_smart">Smart</string>
+    <string name="subtitle_mode_only_forced">Bare Tvunget</string>
+    <string name="subtitle_mode_always">Alltid</string>
+    <string name="subtitle_mode_none">Ingen</string>
+    <string name="preferred_subtitle_language">Foretrukket undertekstspråk</string>
+    <string name="preferred_audio_language">Foretrukket lydspråk</string>
+    <string name="override_user_profile_settings">Flere brukerprofilinnstillinger</string>
+    <string name="override_user_profile_settings_summary">Overskriv brukerprofilinnstillingene dine fra tjeneren</string>
+    <string name="any_language">Hvilket som helst språk</string>
+    <string name="hash_matches">Hash-matcher</string>
+    <string name="subtitles_hearing_impaired">SDH</string>
+    <string name="programs">TV-program</string>
+    <string name="recordings">Opptak</string>
+    <string name="folders_title">Mapper</string>
+    <string name="user_views">Brukervisninger</string>
+    <string name="books">Bøker</string>
+    <string name="audio_books">Lydbøker</string>
+    <string name="server_version_not_supported">Tjenerversjon ikke støttet</string>
+    <string name="appears_on">Opptrer på</string>
+    <string name="dim_after_delay">Dim skjerm etter forsinking</string>
+    <string name="dim_percentage">Dim prosent</string>
+    <string name="dim_screen">Dim skjerm</string>
+    <string name="photo_albums">Fotoalbum</string>
+    <string name="no_favorites_found">Ingen favoritter funnet!</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index d5a348967..c8d968685 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -42,8 +42,8 @@
     <string name="file_size">Grootte</string>
     <string name="forced_track">Geforceerd</string>
     <string name="genres">Genres</string>
-    <string name="go_to_series">Ga naar serie</string>
-    <string name="go_to">Ga naar item</string>
+    <string name="go_to_series">Naar seizoenen</string>
+    <string name="go_to">Naar inhoud</string>
     <string name="hide_controller_timeout">Afspeelbediening verbergen</string>
     <string name="hide_debug_info">Foutopsporingsinformatie verbergen</string>
     <string name="hide">Verbergen</string>
@@ -660,4 +660,6 @@
     <string name="scenes_title">Scenes</string>
     <string name="pin_digits_hint">[0-9]</string>
     <string name="dts_x">DTS:X</string>
+    <string name="override_user_profile_settings">Meer instellingen gebruikersprofiel</string>
+    <string name="d_pad_seek_mode_title">"D-pad  zoekbalk"</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 28629d944..7e968044a 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -749,4 +749,16 @@
     <string name="dim_screen">Przyciemnienie ekranu</string>
     <string name="dim_after_delay">Opóźnienie przyciemniana ekranu</string>
     <string name="dim_percentage">Procent przyciemniane</string>
+    <string name="photo_albums">Albumy zdjęć</string>
+    <string name="no_favorites_found">Nic jeszcze nie polubiono!</string>
+    <string name="season_number">Sezon %1$d</string>
+    <string name="remove_from_playlist">Usuń z listy odtwarzania</string>
+    <string name="login_credentials_expired">Sesja wygasła, zaloguj się ponownie</string>
+    <string name="login_not_authorized">Nie jesteś upoważniony do dostępu do serwera w tym momencie</string>
+    <string name="episode_number_short">O%1$d</string>
+    <string name="duration_hours_seconds">%1$dh %2$ds</string>
+    <string name="season_episode_number">S%1$d O%2$d</string>
+    <string name="season_episode_number_range">S%1$d O%2$d-%3$d</string>
+    <string name="season_episode_number_padded">S%1$02d O%2$02d</string>
+    <string name="season_episode_number_padded_range">S%1$02d O%2$02d-%3$02d</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 6255f0350..033eb50b2 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -655,4 +655,66 @@
     <string name="duration_seconds">%1$ds</string>
     <string name="profile_specific_settings_from_server">Configuração de Perfil de Usuário do servidor</string>
     <string name="time_left">%1$s left</string>
+    <string name="featurettes_title">Conteúdos extras</string>
+    <string name="shorts_title">Curtos</string>
+    <plurals name="trailers">
+        <item quantity="one">Trailer</item>
+        <item quantity="many">Trailers</item>
+        <item quantity="other">Trailers</item>
+    </plurals>
+    <string name="require_login">Exigir login para o perfil</string>
+    <string name="pin_digits_hint">0-9</string>
+    <string name="disable_audio_offload">Desativar aceleração de hardware de áudio</string>
+    <string name="disable_audio_offload_summary">Desativar a aceleração de hardware de áudio pode corrigir travamentos durante a reprodução em alguns dispositivos</string>
+    <string name="prefer_ac3_for_surround_summary"><![CDATA[Transcodificar áudio não estéreo para AC3/Dolby Digital]]></string>
+    <string name="prefer_ac3_for_surround">Usar AC3 para áudio surround</string>
+    <string name="brown">Marrom</string>
+    <string name="user_interface_language">Idioma de exibição</string>
+    <string name="display_toggles_title">Exibir classificações</string>
+    <string name="display_toggles_summary">Personalizar itens exibidos</string>
+    <string name="profile_protection">Proteção do perfil</string>
+    <string name="continue_watching_click_behavior">Clique em Continuar assistindo/Próximo</string>
+    <string name="continue_watching_click_summary_on">Reproduzir ao clicar</string>
+    <string name="continue_watching_click_summary_off">Mostrar detalhes ao clicar</string>
+    <string name="stars">Estrelas</string>
+    <string name="tomatoes">Tomates</string>
+    <string name="sort">Ordenar</string>
+    <string name="split_into_separate_rows">Dividir em linhas separadas</string>
+    <string name="genre_movies">%1$s Filmes</string>
+    <string name="genre_tv_shows">%1$s Séries</string>
+    <string name="quality_profile">Perfil de qualidade</string>
+    <string name="is_default">Padrão</string>
+    <string name="root_folder">Pasta raiz</string>
+    <string name="popularity">Popularidade</string>
+    <string name="production_status">Status de produção</string>
+    <string name="different_for_hdr">Usar estilo diferente para HDR</string>
+    <string name="experimental_settings">Configurações experimentais</string>
+    <string name="confirm_enable_experimental_title">Ativar configurações experimentais?</string>
+    <string name="confirm_enable_experimental_body">Configurações experimentais podem ser instáveis!\n\nElas podem ser removidas ou alteradas em qualquer versão.</string>
+    <string name="video_tunneling">Tunelamento de vídeo</string>
+    <string name="d_pad_seek_mode_title">Modo da barra de busca com D-Pad</string>
+    <string name="dpad_seek_mode_minimal">Mínimo</string>
+    <string name="dpad_seek_mode_trickplay">Navegação rápida</string>
+    <string name="dpad_seek_mode_minimal_summary">Barra de progresso pequena na parte inferior da tela (padrão)</string>
+    <string name="dpad_seek_mode_trickplay_summary">Barra de progresso com imagens de pré-visualização do Trickplay</string>
+    <string name="dpad_seek_mode_none_summary">Sem barra de progresso</string>
+    <string name="blocklisted">Bloqueado</string>
+    <string name="unavailable">Indisponível</string>
+    <string name="subtitle_mode">Modo de legenda</string>
+    <string name="use_user_profile">Usar configuração do seu perfil</string>
+    <string name="subtitle_mode_default">Padrão</string>
+    <string name="subtitle_mode_smart">Inteligente</string>
+    <string name="subtitle_mode_only_forced">Somente forçadas</string>
+    <string name="subtitle_mode_always">Sempre</string>
+    <string name="subtitle_mode_none">Nenhuma</string>
+    <string name="preferred_subtitle_language">Idioma preferido das legendas</string>
+    <string name="preferred_audio_language">Idioma preferido do áudio</string>
+    <string name="override_user_profile_settings">Mais configurações do perfil</string>
+    <string name="override_user_profile_settings_summary">Substituir as configurações do seu perfil definidas pelo servidor</string>
+    <string name="any_language">Qualquer idioma</string>
+    <string name="hash_matches">Correspondências de hash</string>
+    <string name="subtitles_hearing_impaired">SDH</string>
+    <string name="programs">Programas de TV</string>
+    <string name="recordings">Gravações</string>
+    <string name="folders_title">Pastas</string>
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index d54608d7a..4bc79ea74 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -726,4 +726,16 @@
     <string name="appears_on">Aparece em</string>
     <string name="disable_audio_offload">Desativar a processamento de áudio por hardware</string>
     <string name="disable_audio_offload_summary">Desativar o processamento de áudio por hardware pode resolver os bloqueios de reprodução em alguns dispositivos</string>
+    <string name="dim_after_delay">Escurecimento do ecrã após tempo de inatividade</string>
+    <string name="dim_percentage">Percentagem do escurecimento</string>
+    <string name="dim_screen">Escurecer ecrã</string>
+    <string name="photo_albums">Álbum de fotos</string>
+    <string name="no_favorites_found">Não foram encontrados favoritos!</string>
+    <string name="duration_hours_seconds">%1$dh %2$ds</string>
+    <string name="season_episode_number">T%1$d E%2$d</string>
+    <string name="season_episode_number_range">T%1$d E%2$d-E%3$d</string>
+    <string name="season_episode_number_padded">T%1$02dE%2$02d</string>
+    <string name="season_episode_number_padded_range">T%1$02dE%2$02d-E%3$02d</string>
+    <string name="episode_number_short">E%1$d</string>
+    <string name="season_number">Temporada %1$d</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e83ae0a83..ba8bb7b3d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -20,7 +20,7 @@
     <string name="confirm">Подтвердить</string>
     <string name="continue_watching">Продолжить просмотр</string>
     <string name="critic_rating">Оценка критиков</string>
-    <string name="decimal_seconds">%.1f секунда</string>
+    <string name="decimal_seconds">%.2f секунд</string>
     <string name="default_track">По умолчанию</string>
     <string name="delete">Удалить</string>
     <string name="died">Умер</string>
@@ -124,13 +124,15 @@
     <string name="runtime_sort">Продолжительность</string>
     <string name="extras_title">Дополнительно</string>
     <plurals name="other_extras">
-        <item quantity="one">Другое</item>
+        <item quantity="one">Другой</item>
         <item quantity="few">Других</item>
         <item quantity="many">Других</item>
         <item quantity="other">Других</item>
     </plurals>
     <plurals name="behind_the_scenes">
         <item quantity="one">За кадром</item>
+        <item quantity="few">За кадром</item>
+        <item quantity="many">За кадром</item>
         <item quantity="other">За кадром</item>
     </plurals>
     <plurals name="clips">
@@ -272,7 +274,7 @@
     <string name="auto_play_next">Автовоспроизведение следующей серии</string>
     <string name="combine_continue_next_summary">Применяется только к Телешоу</string>
     <string name="combine_continue_next">Объединить Продолжить просмотр и Далее</string>
-    <string name="direct_play_ass">Прямое воспроизведение ASS-субтитров</string>
+    <string name="direct_play_ass">Использовать libaas для ASS-субтитров</string>
     <string name="direct_play_pgs">Прямое воспроизведение PGS-субтитров</string>
     <string name="font_size">Размер шрифта</string>
     <string name="font_color">Цвет щрифта</string>
@@ -294,12 +296,16 @@
         <item quantity="other">%d объектов</item>
     </plurals>
     <plurals name="samples">
-        <item quantity="one">Отрывки</item>
-        <item quantity="other">Отрывки</item>
+        <item quantity="one">Образец</item>
+        <item quantity="few">Образца</item>
+        <item quantity="many">Образцов</item>
+        <item quantity="other">Образцов</item>
     </plurals>
     <plurals name="featurettes">
-        <item quantity="one">Дополнительные материалы</item>
-        <item quantity="other">Дополнительные материалы</item>
+        <item quantity="one">Дополнительный материал</item>
+        <item quantity="few">Дополнительных материала</item>
+        <item quantity="many">Дополнительных материалов</item>
+        <item quantity="other">Дополнительных материалов</item>
     </plurals>
     <string name="player_backend">Выбор плеера</string>
     <string name="edge_size">Толщина обводки</string>
@@ -307,12 +313,16 @@
     <string name="max_homepage_items">Максимальное количество элементов в ряду на домашней странице</string>
     <string name="forced_track">Форсированные</string>
     <plurals name="theme_songs">
-        <item quantity="one">Саундтреки</item>
-        <item quantity="other">Саундтреки</item>
+        <item quantity="one">Тематическая песня</item>
+        <item quantity="few">Тематические песни</item>
+        <item quantity="many">Тематических песен</item>
+        <item quantity="other">Тематических песен</item>
     </plurals>
     <plurals name="theme_videos">
-        <item quantity="one">Видеоролики</item>
-        <item quantity="other">Видеоролики</item>
+        <item quantity="one">Тематическое видео</item>
+        <item quantity="few">Тематических видео</item>
+        <item quantity="many">Тематических видео</item>
+        <item quantity="other">Тематических видео</item>
     </plurals>
     <string name="nav_drawer_pins">Настроить элементы боковой панели</string>
     <string name="nav_drawer_pins_summary">Выберите элементы для показа на панели, остальные элементы будут скрыты</string>
@@ -326,8 +336,10 @@
     <string name="nav_drawer_switch_on_focus">Смена страниц по выделению</string>
     <string name="pass_out_protection">Остановка воспроизведения при бездействии</string>
     <plurals name="shorts">
-        <item quantity="one">Короткометражки</item>
-        <item quantity="other">Короткометражки</item>
+        <item quantity="one">Короткометражка</item>
+        <item quantity="few">Короткометражки</item>
+        <item quantity="many">Короткометражек</item>
+        <item quantity="other">Короткометражек</item>
     </plurals>
     <string name="ends_at">Конец в %1$s</string>
     <string name="enter_server_address">Введите адрес сервера</string>
@@ -416,4 +428,106 @@
     <string name="light_gray">Светло-серый</string>
     <string name="dark_gray">Темно-серый</string>
     <string name="yellow">Желтый</string>
+    <plurals name="movies">
+        <item quantity="one">Фильм</item>
+        <item quantity="few">Фильма</item>
+        <item quantity="many">Фильмов</item>
+        <item quantity="other">Фильмов</item>
+    </plurals>
+    <plurals name="tv_shows">
+        <item quantity="one">Сериал</item>
+        <item quantity="few">Сериала</item>
+        <item quantity="many">Сериалов</item>
+        <item quantity="other">Сериалов</item>
+    </plurals>
+    <plurals name="people">
+        <item quantity="one">Человек</item>
+        <item quantity="few">Человека</item>
+        <item quantity="many">Человек</item>
+        <item quantity="other">Человек</item>
+    </plurals>
+    <plurals name="years_old">
+        <item quantity="one">%1$d год</item>
+        <item quantity="few">%1$d года</item>
+        <item quantity="many">%1$d лет</item>
+        <item quantity="other">%1$d лет</item>
+    </plurals>
+    <string name="profile_specific_settings_from_server">Использовать настройки профиля с сервера</string>
+    <string name="trailers_title">Трейлеры</string>
+    <string name="behind_the_scenes_title">За кадром</string>
+    <string name="theme_songs_title">Тематические Песни</string>
+    <string name="theme_videos_title">Тематические Видео</string>
+    <string name="clips_title">Клипы</string>
+    <string name="deleted_scenes_title">Удаленные Сцены</string>
+    <string name="interviews_title">Интервью</string>
+    <string name="scenes_title">Сцены</string>
+    <string name="require_login">Требуется логин для профиля</string>
+    <string name="pin_digits_hint">[0–9]</string>
+    <string name="avc">AVC</string>
+    <string name="sdr">SDR</string>
+    <string name="hdr10">HDR10</string>
+    <string name="hdr10_plus">HDR10+</string>
+    <string name="hlg">HLG</string>
+    <string name="sample_rate_unit">Hz</string>
+    <string name="combined_search_results_on">Показать все результаты в одном списке</string>
+    <string name="combined_search_results_off">Показать результаты по категориям</string>
+    <string name="show_voice_search_button">Показать кнопку голосового ввода</string>
+    <string name="dts_x">DTS:X</string>
+    <string name="dts_hd">DTS:HD</string>
+    <string name="dts_hd_ma">DTS:HD MA</string>
+    <string name="truehd">TrueHD</string>
+    <string name="dolby_digital">DD</string>
+    <string name="dolby_digital_plus">DD+</string>
+    <string name="dts">DTS</string>
+    <string name="force_dovi_profile_7">Прямое воспроизведение Dolby Vision Profile 7</string>
+    <string name="server_version_not_supported">Серверная версия не поддерживается</string>
+    <string name="favorite_items_title">Избранное %s</string>
+    <string name="disable_audio_offload_summary">Отключение выгрузки аудио-декодирования может исправить фризы воспроизведения на некоторых устройствах</string>
+    <string name="nal">NAL</string>
+    <string name="show_titles">Показывать названия</string>
+    <string name="live_tv_repeat">Повтор</string>
+    <string name="favorite_channels_at_beginning">Сначала показывать избранные каналы</string>
+    <string name="sort_channels_recently_watched">Сортировка каналов по недавно просмотренным</string>
+    <string name="backdrop_display">Стиль фона</string>
+    <string name="combined_search_results">Комбинированные результаты поиска</string>
+    <string name="visible_ui">Видимый</string>
+    <string name="hidden_ui">Скрытый</string>
+    <string name="results">Результаты</string>
+    <string name="resolution_switching">Переключение разрешения</string>
+    <string name="local">Локальный</string>
+    <string name="clear_track_choices">Очистить выбор дорожки</string>
+    <string name="force_dovi_profile_7_summary">Игнорировать проверки совместимости устройства</string>
+    <string name="discover">Обзор</string>
+    <string name="request">Запрос</string>
+    <string name="pending">В ожидании</string>
+    <string name="remove_seerr_server">Удалить сервер Seerr</string>
+    <string name="seerr_server_added">Сервер Seerr добавлен</string>
+    <string name="quick_connect">Быстрое Поключение</string>
+    <string name="quick_connect_summary">Авторизовать другое устройство для поключения к вашей учетной записи</string>
+    <string name="quick_connect_code">Ввести код Быстрого Подключения</string>
+    <string name="quick_connect_code_error">В коде должно быть 6 цифр</string>
+    <string name="quick_connect_success">Устройство авторизовано успешно</string>
+    <string name="url">URL</string>
+    <string name="trending">В тренде</string>
+    <string name="upcoming_tv">Ожидаемые сериалы</string>
+    <string name="upcoming_movies">Ожидаемые фильмы</string>
+    <string name="request_4k">Запросить в 4K</string>
+    <string name="software_decoding_av1">Программное декодирование AV1</string>
+    <string name="upgrade_mpv_toast">MPV сейчас плеер по умолчанию исключая HDR.\nВы можете изменить это в настройках.</string>
+    <string name="play_slideshow">Воспроизвести слайдшоу</string>
+    <string name="stop_slideshow">Остановить слайдшоу</string>
+    <string name="no_more_images">Больше нет фото</string>
+    <string name="rotate_left">Повернуть влево</string>
+    <string name="rotate_right">Повернуть вправо</string>
+    <string name="zoom_in">Приблизить</string>
+    <string name="zoom_out">Отдалить</string>
+    <string name="slideshow_duration">Продолжитьльность слайдшоу</string>
+    <string name="play_videos_during_slideshow">Воспроизводить видео во время слайдшоу</string>
+    <string name="send_media_info_log_to_server">Отправить лог информации о медиа на сервер</string>
+    <string name="no_limit">Без ограничения</string>
+    <string name="hdr">HDR</string>
+    <string name="blur">Размытие</string>
+    <string name="layout">Расположение</string>
+    <string name="ffmpeg_never">Никогда не использовать FFmpeg</string>
+    <string name="ffmpeg_fallback">Использовать FFmpeg только, если не существует встроенных декодеров</string>
 </resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index c0c2ad092..3d1991188 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -751,4 +751,13 @@
     <string name="dim_after_delay">Stlmiť obrazovku po uplynutí času</string>
     <string name="dim_percentage">Úroveň stlmenia</string>
     <string name="dim_screen">Stlmenie obrazovky</string>
+    <string name="photo_albums">Fotoalbumy</string>
+    <string name="no_favorites_found">Nenašli sa žiadne obľúbené položky!</string>
+    <string name="duration_hours_seconds">%1$dh %2$ds</string>
+    <string name="season_episode_number">S%1$d E%2$d</string>
+    <string name="season_episode_number_range">S%1$d E%2$d-E%3$d</string>
+    <string name="season_episode_number_padded">S%1$02dE%2$02d</string>
+    <string name="season_episode_number_padded_range">S%1$02dE%2$02d-E%3$02d</string>
+    <string name="episode_number_short">E%1$d</string>
+    <string name="season_number">Séria %1$d</string>
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 258a5de20..b5b2954e8 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -346,7 +346,7 @@
     <string name="refresh_rate_switching">Växling av uppdateringsfrekvens</string>
     <string name="ref_frames">Referensbilder</string>
     <string name="red">Röd</string>
-    <string name="resolution_switching">Växling av uppdateringsfrekvens</string>
+    <string name="resolution_switching">Växling av upplösning</string>
     <string name="retry">Försök igen</string>
     <string name="rewatch_next_up">Tillåt omvisning i “Nästa upp”</string>
     <string name="api_key">API nyckel</string>
@@ -648,4 +648,26 @@
     <string name="brown">Brun</string>
     <string name="show_visualizer">Visa visualizer</string>
     <string name="show_backdrop">Visa bakgrund</string>
+    <string name="player_backend">Uppspelning backend</string>
+    <string name="season_number">Säsong %1$d</string>
+    <string name="season_episode_number">S%1$d E%2$d</string>
+    <string name="season_episode_number_range">S%1$d E%2$d-E%3$d</string>
+    <string name="season_episode_number_padded">S%1$02dE%2$02d</string>
+    <string name="duration_hours_seconds">%1$dt %2$ds</string>
+    <string name="blur">Oskärpa</string>
+    <string name="season_episode_number_padded_range">S%1$02dE%2$02d-E%3$02d</string>
+    <string name="episode_number_short">E%1$d</string>
+    <string name="show_more">Visa %1$s till</string>
+    <string name="is_default">Standard</string>
+    <string name="preferred_audio_language">Föredraget ljudspråk</string>
+    <string name="override_user_profile_settings">Fler profilinställningar</string>
+    <string name="use_user_profile">Använd profilinställningar</string>
+    <string name="override_user_profile_settings_summary">Ignorera serverns profilinställningar</string>
+    <string name="server_version_not_supported">Serverns version stöds inte</string>
+    <string name="appears_on">Medverkar i</string>
+    <string name="photo_albums">Fotoalbum</string>
+    <string name="no_favorites_found">Inga favoriter hittades!</string>
+    <string name="confirm_enable_experimental_body">Experimentella inställningar kan vara instabila!\n\n Dessa kan tas bort eller ändras i framtida versioner.</string>
+    <string name="remove_from_playlist">Ta bort från spellista</string>
+    <string name="trailers_title">Trailers</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 951b510c3..2717aa787 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -706,4 +706,13 @@
     <string name="dim_after_delay">Belirli bir süre sonra ekranı karart</string>
     <string name="dim_percentage">Karartma yüzdesi</string>
     <string name="dim_screen">Ekranı karart</string>
+    <string name="duration_hours_seconds">%1$dsa %2$dsn</string>
+    <string name="season_episode_number">S%1$d E%2$d</string>
+    <string name="season_episode_number_range">S%1$d E%2$d-E%3$d</string>
+    <string name="season_episode_number_padded">S%1$02dE%2$02d</string>
+    <string name="season_episode_number_padded_range">S%1$02dE%2$02d-E%3$02d</string>
+    <string name="episode_number_short">E%1$d</string>
+    <string name="season_number">Sezon %1$d</string>
+    <string name="photo_albums">Fotoğraf Albümleri</string>
+    <string name="no_favorites_found">Favori bulunamadı!</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 91dc97bbe..f676b9f1b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -685,4 +685,6 @@
     <string name="dim_after_delay">延迟后调暗屏幕</string>
     <string name="dim_percentage">调暗百分比</string>
     <string name="dim_screen">调暗屏幕</string>
+    <string name="photo_albums">相册</string>
+    <string name="no_favorites_found">未找到收藏！</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index f2e45616a..a9f7cc5fb 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -685,4 +685,16 @@
     <string name="dim_after_delay">閒置後調暗螢幕</string>
     <string name="dim_percentage">調暗程度</string>
     <string name="dim_screen">螢幕調暗</string>
+    <string name="no_favorites_found">未添加任何最愛項目！</string>
+    <string name="photo_albums">相簿</string>
+    <string name="duration_hours_seconds">%1$d小時%2$d分</string>
+    <string name="season_episode_number">第%1$d季 第%2$d集</string>
+    <string name="season_episode_number_range">第%1$d季 第%2$d-%3$d集</string>
+    <string name="season_episode_number_padded">第%1$02d季 第%2$02d集</string>
+    <string name="season_episode_number_padded_range">第%1$02d季 第%2$02d-%3$02d集</string>
+    <string name="episode_number_short">第 %1$d 集</string>
+    <string name="season_number">第 %1$d 季</string>
+    <string name="remove_from_playlist">從播放清單中移除</string>
+    <string name="login_not_authorized">您目前無存取此伺服器的權限</string>
+    <string name="login_credentials_expired">登入憑證已過期，請重新登入</string>
 </resources>
diff --git a/app/src/test/java/com/github/damontecres/wholphin/services/IntentServiceTest.kt b/app/src/test/java/com/github/damontecres/wholphin/services/IntentServiceTest.kt
index bb4904aa3..ee32c7dda 100644
--- a/app/src/test/java/com/github/damontecres/wholphin/services/IntentServiceTest.kt
+++ b/app/src/test/java/com/github/damontecres/wholphin/services/IntentServiceTest.kt
@@ -1,24 +1,34 @@
 package com.github.damontecres.wholphin.services
 
+import android.app.SearchManager
 import android.content.Intent
 import com.github.damontecres.wholphin.data.CurrentUser
+import com.github.damontecres.wholphin.data.JellyfinServerDao
 import com.github.damontecres.wholphin.data.ServerRepository
 import com.github.damontecres.wholphin.preferences.AppPreferences
 import com.github.damontecres.wholphin.preferences.UserPreferences
 import com.github.damontecres.wholphin.preferences.update
+import com.github.damontecres.wholphin.test.assertIs
 import com.github.damontecres.wholphin.test.currentUser
+import com.github.damontecres.wholphin.test.movie
 import com.github.damontecres.wholphin.test.server
 import com.github.damontecres.wholphin.test.user
+import com.github.damontecres.wholphin.ui.nav.Destination
+import com.github.damontecres.wholphin.ui.successResponse
 import com.github.damontecres.wholphin.ui.toServerString
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.every
 import io.mockk.mockk
+import io.mockk.verify
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.test.runTest
 import org.jellyfin.sdk.api.client.ApiClient
+import org.jellyfin.sdk.api.client.extensions.userLibraryApi
+import org.jellyfin.sdk.api.operations.UserLibraryApi
 import org.jellyfin.sdk.model.UUID
+import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Before
@@ -32,13 +42,16 @@ import org.robolectric.annotation.Config
 class IntentServiceTest {
     private val api: ApiClient = mockk()
     private val serverRepository: ServerRepository = mockk()
+    private val serverDao: JellyfinServerDao = mockk()
     private val userPreferencesService: UserPreferencesService = mockk()
+    private val userLibraryApi: UserLibraryApi = mockk()
 
     lateinit var intentService: IntentService
 
     private val serverId = UUID.randomUUID()
     private val userId = UUID.randomUUID()
     private val currentUser = currentUser(serverId, userId)
+    private val itemId = UUID.randomUUID()
 
     private val protectedCurrentUser =
         CurrentUser(
@@ -49,6 +62,9 @@ class IntentServiceTest {
     @Before
     fun setup() {
         intentService = IntentService(api, serverRepository, userPreferencesService)
+        every { api.userLibraryApi } returns userLibraryApi
+        coEvery { userLibraryApi.getItem(itemId) } returns successResponse(movie(itemId))
+        every { serverRepository.serverDao } returns serverDao
     }
 
     private fun setupPreferences(block: AppPreferences.Builder.() -> Unit) {
@@ -63,16 +79,20 @@ class IntentServiceTest {
             }
     }
 
+    private fun setupAutoSignInUnprotected() {
+        setupPreferences {
+            signInAutomatically = true
+            currentServerId = serverId.toServerString()
+            currentUserId = userId.toServerString()
+        }
+        every { serverRepository.current } returns MutableStateFlow<CurrentUser?>(currentUser)
+        coEvery { serverRepository.restoreSession(serverId, userId) } returns currentUser
+    }
+
     @Test
     fun `Test auto sign in with unprotected profile`() =
         runTest {
-            setupPreferences {
-                signInAutomatically = true
-                currentServerId = serverId.toServerString()
-                currentUserId = userId.toServerString()
-            }
-            every { serverRepository.current } returns MutableStateFlow<CurrentUser?>(currentUser)
-            coEvery { serverRepository.restoreSession(serverId, userId) } returns currentUser
+            setupAutoSignInUnprotected()
 
             val intent = Intent()
             val result = intentService.prepare(intent)
@@ -221,4 +241,243 @@ class IntentServiceTest {
 
             coVerify(exactly = 0) { serverRepository.restoreSession(serverId, userId) }
         }
+
+    @Test
+    fun `Test parseIntent with view item`() =
+        runTest {
+            setupAutoSignInUnprotected()
+
+            val intent =
+                Intent().apply {
+                    action = Intent.ACTION_VIEW
+                    putExtra("itemId", itemId.toString())
+                }
+            val result = intentService.parseIntent(intent)
+            assertIs<IntentResult.Target>(result)
+
+            val destinations = result.destinations
+            assertEquals(1, destinations.size)
+            assertTrue(result.addHomeToBackStack)
+            val first = destinations.first()
+            assertIs<Destination.MediaItem>(first)
+
+            assertEquals(itemId, first.itemId)
+
+            coVerify { userLibraryApi.getItem(itemId) }
+        }
+
+    @Test
+    fun `Test parseIntent with view and no itemId`() =
+        runTest {
+            setupAutoSignInUnprotected()
+
+            val intent =
+                Intent().apply {
+                    action = Intent.ACTION_VIEW
+                }
+            val result = intentService.parseIntent(intent)
+            assertIs<IntentResult.Target>(result)
+
+            val destinations = result.destinations
+            assertEquals(0, destinations.size)
+            assertTrue(result.addHomeToBackStack)
+
+            coVerify(exactly = 0) { userLibraryApi.getItem(itemId) }
+        }
+
+    @Test
+    fun `Test parseIntent with view and switch user`() =
+        runTest {
+            setupAutoSignInUnprotected()
+
+            val newUserId = UUID.randomUUID()
+            val newServerId = UUID.randomUUID()
+            val newCurrentUser = currentUser(newServerId, newUserId)
+
+            every { serverRepository.current } returns MutableStateFlow<CurrentUser?>(currentUser)
+            coEvery {
+                serverRepository.restoreSession(
+                    newServerId,
+                    newUserId,
+                )
+            } returns newCurrentUser
+            every { serverDao.getUser(newServerId, newUserId) } returns newCurrentUser.user
+
+            val intent =
+                Intent().apply {
+                    action = Intent.ACTION_VIEW
+                    putExtra("userId", newUserId.toString())
+                    putExtra("serverId", newServerId.toString())
+                }
+            val result = intentService.parseIntent(intent)
+            assertIs<IntentResult.Target>(result)
+
+            val destinations = result.destinations
+            assertEquals(0, destinations.size)
+            assertTrue(result.addHomeToBackStack)
+
+            coVerify(exactly = 0) { serverRepository.restoreSession(serverId, userId) }
+            verify { serverDao.getUser(newServerId, newUserId) }
+            coVerify { serverRepository.restoreSession(newServerId, newUserId) }
+            coVerify(exactly = 0) { userLibraryApi.getItem(itemId) }
+        }
+
+    @Test
+    fun `Test parseIntent with view, itemId, and switch user`() =
+        runTest {
+            setupAutoSignInUnprotected()
+
+            val newUserId = UUID.randomUUID()
+            val newServerId = UUID.randomUUID()
+            val newCurrentUser = currentUser(newServerId, newUserId)
+
+            every { serverRepository.current } returns MutableStateFlow<CurrentUser?>(currentUser)
+            coEvery {
+                serverRepository.restoreSession(
+                    newServerId,
+                    newUserId,
+                )
+            } returns newCurrentUser
+            every { serverDao.getUser(newServerId, newUserId) } returns newCurrentUser.user
+
+            val intent =
+                Intent().apply {
+                    action = Intent.ACTION_VIEW
+                    putExtra("userId", newUserId.toString())
+                    putExtra("serverId", newServerId.toString())
+                    putExtra("itemId", itemId.toString())
+                }
+            val result = intentService.parseIntent(intent)
+            assertIs<IntentResult.Target>(result)
+
+            val destinations = result.destinations
+            assertEquals(1, destinations.size)
+            assertTrue(result.addHomeToBackStack)
+            val first = destinations.first()
+            assertIs<Destination.MediaItem>(first)
+
+            assertEquals(itemId, first.itemId)
+
+            coVerify(exactly = 0) { serverRepository.restoreSession(serverId, userId) }
+            verify { serverDao.getUser(newServerId, newUserId) }
+            coVerify { serverRepository.restoreSession(newServerId, newUserId) }
+            coVerify { userLibraryApi.getItem(itemId) }
+        }
+
+    @Test
+    fun `Test parseIntent with search`() =
+        runTest {
+            setupAutoSignInUnprotected()
+
+            val intent =
+                Intent().apply {
+                    action = Intent.ACTION_SEARCH
+                }
+            val result = intentService.parseIntent(intent)
+            assertIs<IntentResult.Target>(result)
+
+            val destinations = result.destinations
+            assertEquals(1, destinations.size)
+            assertTrue(result.addHomeToBackStack)
+            val first = destinations.first()
+            assertIs<Destination.Search>(first)
+
+            assertEquals("", first.query)
+        }
+
+    @Test
+    fun `Test parseIntent with search query`() =
+        runTest {
+            setupAutoSignInUnprotected()
+
+            val query = "query123"
+            val intent =
+                Intent().apply {
+                    action = Intent.ACTION_SEARCH
+                    putExtra(SearchManager.QUERY, query)
+                }
+            val result = intentService.parseIntent(intent)
+            assertIs<IntentResult.Target>(result)
+
+            val destinations = result.destinations
+            assertEquals(1, destinations.size)
+            assertTrue(result.addHomeToBackStack)
+            val first = destinations.first()
+            assertIs<Destination.Search>(first)
+
+            assertEquals(query, first.query)
+        }
+
+    @Test
+    fun `Test parseIntent with play but no itemId`() =
+        runTest {
+            setupAutoSignInUnprotected()
+
+            val intent =
+                Intent().apply {
+                    action = IntentService.ACTION_PLAYBACK
+                }
+            val result = intentService.parseIntent(intent)
+            assertIs<IntentResult.Error>(result)
+        }
+
+    @Test
+    fun `Test parseIntent with play itemId`() =
+        runTest {
+            setupAutoSignInUnprotected()
+
+            val intent =
+                Intent().apply {
+                    action = IntentService.ACTION_PLAYBACK
+                    putExtra("itemId", itemId.toString())
+                }
+            val result = intentService.parseIntent(intent)
+            assertIs<IntentResult.Target>(result)
+
+            val destinations = result.destinations
+            assertEquals(2, destinations.size)
+            assertTrue(result.addHomeToBackStack)
+            val first = destinations.first()
+            val second = destinations[1]
+            assertIs<Destination.MediaItem>(first)
+            assertIs<Destination.Playback>(second)
+
+            assertEquals(itemId, first.itemId)
+            assertEquals(itemId, second.itemId)
+
+            coVerify { userLibraryApi.getItem(itemId) }
+        }
+
+    @Test
+    fun `Test parseIntent with play itemId and params`() =
+        runTest {
+            setupAutoSignInUnprotected()
+
+            val position = 4_000L
+            val shuffle = true
+            val intent =
+                Intent().apply {
+                    action = IntentService.ACTION_PLAYBACK
+                    putExtra("itemId", itemId.toString())
+                    putExtra("position", position)
+                    putExtra("shuffle", shuffle)
+                }
+            val result = intentService.parseIntent(intent)
+            assertIs<IntentResult.Target>(result)
+
+            val destinations = result.destinations
+            assertEquals(2, destinations.size)
+            assertTrue(result.addHomeToBackStack)
+            val first = destinations.first()
+            val second = destinations[1]
+            assertIs<Destination.MediaItem>(first)
+            assertIs<Destination.Playback>(second)
+
+            assertEquals(itemId, first.itemId)
+            assertEquals(itemId, second.itemId)
+            assertEquals(shuffle, second.shuffle)
+            assertEquals(position, second.positionMs)
+
+            coVerify { userLibraryApi.getItem(itemId) }
+        }
 }
diff --git a/app/src/test/java/com/github/damontecres/wholphin/test/TestUtils.kt b/app/src/test/java/com/github/damontecres/wholphin/test/TestUtils.kt
index 7f51e994c..34d962da2 100644
--- a/app/src/test/java/com/github/damontecres/wholphin/test/TestUtils.kt
+++ b/app/src/test/java/com/github/damontecres/wholphin/test/TestUtils.kt
@@ -4,12 +4,16 @@ import com.github.damontecres.wholphin.data.CurrentUser
 import com.github.damontecres.wholphin.data.model.JellyfinServer
 import com.github.damontecres.wholphin.data.model.JellyfinUser
 import com.github.damontecres.wholphin.ui.isNotNullOrBlank
+import com.ibm.icu.impl.Assert
 import io.mockk.MockKMatcherScope
 import org.jellyfin.sdk.model.UUID
 import org.jellyfin.sdk.model.api.BaseItemDto
 import org.jellyfin.sdk.model.api.BaseItemKind
 import org.jellyfin.sdk.model.api.NameGuidPair
 import org.jellyfin.sdk.model.api.UserDto
+import org.junit.Assert.assertNotNull
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.contract
 
 fun MockKMatcherScope.nonBlankString() = match<String> { it.isNotNullOrBlank() }
 
@@ -128,3 +132,20 @@ fun currentUser(
     server(serverId),
     user(userId),
 )
+
+/**
+ * Asserts that the object is not null and is type `T`
+ *
+ * Includes a [contract] to smart-cast the object to T
+ */
+@OptIn(ExperimentalContracts::class)
+inline fun <reified T : Any> assertIs(obj: Any?) {
+    contract {
+        returns() implies (obj is T)
+    }
+    assertNotNull(obj)
+    val result = T::class.isInstance(obj)
+    if (!result) {
+        Assert.fail("Expected type=${T::class.qualifiedName}, actual type= ${obj!!::class.qualifiedName} ")
+    }
+}
diff --git a/app/src/test/java/com/github/damontecres/wholphin/ui/main/HomeViewModelTest.kt b/app/src/test/java/com/github/damontecres/wholphin/ui/main/HomeViewModelTest.kt
new file mode 100644
index 000000000..6e59a9526
--- /dev/null
+++ b/app/src/test/java/com/github/damontecres/wholphin/ui/main/HomeViewModelTest.kt
@@ -0,0 +1,119 @@
+package com.github.damontecres.wholphin.ui.main
+
+import android.content.Context
+import com.github.damontecres.wholphin.data.ServerRepository
+import com.github.damontecres.wholphin.preferences.AppPreferences
+import com.github.damontecres.wholphin.preferences.UserPreferences
+import com.github.damontecres.wholphin.services.BackdropService
+import com.github.damontecres.wholphin.services.DatePlayedService
+import com.github.damontecres.wholphin.services.FavoriteWatchManager
+import com.github.damontecres.wholphin.services.HomePageResolvedSettings
+import com.github.damontecres.wholphin.services.HomeSettingsService
+import com.github.damontecres.wholphin.services.LatestNextUpService
+import com.github.damontecres.wholphin.services.MediaManagementService
+import com.github.damontecres.wholphin.services.NavDrawerService
+import com.github.damontecres.wholphin.services.NavigationManager
+import com.github.damontecres.wholphin.services.ServerReportService
+import com.github.damontecres.wholphin.services.UserPreferencesService
+import com.github.damontecres.wholphin.util.LoadingState
+import com.github.damontecres.wholphin.util.WholphinDispatchers
+import com.github.damontecres.wholphin.util.configure
+import com.github.damontecres.wholphin.util.reset
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.runTest
+import org.jellyfin.sdk.model.UUID
+import org.jellyfin.sdk.model.api.UserDto
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class HomeViewModelTest {
+    private val testDispatcher = StandardTestDispatcher()
+
+    @Before
+    fun setUp() {
+        WholphinDispatchers.configure(testDispatcher)
+    }
+
+    @After
+    fun tearDown() {
+        WholphinDispatchers.reset()
+    }
+
+    @Test
+    fun `reactive user settings reset preserves acquisition items`() =
+        runTest(testDispatcher) {
+            val userId = UUID.randomUUID()
+            val currentUser =
+                MutableStateFlow<UserDto?>(
+                    UserDto(
+                        id = userId,
+                        name = "test-user",
+                        serverName = "test-server",
+                        hasPassword = true,
+                        hasConfiguredPassword = true,
+                        hasConfiguredEasyPassword = false,
+                    ),
+                )
+            val currentSettings = MutableStateFlow(HomePageResolvedSettings.EMPTY)
+            val acquiringItem = mockk<HomeAcquiringItem>()
+            val acquisitionState = MutableStateFlow(HomeAcquiringState(listOf(acquiringItem)))
+
+            val serverRepository =
+                mockk<ServerRepository>(relaxed = true) {
+                    every { currentUserDtoFlow } returns currentUser
+                }
+            val homeSettingsService =
+                mockk<HomeSettingsService>(relaxed = true) {
+                    every { this@mockk.currentSettings } returns currentSettings
+                }
+            val navDrawerService =
+                mockk<NavDrawerService>(relaxed = true) {
+                    coEvery { getAllUserLibraries(any(), any()) } returns emptyList()
+                }
+            val appPreferences = mockk<AppPreferences>(relaxed = true)
+            val userPreferencesService =
+                mockk<UserPreferencesService>(relaxed = true) {
+                    coEvery { getCurrent() } returns UserPreferences(appPreferences, null)
+                }
+            val acquiringSource =
+                mockk<HomeAcquiringStateProvider> {
+                    every { state } returns acquisitionState
+                }
+            val viewModel =
+                HomeViewModel(
+                    context = mockk<Context>(relaxed = true),
+                    navigationManager = mockk<NavigationManager>(relaxed = true),
+                    serverRepository = serverRepository,
+                    serverReportService = mockk<ServerReportService>(relaxed = true),
+                    navDrawerService = navDrawerService,
+                    homeSettingsService = homeSettingsService,
+                    favoriteWatchManager = mockk<FavoriteWatchManager>(relaxed = true),
+                    datePlayedService = mockk<DatePlayedService>(relaxed = true),
+                    backdropService = mockk<BackdropService>(relaxed = true),
+                    userPreferencesService = userPreferencesService,
+                    mediaManagementService = mockk<MediaManagementService>(relaxed = true),
+                    latestNextUpService = mockk<LatestNextUpService>(relaxed = true),
+                    homeAcquiringSource = acquiringSource,
+                )
+
+            advanceUntilIdle()
+            assertEquals(listOf(acquiringItem), viewModel.state.value.acquiringItems)
+
+            val reloadedSettings = HomePageResolvedSettings(userId, emptyList())
+            currentSettings.value = reloadedSettings
+            advanceUntilIdle()
+
+            assertEquals(reloadedSettings, viewModel.state.value.settings)
+            assertEquals(LoadingState.Success, viewModel.state.value.loadingState)
+            assertEquals(listOf(acquiringItem), viewModel.state.value.acquiringItems)
+        }
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e7c6ca928..dc7608cfd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ coreKtx = "1.19.0"
 appcompat = "1.8.0"
 composeBom = "2026.09.00"
 mockk = "1.14.11"
-robolectric = "4.16.1"
+robolectric = "4.17"
 multiplatformMarkdownRenderer = "0.45.0"
 okhttpBom = "5.5.0"
 programguide = "1.6.0"