diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2b7eaa5..e271aa9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,6 +56,7 @@ jobs:
         run: |
           python3 tools/test_export_patches.py -v
           python3 tools/test_conversation_patch.py -v
+          python3 tools/test_signal_830_patch.py -v
           python3 -m py_compile tools/export_patches.py tools/test_export_patches.py
           bash -n tools/export.sh tools/materialize.sh
 
@@ -124,6 +125,7 @@ jobs:
           --tests 'org.thoughtcrime.securesms.profiles.manage.EditProfileActivityThemeLifecycleTest'
           --tests 'org.thoughtcrime.securesms.util.RemoteConfig*Test*'
           --tests 'org.thoughtcrime.securesms.util.VesperConfigTest'
+          --tests 'org.thoughtcrime.securesms.util.VesperLogPreferencesTest'
           --stacktrace
 
       - name: Build release APKs
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 7db6bfd..d779907 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        signal: [pinned, v8.29.2]
+        signal: [pinned, v8.30.0]
 
     steps:
       - name: Check out Vesper patchset
@@ -35,6 +35,7 @@ jobs:
         run: |
           python3 tools/test_export_patches.py -v
           python3 tools/test_conversation_patch.py -v
+          python3 tools/test_signal_830_patch.py -v
           python3 -m py_compile tools/export_patches.py tools/test_export_patches.py
           bash -n tools/export.sh tools/materialize.sh
 
@@ -100,6 +101,7 @@ jobs:
           --tests 'org.thoughtcrime.securesms.profiles.manage.EditProfileActivityThemeLifecycleTest'
           --tests 'org.thoughtcrime.securesms.util.RemoteConfig*Test*'
           --tests 'org.thoughtcrime.securesms.util.VesperConfigTest'
+          --tests 'org.thoughtcrime.securesms.util.VesperLogPreferencesTest'
           --stacktrace
 
       - name: Build release APKs
diff --git a/patches/0001-feat-add-Material-You-dynamic-theming.patch b/patches/0001-feat-add-Material-You-dynamic-theming.patch
index 11fdc87..0116bab 100644
--- a/patches/0001-feat-add-Material-You-dynamic-theming.patch
+++ b/patches/0001-feat-add-Material-You-dynamic-theming.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: amber <amber@flourish.ch>
 Date: Sat, 25 Jul 2026 18:30:41 +0100
-Subject: [PATCH 01/28] feat: add Material You dynamic theming
+Subject: [PATCH 01/29] feat: add Material You dynamic theming
 
 Adapted from Molly work by Oscar Mira and other Molly contributors.
 
@@ -82,7 +82,7 @@ Signed-off-by: amber <amber@flourish.ch>
  create mode 100644 app/src/main/java/org/thoughtcrime/securesms/util/DynamicMediaPreviewTheme.java
 
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java
-index 4982c26..22721e7 100644
+index 4982c2605f..22721e75df 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java
 @@ -35,6 +35,8 @@ import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
@@ -123,7 +123,7 @@ index 4982c26..22721e7 100644
  
      WindowUtil.clearLightStatusBar(getWindow());
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
-index e3a9873..dab325a 100644
+index 7bad7aeea0..8e6b049790 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
 @@ -53,7 +53,6 @@ import androidx.compose.ui.Modifier
@@ -178,7 +178,7 @@ index e3a9873..dab325a 100644
              MainNavigationBar(
                state = mainNavigationState,
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/photo/PhotoEditorActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/photo/PhotoEditorActivity.kt
-index 59263d8..232813e 100644
+index 59263d882f..232813e2f9 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/avatar/photo/PhotoEditorActivity.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/photo/PhotoEditorActivity.kt
 @@ -10,8 +10,21 @@ import androidx.fragment.app.Fragment
@@ -204,7 +204,7 @@ index 59263d8..232813e 100644
    override fun attachBaseContext(newBase: Context) {
      delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_YES
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogAdapter.kt
-index 7b8a165..acc7ed6 100644
+index 7b8a165745..acc7ed68e6 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogAdapter.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogAdapter.kt
 @@ -5,7 +5,6 @@ import android.text.style.TextAppearanceSpan
@@ -232,7 +232,7 @@ index 7b8a165..acc7ed6 100644
        )
  
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
-index bebf8b9..f8de387 100644
+index bebf8b99d8..f8de387889 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
 @@ -25,6 +25,8 @@ import com.airbnb.lottie.LottieAnimationView;
@@ -262,7 +262,7 @@ index bebf8b9..f8de387 100644
        }
  
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
-index 6acd230..7f9e0ca 100644
+index 6acd230877..7f9e0cacb5 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
 @@ -7,8 +7,7 @@ import android.util.AttributeSet;
@@ -297,7 +297,7 @@ index 6acd230..7f9e0ca 100644
    }
  }
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
-index 16fc244..bb178f0 100644
+index 16fc24488a..bb178f0242 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
 @@ -1,7 +1,5 @@
@@ -317,7 +317,7 @@ index 16fc244..bb178f0 100644
  import org.signal.core.ui.view.Stub;
  import org.signal.core.util.ThreadUtil;
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ActionItem.kt b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ActionItem.kt
-index c64b263..57ac1a1 100644
+index c64b263888..57ac1a1c7b 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ActionItem.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ActionItem.kt
 @@ -1,8 +1,6 @@
@@ -338,7 +338,7 @@ index c64b263..57ac1a1 100644
    val action: Runnable
  )
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt
-index 7fbfb2a..e0052cd 100644
+index 7fbfb2a6bb..e0052cd511 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt
 @@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.components.menu
@@ -362,7 +362,7 @@ index 7fbfb2a..e0052cd 100644
        title.setTextColor(tintColor)
  
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/quotes/QuoteViewColorTheme.kt b/app/src/main/java/org/thoughtcrime/securesms/components/quotes/QuoteViewColorTheme.kt
-index 63e92e2..249a807 100644
+index 63e92e2e81..249a8071ba 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/quotes/QuoteViewColorTheme.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/quotes/QuoteViewColorTheme.kt
 @@ -1,46 +1,46 @@
@@ -439,7 +439,7 @@ index 63e92e2..249a807 100644
    companion object {
      @JvmStatic
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsIcon.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsIcon.kt
-index 69f4bb0..0708b35 100644
+index 69f4bb0d25..0708b35bc9 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsIcon.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsIcon.kt
 @@ -6,10 +6,10 @@ import android.graphics.PorterDuffColorFilter
@@ -500,7 +500,7 @@ index 69f4bb0..0708b35 100644
      @JvmStatic
      fun from(drawable: Drawable): DSLSettingsIcon = FromDrawable(drawable)
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsFragment.kt
-index 79388aa..aaeb87f 100644
+index 79388aa17d..aaeb87f2bb 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsFragment.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsFragment.kt
 @@ -25,6 +25,7 @@ import org.signal.core.ui.compose.SignalIcons
@@ -563,7 +563,7 @@ index 79388aa..aaeb87f 100644
          language = "en-US",
          isCompactNavigationBar = false
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsState.kt
-index 9e080f6..d65ba28 100644
+index 9e080f65b8..d65ba284d3 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsState.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsState.kt
 @@ -4,6 +4,7 @@ import org.thoughtcrime.securesms.keyvalue.SettingsValues
@@ -575,7 +575,7 @@ index 9e080f6..d65ba28 100644
    val language: String,
    val isCompactNavigationBar: Boolean
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsViewModel.kt
-index 85398c0..131b3f3 100644
+index 85398c05e6..131b3f3426 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsViewModel.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsViewModel.kt
 @@ -21,9 +21,9 @@ class AppearanceSettingsViewModel : ViewModel() {
@@ -600,7 +600,7 @@ index 85398c0..131b3f3 100644
        PlainTextKeyValueStore.language,
        SignalStore.settings.useCompactNavigationBar
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt
-index 8e840e8..c2d21f2 100644
+index 8e840e8eea..c2d21f258d 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt
 @@ -118,8 +118,8 @@ class DonateToSignalFragment :
@@ -615,7 +615,7 @@ index 8e840e8..c2d21f2 100644
    }
  
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt
-index 8a4c723..17df36c 100644
+index 8a4c723124..17df36c361 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt
 @@ -138,8 +138,8 @@ class ManageDonationsFragment :
@@ -630,7 +630,7 @@ index 8a4c723..17df36c 100644
    }
  
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/QrImageSelectionActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/QrImageSelectionActivity.kt
-index 9608821..9e57182 100644
+index 960882133d..9e57182fc2 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/QrImageSelectionActivity.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/QrImageSelectionActivity.kt
 @@ -16,11 +16,19 @@ import androidx.appcompat.app.AppCompatDelegate
@@ -662,44 +662,28 @@ index 9608821..9e57182 100644
      enableEdgeToEdge()
      setContentView(R.layout.username_qr_image_selection_activity)
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/WebRtcCallActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/WebRtcCallActivity.kt
-index 3dd7490..8fada10 100644
+index dfe206f9db..36679fddb7 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/WebRtcCallActivity.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/WebRtcCallActivity.kt
-@@ -84,6 +84,8 @@ import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet
- import org.thoughtcrime.securesms.service.webrtc.CallLinkDisconnectReason
- import org.thoughtcrime.securesms.service.webrtc.SignalCallManager
+@@ -87,2 +87,4 @@ import org.thoughtcrime.securesms.service.webrtc.SignalCallManager
  import org.thoughtcrime.securesms.sms.MessageSender
 +import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
 +import org.thoughtcrime.securesms.util.DynamicTheme
  import org.thoughtcrime.securesms.util.FullscreenHelper
- import org.thoughtcrime.securesms.util.RemoteConfig
- import org.thoughtcrime.securesms.util.TextSecurePreferences
-@@ -137,6 +139,7 @@ class WebRtcCallActivity : BaseActivity(), SafetyNumberChangeDialog.Callback, Re
-   private var ephemeralStateDisposable = Disposable.empty()
-   private val callPermissionsDialogController = CallPermissionsDialogController()
+@@ -147,2 +149,3 @@ class WebRtcCallActivity : BaseActivity(), SafetyNumberChangeDialog.Callback, Re
    private val eventBusSubscriber = EventBusSubscriber()
 +  private val theme: DynamicTheme = DynamicNoActionBarTheme()
    private val mediaProjectionLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-     if (result.resultCode == RESULT_OK && result.data != null) {
-       AppDependencies.signalCallManager.startScreenShare(result.data!!)
-@@ -155,6 +158,7 @@ class WebRtcCallActivity : BaseActivity(), SafetyNumberChangeDialog.Callback, Re
- 
-   @SuppressLint("MissingInflatedId")
+@@ -165,2 +168,3 @@ class WebRtcCallActivity : BaseActivity(), SafetyNumberChangeDialog.Callback, Re
    override fun onCreate(savedInstanceState: Bundle?) {
 +    theme.onCreate(this)
      val callIntent: CallIntent = getCallIntent()
-     Log.i(TAG, "onCreate(${callIntent.isStartedFromFullScreen})")
- 
-@@ -270,6 +274,7 @@ class WebRtcCallActivity : BaseActivity(), SafetyNumberChangeDialog.Callback, Re
-   override fun onResume() {
-     Log.i(TAG, "onResume()")
+@@ -280,2 +284,3 @@ class WebRtcCallActivity : BaseActivity(), SafetyNumberChangeDialog.Callback, Re
      super.onResume()
 +    theme.onResume(this)
  
-     initializeScreenshotSecurity()
- 
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchModels.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchModels.kt
-index 0ac0d01..05fffba 100644
+index 0ac0d01c12..05fffba34f 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchModels.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchModels.kt
 @@ -439,7 +439,7 @@ object ContactSearchModels {
@@ -712,7 +696,7 @@ index 0ac0d01..05fffba 100644
          }
        )
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
-index 899fd99..cc2f8de 100644
+index 1941426655..82f00a5dad 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
 @@ -129,6 +129,7 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreview;
@@ -764,7 +748,7 @@ index 899fd99..cc2f8de 100644
  
    private void setFooter(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> next, @NonNull Locale locale, boolean isGroupThread, boolean hasWallpaper) {
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
-index af7845c..d6d9e1c 100644
+index af7845c763..d6d9e1cd9a 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
 @@ -855,11 +855,11 @@ public final class ConversationUpdateItem extends FrameLayout
@@ -791,7 +775,7 @@ index af7845c..d6d9e1c 100644
  
          collapsedButton.setVisibility(VISIBLE);
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt
-index d0970aa..765b8b0 100644
+index d0970aa94a..765b8b0bbf 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt
 @@ -68,11 +68,24 @@ import org.thoughtcrime.securesms.recipients.ui.RecipientSelection
@@ -820,7 +804,7 @@ index d0970aa..765b8b0 100644
      @JvmOverloads
      @JvmStatic
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorPreviewView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorPreviewView.kt
-index 5b58874..10a6aab 100644
+index 5b58874ee0..10a6aab945 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorPreviewView.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorPreviewView.kt
 @@ -10,7 +10,6 @@ import android.view.View
@@ -847,16 +831,14 @@ index 5b58874..10a6aab 100644
        )
      }
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
-index f38ce40..66a0e85 100644
+index 0329e18b7e..78666e4768 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
-@@ -427,2 +427,3 @@ import androidx.compose.ui.graphics.Color as ComposeColor
+@@ -429,2 +429,3 @@ import androidx.compose.ui.graphics.Color as ComposeColor
  import org.signal.core.ui.R as CoreUiR
 +import com.google.android.material.R as MaterialR
  
-@@ -2081,9 +2082,9 @@ class ConversationFragment :
-     if (!resources.isSplitPane() || isFullScreenPane) {
-       binding.toolbar.setNavigationIcon(CoreUiR.drawable.symbol_arrow_start_24)
+@@ -2198,5 +2199,5 @@ class ConversationFragment :
        binding.toolbar.navigationIcon?.setTint(
 -        ContextCompat.getColor(
 +        ThemeUtil.getThemedColor(
@@ -864,26 +846,17 @@ index f38ce40..66a0e85 100644
 -          if (viewModel.wallpaperSnapshot != null) CoreUiR.color.signal_colorNeutralInverse else CoreUiR.color.signal_colorOnSurface
 +          if (viewModel.wallpaperSnapshot != null) CoreUiR.color.signal_colorNeutralInverse else MaterialR.attr.colorOnSurfaceVariant
          )
-       )
-       binding.toolbar.setNavigationContentDescription(R.string.ConversationFragment__content_description_back_button)
-@@ -2167,12 +2168,12 @@ class ConversationFragment :
- 
-     val wallpaperEnabled = chatWallpaper != null || recipient.isReleaseNotes
+@@ -2284,3 +2285,3 @@ class ConversationFragment :
  
 -    val toolbarTint = ContextCompat.getColor(
 +    val toolbarTint = ThemeUtil.getThemedColor(
        requireContext(),
-       if (wallpaperEnabled) {
-         CoreUiR.color.signal_colorNeutralInverse
+@@ -2289,3 +2290,3 @@ class ConversationFragment :
        } else {
 -        CoreUiR.color.signal_colorOnSurface
 +        MaterialR.attr.colorOnSurface
        }
-     )
- 
-@@ -2198,9 +2199,9 @@ class ConversationFragment :
-     )
- 
+@@ -2315,5 +2316,5 @@ class ConversationFragment :
      binding.scrollDateHeader.setTextColor(
 -      ContextCompat.getColor(
 +      ThemeUtil.getThemedColor(
@@ -891,11 +864,7 @@ index f38ce40..66a0e85 100644
 -        if (wallpaperEnabled) R.color.sticky_header_foreground_wallpaper else CoreUiR.color.signal_colorOnSurfaceVariant
 +        if (wallpaperEnabled) R.color.sticky_header_foreground_wallpaper else MaterialR.attr.colorOnSurfaceVariant
        )
-     )
- 
-@@ -2240,10 +2241,10 @@ class ConversationFragment :
-     val navColor = if (hasWallpaper) {
-       R.color.conversation_navigation_wallpaper
+@@ -2357,6 +2358,6 @@ class ConversationFragment :
      } else {
 -      CoreUiR.color.signal_colorBackground
 +      MaterialR.attr.colorSurface
@@ -904,25 +873,18 @@ index f38ce40..66a0e85 100644
 -    chatScrims.navigationBarColor = ContextCompat.getColor(requireContext(), navColor)
 +    chatScrims.navigationBarColor = ThemeUtil.getThemedColor(requireContext(), navColor)
      chatScrims.attachmentKeyboardColor = androidx.compose.ui.graphics.Color(
-       ContextCompat.getColor(
-         requireContext(),
-@@ -4655,12 +4656,12 @@ class ConversationFragment :
-         }
-       }
+@@ -4799,3 +4800,3 @@ class ConversationFragment :
  
 -      val toolbarTextAndIconColor = ContextCompat.getColor(
 +      val toolbarTextAndIconColor = ThemeUtil.getThemedColor(
          requireContext(),
-         if (viewModel.wallpaperSnapshot != null) {
-           CoreUiR.color.signal_colorNeutralInverse
+@@ -4804,3 +4805,3 @@ class ConversationFragment :
          } else {
 -          CoreUiR.color.signal_colorOnSurface
 +          MaterialR.attr.colorOnSurface
          }
-       )
- 
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationToolbarOnScrollHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationToolbarOnScrollHelper.kt
-index 3835de8..8301f06 100644
+index 3835de8cc1..8301f069c1 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationToolbarOnScrollHelper.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationToolbarOnScrollHelper.kt
 @@ -7,7 +7,7 @@ import androidx.lifecycle.LifecycleOwner
@@ -975,7 +937,7 @@ index 3835de8..8301f06 100644
    }
  }
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/DisabledInputView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/DisabledInputView.kt
-index 7872237..5998b0f 100644
+index 7872237f35..5998b0f3bc 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/DisabledInputView.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/DisabledInputView.kt
 @@ -13,9 +13,9 @@ import android.view.View
@@ -1007,7 +969,7 @@ index 7872237..5998b0f 100644
    }
  
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ChatFolderAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ChatFolderAdapter.kt
-index a383e0d..52d1067 100644
+index a383e0d872..52d106744d 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ChatFolderAdapter.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ChatFolderAdapter.kt
 @@ -13,6 +13,8 @@ import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
@@ -1039,7 +1001,7 @@ index a383e0d..52d1067 100644
      }
  
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
-index 3f6101f..42f176c 100644
+index 3f6101fbee..42f176cf56 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
 @@ -16,8 +16,6 @@
@@ -1060,7 +1022,7 @@ index 3f6101f..42f176c 100644
  import org.thoughtcrime.securesms.BindableConversationListItem;
  import org.thoughtcrime.securesms.OverlayTransformation;
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/ConversationListFilterPullView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/ConversationListFilterPullView.kt
-index 60e3f66..da3cae0 100644
+index 60e3f66b0b..da3cae06a2 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/ConversationListFilterPullView.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/ConversationListFilterPullView.kt
 @@ -26,6 +26,8 @@ import kotlin.math.max
@@ -1084,7 +1046,7 @@ index 60e3f66..da3cae0 100644
    fun setPillText(@StringRes textId: Int) {
      binding.filterText.setText(textId)
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/FilterCircleView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/FilterCircleView.kt
-index 4dc14cf..19ad9ec 100644
+index 4dc14cff90..19ad9ec5cb 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/FilterCircleView.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/FilterCircleView.kt
 @@ -17,6 +17,8 @@ import org.signal.core.util.dp
@@ -1112,7 +1074,7 @@ index 4dc14cf..19ad9ec 100644
    private var circleColorAnimator: ValueAnimator? = null
    private var strokeColorAnimator: ValueAnimator? = null
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/KeyboardPageSearchView.kt b/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/KeyboardPageSearchView.kt
-index 0b2327b..e4e6041 100644
+index 0b2327b9c3..e4e604106b 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/KeyboardPageSearchView.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/KeyboardPageSearchView.kt
 @@ -9,7 +9,6 @@ import android.view.View
@@ -1148,35 +1110,20 @@ index 0b2327b..e4e6041 100644
        ImageViewCompat.setImageTintList(clearButton, iconTint)
        input.setHintTextColor(iconTint)
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.kt
-index c18fb1a..f4cbf92 100644
+index c9e44baaa4..843ce4c68e 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.kt
-@@ -35,6 +35,8 @@ class SettingsValues internal constructor(store: KeyValueStore, context: Context
-     const val THREAD_TRIM_LENGTH = "pref_trim_length"
-     const val THREAD_TRIM_ENABLED = "pref_trim_threads"
+@@ -40,2 +40,4 @@ class SettingsValues internal constructor(store: KeyValueStore, private val cont
  
 +    const val DYNAMIC_COLORS_ENABLED = "settings.dynamicColors"
 +    private const val IGNORE_REMOTE_DELETE = "settings.ignore.remote.delete"
      const val THEME = "settings.theme"
-     const val MESSAGE_FONT_SIZE = "settings.message.font.size"
-     const val PREFER_SYSTEM_EMOJI = "settings.use.system.emoji"
-@@ -113,6 +115,8 @@ class SettingsValues internal constructor(store: KeyValueStore, context: Context
-     THREAD_TRIM_LENGTH,
-     THREAD_TRIM_ENABLED,
+@@ -137,2 +139,4 @@ class SettingsValues internal constructor(store: KeyValueStore, private val cont
      THEME,
 +    DYNAMIC_COLORS_ENABLED,
 +    IGNORE_REMOTE_DELETE,
      MESSAGE_FONT_SIZE,
-     PREFER_SYSTEM_EMOJI,
-     ENTER_KEY_SENDS,
-@@ -193,10 +197,25 @@ class SettingsValues internal constructor(store: KeyValueStore, context: Context
-   var theme: Theme
-     get() = Theme.deserialize(getString(THEME, TextSecurePreferences.getTheme(AppDependencies.application)))
-     set(value) {
--      putString(THEME, value.serialize())
--      configurationSettingChanged.postValue(THEME)
-+      setTheme(value, isDynamicColorsEnabled)
-     }
+@@ -224,2 +228,18 @@ class SettingsValues internal constructor(store: KeyValueStore, private val cont
  
 +  fun setTheme(theme: Theme, useDynamicColors: Boolean) {
 +    putString(THEME, theme.serialize())
@@ -1194,11 +1141,15 @@ index c18fb1a..f4cbf92 100644
 +    putBoolean(IGNORE_REMOTE_DELETE, enabled)
 +  }
 +
-   var messageFontSize: Int
-     get() = getInteger(MESSAGE_FONT_SIZE, TextSecurePreferences.getMessageBodyTextSize(AppDependencies.application))
+   var theme: Theme
+@@ -227,4 +247,3 @@ class SettingsValues internal constructor(store: KeyValueStore, private val cont
      set(value) {
+-      putString(THEME, value.serialize())
+-      configurationSettingChanged.postValue(THEME)
++      setTheme(value, isDynamicColorsEnabled)
+     }
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
-index 6d9f12e..21b6482 100644
+index 6d9f12eea0..21b64822c2 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
 @@ -261,7 +261,7 @@ public class SubmitDebugLogActivity extends BaseActivity {
@@ -1232,7 +1183,7 @@ index 6d9f12e..21b6482 100644
      DebugLogsViewer.onFilterLevel(logWebView, "[]");
    }
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationBar.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationBar.kt
-index eb38610..554a286 100644
+index eb38610d0d..554a2863ee 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationBar.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationBar.kt
 @@ -20,8 +20,10 @@ import androidx.compose.foundation.shape.RoundedCornerShape
@@ -1295,7 +1246,7 @@ index eb38610..554a286 100644
            icon = {
              NavigationDestinationIcon(
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java
-index 01de188..002b52b 100644
+index 01de1886ad..002b52b900 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java
 @@ -26,6 +26,8 @@ import org.thoughtcrime.securesms.mms.PushMediaConstraints;
@@ -1330,7 +1281,7 @@ index 01de188..002b52b 100644
      super.onCreate(savedInstanceState);
  
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseStoryTypeBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseStoryTypeBottomSheet.kt
-index c333d12..a6f66ab 100644
+index c333d12197..a6f66ab725 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseStoryTypeBottomSheet.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseStoryTypeBottomSheet.kt
 @@ -40,9 +40,9 @@ class ChooseStoryTypeBottomSheet : DSLSettingsBottomSheetFragment(
@@ -1358,7 +1309,7 @@ index c333d12..a6f66ab 100644
            ),
            onClick = {
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestBarColorTheme.kt b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestBarColorTheme.kt
-index 68e1def..28c54a9 100644
+index 68e1def4f0..28c54a942e 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestBarColorTheme.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestBarColorTheme.kt
 @@ -1,40 +1,41 @@
@@ -1421,7 +1372,7 @@ index 68e1def..28c54a9 100644
    companion object {
      @JvmStatic
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/model/PaymentItem.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/model/PaymentItem.java
-index 05305ae..34ffc1e 100644
+index 05305aeb85..34ffc1eebb 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/model/PaymentItem.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/model/PaymentItem.java
 @@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.payments.preferences.model;
@@ -1454,7 +1405,7 @@ index 05305ae..34ffc1e 100644
    }
  
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/viewholder/PaymentItemViewHolder.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/viewholder/PaymentItemViewHolder.java
-index c26ddbf..855d5e1 100644
+index c26ddbf4ba..855d5e12a7 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/viewholder/PaymentItemViewHolder.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/viewholder/PaymentItemViewHolder.java
 @@ -4,8 +4,7 @@ import android.view.View;
@@ -1477,7 +1428,7 @@ index c26ddbf..855d5e1 100644
      itemView.setOnClickListener(v -> callbacks.onPaymentItem(model));
  
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/EditProxyFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/EditProxyFragment.java
-index b709e56..2794bb4 100644
+index b709e562b8..2794bb4fd2 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/EditProxyFragment.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/EditProxyFragment.java
 @@ -20,14 +20,15 @@ import androidx.navigation.Navigation;
@@ -1508,7 +1459,7 @@ index b709e56..2794bb4 100644
          case CONNECTED:
            proxyStatus.setText(R.string.preferences_connected_to_proxy);
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragment.java
-index 76cc7dc..9d29648 100644
+index 76cc7dc4d6..9d29648622 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragment.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragment.java
 @@ -182,8 +182,8 @@ public class UsernameEditFragment extends LoggingFragment {
@@ -1523,7 +1474,7 @@ index 76cc7dc..9d29648 100644
      binding.usernameTextFocusedStroke.setBackgroundColor(color);
      binding.usernameTextWrapper.setHintTextColor(ColorStateList.valueOf(color));
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.kt
-index 59bf8c3..4822091 100644
+index 59bf8c3a04..4822091569 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.kt
 @@ -61,7 +61,6 @@ import org.whispersystems.signalservice.api.util.OptionalUtil
@@ -1544,7 +1495,7 @@ index 59bf8c3..4822091 100644
  
          if (isLtr) {
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/RecipientPicker.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/RecipientPicker.kt
-index a47bf1d..87877ad 100644
+index a47bf1df9f..87877ad391 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/RecipientPicker.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/RecipientPicker.kt
 @@ -323,7 +323,7 @@ private suspend fun showItemContextMenu(
@@ -1593,7 +1544,7 @@ index a47bf1d..87877ad 100644
        )
        add(blockItem)
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageActivity.java b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageActivity.java
-index c4d56a9..38a4145 100644
+index c4d56a9faa..38a41459e9 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageActivity.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageActivity.java
 @@ -26,6 +26,8 @@ import org.thoughtcrime.securesms.PassphraseRequiredActivity;
@@ -1626,7 +1577,7 @@ index c4d56a9..38a4145 100644
    private final Handler  handler                = new Handler(Looper.getMainLooper());
    private final Runnable durationUpdateRunnable = () -> {
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorStickerSelectActivity.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorStickerSelectActivity.java
-index 28f099e..93e1b5f 100644
+index 28f099e86e..93e1b5f172 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorStickerSelectActivity.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorStickerSelectActivity.java
 @@ -26,11 +26,20 @@ import org.thoughtcrime.securesms.scribbles.stickers.FeatureSticker;
@@ -1659,7 +1610,7 @@ index 28f099e..93e1b5f 100644
      super.onCreate(savedInstanceState);
      setContentView(R.layout.scribble_select_new_sticker_activity);
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerActivity.kt
-index ed76d94..2afe86a 100644
+index ed76d94e02..2afe86ab00 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerActivity.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerActivity.kt
 @@ -30,6 +30,8 @@ import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaControllerOwner
@@ -1693,7 +1644,7 @@ index ed76d94..2afe86a 100644
      if (StoryMutePolicy.isContentMuted) {
        viewModel.mute()
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicConversationSettingsTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicConversationSettingsTheme.java
-index 75411f8..25a4de3 100644
+index 75411f8dfb..25a4de392a 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicConversationSettingsTheme.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicConversationSettingsTheme.java
 @@ -9,4 +9,9 @@ public class DynamicConversationSettingsTheme extends DynamicTheme {
@@ -1708,7 +1659,7 @@ index 75411f8..25a4de3 100644
  }
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicMediaPreviewTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicMediaPreviewTheme.java
 new file mode 100644
-index 0000000..5758653
+index 0000000000..5758653f63
 --- /dev/null
 +++ b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicMediaPreviewTheme.java
 @@ -0,0 +1,18 @@
@@ -1731,7 +1682,7 @@ index 0000000..5758653
 +  }
 +}
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java
-index 53e27e7..9cbbb13 100644
+index 53e27e72a5..9cbbb139a6 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java
 @@ -9,4 +9,9 @@ public class DynamicNoActionBarTheme extends DynamicTheme {
@@ -1745,7 +1696,7 @@ index 53e27e7..9cbbb13 100644
 +  }
  }
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java
-index f5d5f07..ce691bf 100644
+index f5d5f07b68..ce691bfcf6 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java
 @@ -9,4 +9,9 @@ public class DynamicRegistrationTheme extends DynamicTheme {
@@ -1759,7 +1710,7 @@ index f5d5f07..ce691bf 100644
 +  }
  }
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java
-index e58338b..a49c595 100644
+index e58338bee0..a49c5956dd 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java
 @@ -9,6 +9,8 @@ import androidx.annotation.NonNull;
@@ -1805,7 +1756,7 @@ index e58338b..a49c595 100644
      return Build.VERSION.SDK_INT >= 29;
    }
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Material3OnScrollHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/util/Material3OnScrollHelper.kt
-index d83c1c7..b634764 100644
+index d83c1c75ec..b634764cd4 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/util/Material3OnScrollHelper.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/util/Material3OnScrollHelper.kt
 @@ -1,10 +1,9 @@
@@ -1945,7 +1896,7 @@ index d83c1c7..b634764 100644
 +  }
  }
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java
-index f8a7609..28a2e4a 100644
+index f8a7609237..28a2e4aa60 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java
 @@ -201,7 +201,7 @@ public final class SpanUtil {
@@ -1967,7 +1918,7 @@ index f8a7609..28a2e4a 100644
      }, start, start + clickable.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
  
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/crop/WallpaperImageSelectionActivity.java b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/crop/WallpaperImageSelectionActivity.java
-index a3519df..fd7da4a 100644
+index a3519dfce6..fd7da4afea 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/crop/WallpaperImageSelectionActivity.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/crop/WallpaperImageSelectionActivity.java
 @@ -14,12 +14,21 @@ import org.thoughtcrime.securesms.R;
@@ -2001,7 +1952,7 @@ index a3519df..fd7da4a 100644
      super.onCreate(savedInstanceState);
  
 diff --git a/app/src/main/res/drawable/signal_context_menu_background.xml b/app/src/main/res/drawable/signal_context_menu_background.xml
-index 4b7312a..337ea4d 100644
+index 4b7312abba..337ea4d08f 100644
 --- a/app/src/main/res/drawable/signal_context_menu_background.xml
 +++ b/app/src/main/res/drawable/signal_context_menu_background.xml
 @@ -4,6 +4,6 @@
@@ -2015,7 +1966,7 @@ index 4b7312a..337ea4d 100644
 \ No newline at end of file
 +</shape>
 diff --git a/app/src/main/res/layout/contact_photo_preview_activity.xml b/app/src/main/res/layout/contact_photo_preview_activity.xml
-index 752aac4..8af1f64 100644
+index 752aac4be3..8af1f644e4 100644
 --- a/app/src/main/res/layout/contact_photo_preview_activity.xml
 +++ b/app/src/main/res/layout/contact_photo_preview_activity.xml
 @@ -4,8 +4,7 @@
@@ -2029,7 +1980,7 @@ index 752aac4..8af1f64 100644
      <com.github.chrisbanes.photoview.PhotoView
          android:id="@+id/avatar"
 diff --git a/app/src/main/res/layout/contact_search_unknown_item.xml b/app/src/main/res/layout/contact_search_unknown_item.xml
-index 49f58ee..06a3052 100644
+index 49f58ee7eb..06a305214c 100644
 --- a/app/src/main/res/layout/contact_search_unknown_item.xml
 +++ b/app/src/main/res/layout/contact_search_unknown_item.xml
 @@ -23,7 +23,7 @@
@@ -2051,7 +2002,7 @@ index 49f58ee..06a3052 100644
  
      <androidx.appcompat.widget.AppCompatCheckBox
 diff --git a/app/src/main/res/layout/contact_selection_find_by_phone_number_item.xml b/app/src/main/res/layout/contact_selection_find_by_phone_number_item.xml
-index 6cb38bf..0a7fe66 100644
+index 6cb38bfb6c..0a7fe66318 100644
 --- a/app/src/main/res/layout/contact_selection_find_by_phone_number_item.xml
 +++ b/app/src/main/res/layout/contact_selection_find_by_phone_number_item.xml
 @@ -14,7 +14,7 @@
@@ -2073,7 +2024,7 @@ index 6cb38bf..0a7fe66 100644
      <TextView
          android:id="@+id/invite_text"
 diff --git a/app/src/main/res/layout/contact_selection_find_by_username_item.xml b/app/src/main/res/layout/contact_selection_find_by_username_item.xml
-index 5b0e95c..9b50c6a 100644
+index 5b0e95c069..9b50c6ade7 100644
 --- a/app/src/main/res/layout/contact_selection_find_by_username_item.xml
 +++ b/app/src/main/res/layout/contact_selection_find_by_username_item.xml
 @@ -14,7 +14,7 @@
@@ -2095,7 +2046,7 @@ index 5b0e95c..9b50c6a 100644
      <TextView
          android:id="@+id/invite_text"
 diff --git a/app/src/main/res/layout/contact_selection_find_contacts_item.xml b/app/src/main/res/layout/contact_selection_find_contacts_item.xml
-index c780320..348f16c 100644
+index c780320756..348f16c4e0 100644
 --- a/app/src/main/res/layout/contact_selection_find_contacts_item.xml
 +++ b/app/src/main/res/layout/contact_selection_find_contacts_item.xml
 @@ -14,7 +14,7 @@
@@ -2117,7 +2068,7 @@ index c780320..348f16c 100644
      <TextView
          android:id="@+id/title"
 diff --git a/app/src/main/res/layout/contact_selection_invite_action_item.xml b/app/src/main/res/layout/contact_selection_invite_action_item.xml
-index eaea72e..cd0b5c0 100644
+index eaea72ef82..cd0b5c00e1 100644
 --- a/app/src/main/res/layout/contact_selection_invite_action_item.xml
 +++ b/app/src/main/res/layout/contact_selection_invite_action_item.xml
 @@ -14,11 +14,11 @@
@@ -2135,7 +2086,7 @@ index eaea72e..cd0b5c0 100644
          app:layout_constraintStart_toStartOf="parent"
          app:layout_constraintTop_toTopOf="parent"
 diff --git a/app/src/main/res/layout/contact_selection_new_group_item.xml b/app/src/main/res/layout/contact_selection_new_group_item.xml
-index 65cd30d..2c87976 100644
+index 65cd30d496..2c87976ddd 100644
 --- a/app/src/main/res/layout/contact_selection_new_group_item.xml
 +++ b/app/src/main/res/layout/contact_selection_new_group_item.xml
 @@ -14,7 +14,7 @@
@@ -2157,7 +2108,7 @@ index 65cd30d..2c87976 100644
      <TextView
          android:id="@+id/invite_text"
 diff --git a/app/src/main/res/layout/contact_selection_refresh_action_item.xml b/app/src/main/res/layout/contact_selection_refresh_action_item.xml
-index 545b983..25837ed 100644
+index 545b98372c..25837ed798 100644
 --- a/app/src/main/res/layout/contact_selection_refresh_action_item.xml
 +++ b/app/src/main/res/layout/contact_selection_refresh_action_item.xml
 @@ -14,7 +14,7 @@
@@ -2179,7 +2130,7 @@ index 545b983..25837ed 100644
      <TextView
          android:id="@+id/title"
 diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
-index da48535..e8bd1b2 100644
+index da485359b5..e8bd1b2026 100644
 --- a/app/src/main/res/values-night-v31/themes.xml
 +++ b/app/src/main/res/values-night-v31/themes.xml
 @@ -1,6 +1,6 @@
@@ -2191,7 +2142,7 @@ index da48535..e8bd1b2 100644
          <item name="android:windowSplashScreenAnimatedIcon">@drawable/ic_splash</item>
      </style>
 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
-index 5991f98..c9ee61c 100644
+index 5991f98857..c9ee61c535 100644
 --- a/app/src/main/res/values/colors.xml
 +++ b/app/src/main/res/values/colors.xml
 @@ -50,7 +50,7 @@
@@ -2204,7 +2155,7 @@ index 5991f98..c9ee61c 100644
      <color name="storage_color_empty">@color/core_grey_50</color>
      <color name="storage_color_photos">#ff5951C8</color>
 diff --git a/app/src/main/res/values/signal_styles.xml b/app/src/main/res/values/signal_styles.xml
-index e37c905..e7e575d 100644
+index e37c905beb..e7e575d7a8 100644
 --- a/app/src/main/res/values/signal_styles.xml
 +++ b/app/src/main/res/values/signal_styles.xml
 @@ -274,8 +274,6 @@
@@ -2268,7 +2219,7 @@ index e37c905..e7e575d 100644
 +
  </resources>
 diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
-index a084177..bbe42c1 100644
+index a084177fd3..bbe42c1f7c 100644
 --- a/app/src/main/res/values/themes.xml
 +++ b/app/src/main/res/values/themes.xml
 @@ -129,12 +129,115 @@
@@ -2700,7 +2651,7 @@ index a084177..bbe42c1 100644
  
      <style name="Theme.Signal.AlertDialog.Light.Cornered" parent="MaterialAlertDialog.Material3">
 diff --git a/core/ui/src/main/java/org/signal/core/ui/compose/Buttons.kt b/core/ui/src/main/java/org/signal/core/ui/compose/Buttons.kt
-index ca68f68..b74be78 100644
+index ca68f685f9..b74be78807 100644
 --- a/core/ui/src/main/java/org/signal/core/ui/compose/Buttons.kt
 +++ b/core/ui/src/main/java/org/signal/core/ui/compose/Buttons.kt
 @@ -28,6 +28,7 @@ import androidx.compose.material3.ButtonElevation
@@ -2765,7 +2716,7 @@ index ca68f68..b74be78 100644
          content = imageContent
        )
 diff --git a/core/ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt b/core/ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt
-index f867cfd..913005e 100644
+index f867cfd326..913005e6ca 100644
 --- a/core/ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt
 +++ b/core/ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt
 @@ -1,21 +1,31 @@
@@ -3054,7 +3005,7 @@ index f867cfd..913005e 100644
  @Composable
  private fun TypographyPreview() {
 diff --git a/core/ui/src/main/java/org/signal/core/ui/fonts/SignalSymbols.kt b/core/ui/src/main/java/org/signal/core/ui/fonts/SignalSymbols.kt
-index 69daa45..fb9c3fb 100644
+index 69daa45c4e..fb9c3fb226 100644
 --- a/core/ui/src/main/java/org/signal/core/ui/fonts/SignalSymbols.kt
 +++ b/core/ui/src/main/java/org/signal/core/ui/fonts/SignalSymbols.kt
 @@ -15,7 +15,6 @@ import android.text.style.AbsoluteSizeSpan
@@ -3096,7 +3047,7 @@ index 69daa45..fb9c3fb 100644
        text
      }
 diff --git a/core/ui/src/main/java/org/signal/core/ui/util/ThemeUtil.java b/core/ui/src/main/java/org/signal/core/ui/util/ThemeUtil.java
-index 6e038b9..19e7590 100644
+index 6e038b9c5f..19e7590658 100644
 --- a/core/ui/src/main/java/org/signal/core/ui/util/ThemeUtil.java
 +++ b/core/ui/src/main/java/org/signal/core/ui/util/ThemeUtil.java
 @@ -15,6 +15,7 @@ import androidx.annotation.Nullable;
diff --git a/patches/0002-fix-adapt-dynamic-theme-to-inline-media-send.patch b/patches/0002-fix-adapt-dynamic-theme-to-inline-media-send.patch
index 1f27582..61bc3a0 100644
--- a/patches/0002-fix-adapt-dynamic-theme-to-inline-media-send.patch
+++ b/patches/0002-fix-adapt-dynamic-theme-to-inline-media-send.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Fri, 21 Aug 2026 14:14:19 +0000
-Subject: [PATCH 02/28] fix: adapt dynamic theme to inline media send
+Subject: [PATCH 02/29] fix: adapt dynamic theme to inline media send
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
diff --git a/patches/0003-feat-allow-disabling-debug-logs.patch b/patches/0003-feat-allow-disabling-debug-logs.patch
index 0008959..86791fb 100644
--- a/patches/0003-feat-allow-disabling-debug-logs.patch
+++ b/patches/0003-feat-allow-disabling-debug-logs.patch
@@ -1,15 +1,16 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Thu, 6 Aug 2026 07:44:38 +0000
-Subject: [PATCH 03/28] feat: allow disabling debug logs
+Subject: [PATCH 03/29] feat: allow disabling debug logs
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
  .../settings/app/help/HelpSettingsState.kt    |  5 ++++
- .../securesms/util/TextSecurePreferences.java |  9 +++++++
+ .../securesms/util/VesperLogPreferences.kt    | 23 ++++++++++++++++
  .../java/org/signal/core/util/logging/Log.kt  | 27 ++++++++++++-------
- 3 files changed, 31 insertions(+), 10 deletions(-)
+ 3 files changed, 45 insertions(+), 10 deletions(-)
  create mode 100644 app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsState.kt
+ create mode 100644 app/src/main/java/org/thoughtcrime/securesms/util/VesperLogPreferences.kt
 
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsState.kt
 new file mode 100644
@@ -22,33 +23,35 @@ index 0000000000..3033c7e651
 +data class HelpSettingsState(
 +  val logEnabled: Boolean
 +)
-diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
-index 2b04af571f..8b16e49eb7 100644
---- a/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
-+++ b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
-@@ -122,6 +122,7 @@ public class TextSecurePreferences {
-   private static final String LAST_FULL_CONTACT_SYNC_TIME = "pref_last_full_contact_sync_time";
-   private static final String NEEDS_FULL_CONTACT_SYNC     = "pref_needs_full_contact_sync";
- 
-+  public  static final String LOG_ENABLED            = "pref_log_enabled";
-   private static final String LOG_ENCRYPTED_SECRET   = "pref_log_encrypted_secret";
-   private static final String LOG_UNENCRYPTED_SECRET = "pref_log_unencrypted_secret";
- 
-@@ -719,6 +720,14 @@ public class TextSecurePreferences {
-     setBooleanPreference(context, NEEDS_FULL_CONTACT_SYNC, needsSync);
-   }
- 
-+  public static void setLogEnabled(Context context, boolean enabled) {
-+    setBooleanPreference(context, LOG_ENABLED, enabled);
-+  }
+diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/VesperLogPreferences.kt b/app/src/main/java/org/thoughtcrime/securesms/util/VesperLogPreferences.kt
+new file mode 100644
+index 0000000000..4d1109feb9
+--- /dev/null
++++ b/app/src/main/java/org/thoughtcrime/securesms/util/VesperLogPreferences.kt
+@@ -0,0 +1,23 @@
++/*
++ * Copyright 2026 Vesper contributors
++ * SPDX-License-Identifier: AGPL-3.0-only
++ */
++package org.thoughtcrime.securesms.util
++
++import android.content.Context
++import androidx.preference.PreferenceManager
 +
-+  public static boolean isLogEnabled(Context context) {
-+    return getBooleanPreference(context, LOG_ENABLED, false);
++/** Retains the preference used by Vesper before Signal removed TextSecurePreferences. */
++object VesperLogPreferences {
++  private const val LOG_ENABLED = "pref_log_enabled"
++
++  @JvmStatic
++  fun setLogEnabled(context: Context, enabled: Boolean) {
++    PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(LOG_ENABLED, enabled).apply()
 +  }
 +
-   public static void setLogEncryptedSecret(Context context, String base64Secret) {
-     setStringPreference(context, LOG_ENCRYPTED_SECRET, base64Secret);
-   }
++  @JvmStatic
++  fun isLogEnabled(context: Context): Boolean {
++    return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(LOG_ENABLED, false)
++  }
++}
 diff --git a/core/util-jvm/src/main/java/org/signal/core/util/logging/Log.kt b/core/util-jvm/src/main/java/org/signal/core/util/logging/Log.kt
 index 1748be82ee..752f830e8a 100644
 --- a/core/util-jvm/src/main/java/org/signal/core/util/logging/Log.kt
diff --git a/patches/0004-feat-optionally-preserve-remotely-deleted-messages.patch b/patches/0004-feat-optionally-preserve-remotely-deleted-messages.patch
index 8bfb2d9..a3c6580 100644
--- a/patches/0004-feat-optionally-preserve-remotely-deleted-messages.patch
+++ b/patches/0004-feat-optionally-preserve-remotely-deleted-messages.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Sat, 15 Aug 2026 08:31:14 +0000
-Subject: [PATCH 04/28] feat: optionally preserve remotely deleted messages
+Subject: [PATCH 04/29] feat: optionally preserve remotely deleted messages
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
@@ -19,10 +19,10 @@ Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com
  create mode 100644 app/src/main/res/drawable/vesper_preserved_delete_pill_background.xml
 
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
-index b7f48cb226..a5b40aad36 100644
+index fe821d9e15..15ad5a5c00 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
-@@ -101,6 +101,7 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.ThreadMergeEvent
+@@ -102,6 +102,7 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.ThreadMergeEvent
  import org.thoughtcrime.securesms.dependencies.AppDependencies
  import org.thoughtcrime.securesms.keyvalue.SignalStore
  import org.thoughtcrime.securesms.linkpreview.LinkPreview
@@ -30,7 +30,7 @@ index b7f48cb226..a5b40aad36 100644
  import org.thoughtcrime.securesms.mms.PartAuthority
  import org.thoughtcrime.securesms.mms.QuoteModel
  import org.thoughtcrime.securesms.payments.FailureReason
-@@ -1495,6 +1496,7 @@ private fun BodyRangeList.BodyRange.Style.toRemote(): BackupBodyRange.Style {
+@@ -1511,6 +1512,7 @@ private fun BodyRangeList.BodyRange.Style.toRemote(): BackupBodyRange.Style {
  
  private fun List<ReactionRecord>?.toRemote(exportState: ExportState): List<Reaction> {
    return this
@@ -39,10 +39,10 @@ index b7f48cb226..a5b40aad36 100644
        if (!it.author.hasAciOrE164(exportState)) {
          return@mapNotNull null
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
-index bd1ac399b3..0f84457801 100644
+index a20f64da68..7cd6967831 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
-@@ -161,6 +161,19 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
+@@ -160,6 +160,19 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
          }
        )
  
@@ -62,7 +62,7 @@ index bd1ac399b3..0f84457801 100644
        dividerPref()
  
        sectionHeaderPref(R.string.PrivacySettingsFragment__disappearing_messages)
-@@ -329,6 +342,17 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
+@@ -328,6 +341,17 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
      }
    }
  
@@ -81,10 +81,10 @@ index bd1ac399b3..0f84457801 100644
      MaterialAlertDialogBuilder(requireContext()).apply {
        setTitle(getString(R.string.PrivacySettingsFragment__cant_enable_title))
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsState.kt
-index 06c314db15..5af9ac70d4 100644
+index 88493056da..4ef6643fb0 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsState.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsState.kt
-@@ -4,6 +4,7 @@ data class PrivacySettingsState(
+@@ -5,6 +5,7 @@ data class PrivacySettingsState(
    val blockedCount: Int,
    val readReceipts: Boolean,
    val typingIndicators: Boolean,
@@ -93,34 +93,26 @@ index 06c314db15..5af9ac70d4 100644
    val screenLockActivityTimeout: Long,
    val screenSecurity: Boolean,
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsViewModel.kt
-index 924569866d..23ac7d4a24 100644
+index c06e74c3ca..ad5ceeafd3 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsViewModel.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsViewModel.kt
-@@ -37,6 +37,11 @@ class PrivacySettingsViewModel(
-     refresh()
-   }
+@@ -60,2 +60,7 @@ class PrivacySettingsViewModel(
  
 +  fun setIgnoreRemoteDeleteEnabled(enabled: Boolean) {
 +    SignalStore.settings.setIgnoreRemoteDelete(enabled)
 +    refresh()
 +  }
 +
-   fun setScreenSecurityEnabled(enabled: Boolean) {
-     sharedPreferences.edit().putBoolean(TextSecurePreferences.SCREEN_SECURITY_PREF, enabled).apply()
-     refresh()
-@@ -71,6 +76,7 @@ class PrivacySettingsViewModel(
-       blockedCount = 0,
-       readReceipts = TextSecurePreferences.isReadReceiptsEnabled(AppDependencies.application),
-       typingIndicators = TextSecurePreferences.isTypingIndicatorsEnabled(AppDependencies.application),
-+      ignoreRemoteDelete = SignalStore.settings.isIgnoreRemoteDeleteEnabled,
+   fun refresh() {
+@@ -71,2 +76,3 @@ class PrivacySettingsViewModel(
        screenLock = SignalStore.settings.screenLockEnabled,
++      ignoreRemoteDelete = SignalStore.settings.isIgnoreRemoteDeleteEnabled,
        screenLockActivityTimeout = SignalStore.settings.screenLockTimeout,
-       screenSecurity = TextSecurePreferences.isScreenSecurityEnabled(AppDependencies.application),
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt
-index 996bdbb245..4c711b010d 100644
+index 96300e59a3..56ab07e25b 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt
-@@ -590,9 +590,16 @@ object DataMessageProcessor {
+@@ -589,9 +589,16 @@ object DataMessageProcessor {
      val targetMessage: MessageRecord? = SignalDatabase.messages.getMessageFor(targetSentTimestamp, senderRecipientId)
  
      return if (targetMessage != null && MessageConstraintsUtil.isValidRemoteDeleteReceive(targetMessage, senderRecipientId, envelope.serverTimestamp!!)) {
diff --git a/patches/0005-feat-finish-Vesper-settings-and-help-surfaces.patch b/patches/0005-feat-finish-Vesper-settings-and-help-surfaces.patch
index 327a0f8..41aea82 100644
--- a/patches/0005-feat-finish-Vesper-settings-and-help-surfaces.patch
+++ b/patches/0005-feat-finish-Vesper-settings-and-help-surfaces.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: amber <amber@flourish.ch>
 Date: Sat, 25 Jul 2026 18:30:42 +0100
-Subject: [PATCH 05/28] feat: finish Vesper settings and help surfaces
+Subject: [PATCH 05/29] feat: finish Vesper settings and help surfaces
 
 Adapted from Molly work by Oscar Mira and other Molly contributors.
 
@@ -29,16 +29,19 @@ Signed-off-by: amber <amber@flourish.ch>
  create mode 100644 app/src/test/java/org/thoughtcrime/securesms/jobs/ApkUpdateJobTest.kt
 
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
-index 5530497..857ad28 100644
+index e8f58475f8..d83547e67c 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
-@@ -71,4 +71,5 @@ import org.thoughtcrime.securesms.glide.SignalGlideComponents;
+@@ -70,6 +70,7 @@ import org.thoughtcrime.securesms.gcm.FcmFetchManager;
+ import org.thoughtcrime.securesms.glide.SignalGlideComponents;
  import org.thoughtcrime.securesms.jobmanager.impl.SealedSenderConstraint;
  import org.thoughtcrime.securesms.jobs.AccountConsistencyWorkerJob;
 +import org.thoughtcrime.securesms.jobs.ApkUpdateJob;
  import org.thoughtcrime.securesms.jobs.BackupRefreshJob;
  import org.thoughtcrime.securesms.jobs.BackupSubscriptionCheckJob;
-@@ -288,4 +289,8 @@ public class ApplicationContext extends Application implements AppForegroundObse
+ import org.thoughtcrime.securesms.jobs.BuildExpirationConfirmationJob;
+@@ -287,6 +288,10 @@ public class ApplicationContext extends Application implements AppForegroundObse
+       BackupRefreshJob.enqueueIfNecessary();
        InAppPaymentAuthCheckJob.enqueueIfNeeded();
        RemoteConfig.refreshIfNecessary();
 +      if (BuildConfig.MANAGES_APP_UPDATES && RemoteConfig.internalUser()) {
@@ -47,29 +50,36 @@ index 5530497..857ad28 100644
 +      }
        RetrieveProfileJob.enqueueRoutineFetchIfNecessary();
        executePendingContactSync();
-@@ -372,4 +377,5 @@ public class ApplicationContext extends Application implements AppForegroundObse
+       KeyCachingService.onAppForegrounded(this);
+@@ -371,6 +376,7 @@ public class ApplicationContext extends Application implements AppForegroundObse
+   @VisibleForTesting
    protected void initializeLogging() {
      Log.initialize(RemoteConfig::internalUser, AndroidLogger.INSTANCE, PersistentLogger.getInstance(this));
-+    Log.setLogging(TextSecurePreferences.isLogEnabled(this));
++    Log.setLogging(org.thoughtcrime.securesms.util.VesperLogPreferences.isLogEnabled(this));
  
      SignalProtocolLoggerProvider.setProvider(new CustomSignalProtocolLogger());
+     SignalProtocolLoggerProvider.initializeLogging(BuildConfig.LIBSIGNAL_LOG_LEVEL);
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateInstaller.kt b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateInstaller.kt
-index af21018..090d3d5 100644
+index af21018d7d..090d3d5ce2 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateInstaller.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateInstaller.kt
-@@ -12,4 +12,5 @@ import android.content.Intent
+@@ -11,12 +11,14 @@ import android.content.Context
+ import android.content.Intent
  import android.content.pm.PackageInstaller
  import android.os.Build
 +import org.greenrobot.eventbus.EventBus
  import org.signal.core.util.AppForegroundObserver
  import org.signal.core.util.PendingIntentFlags
-@@ -18,4 +19,5 @@ import org.signal.core.util.getDownloadManager
+ import org.signal.core.util.StreamUtil
+ import org.signal.core.util.getDownloadManager
  import org.signal.core.util.logging.Log
  import org.thoughtcrime.securesms.dependencies.AppDependencies
 +import org.thoughtcrime.securesms.events.WebRtcViewModel
  import org.thoughtcrime.securesms.jobs.ApkUpdateJob
  import org.thoughtcrime.securesms.keyvalue.SignalStore
-@@ -187,11 +189,11 @@ object ApkUpdateInstaller {
+ import org.thoughtcrime.securesms.util.FileUtils
+@@ -186,12 +188,12 @@ object ApkUpdateInstaller {
+   }
  
    private fun shouldAutoUpdate(): Boolean {
 -    // Once we have designs for allowing users to opt-out of auto-updates, we can re-enable this
@@ -88,10 +98,11 @@ index af21018..090d3d5 100644
    }
  }
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsActivity.kt
-index b37ef04..4c80f78 100644
+index b37ef04415..4c80f78b88 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsActivity.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsActivity.kt
-@@ -27,6 +27,17 @@ open class DSLSettingsActivity : PassphraseRequiredActivity() {
+@@ -26,8 +26,19 @@ open class DSLSettingsActivity : PassphraseRequiredActivity() {
+   protected lateinit var navController: NavController
      private set
  
 +  private var themeAppliedBeforeInflation = false
@@ -109,18 +120,22 @@ index b37ef04..4c80f78 100644
 +    }
  
      setContentView(R.layout.dsl_settings_activity)
-@@ -50,6 +61,4 @@ open class DSLSettingsActivity : PassphraseRequiredActivity() {
+ 
+@@ -49,8 +60,6 @@ open class DSLSettingsActivity : PassphraseRequiredActivity() {
+       navController = fragment.navController
      }
  
 -    dynamicTheme.onCreate(this)
 -
      onBackPressedDispatcher.addCallback(this, OnBackPressed())
    }
+ 
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
-index 599b8d0..9180109 100644
+index 599b8d0dc1..9180109df0 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
-@@ -521,19 +521,19 @@ private fun AppSettingsContent(
+@@ -520,21 +520,21 @@ private fun AppSettingsContent(
+           )
          }
  
 -        if (state.showInternalPreferences) {
@@ -153,11 +168,13 @@ index 599b8d0..9180109 100644
 +        if (state.showInternalPreferences) {
            item {
              Rows.TextRow(
+               text = stringResource(R.string.preferences__internal_preferences),
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsState.kt
-index 630e4f7..a4e7a87 100644
+index 630e4f79aa..a4e7a879b5 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsState.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsState.kt
-@@ -2,6 +2,6 @@ package org.thoughtcrime.securesms.components.settings.app
+@@ -1,8 +1,8 @@
+ package org.thoughtcrime.securesms.components.settings.app
  
  import androidx.compose.runtime.Immutable
 +import org.thoughtcrime.securesms.BuildConfig
@@ -165,36 +182,36 @@ index 630e4f7..a4e7a87 100644
 -import org.thoughtcrime.securesms.util.Environment
  import org.thoughtcrime.securesms.util.RemoteConfig
  
-@@ -16,5 +16,5 @@ data class AppSettingsState(
+ @Immutable
+@@ -15,7 +15,7 @@ data class AppSettingsState(
+   val clientDeprecated: Boolean,
    val showInternalPreferences: Boolean = RemoteConfig.internalUser,
    val showPayments: Boolean = SignalStore.payments.paymentsAvailability.showPaymentsMenu(),
 -  val showAppUpdates: Boolean = Environment.IS_NIGHTLY,
 +  val showAppUpdates: Boolean = BuildConfig.MANAGES_APP_UPDATES,
    val backupFailureState: BackupFailureState = BackupFailureState.NONE
  ) {
+   fun isRegisteredAndUpToDate(): Boolean {
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsViewModel.kt
-index 3972b61..af8509c 100644
+index be397caa6a..e62890b03d 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsViewModel.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsViewModel.kt
-@@ -14,4 +14,5 @@ import org.thoughtcrime.securesms.dependencies.AppDependencies
+@@ -13,2 +13,3 @@ import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
  import org.thoughtcrime.securesms.keyvalue.SignalStore
- import org.thoughtcrime.securesms.recipients.Recipient
 +import org.thoughtcrime.securesms.util.RemoteConfig
- import org.thoughtcrime.securesms.util.TextSecurePreferences
- import org.thoughtcrime.securesms.util.livedata.Store
-@@ -66,5 +67,6 @@ class AppSettingsViewModel : ViewModel() {
-       it.copy(
+ import org.thoughtcrime.securesms.recipients.Recipient
+@@ -65,3 +66,4 @@ class AppSettingsViewModel : ViewModel() {
          hasExpiredGiftBadge = SignalStore.inAppPayments.getExpiredGiftBadge() != null,
 -        backupFailureState = getBackupFailureState()
 +        backupFailureState = getBackupFailureState(),
 +        showInternalPreferences = RemoteConfig.internalUser
        )
-     }
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt
-index 2c0c55b..68247d9 100644
+index 2c0c55bbb9..68247d948c 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt
-@@ -11,6 +11,14 @@ import androidx.compose.foundation.layout.fillMaxWidth
+@@ -10,16 +10,36 @@ import androidx.compose.foundation.layout.Row
+ import androidx.compose.foundation.layout.fillMaxWidth
  import androidx.compose.foundation.layout.padding
  import androidx.compose.foundation.lazy.LazyColumn
 +import androidx.compose.foundation.text.InlineTextContent
@@ -209,7 +226,8 @@ index 2c0c55b..68247d9 100644
 +import androidx.compose.runtime.setValue
  import androidx.compose.ui.Alignment.Companion.CenterVertically
  import androidx.compose.ui.Modifier
-@@ -19,6 +27,18 @@ import androidx.compose.ui.platform.LocalContext
+ import androidx.compose.ui.graphics.vector.ImageVector
+ import androidx.compose.ui.platform.LocalContext
  import androidx.compose.ui.res.stringResource
  import androidx.compose.ui.res.vectorResource
 +import androidx.compose.ui.text.LinkAnnotation
@@ -228,7 +246,9 @@ index 2c0c55b..68247d9 100644
 +import com.google.android.material.dialog.MaterialAlertDialogBuilder
  import org.signal.core.ui.compose.ComposeFragment
  import org.signal.core.ui.compose.Dividers
-@@ -36,9 +56,13 @@ import org.thoughtcrime.securesms.util.navigation.safeNavigate
+ import org.signal.core.ui.compose.Rows
+@@ -35,11 +55,15 @@ import org.thoughtcrime.securesms.util.navigation.safeNavigate
+ 
  class HelpSettingsFragment : ComposeFragment() {
  
 +  private val viewModel: HelpSettingsViewModel by viewModels()
@@ -242,7 +262,9 @@ index 2c0c55b..68247d9 100644
 +    var versionTapCount by rememberSaveable { mutableIntStateOf(0) }
  
      Scaffolds.Settings(
-@@ -78,4 +102,16 @@ class HelpSettingsFragment : ComposeFragment() {
+       title = stringResource(R.string.preferences__help),
+@@ -77,6 +101,18 @@ class HelpSettingsFragment : ComposeFragment() {
+           Rows.TextRow(
              text = stringResource(R.string.HelpSettingsFragment__version),
              label = BuildConfig.VERSION_NAME,
 +            onClick = {
@@ -259,7 +281,9 @@ index 2c0c55b..68247d9 100644
 +            },
              onLongClick = {
                Util.copyToClipboard(context, BuildConfig.VERSION_NAME)
-@@ -85,6 +121,28 @@ class HelpSettingsFragment : ComposeFragment() {
+               Toast.makeText(context, R.string.HelpSettingsFragment__copied_to_clipboard, Toast.LENGTH_SHORT).show()
+@@ -84,8 +120,30 @@ class HelpSettingsFragment : ComposeFragment() {
+           )
          }
  
 +        item {
@@ -288,7 +312,9 @@ index 2c0c55b..68247d9 100644
 +            enabled = state.logEnabled,
              text = stringResource(id = R.string.HelpSettingsFragment__debug_log),
              onClick = {
-@@ -114,4 +172,40 @@ class HelpSettingsFragment : ComposeFragment() {
+               navController.safeNavigate(R.id.action_helpSettingsFragment_to_submitDebugLogActivity)
+@@ -113,6 +171,42 @@ class HelpSettingsFragment : ComposeFragment() {
+         }
  
          item {
 +          val externalLinkId = "vesper-website-icon"
@@ -329,7 +355,9 @@ index 2c0c55b..68247d9 100644
 +
            Row(
              modifier = Modifier
-@@ -121,11 +215,6 @@ class HelpSettingsFragment : ComposeFragment() {
+               .fillMaxWidth()
+@@ -120,17 +214,16 @@ class HelpSettingsFragment : ComposeFragment() {
+             verticalAlignment = CenterVertically
            ) {
              TextAndLabel(
 -              label = StringBuilder().apply {
@@ -343,7 +371,8 @@ index 2c0c55b..68247d9 100644
 +              inlineContent = inlineContent
              )
            }
-@@ -134,3 +223,7 @@ class HelpSettingsFragment : ComposeFragment() {
+         }
+       }
      }
    }
 +
@@ -353,7 +382,7 @@ index 2c0c55b..68247d9 100644
  }
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsViewModel.kt
 new file mode 100644
-index 0000000..99a298f
+index 0000000000..a26765a9aa
 --- /dev/null
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsViewModel.kt
 @@ -0,0 +1,53 @@
@@ -371,7 +400,7 @@ index 0000000..99a298f
 +import org.thoughtcrime.securesms.database.LogDatabase
 +import org.thoughtcrime.securesms.dependencies.AppDependencies
 +import org.thoughtcrime.securesms.util.RemoteConfig
-+import org.thoughtcrime.securesms.util.TextSecurePreferences
++import org.thoughtcrime.securesms.util.VesperLogPreferences
 +
 +class HelpSettingsViewModel : ViewModel() {
 +
@@ -381,7 +410,7 @@ index 0000000..99a298f
 +  val state: StateFlow<HelpSettingsState> = internalState
 +
 +  fun setLogEnabled(enabled: Boolean) {
-+    TextSecurePreferences.setLogEnabled(application, enabled)
++    VesperLogPreferences.setLogEnabled(application, enabled)
 +    Log.setLogging(enabled)
 +
 +    if (!enabled) {
@@ -406,26 +435,29 @@ index 0000000..99a298f
 +
 +  private fun getState(): HelpSettingsState {
 +    return HelpSettingsState(
-+      logEnabled = TextSecurePreferences.isLogEnabled(application)
++      logEnabled = VesperLogPreferences.isLogEnabled(application)
 +    )
 +  }
 +}
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/labs/LabsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/labs/LabsSettingsFragment.kt
-index 90939af..e2a968c 100644
+index 90939af9cb..e2a968c576 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/labs/LabsSettingsFragment.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/labs/LabsSettingsFragment.kt
-@@ -82,5 +82,5 @@ private fun LabsSettingsContent(
+@@ -81,7 +81,7 @@ private fun LabsSettingsContent(
+             modifier = Modifier.size(20.dp)
            )
            Text(
 -            text = "These are internal-only pre-release features. They are all in various unfinished states. They may need more polish, finalized designs, or cross-client compatibility before they can be released.",
 +            text = "These are experimental pre-release features. They are all in various unfinished states. They may need more polish, finalized designs, or cross-client compatibility before they can be released.",
              style = MaterialTheme.typography.bodyMedium,
              color = MaterialTheme.colorScheme.onSurfaceVariant,
+             modifier = Modifier.padding(start = 12.dp)
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ApkUpdateJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/ApkUpdateJob.kt
-index 4153c40..93da6ff 100644
+index 4153c40fbc..93da6ff198 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ApkUpdateJob.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ApkUpdateJob.kt
-@@ -18,9 +18,9 @@ import org.signal.core.util.requireLong
+@@ -17,11 +17,11 @@ import org.signal.core.util.requireInt
+ import org.signal.core.util.requireLong
  import org.signal.core.util.requireString
  import org.thoughtcrime.securesms.BuildConfig
 +import org.thoughtcrime.securesms.R
@@ -436,7 +468,9 @@ index 4153c40..93da6ff 100644
 -import org.thoughtcrime.securesms.util.Environment
  import org.thoughtcrime.securesms.util.FileUtils
  import java.io.FileInputStream
-@@ -83,6 +83,6 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
+ import java.io.IOException
+@@ -82,8 +82,8 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
+       Log.d(TAG, "Got descriptor: $updateDescriptor")
      }
  
 -    if (shouldUpdate(getCurrentAppVersionCode(), updateDescriptor, SignalStore.apkUpdate.lastApkUploadTime, Environment.IS_WEBSITE)) {
@@ -445,14 +479,18 @@ index 4153c40..93da6ff 100644
 +      Log.i(TAG, "Newer build available. Current: (versionCode: ${getCurrentAppVersionCode()}, buildTime: ${BuildConfig.BUILD_TIMESTAMP}), Update: (versionCode: ${updateDescriptor.versionCode}, buildTime: ${updateDescriptor.buildTimestamp}, uploadTime: ${updateDescriptor.uploadTimestamp})")
        val digest: ByteArray = Hex.fromStringCondensed(updateDescriptor.digest)
        val downloadStatus: DownloadStatus = getDownloadStatus(updateDescriptor.url, digest)
-@@ -98,5 +98,5 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
+ 
+@@ -97,7 +97,7 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
+         handleDownloadStart(updateDescriptor.url, updateDescriptor.versionName, digest, updateDescriptor.uploadTimestamp ?: 0)
        }
      } else {
 -      Log.d(TAG, "Version code is the same or older than our own. Current: (versionCode: ${getCurrentAppVersionCode()}, uploadTime: ${SignalStore.apkUpdate.lastApkUploadTime}), Update: (versionCode: ${updateDescriptor.versionCode}, uploadTime: ${updateDescriptor.uploadTimestamp})")
 +      Log.d(TAG, "Installed build is current. Current: (versionCode: ${getCurrentAppVersionCode()}, buildTime: ${BuildConfig.BUILD_TIMESTAMP}), Update: (versionCode: ${updateDescriptor.versionCode}, buildTime: ${updateDescriptor.buildTimestamp}, uploadTime: ${updateDescriptor.uploadTimestamp})")
      }
  
-@@ -162,6 +162,6 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
+     SignalStore.apkUpdate.lastSuccessfulCheck = System.currentTimeMillis()
+@@ -161,8 +161,8 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
+ 
      val downloadRequest = DownloadManager.Request(Uri.parse(uri)).apply {
        setAllowedNetworkTypes(DownloadManager.Request.NETWORK_WIFI)
 -      setTitle("Downloading Signal update")
@@ -461,7 +499,9 @@ index 4153c40..93da6ff 100644
 +      setDescription("Downloading ${context.getString(R.string.app_name)} $versionName")
        setDestinationInExternalFilesDir(context, null, "signal-update.apk")
        setNotificationVisibility(DownloadManager.Request.VISIBILITY_HIDDEN)
-@@ -207,12 +207,4 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
+     }
+@@ -206,14 +206,6 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
+     }
    }
  
 -  private fun shouldUpdate(currentVersionCode: Int, updateDescriptor: UpdateDescriptor, lastApkUploadTime: Long, isWebsite: Boolean): Boolean {
@@ -474,7 +514,9 @@ index 4153c40..93da6ff 100644
 -
    private data class UpdateDescriptor(
      @JsonProperty
-@@ -229,5 +221,8 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
+     val versionCode: Int = 0,
+@@ -228,7 +220,10 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
+     val digest: String? = null,
  
      @JsonProperty
 -    val uploadTimestamp: Long? = null
@@ -484,7 +526,9 @@ index 4153c40..93da6ff 100644
 +    val buildTimestamp: Long? = null
    )
  
-@@ -246,2 +241,16 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
+   private class DownloadStatus(val status: Status, val downloadId: Long) {
+@@ -245,3 +240,17 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
+     }
    }
  }
 +
@@ -502,18 +546,15 @@ index 4153c40..93da6ff 100644
 +      )
 +}
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.kt
-index 36b89fe..d931fdd 100644
+index 4c91beb219..9e5c24c148 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.kt
-@@ -57,4 +57,6 @@ class MiscellaneousValues internal constructor(store: KeyValueStore) : SignalSto
-     private const val LAST_APPLIED_PNI_CHANGE_SERVER_TIMESTAMP = "misc.last_applied_pni_change_server_timestamp"
+@@ -63,2 +63,4 @@ class MiscellaneousValues internal constructor(store: KeyValueStore, context: Co
      private const val LAST_MISSING_PLAY_SERVICES_FCM_VERIFICATION_TIME = "misc.last_missing_play_services_fcm_verification_time"
 +    private const val VESPER_INTERNAL_USER_OVERRIDE_SET = "misc.vesper_internal_user_override_set"
 +    private const val VESPER_INTERNAL_USER_OVERRIDE = "misc.vesper_internal_user_override"
      private const val LAST_PROCESSED_SHARE_DATA_TIMESTAMP = "misc.last_processed_share_data_timestamp"
-   }
-@@ -369,4 +371,28 @@ class MiscellaneousValues internal constructor(store: KeyValueStore) : SignalSto
-   var lastMissingPlayServicesFcmVerificationTime: Long by longValue(LAST_MISSING_PLAY_SERVICES_FCM_VERIFICATION_TIME, 0)
+@@ -451,2 +453,26 @@ class MiscellaneousValues internal constructor(store: KeyValueStore, context: Co
  
 +  var vesperInternalUserOverride: Boolean?
 +    get() {
@@ -540,12 +581,12 @@ index 36b89fe..d931fdd 100644
 +    }
 +
    /**
-    * High-water mark of the most recently consumed share payload, as set by
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
-index ab1def3..2b1a3e8 100644
+index ab1def357e..2b1a3e85b1 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
-@@ -98,7 +98,12 @@ object RemoteConfig {
+@@ -97,9 +97,14 @@ object RemoteConfig {
+   @Volatile
    var internalUserDisabled: Boolean = false
  
 +  @Volatile
@@ -558,7 +599,9 @@ index ab1def3..2b1a3e8 100644
 +
        val current = parseStoredConfig(SignalStore.remoteConfig.currentConfig)
        val pending = parseStoredConfig(SignalStore.remoteConfig.pendingConfig)
-@@ -116,4 +121,11 @@ object RemoteConfig {
+       val changes = computeChanges(current, pending)
+@@ -115,6 +120,13 @@ object RemoteConfig {
+     }
    }
  
 +  @JvmStatic
@@ -570,7 +613,9 @@ index ab1def3..2b1a3e8 100644
 +
    @JvmStatic
    fun refreshIfNecessary() {
-@@ -741,6 +753,8 @@ object RemoteConfig {
+     val timeSinceLastFetch = System.currentTimeMillis() - SignalStore.remoteConfig.lastFetchTime
+@@ -740,8 +752,10 @@ object RemoteConfig {
+     key = INTERNAL_USER_KEY,
      hotSwappable = true
    ) { value ->
 +    val override = internalUserOverride
@@ -579,11 +624,13 @@ index ab1def3..2b1a3e8 100644
 +      override != null -> override
        underTest -> value.asBoolean(false)
        Environment.isInternal() -> true
+       else -> value.asBoolean(false)
 diff --git a/app/src/main/res/drawable/reaction_pill_background.xml b/app/src/main/res/drawable/reaction_pill_background.xml
-index a547a80..6c1c88f 100644
+index a547a8078b..6c1c88f098 100644
 --- a/app/src/main/res/drawable/reaction_pill_background.xml
 +++ b/app/src/main/res/drawable/reaction_pill_background.xml
-@@ -2,5 +2,5 @@
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="utf-8"?>
  <shape xmlns:android="http://schemas.android.com/apk/res/android">
      <corners android:radius="1000dp" />
 -    <solid android:color="?attr/colorSurfaceVariant" />
@@ -591,10 +638,11 @@ index a547a80..6c1c88f 100644
      <stroke android:color="?attr/colorSurface" android:width="1dp" />
  </shape>
 diff --git a/app/src/main/res/drawable/reaction_pill_background_selected.xml b/app/src/main/res/drawable/reaction_pill_background_selected.xml
-index ead87f4..37279c6 100644
+index ead87f4275..37279c6f9a 100644
 --- a/app/src/main/res/drawable/reaction_pill_background_selected.xml
 +++ b/app/src/main/res/drawable/reaction_pill_background_selected.xml
-@@ -2,5 +2,5 @@
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="utf-8"?>
  <shape xmlns:android="http://schemas.android.com/apk/res/android">
      <corners android:radius="1000dp" />
 -    <solid android:color="@color/signal_colorSurfaceVariant_32_no_alpha" />
@@ -602,27 +650,31 @@ index ead87f4..37279c6 100644
      <stroke android:color="?attr/colorSurface" android:width="1dp" />
  </shape>
 diff --git a/app/src/main/res/layout/dsl_settings_toolbar.xml b/app/src/main/res/layout/dsl_settings_toolbar.xml
-index 8cf26a4..4435845 100644
+index 8cf26a497e..4435845403 100644
 --- a/app/src/main/res/layout/dsl_settings_toolbar.xml
 +++ b/app/src/main/res/layout/dsl_settings_toolbar.xml
-@@ -20,3 +20,3 @@
+@@ -19,4 +19,4 @@
+         app:titleTextAppearance="@style/Signal.Text.TitleLarge"
          tools:title="Settings" />
  
 -</merge>
 \ No newline at end of file
 +</merge>
 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
-index 4ccc525..badfdb6 100644
+index 1651bc1a01..e32edf7942 100644
 --- a/app/src/main/res/values/strings.xml
 +++ b/app/src/main/res/values/strings.xml
-@@ -4187,4 +4187,6 @@
+@@ -4090,6 +4090,8 @@
+ 
      <!-- Internal only preferences -->
      <string name="preferences__internal_preferences" translatable="false">Internal Preferences</string>
 +    <string name="HelpSettingsFragment__internal_settings_enabled" translatable="false">Internal settings enabled</string>
 +    <string name="HelpSettingsFragment__internal_settings_disabled" translatable="false">Internal settings disabled</string>
      <string name="preferences__internal_details" translatable="false">Internal Details</string>
      <string name="preferences__internal_stories_dialog_launcher" translatable="false">Stories dialog launcher</string>
-@@ -5728,4 +5730,7 @@
+ 
+@@ -5589,6 +5591,9 @@
+     <string name="HelpFragment__licenced_under_the_agplv3">Licensed under the GNU AGPLv3</string>
      <!-- Non-English translations should use "Signal is a nonprofit." instead, dropping the 501c3 reference. -->
      <string name="HelpSettingsFragment__signal_is_a_501c3">Signal is a 501c3 nonprofit</string>
 +    <string name="HelpSettingsFragment__vesper_messenger_by" translatable="false">Vesper Messenger by</string>
@@ -630,9 +682,10 @@ index 4ccc525..badfdb6 100644
 +    <string name="vesper_website_url" translatable="false">https://amber.systems/</string>
  
      <!-- DataAndStorageSettingsFragment -->
+     <string name="DataAndStorageSettingsFragment__media_quality">Media quality</string>
 diff --git a/app/src/test/java/org/thoughtcrime/securesms/jobs/ApkUpdateJobTest.kt b/app/src/test/java/org/thoughtcrime/securesms/jobs/ApkUpdateJobTest.kt
 new file mode 100644
-index 0000000..24bd3c5
+index 0000000000..24bd3c580e
 --- /dev/null
 +++ b/app/src/test/java/org/thoughtcrime/securesms/jobs/ApkUpdateJobTest.kt
 @@ -0,0 +1,34 @@
diff --git a/patches/0006-feat-add-installable-debug-build-variant.patch b/patches/0006-feat-add-installable-debug-build-variant.patch
index 48dd643..7585d24 100644
--- a/patches/0006-feat-add-installable-debug-build-variant.patch
+++ b/patches/0006-feat-add-installable-debug-build-variant.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Thu, 6 Aug 2026 07:45:10 +0000
-Subject: [PATCH 06/28] feat: add installable debug build variant
+Subject: [PATCH 06/29] feat: add installable debug build variant
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
diff --git a/patches/0007-feat-support-16-KB-devices-without-MobileCoin-paymen.patch b/patches/0007-feat-support-16-KB-devices-without-MobileCoin-paymen.patch
index bbd0a37..f8a47fe 100644
--- a/patches/0007-feat-support-16-KB-devices-without-MobileCoin-paymen.patch
+++ b/patches/0007-feat-support-16-KB-devices-without-MobileCoin-paymen.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Sat, 15 Aug 2026 08:31:55 +0000
-Subject: [PATCH 07/28] feat: support 16 KB devices without MobileCoin payments
+Subject: [PATCH 07/29] feat: support 16 KB devices without MobileCoin payments
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
diff --git a/patches/0008-fix-refine-Vesper-conversation-appearance.patch b/patches/0008-fix-refine-Vesper-conversation-appearance.patch
index a7f22ac..58c7846 100644
--- a/patches/0008-fix-refine-Vesper-conversation-appearance.patch
+++ b/patches/0008-fix-refine-Vesper-conversation-appearance.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Sat, 15 Aug 2026 08:32:16 +0000
-Subject: [PATCH 08/28] fix: refine Vesper conversation appearance
+Subject: [PATCH 08/29] fix: refine Vesper conversation appearance
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
diff --git a/patches/0009-chore-clarify-licensing-and-interface-copy.patch b/patches/0009-chore-clarify-licensing-and-interface-copy.patch
index 8178ebb..fc51cb5 100644
--- a/patches/0009-chore-clarify-licensing-and-interface-copy.patch
+++ b/patches/0009-chore-clarify-licensing-and-interface-copy.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Sat, 15 Aug 2026 08:32:53 +0000
-Subject: [PATCH 09/28] chore: clarify licensing and interface copy
+Subject: [PATCH 09/29] chore: clarify licensing and interface copy
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
diff --git a/patches/0010-fix-make-Vesper-build-identity-deterministic.patch b/patches/0010-fix-make-Vesper-build-identity-deterministic.patch
index 5c28680..b682a1b 100644
--- a/patches/0010-fix-make-Vesper-build-identity-deterministic.patch
+++ b/patches/0010-fix-make-Vesper-build-identity-deterministic.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Sat, 15 Aug 2026 08:33:23 +0000
-Subject: [PATCH 10/28] fix: make Vesper build identity deterministic
+Subject: [PATCH 10/29] fix: make Vesper build identity deterministic
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
diff --git a/patches/0011-feat-complete-Vesper-theme-controls.patch b/patches/0011-feat-complete-Vesper-theme-controls.patch
index 6eb9701..905ea87 100644
--- a/patches/0011-feat-complete-Vesper-theme-controls.patch
+++ b/patches/0011-feat-complete-Vesper-theme-controls.patch
@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Thu, 6 Aug 2026 07:45:11 +0000
-Subject: [PATCH 11/28] feat: complete Vesper theme controls
+Subject: [PATCH 11/29] feat: complete Vesper theme controls
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
  .../appearance/AppearanceSettingsFragment.kt  |  17 +-
  .../app/appearance/AppearanceSettingsState.kt |   1 +
  .../appearance/AppearanceSettingsViewModel.kt |   6 +
- .../app/privacy/PrivacySettingsFragment.kt    | 102 ----
+ .../app/privacy/PrivacySettingsFragment.kt    | 101 ----
  .../app/privacy/PrivacySettingsState.kt       |   1 -
  .../app/privacy/PrivacySettingsViewModel.kt   |   6 -
  .../conversation/colors/ChatColorsPalette.kt  |   2 +-
@@ -36,7 +36,7 @@ Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com
  .../res/values/signal_original_themes.xml     | 474 ++++++++++++++++++
  app/src/main/res/values/themes.xml            |   6 +-
  .../core/ui/compose/theme/SignalTheme.kt      |  90 +++-
- 31 files changed, 704 insertions(+), 144 deletions(-)
+ 31 files changed, 704 insertions(+), 143 deletions(-)
  create mode 100644 app/src/main/res/values/signal_original_themes.xml
 
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsFragment.kt
@@ -125,11 +125,10 @@ index 131b3f3426..fd74f0a97b 100644
        SignalStore.settings.messageFontSize,
        PlainTextKeyValueStore.language,
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
-index 0f84457801..f2c088ebe6 100644
+index 7cd6967831..762b4091db 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
-@@ -1,31 +1,20 @@
- package org.thoughtcrime.securesms.components.settings.app.privacy
+@@ -2,7 +2,3 @@ package org.thoughtcrime.securesms.components.settings.app.privacy
  
 -import android.content.ActivityNotFoundException
  import android.content.Intent
@@ -137,41 +136,24 @@ index 0f84457801..f2c088ebe6 100644
 -import android.os.Bundle
 -import android.provider.Settings
  import android.text.SpannableStringBuilder
- import android.view.View
- import android.view.WindowManager
- import android.widget.TextView
+@@ -12,6 +8,2 @@ import android.widget.TextView
  import android.widget.Toast
 -import androidx.activity.result.ActivityResultLauncher
 -import androidx.biometric.BiometricManager
 -import androidx.biometric.BiometricPrompt
 -import androidx.biometric.BiometricPrompt.PromptInfo
  import androidx.lifecycle.ViewModelProvider
- import androidx.navigation.Navigation
- import androidx.navigation.fragment.NavHostFragment
--import androidx.navigation.fragment.navArgs
- import androidx.preference.PreferenceManager
- import com.google.android.material.dialog.MaterialAlertDialogBuilder
- import com.google.android.material.snackbar.Snackbar
- import org.signal.core.ui.util.ThemeUtil
- import org.signal.core.util.ServiceUtil
+@@ -25,4 +17,2 @@ import org.signal.core.util.ServiceUtil
  import org.signal.core.util.logging.Log
 -import org.thoughtcrime.securesms.BiometricDeviceAuthentication
 -import org.thoughtcrime.securesms.BiometricDeviceLockContract
  import org.thoughtcrime.securesms.PassphraseChangeActivity
- import org.thoughtcrime.securesms.R
- import org.thoughtcrime.securesms.components.TimeDurationPickerDialog
-@@ -56,8 +45,6 @@ private val TAG = Log.tag(PrivacySettingsFragment::class.java)
- class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privacy) {
- 
+@@ -56,4 +46,2 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
    private lateinit var viewModel: PrivacySettingsViewModel
 -  private lateinit var biometricAuth: BiometricDeviceAuthentication
 -  private lateinit var biometricDeviceLockLauncher: ActivityResultLauncher<String>
  
-   private val incognitoSummary: CharSequence by lazy {
-     SpannableStringBuilder(getString(R.string.preferences__this_setting_is_not_a_guarantee))
-@@ -69,35 +56,11 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
-       )
-   }
+@@ -69,21 +57,2 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
  
 -  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 -    super.onViewCreated(view, savedInstanceState)
@@ -193,9 +175,7 @@ index 0f84457801..f2c088ebe6 100644
 -  }
 -
    override fun onResume() {
-     super.onResume()
-     viewModel.refreshBlockedCount()
-   }
+@@ -93,7 +62,2 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
  
 -  override fun onPause() {
 -    super.onPause()
@@ -203,27 +183,19 @@ index 0f84457801..f2c088ebe6 100644
 -  }
 -
    override fun bindAdapter(adapter: MappingAdapter) {
-     adapter.registerFactory(ValueClickPreference::class.java, LayoutFactory(::ValueClickPreferenceViewHolder, R.layout.value_click_preference_item))
- 
-@@ -105,15 +68,9 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
-     val repository = PrivacySettingsRepository()
-     val factory = PrivacySettingsViewModel.Factory(sharedPreferences, repository)
+@@ -104,4 +68,2 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
      viewModel = ViewModelProvider(this, factory)[PrivacySettingsViewModel::class.java]
 -    val args: PrivacySettingsFragmentArgs by navArgs()
 -    var showPaymentLock = true
  
-     viewModel.state.observe(viewLifecycleOwner) { state ->
+@@ -109,6 +71,2 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
        adapter.submitList(getConfiguration(state).toMappingModelList())
 -      if (args.showPaymentLock && showPaymentLock) {
 -        showPaymentLock = false
 -        recyclerView?.scrollToPosition(adapter.itemCount - 1)
 -      }
      }
-   }
- 
-@@ -313,25 +270,6 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
- 
-       dividerPref()
+@@ -314,21 +272,2 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
  
 -      sectionHeaderPref(R.string.preferences_app_protection__payments)
 -
@@ -245,11 +217,7 @@ index 0f84457801..f2c088ebe6 100644
 -      dividerPref()
 -
        clickPref(
-         title = DSLSettingsText.from(R.string.preferences__advanced),
-         summary = DSLSettingsText.from(R.string.PrivacySettingsFragment__signal_message_and_calls),
-@@ -353,29 +291,6 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
-       .show()
-   }
+@@ -354,25 +293,2 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
  
 -  private fun showGoToPhoneSettings() {
 -    MaterialAlertDialogBuilder(requireContext()).apply {
@@ -275,11 +243,7 @@ index 0f84457801..f2c088ebe6 100644
 -  }
 -
    private fun getScreenLockInactivityTimeoutSummary(enabledScreenLock: Boolean, timeoutSeconds: Long): String {
-     return if (!enabledScreenLock) {
-       getString(R.string.ScreenLockSettingsFragment__off)
-@@ -415,21 +330,4 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
-       valueText.contentDescription = model.contentDescription.resolve(context)
-     }
+@@ -416,19 +332,2 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
    }
 -
 -  inner class BiometricAuthenticationListener : BiometricPrompt.AuthenticationCallback() {
@@ -300,10 +264,10 @@ index 0f84457801..f2c088ebe6 100644
 -  }
  }
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsState.kt
-index 5af9ac70d4..3c4e4ed366 100644
+index 4ef6643fb0..549f0f7423 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsState.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsState.kt
-@@ -9,7 +9,6 @@ data class PrivacySettingsState(
+@@ -10,7 +10,6 @@ data class PrivacySettingsState(
    val screenLockActivityTimeout: Long,
    val screenSecurity: Boolean,
    val incognitoKeyboard: Boolean,
@@ -312,12 +276,10 @@ index 5af9ac70d4..3c4e4ed366 100644
    val isObsoletePasswordTimeoutEnabled: Boolean,
    val obsoletePasswordTimeout: Int,
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsViewModel.kt
-index 23ac7d4a24..bd9d7b1d5a 100644
+index ad5ceeafd3..bbb78a3b30 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsViewModel.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsViewModel.kt
-@@ -52,11 +52,6 @@ class PrivacySettingsViewModel(
-     refresh()
-   }
+@@ -45,7 +45,2 @@ class PrivacySettingsViewModel(
  
 -  fun togglePaymentLock(enable: Boolean) {
 -    SignalStore.payments.paymentLock = enable
@@ -325,16 +287,9 @@ index 23ac7d4a24..bd9d7b1d5a 100644
 -  }
 -
    fun setObsoletePasswordTimeoutEnabled(enabled: Boolean) {
-     SignalStore.settings.passphraseTimeoutEnabled = enabled
-     refresh()
-@@ -81,7 +76,6 @@ class PrivacySettingsViewModel(
-       screenLockActivityTimeout = SignalStore.settings.screenLockTimeout,
-       screenSecurity = TextSecurePreferences.isScreenSecurityEnabled(AppDependencies.application),
-       incognitoKeyboard = TextSecurePreferences.isIncognitoKeyboardEnabled(AppDependencies.application),
+@@ -81,2 +76,1 @@ class PrivacySettingsViewModel(
 -      paymentLock = SignalStore.payments.paymentLock,
        isObsoletePasswordEnabled = !SignalStore.settings.passphraseDisabled,
-       isObsoletePasswordTimeoutEnabled = SignalStore.settings.passphraseTimeoutEnabled,
-       obsoletePasswordTimeout = SignalStore.settings.passphraseTimeout,
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ChatColorsPalette.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ChatColorsPalette.kt
 index b61464abe2..6f62d279c1 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ChatColorsPalette.kt
@@ -349,10 +304,10 @@ index b61464abe2..6f62d279c1 100644
  
      // endregion
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.kt
-index f63a089142..9ec5ec4be3 100644
+index d6441d2d1c..8b95bd1b3f 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.kt
-@@ -36,6 +36,7 @@ class SettingsValues internal constructor(store: KeyValueStore, context: Context
+@@ -39,6 +39,7 @@ class SettingsValues internal constructor(store: KeyValueStore, private val cont
      const val THREAD_TRIM_ENABLED = "pref_trim_threads"
  
      const val DYNAMIC_COLORS_ENABLED = "settings.dynamicColors"
@@ -360,7 +315,7 @@ index f63a089142..9ec5ec4be3 100644
      private const val IGNORE_REMOTE_DELETE = "settings.ignore.remote.delete"
      const val THEME = "settings.theme"
      const val MESSAGE_FONT_SIZE = "settings.message.font.size"
-@@ -116,6 +117,7 @@ class SettingsValues internal constructor(store: KeyValueStore, context: Context
+@@ -138,6 +139,7 @@ class SettingsValues internal constructor(store: KeyValueStore, private val cont
      THREAD_TRIM_ENABLED,
      THEME,
      DYNAMIC_COLORS_ENABLED,
@@ -368,7 +323,7 @@ index f63a089142..9ec5ec4be3 100644
      IGNORE_REMOTE_DELETE,
      MESSAGE_FONT_SIZE,
      PREFER_SYSTEM_EMOJI,
-@@ -209,6 +211,13 @@ class SettingsValues internal constructor(store: KeyValueStore, context: Context
+@@ -235,6 +237,13 @@ class SettingsValues internal constructor(store: KeyValueStore, private val cont
    val isDynamicColorsEnabled: Boolean
      get() = getBoolean(DYNAMIC_COLORS_ENABLED, true)
  
@@ -665,7 +620,7 @@ index d58facf745..fd13072f77 100644
 \ No newline at end of file
 +</shape>
 diff --git a/app/src/main/res/layout/v2_conversation_fragment.xml b/app/src/main/res/layout/v2_conversation_fragment.xml
-index a09ad5b378..bc1ec771cf 100644
+index 5e57c2c90c..99c1ec1259 100644
 --- a/app/src/main/res/layout/v2_conversation_fragment.xml
 +++ b/app/src/main/res/layout/v2_conversation_fragment.xml
 @@ -104,13 +104,13 @@
diff --git a/patches/0012-fix-stabilize-identity-and-media-controls.patch b/patches/0012-fix-stabilize-identity-and-media-controls.patch
index 75c2565..62003e2 100644
--- a/patches/0012-fix-stabilize-identity-and-media-controls.patch
+++ b/patches/0012-fix-stabilize-identity-and-media-controls.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Thu, 6 Aug 2026 07:45:11 +0000
-Subject: [PATCH 12/28] fix: stabilize identity and media controls
+Subject: [PATCH 12/29] fix: stabilize identity and media controls
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
diff --git a/patches/0013-fix-theme-media-control-backgrounds.patch b/patches/0013-fix-theme-media-control-backgrounds.patch
index 51c60a2..860c49e 100644
--- a/patches/0013-fix-theme-media-control-backgrounds.patch
+++ b/patches/0013-fix-theme-media-control-backgrounds.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Thu, 6 Aug 2026 07:45:11 +0000
-Subject: [PATCH 13/28] fix: theme media control backgrounds
+Subject: [PATCH 13/29] fix: theme media control backgrounds
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
diff --git a/patches/0014-feat-integrate-Vesper-logo-and-wordmark.patch b/patches/0014-feat-integrate-Vesper-logo-and-wordmark.patch
index ae09abe..9fe56c6 100644
--- a/patches/0014-feat-integrate-Vesper-logo-and-wordmark.patch
+++ b/patches/0014-feat-integrate-Vesper-logo-and-wordmark.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Thu, 6 Aug 2026 07:45:11 +0000
-Subject: [PATCH 14/28] feat: integrate Vesper logo and wordmark
+Subject: [PATCH 14/29] feat: integrate Vesper logo and wordmark
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
diff --git a/patches/0015-feat-use-profile-avatar-as-main-menu-trigger.patch b/patches/0015-feat-use-profile-avatar-as-main-menu-trigger.patch
index db301ba..1f72188 100644
--- a/patches/0015-feat-use-profile-avatar-as-main-menu-trigger.patch
+++ b/patches/0015-feat-use-profile-avatar-as-main-menu-trigger.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Thu, 6 Aug 2026 07:45:12 +0000
-Subject: [PATCH 15/28] feat: use profile avatar as main menu trigger
+Subject: [PATCH 15/29] feat: use profile avatar as main menu trigger
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
diff --git a/patches/0016-fix-use-Vesper-icon-on-Android-splash-screen.patch b/patches/0016-fix-use-Vesper-icon-on-Android-splash-screen.patch
index e70931a..f0a405f 100644
--- a/patches/0016-fix-use-Vesper-icon-on-Android-splash-screen.patch
+++ b/patches/0016-fix-use-Vesper-icon-on-Android-splash-screen.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Thu, 6 Aug 2026 07:45:12 +0000
-Subject: [PATCH 16/28] fix: use Vesper icon on Android splash screen
+Subject: [PATCH 16/29] fix: use Vesper icon on Android splash screen
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
diff --git a/patches/0017-feat-add-Vesper-author-verification-badge.patch b/patches/0017-feat-add-Vesper-author-verification-badge.patch
index 7ee2a96..ad4be03 100644
--- a/patches/0017-feat-add-Vesper-author-verification-badge.patch
+++ b/patches/0017-feat-add-Vesper-author-verification-badge.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Thu, 6 Aug 2026 07:45:12 +0000
-Subject: [PATCH 17/28] feat: add Vesper author verification badge
+Subject: [PATCH 17/29] feat: add Vesper author verification badge
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
diff --git a/patches/0018-fix-theme-automatic-message-bubbles.patch b/patches/0018-fix-theme-automatic-message-bubbles.patch
index 35d5a66..5381b1d 100644
--- a/patches/0018-fix-theme-automatic-message-bubbles.patch
+++ b/patches/0018-fix-theme-automatic-message-bubbles.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Thu, 6 Aug 2026 07:45:12 +0000
-Subject: [PATCH 18/28] fix: theme automatic message bubbles
+Subject: [PATCH 18/29] fix: theme automatic message bubbles
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
diff --git a/patches/0019-feat-load-shared-Vesper-account-configuration.patch b/patches/0019-feat-load-shared-Vesper-account-configuration.patch
index be93641..79e5832 100644
--- a/patches/0019-feat-load-shared-Vesper-account-configuration.patch
+++ b/patches/0019-feat-load-shared-Vesper-account-configuration.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Thu, 6 Aug 2026 07:45:12 +0000
-Subject: [PATCH 19/28] feat: load shared Vesper account configuration
+Subject: [PATCH 19/29] feat: load shared Vesper account configuration
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
@@ -20,64 +20,38 @@ Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com
  create mode 100644 app/src/test/java/org/thoughtcrime/securesms/util/VesperConfigTest.kt
 
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
-index 857ad28..a19de6c 100644
+index d83547e67c..7c6c946ce0 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
 +++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
-@@ -135,6 +135,7 @@ import org.thoughtcrime.securesms.util.SignalUncaughtExceptionHandler;
- import org.thoughtcrime.securesms.util.SqlCipherLogTarget;
- import org.thoughtcrime.securesms.util.TextSecurePreferences;
+@@ -136,2 +136,3 @@ import org.thoughtcrime.securesms.util.SqlCipherLogTarget;
  import org.thoughtcrime.securesms.util.VersionTracker;
 +import org.thoughtcrime.securesms.util.VesperConfig;
  import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
- import org.whispersystems.signalservice.api.websocket.SignalWebSocket;
- 
-@@ -211,6 +212,7 @@ public class ApplicationContext extends Application implements AppForegroundObse
-                 }
-               })
+@@ -212,2 +213,3 @@ public class ApplicationContext extends Application implements AppForegroundObse
                .addBlocking("blob-provider", this::initializeBlobProvider)
 +              .addBlocking("vesper-config", VesperConfig::init)
                .addBlocking("remote-config", RemoteConfig::init)
-               .addBlocking("ring-rtc", this::initializeRingRtc)
-               .addBlocking("glide", () -> SignalGlideModule.setRegisterGlideComponents(new SignalGlideComponents()))
-@@ -231,6 +233,7 @@ public class ApplicationContext extends Application implements AppForegroundObse
-               .addNonBlocking(StorageSyncHelper::scheduleRoutineSync)
-               .addNonBlocking(this::beginJobLoop)
+@@ -232,2 +234,3 @@ public class ApplicationContext extends Application implements AppForegroundObse
                .addNonBlocking(EmojiSource::refresh)
 +              .addNonBlocking(() -> VesperConfig.refreshIfNecessary(RemoteConfig.internalUser()))
                .addNonBlocking(() -> AppDependencies.getGiphyMp4Cache().onAppStart(this))
-               .addNonBlocking(AppDependencies::getBillingApi)
-               .addNonBlocking(this::ensureProfileUploaded)
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStore.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStore.kt
-index 15d1e05..420764e 100644
+index 210825d157..f9ff47eba5 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStore.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStore.kt
-@@ -15,6 +15,7 @@ class SignalStore(context: Application, private val store: KeyValueStore) {
-   val registrationValues = RegistrationValues(store)
-   val pinValues = PinValues(store)
+@@ -17,2 +17,3 @@ class SignalStore(context: Application, private val store: KeyValueStore) {
    val remoteConfigValues = RemoteConfigValues(store)
 +  val vesperConfigValues = VesperConfigValues(store)
    val storageServiceValues = StorageServiceValues(store)
-   val uiHintValues = UiHintValues(store)
-   val tooltipValues = TooltipValues(store)
-@@ -62,6 +63,7 @@ class SignalStore(context: Application, private val store: KeyValueStore) {
-       registration.onFirstEverAppLaunch()
-       pin.onFirstEverAppLaunch()
+@@ -64,2 +65,3 @@ class SignalStore(context: Application, private val store: KeyValueStore) {
        remoteConfig.onFirstEverAppLaunch()
 +      vesperConfig.onFirstEverAppLaunch()
        storageService.onFirstEverAppLaunch()
-       uiHints.onFirstEverAppLaunch()
-       tooltips.onFirstEverAppLaunch()
-@@ -96,6 +98,7 @@ class SignalStore(context: Application, private val store: KeyValueStore) {
-           registration.keysToIncludeInBackup +
-           pin.keysToIncludeInBackup +
+@@ -98,2 +100,3 @@ class SignalStore(context: Application, private val store: KeyValueStore) {
            remoteConfig.keysToIncludeInBackup +
 +          vesperConfig.keysToIncludeInBackup +
            storageService.keysToIncludeInBackup +
-           uiHints.keysToIncludeInBackup +
-           tooltips.keysToIncludeInBackup +
-@@ -172,6 +175,11 @@ class SignalStore(context: Application, private val store: KeyValueStore) {
-     val remoteConfig: RemoteConfigValues
-       get() = instance!!.remoteConfigValues
+@@ -175,2 +178,7 @@ class SignalStore(context: Application, private val store: KeyValueStore) {
  
 +    @JvmStatic
 +    @get:JvmName("vesperConfig")
@@ -85,11 +59,9 @@ index 15d1e05..420764e 100644
 +      get() = instance!!.vesperConfigValues
 +
      @JvmStatic
-     @get:JvmName("storageService")
-     val storageService: StorageServiceValues
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/VesperConfigValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/VesperConfigValues.kt
 new file mode 100644
-index 0000000..a1a8581
+index 0000000000..a1a8581f66
 --- /dev/null
 +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/VesperConfigValues.kt
 @@ -0,0 +1,27 @@
@@ -121,7 +93,7 @@ index 0000000..a1a8581
 +  var lastFetchTime: Long by longValue(LAST_FETCH_TIME, 0)
 +}
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/VesperVerifiedRecipients.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/VesperVerifiedRecipients.kt
-index ebaf08f..d7d6e08 100644
+index ebaf08f5ee..d7d6e08ed1 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/VesperVerifiedRecipients.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/VesperVerifiedRecipients.kt
 @@ -6,6 +6,8 @@
@@ -148,7 +120,7 @@ index ebaf08f..d7d6e08 100644
    }
  }
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt
-index 034290c..65c081a 100644
+index 034290c64c..65c081a5f4 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt
 @@ -30,6 +30,7 @@ import androidx.compose.runtime.remember
@@ -228,7 +200,7 @@ index 034290c..65c081a 100644
          .padding(end = 16.dp)
          .size(20.dp)
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
-index 2b1a3e8..44ceed5 100644
+index 2b1a3e85b1..44ceed51b5 100644
 --- a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
 +++ b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
 @@ -80,7 +80,7 @@ object RemoteConfig {
@@ -257,7 +229,7 @@ index 2b1a3e8..44ceed5 100644
          initLock.withLock {
 diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/VesperConfig.kt b/app/src/main/java/org/thoughtcrime/securesms/util/VesperConfig.kt
 new file mode 100644
-index 0000000..b992683
+index 0000000000..b992683286
 --- /dev/null
 +++ b/app/src/main/java/org/thoughtcrime/securesms/util/VesperConfig.kt
 @@ -0,0 +1,237 @@
@@ -499,7 +471,7 @@ index 0000000..b992683
 +  }
 +}
 diff --git a/app/src/test/java/org/thoughtcrime/securesms/recipients/VesperVerifiedRecipientsTest.kt b/app/src/test/java/org/thoughtcrime/securesms/recipients/VesperVerifiedRecipientsTest.kt
-index cabe899..00c8acd 100644
+index cabe8990a8..00c8acd6c3 100644
 --- a/app/src/test/java/org/thoughtcrime/securesms/recipients/VesperVerifiedRecipientsTest.kt
 +++ b/app/src/test/java/org/thoughtcrime/securesms/recipients/VesperVerifiedRecipientsTest.kt
 @@ -7,17 +7,35 @@ package org.thoughtcrime.securesms.recipients
@@ -545,7 +517,7 @@ index cabe899..00c8acd 100644
    @Test
 diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/VesperConfigTest.kt b/app/src/test/java/org/thoughtcrime/securesms/util/VesperConfigTest.kt
 new file mode 100644
-index 0000000..e5ca6ea
+index 0000000000..e5ca6ea4dd
 --- /dev/null
 +++ b/app/src/test/java/org/thoughtcrime/securesms/util/VesperConfigTest.kt
 @@ -0,0 +1,107 @@
diff --git a/patches/0020-fix-adapt-dynamic-theme-to-Signal-v8.21-edge-to-edge.patch b/patches/0020-fix-adapt-dynamic-theme-to-Signal-v8.21-edge-to-edge.patch
index 58c366d..343692d 100644
--- a/patches/0020-fix-adapt-dynamic-theme-to-Signal-v8.21-edge-to-edge.patch
+++ b/patches/0020-fix-adapt-dynamic-theme-to-Signal-v8.21-edge-to-edge.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Thu, 6 Aug 2026 07:45:12 +0000
-Subject: [PATCH 20/28] fix: adapt dynamic theme to Signal v8.21 edge-to-edge
+Subject: [PATCH 20/29] fix: adapt dynamic theme to Signal v8.21 edge-to-edge
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
diff --git a/patches/0021-feat-add-backup-subscription-diagnostics.patch b/patches/0021-feat-add-backup-subscription-diagnostics.patch
index 9ccdfda..623061d 100644
--- a/patches/0021-feat-add-backup-subscription-diagnostics.patch
+++ b/patches/0021-feat-add-backup-subscription-diagnostics.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Tue, 11 Aug 2026 10:53:42 +0000
-Subject: [PATCH 21/28] feat: add backup subscription diagnostics
+Subject: [PATCH 21/29] feat: add backup subscription diagnostics
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
diff --git a/patches/0022-fix-isolate-backup-diagnostics-actions.patch b/patches/0022-fix-isolate-backup-diagnostics-actions.patch
index 2475247..d66ad73 100644
--- a/patches/0022-fix-isolate-backup-diagnostics-actions.patch
+++ b/patches/0022-fix-isolate-backup-diagnostics-actions.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Tue, 11 Aug 2026 11:21:16 +0000
-Subject: [PATCH 22/28] fix: isolate backup diagnostics actions
+Subject: [PATCH 22/29] fix: isolate backup diagnostics actions
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
diff --git a/patches/0023-fix-apply-profile-theme-before-window-creation.patch b/patches/0023-fix-apply-profile-theme-before-window-creation.patch
index 9e74aa1..2d51372 100644
--- a/patches/0023-fix-apply-profile-theme-before-window-creation.patch
+++ b/patches/0023-fix-apply-profile-theme-before-window-creation.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Sun, 16 Aug 2026 13:57:30 +0000
-Subject: [PATCH 23/28] fix: apply profile theme before window creation
+Subject: [PATCH 23/29] fix: apply profile theme before window creation
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 ---
diff --git a/patches/0024-fix-preserve-public-Vesper-labs-access.patch b/patches/0024-fix-preserve-public-Vesper-labs-access.patch
index 2aa9893..0932295 100644
--- a/patches/0024-fix-preserve-public-Vesper-labs-access.patch
+++ b/patches/0024-fix-preserve-public-Vesper-labs-access.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: amber <amber@flourish.ch>
 Date: Fri, 21 Aug 2026 14:29:19 +0000
-Subject: [PATCH 24/28] fix: preserve public Vesper labs access
+Subject: [PATCH 24/29] fix: preserve public Vesper labs access
 
 Signed-off-by: amber <amber@flourish.ch>
 ---
diff --git a/patches/0025-test-cover-Vesper-settings-after-upstream-Kotlin-mig.patch b/patches/0025-test-cover-Vesper-settings-after-upstream-Kotlin-mig.patch
index 49b8920..b3e8544 100644
--- a/patches/0025-test-cover-Vesper-settings-after-upstream-Kotlin-mig.patch
+++ b/patches/0025-test-cover-Vesper-settings-after-upstream-Kotlin-mig.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: amber <amber@flourish.ch>
 Date: Tue, 15 Sep 2026 15:51:40 +0000
-Subject: [PATCH 25/28] test: cover Vesper settings after upstream Kotlin
+Subject: [PATCH 25/29] test: cover Vesper settings after upstream Kotlin
  migration
 
 Signed-off-by: amber <amber@flourish.ch>
diff --git a/patches/0026-fix-adapt-backup-diagnostics-to-Kotlin-subscription-.patch b/patches/0026-fix-adapt-backup-diagnostics-to-Kotlin-subscription-.patch
index 107d872..fc109c3 100644
--- a/patches/0026-fix-adapt-backup-diagnostics-to-Kotlin-subscription-.patch
+++ b/patches/0026-fix-adapt-backup-diagnostics-to-Kotlin-subscription-.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Wed, 16 Sep 2026 12:49:14 +0000
-Subject: [PATCH 26/28] fix: adapt backup diagnostics to Kotlin subscription
+Subject: [PATCH 26/29] fix: adapt backup diagnostics to Kotlin subscription
  response
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
diff --git a/patches/0027-test-initialise-plaintext-settings-before-profile-ac.patch b/patches/0027-test-initialise-plaintext-settings-before-profile-ac.patch
index 3e92b09..05eebef 100644
--- a/patches/0027-test-initialise-plaintext-settings-before-profile-ac.patch
+++ b/patches/0027-test-initialise-plaintext-settings-before-profile-ac.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Vesper Materializer <vesper-materializer@users.noreply.github.com>
 Date: Wed, 16 Sep 2026 13:00:08 +0000
-Subject: [PATCH 27/28] test: initialise plaintext settings before profile
+Subject: [PATCH 27/29] test: initialise plaintext settings before profile
  activity
 
 Signed-off-by: Vesper Materializer <vesper-materializer@users.noreply.github.com>
diff --git a/patches/0028-test-isolate-shared-Vesper-account-configuration.patch b/patches/0028-test-isolate-shared-Vesper-account-configuration.patch
index d194347..570e4a9 100644
--- a/patches/0028-test-isolate-shared-Vesper-account-configuration.patch
+++ b/patches/0028-test-isolate-shared-Vesper-account-configuration.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: amber <amber@flourish.ch>
 Date: Wed, 30 Sep 2026 06:10:26 +0000
-Subject: [PATCH 28/28] test: isolate shared Vesper account configuration
+Subject: [PATCH 28/29] test: isolate shared Vesper account configuration
 
 Reset process-wide configuration after each test as well as before it. Otherwise the cached-override test can leave android.internalUser forced true for the upstream static-value checks. Exercise the actual JUnit lifecycle to make the regression independent of test ordering.
 
diff --git a/patches/0029-test-preserve-Vesper-logging-preferences-across-upst.patch b/patches/0029-test-preserve-Vesper-logging-preferences-across-upst.patch
new file mode 100644
index 0000000..24875a7
--- /dev/null
+++ b/patches/0029-test-preserve-Vesper-logging-preferences-across-upst.patch
@@ -0,0 +1,61 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: amber <amber@flourish.ch>
+Date: Fri, 2 Oct 2026 06:44:02 +0000
+Subject: [PATCH 29/29] test: preserve Vesper logging preferences across
+ upstream migration
+
+Signed-off-by: amber <amber@flourish.ch>
+---
+ .../util/VesperLogPreferencesTest.kt          | 43 +++++++++++++++++++
+ 1 file changed, 43 insertions(+)
+ create mode 100644 app/src/test/java/org/thoughtcrime/securesms/util/VesperLogPreferencesTest.kt
+
+diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/VesperLogPreferencesTest.kt b/app/src/test/java/org/thoughtcrime/securesms/util/VesperLogPreferencesTest.kt
+new file mode 100644
+index 0000000..5e38b91
+--- /dev/null
++++ b/app/src/test/java/org/thoughtcrime/securesms/util/VesperLogPreferencesTest.kt
+@@ -0,0 +1,43 @@
++/*
++ * Copyright 2026 Vesper contributors
++ * SPDX-License-Identifier: AGPL-3.0-only
++ */
++package org.thoughtcrime.securesms.util
++
++import android.app.Application
++import androidx.preference.PreferenceManager
++import org.junit.Assert.assertFalse
++import org.junit.Assert.assertTrue
++import org.junit.Before
++import org.junit.Test
++import org.junit.runner.RunWith
++import org.robolectric.RobolectricTestRunner
++import org.robolectric.RuntimeEnvironment
++import org.robolectric.annotation.Config
++
++@RunWith(RobolectricTestRunner::class)
++@Config(application = Application::class, sdk = [34])
++class VesperLogPreferencesTest {
++  private val application: Application get() = RuntimeEnvironment.getApplication()
++
++  @Before
++  fun clearPreferences() {
++    PreferenceManager.getDefaultSharedPreferences(application).edit().clear().commit()
++  }
++
++  @Test
++  fun `logging remains disabled by default`() {
++    assertFalse(VesperLogPreferences.isLogEnabled(application))
++  }
++
++  @Test
++  fun `existing logging preference survives the upstream preferences removal`() {
++    val preferences = PreferenceManager.getDefaultSharedPreferences(application)
++    preferences.edit().putBoolean("pref_log_enabled", true).commit()
++    assertTrue(VesperLogPreferences.isLogEnabled(application))
++    VesperLogPreferences.setLogEnabled(application, false)
++    assertFalse(preferences.getBoolean("pref_log_enabled", true))
++    VesperLogPreferences.setLogEnabled(application, true)
++    assertTrue(preferences.getBoolean("pref_log_enabled", false))
++  }
++}
diff --git a/tools/test_signal_830_patch.py b/tools/test_signal_830_patch.py
new file mode 100644
index 0000000..8e5ecda
--- /dev/null
+++ b/tools/test_signal_830_patch.py
@@ -0,0 +1,67 @@
+# Copyright 2026 Vesper contributors
+# SPDX-License-Identifier: AGPL-3.0-only
+
+"""Exercise real exported hunks against upstream 8.30 context changes, offline."""
+from pathlib import Path
+import re
+import subprocess
+import tempfile
+import unittest
+
+ROOT = Path(__file__).resolve().parents[1]
+BASE = "app/src/main/java/org/thoughtcrime/securesms/"
+
+
+class Signal830PatchTest(unittest.TestCase):
+    def apply_hunks(self, target, predicate, upstream):
+        patch = (ROOT / "patches/0001-feat-add-Material-You-dynamic-theming.patch").read_text()
+        section = patch.split(f"diff --git a/{target} b/{target}\n", 1)[1].split("\ndiff --git ", 1)[0]
+        chunks = re.split(r"(?m)(?=^@@ -)", section)
+        hunks = [chunk for chunk in chunks[1:] if predicate(chunk)]
+        self.assertTrue(hunks)
+        with tempfile.TemporaryDirectory() as tmp:
+            path = Path(tmp) / target
+            path.parent.mkdir(parents=True)
+            path.write_text(upstream)
+            result = subprocess.run(["git", "apply", "-"], cwd=tmp, text=True, capture_output=True,
+                                    input=f"diff --git a/{target} b/{target}\n{chunks[0]}" + "".join(hunks).rstrip("\n") + "\n")
+            self.assertEqual(result.returncode, 0, result.stderr)
+            return path.read_text()
+
+    def test_call_theme_imports_without_removed_preferences_import(self):
+        upstream = "\n".join("import org.thoughtcrime.securesms." + name for name in [
+            "safety.SafetyNumberBottomSheet", "service.webrtc.CallLinkDisconnectReason",
+            "service.webrtc.SignalCallManager", "sms.MessageSender", "util.FullscreenHelper",
+            "util.RemoteConfig", "util.VibrateUtil"]) + "\n"
+        source = self.apply_hunks(BASE + "components/webrtc/v2/WebRtcCallActivity.kt",
+                                  lambda h: "+import org.thoughtcrime.securesms.util.DynamicTheme" in h, upstream)
+        for name in ["DynamicTheme", "DynamicNoActionBarTheme"]:
+            line = f"import org.thoughtcrime.securesms.util.{name}\n"
+            self.assertEqual(source.count(line), 1)
+            source = source.replace(line, "")
+        self.assertEqual(source, upstream)
+
+    def test_settings_preserve_new_upstream_defaults(self):
+        upstream = '''    }
+
+  var theme: Theme
+    get() = Theme.deserialize(getString(THEME, if (DynamicTheme.systemThemeAvailable()) "system" else "light"))
+    set(value) {
+      putString(THEME, value.serialize())
+      configurationSettingChanged.postValue(THEME)
+    }
+
+  var messageFontSize: Int by integerValue(MESSAGE_FONT_SIZE, 16)
+'''
+        source = self.apply_hunks(BASE + "keyvalue/SettingsValues.kt",
+                                  lambda h: "+      setTheme(value" in h or "+  fun setTheme(" in h, upstream)
+        self.assertIn('getString(THEME, if (DynamicTheme.systemThemeAvailable()) "system" else "light")', source)
+        self.assertIn('var messageFontSize: Int by integerValue(MESSAGE_FONT_SIZE, 16)', source)
+        self.assertIn('setTheme(value, isDynamicColorsEnabled)', source)
+        self.assertIn('putBoolean(DYNAMIC_COLORS_ENABLED, useDynamicColors)', source)
+        self.assertIn('configurationSettingChanged.postValue(THEME)', source)
+        self.assertIn('getBoolean(IGNORE_REMOTE_DELETE, false)', source)
+
+
+if __name__ == "__main__":
+    unittest.main()