diff --git a/composeApp/src/commonMain/composeResources/values-no/strings.xml b/composeApp/src/commonMain/composeResources/values-no/strings.xml
index 0fa7a5bd..64646871 100644
--- a/composeApp/src/commonMain/composeResources/values-no/strings.xml
+++ b/composeApp/src/commonMain/composeResources/values-no/strings.xml
@@ -379,7 +379,7 @@
     <string name="compose_settings_page_appearance">Utseende</string>
     <string name="compose_settings_page_content_discovery">Innhold &amp; oppdagelse</string>
     <string name="compose_settings_page_continue_watching">Fortsett å se</string>
-    <string name="compose_settings_page_debrid">Debrid</string>
+    <string name="compose_settings_page_debrid">Skytjenester</string>
     <string name="compose_settings_page_homescreen">Hjemmeoppsett</string>
     <string name="compose_settings_page_integrations">Integrasjoner</string>
     <string name="compose_settings_page_licenses_attributions">Lisenser &amp; attribusjon</string>
@@ -588,13 +588,13 @@
     <string name="settings_integrations_section_title">Integrasjoner</string>
     <string name="settings_integrations_tmdb_description">Metadata-berikelse-kontroller</string>
     <string name="settings_integrations_mdblist_description">Eksterne vurderingsleverandører</string>
-    <string name="settings_integrations_debrid_description">Eksperimentelle sky-konto-kilder</string>
-    <string name="settings_debrid_section_title">Debrid</string>
-    <string name="settings_debrid_experimental_notice">Debrid-støtte er eksperimentell og kan endres eller fjernes senere.</string>
-    <string name="settings_debrid_enable">Aktiver kilder</string>
-    <string name="settings_debrid_enable_description">Vis spillbare resultater fra tilkoblede kontoer.</string>
-    <string name="settings_debrid_add_key_first">Koble til en Debrid-konto først.</string>
-    <string name="settings_debrid_section_providers">Konto</string>
+    <string name="settings_integrations_debrid_description">Administrer skytjenestekontoer og tilgang til skybibliotek</string>
+    <string name="settings_debrid_section_title">Skytjenester</string>
+    <string name="settings_debrid_experimental_notice">Støtte for skytjenester er eksperimentell og kan endres eller fjernes senere.</string>
+    <string name="settings_debrid_enable">Aktiver skytjenester</string>
+    <string name="settings_debrid_enable_description">Bruk tilkoblede kontoer for spillbare lenker og tilgang til skybibliotek.</string>
+    <string name="settings_debrid_add_key_first">Koble til en skytjenestekonto først.</string>
+    <string name="settings_debrid_section_providers">Skytjenester</string>
     <string name="settings_debrid_provider_description">Koble til %1$s-kontoen din.</string>
     <string name="settings_debrid_provider_device_description">Koble til %1$s-kontoen din i nettleseren.</string>
     <string name="settings_debrid_dialog_title">%1$s API-nøkkel</string>
@@ -614,15 +614,15 @@
     <string name="settings_debrid_device_auth_expired">Denne koden er utløpt. Prøv igjen.</string>
     <string name="settings_debrid_section_instant_playback">Umiddelbar avspilling</string>
     <string name="settings_debrid_prepare_instant_playback">Forbered lenker</string>
-    <string name="settings_debrid_prepare_instant_playback_description">Løs første kilder før avspilling starter.</string>
-    <string name="settings_debrid_prepare_stream_count">Kilder å forberede</string>
-    <string name="settings_debrid_prepare_count_one">1 kilde</string>
-    <string name="settings_debrid_prepare_count_many">%1$d kilder</string>
+    <string name="settings_debrid_prepare_instant_playback_description">Løs spillbare lenker før avspilling starter.</string>
+    <string name="settings_debrid_prepare_stream_count">Lenker å forberede</string>
+    <string name="settings_debrid_prepare_count_one">1 lenke</string>
+    <string name="settings_debrid_prepare_count_many">%1$d lenker</string>
     <string name="settings_debrid_section_formatting">Formatering</string>
     <string name="settings_debrid_name_template">Navnemal</string>
-    <string name="settings_debrid_name_template_description">Styrer hvordan kildenavn vises.</string>
+    <string name="settings_debrid_name_template_description">Styrer hvordan navn på skyresultater vises.</string>
     <string name="settings_debrid_description_template">Beskrivelsesmal</string>
-    <string name="settings_debrid_description_template_description">Styrer metadata vist under hver kilde.</string>
+    <string name="settings_debrid_description_template_description">Styrer metadata vist under hvert skyresultat.</string>
     <string name="settings_debrid_key_valid">API-nøkkel validert.</string>
     <string name="settings_debrid_key_invalid">Kunne ikke validere denne API-nøkkelen.</string>
     <string name="settings_mdb_add_api_key_first">Legg til MDBList API-nøkkel før du skrur på vurderinger.</string>
@@ -1160,9 +1160,9 @@
     <string name="streams_resume_from_time">Gjenoppta fra %1$s</string>
     <string name="streams_size">STØRRELSE %1$s</string>
     <string name="streams_torrent_not_supported">Denne strømtypen støttes ikke</string>
-    <string name="debrid_missing_api_key">Koble til en Debrid-konto i Innstillinger.</string>
-    <string name="debrid_stream_stale">Dette Debrid-resultatet er utgått. Oppdaterer strømmer.</string>
-    <string name="debrid_resolve_failed">Kunne ikke løse denne Debrid-strømmen.</string>
+    <string name="debrid_missing_api_key">Koble til en skytjenestekonto i Innstillinger.</string>
+    <string name="debrid_stream_stale">Denne skytjenestelenken er utgått. Oppdaterer resultater.</string>
+    <string name="debrid_resolve_failed">Kunne ikke åpne denne skytjenestelenken.</string>
     <string name="external_player_failed">Kunne ikke åpne ekstern avspiller</string>
     <string name="external_player_not_configured">Velg en ekstern avspiller i innstillinger først</string>
     <string name="external_player_unavailable">Ingen ekstern avspiller er tilgjengelig</string>
diff --git a/composeApp/src/commonMain/composeResources/values/strings.xml b/composeApp/src/commonMain/composeResources/values/strings.xml
index 528d11ab..1d410fb7 100644
--- a/composeApp/src/commonMain/composeResources/values/strings.xml
+++ b/composeApp/src/commonMain/composeResources/values/strings.xml
@@ -380,7 +380,7 @@
     <string name="compose_settings_page_appearance">Layout</string>
     <string name="compose_settings_page_content_discovery">Content &amp; Discovery</string>
     <string name="compose_settings_page_continue_watching">Continue Watching</string>
-    <string name="compose_settings_page_debrid">Debrid</string>
+    <string name="compose_settings_page_debrid">Cloud Services</string>
     <string name="compose_settings_page_homescreen">Home Layout</string>
     <string name="compose_settings_page_integrations">Integrations</string>
     <string name="compose_settings_page_licenses_attributions">Licenses &amp; Attribution</string>
@@ -589,13 +589,13 @@
     <string name="settings_integrations_section_title">Integrations</string>
     <string name="settings_integrations_tmdb_description">Metadata enrichment controls</string>
     <string name="settings_integrations_mdblist_description">External ratings providers</string>
-    <string name="settings_integrations_debrid_description">Experimental cloud account sources</string>
-    <string name="settings_debrid_section_title">Debrid</string>
-    <string name="settings_debrid_experimental_notice">Debrid support is experimental and may be kept, changed, or removed later.</string>
-    <string name="settings_debrid_enable">Enable sources</string>
-    <string name="settings_debrid_enable_description">Show playable results from connected accounts.</string>
-    <string name="settings_debrid_add_key_first">Connect a Debrid account first.</string>
-    <string name="settings_debrid_section_providers">Account</string>
+    <string name="settings_integrations_debrid_description">Manage cloud service accounts and cloud library access</string>
+    <string name="settings_debrid_section_title">Cloud Services</string>
+    <string name="settings_debrid_experimental_notice">Cloud Services support is experimental and may be kept, changed, or removed later.</string>
+    <string name="settings_debrid_enable">Enable cloud services</string>
+    <string name="settings_debrid_enable_description">Use connected accounts for playable links and cloud library access.</string>
+    <string name="settings_debrid_add_key_first">Connect a cloud service account first.</string>
+    <string name="settings_debrid_section_providers">Cloud Services</string>
     <string name="settings_debrid_provider_description">Connect your %1$s account.</string>
     <string name="settings_debrid_provider_device_description">Link your %1$s account in the browser.</string>
     <string name="settings_debrid_dialog_title">%1$s API Key</string>
@@ -616,18 +616,18 @@
     <string name="settings_debrid_device_auth_expired">This code expired. Try again.</string>
     <string name="settings_debrid_section_instant_playback">Instant Playback</string>
     <string name="settings_debrid_prepare_instant_playback">Prepare links</string>
-    <string name="settings_debrid_prepare_instant_playback_description">Resolve the first sources before playback starts.</string>
-    <string name="settings_debrid_prepare_stream_count">Sources to prepare</string>
-    <string name="settings_debrid_prepare_stream_count_warning">Use a lower count when possible. Debrid services may rate-limit how many links can be resolved in a time period. Opening a movie or episode can count toward those limits even if you do not press Watch, because the links are prepared ahead of time.</string>
-    <string name="settings_debrid_prepare_count_one">1 source</string>
-    <string name="settings_debrid_prepare_count_many">%1$d sources</string>
+    <string name="settings_debrid_prepare_instant_playback_description">Resolve playable links before playback starts.</string>
+    <string name="settings_debrid_prepare_stream_count">Links to prepare</string>
+    <string name="settings_debrid_prepare_stream_count_warning">Use a lower count when possible. Cloud services may rate-limit how many links can be resolved in a time period. Opening a movie or episode can count toward those limits even if you do not press Watch, because the links are prepared ahead of time.</string>
+    <string name="settings_debrid_prepare_count_one">1 link</string>
+    <string name="settings_debrid_prepare_count_many">%1$d links</string>
     <string name="settings_debrid_section_formatting">Formatting</string>
     <string name="settings_debrid_name_template">Name template</string>
-    <string name="settings_debrid_name_template_description">Controls how source names appear.</string>
+    <string name="settings_debrid_name_template_description">Controls how cloud result names appear.</string>
     <string name="settings_debrid_description_template">Description template</string>
-    <string name="settings_debrid_description_template_description">Controls the metadata shown under each source.</string>
+    <string name="settings_debrid_description_template_description">Controls the metadata shown under each cloud result.</string>
     <string name="settings_debrid_formatter_reset_title">Reset formatting</string>
-    <string name="settings_debrid_formatter_reset_subtitle">Restore default source formatting.</string>
+    <string name="settings_debrid_formatter_reset_subtitle">Restore default cloud result formatting.</string>
     <string name="settings_debrid_key_valid">API key validated.</string>
     <string name="settings_debrid_key_invalid">Could not validate this API key.</string>
     <string name="settings_mdb_add_api_key_first">Add your MDBList API key below before turning ratings on.</string>
@@ -1165,10 +1165,10 @@
     <string name="streams_resume_from_time">Resume from %1$s</string>
     <string name="streams_size">SIZE %1$s</string>
     <string name="streams_torrent_not_supported">This stream type is not supported</string>
-    <string name="debrid_missing_api_key">Connect a Debrid account in Settings.</string>
+    <string name="debrid_missing_api_key">Connect a cloud service account in Settings.</string>
     <string name="debrid_not_cached">Not cached on Torbox.</string>
-    <string name="debrid_stream_stale">This Debrid result expired. Refreshing streams.</string>
-    <string name="debrid_resolve_failed">Could not resolve this Debrid stream.</string>
+    <string name="debrid_stream_stale">This cloud service link expired. Refreshing results.</string>
+    <string name="debrid_resolve_failed">Could not open this cloud service link.</string>
     <string name="external_player_failed">Couldn&apos;t open external player</string>
     <string name="external_player_not_configured">Choose an external player in settings first</string>
     <string name="external_player_unavailable">No external player is available</string>
@@ -1328,7 +1328,7 @@
     <string name="library_trakt_load_failed">Couldn't load Trakt library</string>
     <string name="library_trakt_title">Trakt Library</string>
     <string name="cloud_library_connect_action">Connect account</string>
-    <string name="cloud_library_connect_message">Connect Torbox in Debrid settings to browse playable files from your cloud library.</string>
+    <string name="cloud_library_connect_message">Connect Torbox in Cloud Services settings to browse playable files from your cloud library.</string>
     <string name="cloud_library_connect_title">No cloud account connected</string>
     <string name="cloud_library_empty_message">No playable cloud files match the current filters.</string>
     <string name="cloud_library_empty_title">Nothing here yet</string>
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/DebridSettingsPage.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/DebridSettingsPage.kt
index 93db2c73..0d60c6b3 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/DebridSettingsPage.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/DebridSettingsPage.kt
@@ -272,14 +272,14 @@ internal fun LazyListScope.debridSettingsContent(
         val rows = debridRuleRows(preferences)
 
         SettingsSection(
-            title = "Filters & Sorting",
+            title = "Result Management",
             isTablet = isTablet,
         ) {
             SettingsGroup(isTablet = isTablet) {
                 DebridPreferenceRow(
                     isTablet = isTablet,
                     title = "Max results",
-                    description = "Limit how many debrid-ready addon streams appear.",
+                    description = "Limit how many cloud-service results appear.",
                     value = streamMaxResultsLabel(preferences.maxResults),
                     enabled = settings.enabled,
                     onClick = { activeStreamPicker = DebridStreamPicker.MAX_RESULTS },
@@ -287,8 +287,8 @@ internal fun LazyListScope.debridSettingsContent(
                 SettingsGroupDivider(isTablet = isTablet)
                 DebridPreferenceRow(
                     isTablet = isTablet,
-                    title = "Sort streams",
-                    description = "Choose how debrid-ready addon streams are ordered.",
+                    title = "Sort results",
+                    description = "Choose how cloud-service results are ordered.",
                     value = sortProfileLabel(preferences.sortCriteria),
                     enabled = settings.enabled,
                     onClick = { activeStreamPicker = DebridStreamPicker.SORT_MODE },
@@ -315,7 +315,7 @@ internal fun LazyListScope.debridSettingsContent(
                 DebridPreferenceRow(
                     isTablet = isTablet,
                     title = "Size range",
-                    description = "Filter streams by file size.",
+                    description = "Filter cloud-service results by file size.",
                     value = sizeRangeLabel(preferences),
                     enabled = settings.enabled,
                     onClick = { activeStreamPicker = DebridStreamPicker.SIZE_RANGE },
@@ -413,7 +413,7 @@ private fun templatePreview(value: String): String {
         .lineSequence()
         .map { it.trim() }
         .firstOrNull { it.isNotBlank() }
-        ?: return "Addon default"
+        ?: return "Default format"
     return if (firstLine.length <= 28) firstLine else "${firstLine.take(28)}..."
 }
 
@@ -657,7 +657,7 @@ private fun DebridStreamPreferenceDialog(
             onDismiss = onDismiss,
         )
         DebridStreamPicker.SORT_MODE -> DebridSingleChoiceDialog(
-            title = "Sort streams",
+            title = "Sort results",
             selectedValue = sortProfileFor(preferences.sortCriteria),
             options = listOf(
                 DebridSortProfile.DEFAULT,
@@ -1101,7 +1101,7 @@ private fun DebridDialogOptionRow(
 
 @Composable
 private fun streamMaxResultsLabel(value: Int): String =
-    if (value <= 0) "All streams" else "$value streams"
+    if (value <= 0) "All results" else "$value results"
 
 private fun sortProfileLabel(value: DebridSortProfile): String =
     when (value) {
@@ -1118,8 +1118,8 @@ private fun debridRuleRows(preferences: DebridStreamPreferences): List<DebridRul
         DebridRuleRow(DebridStreamPicker.REQUIRED_RESOLUTIONS, "Required resolutions", "Only show selected resolutions.", selectionCountLabel(preferences.requiredResolutions)),
         DebridRuleRow(DebridStreamPicker.EXCLUDED_RESOLUTIONS, "Excluded resolutions", "Hide selected resolutions.", selectionCountLabel(preferences.excludedResolutions)),
         DebridRuleRow(DebridStreamPicker.PREFERRED_QUALITIES, "Preferred qualities", "Sort selected qualities first, in default order.", selectionCountLabel(preferences.preferredQualities)),
-        DebridRuleRow(DebridStreamPicker.REQUIRED_QUALITIES, "Required qualities", "Only show selected source qualities.", selectionCountLabel(preferences.requiredQualities)),
-        DebridRuleRow(DebridStreamPicker.EXCLUDED_QUALITIES, "Excluded qualities", "Hide selected source qualities.", selectionCountLabel(preferences.excludedQualities)),
+        DebridRuleRow(DebridStreamPicker.REQUIRED_QUALITIES, "Required qualities", "Only show selected qualities.", selectionCountLabel(preferences.requiredQualities)),
+        DebridRuleRow(DebridStreamPicker.EXCLUDED_QUALITIES, "Excluded qualities", "Hide selected qualities.", selectionCountLabel(preferences.excludedQualities)),
         DebridRuleRow(DebridStreamPicker.PREFERRED_VISUAL_TAGS, "Preferred visual tags", "Sort DV, HDR, 10bit, IMAX and similar tags.", selectionCountLabel(preferences.preferredVisualTags)),
         DebridRuleRow(DebridStreamPicker.REQUIRED_VISUAL_TAGS, "Required visual tags", "Require DV, HDR, 10bit, IMAX, SDR and similar tags.", selectionCountLabel(preferences.requiredVisualTags)),
         DebridRuleRow(DebridStreamPicker.EXCLUDED_VISUAL_TAGS, "Excluded visual tags", "Hide DV, HDR, 10bit, 3D and similar tags.", selectionCountLabel(preferences.excludedVisualTags)),
@@ -1133,8 +1133,8 @@ private fun debridRuleRows(preferences: DebridStreamPreferences): List<DebridRul
         DebridRuleRow(DebridStreamPicker.REQUIRED_ENCODES, "Required encodes", "Require AV1, HEVC, AVC and similar encodes.", selectionCountLabel(preferences.requiredEncodes)),
         DebridRuleRow(DebridStreamPicker.EXCLUDED_ENCODES, "Excluded encodes", "Hide selected encodes.", selectionCountLabel(preferences.excludedEncodes)),
         DebridRuleRow(DebridStreamPicker.PREFERRED_LANGUAGES, "Preferred languages", "Sort preferred audio languages first.", selectionCountLabel(preferences.preferredLanguages)),
-        DebridRuleRow(DebridStreamPicker.REQUIRED_LANGUAGES, "Required languages", "Only show streams with selected languages.", selectionCountLabel(preferences.requiredLanguages)),
-        DebridRuleRow(DebridStreamPicker.EXCLUDED_LANGUAGES, "Excluded languages", "Hide streams where every language is excluded.", selectionCountLabel(preferences.excludedLanguages)),
+        DebridRuleRow(DebridStreamPicker.REQUIRED_LANGUAGES, "Required languages", "Only show results with selected languages.", selectionCountLabel(preferences.requiredLanguages)),
+        DebridRuleRow(DebridStreamPicker.EXCLUDED_LANGUAGES, "Excluded languages", "Hide results where every language is excluded.", selectionCountLabel(preferences.excludedLanguages)),
         DebridRuleRow(DebridStreamPicker.REQUIRED_RELEASE_GROUPS, "Required release groups", "Only show selected release groups.", selectionCountLabel(preferences.requiredReleaseGroups)),
         DebridRuleRow(DebridStreamPicker.EXCLUDED_RELEASE_GROUPS, "Excluded release groups", "Hide selected release groups.", selectionCountLabel(preferences.excludedReleaseGroups)),
     )