diff --git a/app/src/foss/res/values/strings.xml b/app/src/foss/res/values/strings.xml
index 8da1d42a..ebe9d891 100644
--- a/app/src/foss/res/values/strings.xml
+++ b/app/src/foss/res/values/strings.xml
@@ -8,4 +8,7 @@
     <string name="upgrade_foss_sponsor_subtitle">No ads. No tracking. No Google Play lock-in.</string>
     <string name="upgrade_foss_sponsor_returned_early">Back already? Your support keeps CAPod alive.</string>
     <string name="upgrade_badge_label">FOSS</string>
-</resources>
\ No newline at end of file
+    <string name="upgrade_foss_supporter_since">Supporter since %s</string>
+    <string name="upgrade_foss_supporter_thanks">Thank you for supporting CAPod\'s development!</string>
+    <string name="upgrade_foss_sponsor_again_action">Open sponsor page</string>
+</resources>
diff --git a/app/src/gplay/res/values/strings.xml b/app/src/gplay/res/values/strings.xml
index 7a7a3ffa..0c9965b1 100644
--- a/app/src/gplay/res/values/strings.xml
+++ b/app/src/gplay/res/values/strings.xml
@@ -10,4 +10,43 @@
     <string name="upgrades_gplay_already_owned_description">Google Play reports that you already own this upgrade, but it couldn\'t be restored. Make sure you are using the Google account you purchased with. Play Store synchronization may take time — try rebooting, clearing the Google Play cache or simply waiting.</string>
     <string name="upgrade_restore_action">Restore purchase</string>
     <string name="upgrade_badge_label">Pro</string>
-</resources>
\ No newline at end of file
+    <string name="upgrade_preamble">CAPod is developed by a single person. Upgrading unlocks extra features and helps keep the app alive.</string>
+    <string name="upgrade_screen_options_description">Same features, different pricing. The subscription includes a free trial and can be cancelled at any time.</string>
+    <string name="upgrade_screen_options_description_no_trial">Same features, different pricing. The subscription can be cancelled at any time.</string>
+    <string name="upgrade_screen_subscription_trial_action">Start free trial</string>
+    <string name="upgrade_screen_subscription_action">Subscribe yearly</string>
+    <string name="upgrade_screen_subscription_action_hint">%s/year</string>
+    <string name="upgrade_screen_iap_action">Buy once</string>
+    <string name="upgrade_screen_iap_action_hint">One-time purchase: %s</string>
+    <string name="upgrade_screen_restore_purchase_action">Restore purchase</string>
+    <string name="upgrade_screen_restore_purchase_message">No purchases found. Are you using the right account?</string>
+    <string name="upgrade_screen_restore_troubleshooting_msg">If you\'ve recently purchased, it may take a moment for Google Play to sync.</string>
+    <string name="upgrade_screen_restore_sync_patience_hint">Try again in a few minutes if your purchase doesn\'t appear.</string>
+    <string name="upgrade_screen_restore_multiaccount_hint">Make sure you\'re signed in with the same Google account used for the purchase.</string>
+    <string name="upgrade_screen_restore_webinstall_hint">Multiple accounts can confuse Google Play. Installing the app through the Google Play website forces the association with a specific account.</string>
+    <string name="upgrade_screen_restore_banner_title">Already bought Pro?</string>
+    <string name="upgrade_screen_restore_banner_body">It looks like you upgraded to Pro on this device before. Restore your purchase to unlock it again.</string>
+    <string name="upgrade_screen_restore_success_message">Purchase restored.</string>
+    <string name="upgrade_screen_restore_status_title">Status looks wrong?</string>
+    <string name="upgrade_screen_restore_status_body">If you own an upgrade that isn\'t shown here, restore your purchase.</string>
+    <string name="upgrade_screen_owned_hero_title">You have CAPod Pro!</string>
+    <string name="upgrade_screen_owned_hero_sub_body">Unlocked by your subscription. Thank you for supporting CAPod!</string>
+    <string name="upgrade_screen_owned_hero_iap_body">Unlocked by your one-time purchase. Thank you for supporting CAPod!</string>
+    <string name="upgrade_screen_owned_sub_title">Yearly subscription</string>
+    <string name="upgrade_screen_owned_sub_renewing_body">Your subscription is active and set to renew. Billing is managed by Google Play.</string>
+    <string name="upgrade_screen_owned_sub_not_renewing_body">Your subscription is active, but not set to renew. Pro stays available until the current period ends.</string>
+    <string name="upgrade_screen_owned_iap_title">One-time purchase</string>
+    <string name="upgrade_screen_owned_iap_body">Yours forever. No renewals, no expiry.</string>
+    <string name="upgrade_screen_owned_both_renewing_warning">You own the one-time purchase, but your subscription is still set to renew. Cancel it in Google Play to avoid paying twice.</string>
+    <string name="upgrade_screen_manage_subscription_action">Manage subscription</string>
+    <string name="upgrade_screen_iap_offer_title">Switch to the one-time purchase</string>
+    <string name="upgrade_screen_owned_iap_locked_note">Available once your subscription is no longer set to renew. Cancel it in Google Play to switch.</string>
+    <string name="upgrade_screen_owned_iap_purchase_note">This is a separate purchase — it does not cancel or refund your subscription. Use the same Google account.</string>
+    <string name="upgrade_screen_sub_still_renewing_title">Subscription still active</string>
+    <string name="upgrade_screen_sub_still_renewing_message">Your subscription is still set to renew. Cancel it in Google Play first, then switch to the one-time purchase. Just cancelled? Give Google Play a moment and try again.</string>
+    <string name="upgrade_screen_sub_check_failed_title">Subscription check failed</string>
+    <string name="upgrade_screen_sub_check_failed_message">Couldn\'t check your subscription status with Google Play. To avoid a double purchase, try again in a moment.</string>
+    <string name="upgrade_screen_grace_title">Confirming your purchase</string>
+    <string name="upgrade_screen_grace_body_short">Google Play hasn\'t confirmed your purchase yet. Pro is still active — no action needed.</string>
+    <string name="upgrade_screen_grace_body">Google Play hasn\'t confirmed your purchase for a while. Pro is still active. Make sure you\'re online and signed in with the Google account used for the purchase, then try restoring.</string>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ea5525c7..4d03517e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,7 +21,6 @@
 
     <string name="upgrade_capod_label">Upgrade CAPod</string>
     <string name="upgrade_capod_description">Get additional features and support the developer.</string>
-    <string name="upgrade_preamble">CAPod is developed by a single person. Upgrading unlocks extra features and helps keep the app alive.</string>
     <string name="upgrade_benefit_themes">Theme customization</string>
     <string name="upgrade_benefit_autoplay">Auto-play &amp; auto-pause</string>
     <string name="upgrade_benefit_popups">Popup on case open &amp; connection</string>
@@ -31,48 +30,7 @@
     <string name="upgrade_benefit_support">Support the developer</string>
     <string name="upgrade_benefit_disclaimer">Feature availability depends on your headphones and device.</string>
 
-    <string name="upgrade_screen_options_description">Same features, different pricing. The subscription includes a free trial and can be cancelled at any time.</string>
-    <string name="upgrade_screen_options_description_no_trial">Same features, different pricing. The subscription can be cancelled at any time.</string>
 
-    <string name="upgrade_screen_subscription_trial_action">Start free trial</string>
-    <string name="upgrade_screen_subscription_action">Subscribe yearly</string>
-    <string name="upgrade_screen_subscription_action_hint">%s/year</string>
-    <string name="upgrade_screen_iap_action">Buy once</string>
-    <string name="upgrade_screen_iap_action_hint">One-time purchase: %s</string>
-    <string name="upgrade_screen_restore_purchase_action">Restore purchase</string>
-    <string name="upgrade_screen_restore_purchase_message">No purchases found. Are you using the right account?</string>
-    <string name="upgrade_screen_restore_troubleshooting_msg">If you\'ve recently purchased, it may take a moment for Google Play to sync.</string>
-    <string name="upgrade_screen_restore_sync_patience_hint">Try again in a few minutes if your purchase doesn\'t appear.</string>
-    <string name="upgrade_screen_restore_multiaccount_hint">Make sure you\'re signed in with the same Google account used for the purchase.</string>
-    <string name="upgrade_screen_restore_webinstall_hint">Multiple accounts can confuse Google Play. Installing the app through the Google Play website forces the association with a specific account.</string>
-    <string name="upgrade_screen_restore_banner_title">Already bought Pro?</string>
-    <string name="upgrade_screen_restore_banner_body">It looks like you upgraded to Pro on this device before. Restore your purchase to unlock it again.</string>
-    <string name="upgrade_screen_restore_success_message">Purchase restored.</string>
-    <string name="upgrade_screen_restore_status_title">Status looks wrong?</string>
-    <string name="upgrade_screen_restore_status_body">If you own an upgrade that isn\'t shown here, restore your purchase.</string>
-    <string name="upgrade_screen_owned_hero_title">You have CAPod Pro!</string>
-    <string name="upgrade_screen_owned_hero_sub_body">Unlocked by your subscription. Thank you for supporting CAPod!</string>
-    <string name="upgrade_screen_owned_hero_iap_body">Unlocked by your one-time purchase. Thank you for supporting CAPod!</string>
-    <string name="upgrade_screen_owned_sub_title">Yearly subscription</string>
-    <string name="upgrade_screen_owned_sub_renewing_body">Your subscription is active and set to renew. Billing is managed by Google Play.</string>
-    <string name="upgrade_screen_owned_sub_not_renewing_body">Your subscription is active, but not set to renew. Pro stays available until the current period ends.</string>
-    <string name="upgrade_screen_owned_iap_title">One-time purchase</string>
-    <string name="upgrade_screen_owned_iap_body">Yours forever. No renewals, no expiry.</string>
-    <string name="upgrade_screen_owned_both_renewing_warning">You own the one-time purchase, but your subscription is still set to renew. Cancel it in Google Play to avoid paying twice.</string>
-    <string name="upgrade_screen_manage_subscription_action">Manage subscription</string>
-    <string name="upgrade_screen_iap_offer_title">Switch to the one-time purchase</string>
-    <string name="upgrade_screen_owned_iap_locked_note">Available once your subscription is no longer set to renew. Cancel it in Google Play to switch.</string>
-    <string name="upgrade_screen_owned_iap_purchase_note">This is a separate purchase — it does not cancel or refund your subscription. Use the same Google account.</string>
-    <string name="upgrade_screen_sub_still_renewing_title">Subscription still active</string>
-    <string name="upgrade_screen_sub_still_renewing_message">Your subscription is still set to renew. Cancel it in Google Play first, then switch to the one-time purchase. Just cancelled? Give Google Play a moment and try again.</string>
-    <string name="upgrade_screen_sub_check_failed_title">Subscription check failed</string>
-    <string name="upgrade_screen_sub_check_failed_message">Couldn\'t check your subscription status with Google Play. To avoid a double purchase, try again in a moment.</string>
-    <string name="upgrade_screen_grace_title">Confirming your purchase</string>
-    <string name="upgrade_screen_grace_body_short">Google Play hasn\'t confirmed your purchase yet. Pro is still active — no action needed.</string>
-    <string name="upgrade_screen_grace_body">Google Play hasn\'t confirmed your purchase for a while. Pro is still active. Make sure you\'re online and signed in with the Google account used for the purchase, then try restoring.</string>
-    <string name="upgrade_foss_supporter_since">Supporter since %s</string>
-    <string name="upgrade_foss_supporter_thanks">Thank you for supporting CAPod\'s development!</string>
-    <string name="upgrade_foss_sponsor_again_action">Open sponsor page</string>
 
     <string name="settings_monitor_connected_notification_label">Extra notification</string>
     <string name="settings_monitor_connected_notification_description">Shows an extra notification when a device is connected. This lets you hide the permanent \"No devices\" notification by disabling the \"Device status\" channel.</string>