diff --git a/src/lib/media/video/upload.shared.ts b/src/lib/media/video/upload.shared.ts
index 7fa87e109..3c4c4a4de 100644
--- a/src/lib/media/video/upload.shared.ts
+++ b/src/lib/media/video/upload.shared.ts
@@ -3,9 +3,9 @@ import {type I18n} from '@lingui/core'
 import {msg} from '@lingui/macro'
 
 import {VIDEO_SERVICE_DID} from '#/lib/constants'
-import {pdsAgent} from '#/state/session/agent'
 import {UploadLimitError} from '#/lib/media/video/errors'
 import {getServiceAuthAudFromUrl} from '#/lib/strings/url-helpers'
+import {pdsAgent} from '#/state/session/agent'
 import {createVideoAgent} from './util'
 
 export async function getServiceAuthToken({
@@ -23,7 +23,9 @@ export async function getServiceAuthToken({
   if (!pdsAud) {
     throw new Error('Agent does not have a PDS URL')
   }
-  const {data: serviceAuth} = await pdsAgent(agent).com.atproto.server.getServiceAuth({
+  const {data: serviceAuth} = await pdsAgent(
+    agent,
+  ).com.atproto.server.getServiceAuth({
     aud: aud ?? pdsAud,
     lxm,
     exp,
diff --git a/src/screens/Profile/Header/Shell.tsx b/src/screens/Profile/Header/Shell.tsx
index 2575716a4..1875f949c 100644
--- a/src/screens/Profile/Header/Shell.tsx
+++ b/src/screens/Profile/Header/Shell.tsx
@@ -1,5 +1,5 @@
 import {memo, useCallback, useEffect, useMemo} from 'react'
-import {Pressable, View} from 'react-native'
+import {Pressable, TouchableWithoutFeedback, View} from 'react-native'
 import Animated, {
   measure,
   type MeasuredDimensions,
@@ -169,14 +169,14 @@ let ProfileHeaderShell = ({
         runOnUI(() => {
           'worklet'
           const rect = measure(aviRef)
-          runOnJS(_openLightboxAvi)(avatar, rect)
+          runOnJS(_openLightbox)(avatar, rect)
         })()
       }
     }
   }, [
     profile,
     moderation,
-    _openLightboxAvi,
+    _openLightbox,
     aviRef,
     liveStatusControl,
     live,
@@ -190,10 +190,10 @@ let ProfileHeaderShell = ({
       runOnUI(() => {
         'worklet'
         const rect = measure(bannerRef)
-        runOnJS(_openLightbox)(banner, rect, 'image')
+        runOnJS(_openLightboxBanner)(banner, rect, 'image')
       })()
     }
-  }, [profile.banner, moderation, _openLightbox, bannerRef])
+  }, [profile.banner, moderation, _openLightboxBanner, bannerRef])
 
   return (
     <View style={t.atoms.bg} pointerEvents={isIOS ? 'auto' : 'box-none'}>
diff --git a/src/screens/Signup/StepInfo/index.tsx b/src/screens/Signup/StepInfo/index.tsx
index ad46ae456..64787a643 100644
--- a/src/screens/Signup/StepInfo/index.tsx
+++ b/src/screens/Signup/StepInfo/index.tsx
@@ -8,13 +8,15 @@ import type tldts from 'tldts'
 import {DEFAULT_SERVICE} from '#/lib/constants'
 import {isEmailMaybeInvalid} from '#/lib/strings/email'
 import {logger} from '#/logger'
-import {isNative} from '#/platform/detection'
+import {isNative, isWeb} from '#/platform/detection'
 import {useSignupContext} from '#/screens/Signup/state'
 import {Policies} from '#/screens/Signup/StepInfo/Policies'
 import {atoms as a, native} from '#/alf'
 import * as Admonition from '#/components/Admonition'
+import {Button, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
 import {DeviceLocationRequestDialog} from '#/components/dialogs/DeviceLocationRequestDialog'
+import {Divider} from '#/components/Divider'
 import * as DateField from '#/components/forms/DateField'
 import {type DateFieldRef} from '#/components/forms/DateField/types'
 import {FormError} from '#/components/forms/FormError'
@@ -23,10 +25,13 @@ import * as TextField from '#/components/forms/TextField'
 import {Envelope_Stroke2_Corner0_Rounded as Envelope} from '#/components/icons/Envelope'
 import {Lock_Stroke2_Corner0_Rounded as Lock} from '#/components/icons/Lock'
 import {Ticket_Stroke2_Corner0_Rounded as Ticket} from '#/components/icons/Ticket'
+import {SimpleInlineLinkText as InlineLinkText} from '#/components/Link'
 import {createStaticClick, SimpleInlineLinkText} from '#/components/Link'
 import {Loader} from '#/components/Loader'
 import {usePreemptivelyCompleteActivePolicyUpdate} from '#/components/PolicyUpdateOverlay/usePreemptivelyCompleteActivePolicyUpdate'
+import {ScreenTransition} from '#/components/ScreenTransition'
 import * as Toast from '#/components/Toast'
+import {Text} from '#/components/Typography'
 import {
   isUnderAge,
   MIN_ACCESS_AGE,
diff --git a/src/view/com/profile/ProfileMenu.tsx b/src/view/com/profile/ProfileMenu.tsx
index 761ec0817..63f3acad8 100644
--- a/src/view/com/profile/ProfileMenu.tsx
+++ b/src/view/com/profile/ProfileMenu.tsx
@@ -15,13 +15,13 @@ import {logger} from '#/logger'
 import {isWeb} from '#/platform/detection'
 import {type Shadow} from '#/state/cache/types'
 import {useModalControls} from '#/state/modals'
-import {Nux, useNux, useSaveNux} from '#/state/queries/nuxs'
 import {
   useDeerVerificationEnabled,
   useDeerVerificationTrusted,
   useSetDeerVerificationTrust,
 } from '#/state/preferences/deer-verification'
 import {useEnableSquareButtons} from '#/state/preferences/enable-square-buttons'
+import {Nux, useNux, useSaveNux} from '#/state/queries/nuxs'
 import {
   RQKEY as profileQueryKey,
   useProfileBlockMutationQueue,