diff --git a/src/ageAssurance/components/RedirectOverlay.tsx b/src/ageAssurance/components/RedirectOverlay.tsx
index 5a6f5b2934..9a71649e4c 100644
--- a/src/ageAssurance/components/RedirectOverlay.tsx
+++ b/src/ageAssurance/components/RedirectOverlay.tsx
@@ -9,8 +9,7 @@ import {
 } from 'react'
 import {Dimensions, View} from 'react-native'
 import * as Linking from 'expo-linking'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {retry} from '#/lib/async/retry'
@@ -132,7 +131,7 @@ export function Provider({children}: {children?: React.ReactNode}) {
 
 export function RedirectOverlay() {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {isOpen} = useRedirectOverlayContext()
   const {gtMobile} = useBreakpoints()
 
@@ -162,7 +161,7 @@ export function RedirectOverlay() {
         <View
           role="dialog"
           aria-role="dialog"
-          aria-label={_(msg`Verifying your age assurance status`)}>
+          aria-label={l`Verifying your age assurance status`}>
           <View style={[a.pb_3xl, {width: 300}]}>
             <Inner />
           </View>
@@ -175,7 +174,7 @@ export function RedirectOverlay() {
 function Inner() {
   const t = useTheme()
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const agent = useAgent()
   const polling = useRef(false)
   const unmounted = useRef(false)
@@ -262,7 +261,7 @@ function Inner() {
 
           <View style={[a.w_full, a.pt_lg]}>
             <Button
-              label={_(msg`Close`)}
+              label={l`Close`}
               size="large"
               variant="solid"
               color="secondary"
@@ -318,7 +317,7 @@ function Inner() {
         {error && (
           <View style={[a.w_full, a.pt_lg]}>
             <Button
-              label={_(msg`Close`)}
+              label={l`Close`}
               size="large"
               variant="solid"
               color="secondary"
diff --git a/src/analytics/index.tsx b/src/analytics/index.tsx
index 20f919f501..ce02efb85d 100644
--- a/src/analytics/index.tsx
+++ b/src/analytics/index.tsx
@@ -83,7 +83,7 @@ function createLogger(
     warn: logger.warn.bind(logger),
     error: logger.error.bind(logger),
     useChild: (context: Exclude<Logger['context'], undefined>) => {
-      return useMemo(() => createLogger(context, metadata), [context, metadata])
+      return useMemo(() => createLogger(context, metadata), [context])
     },
     Context: Logger.Context,
   }
diff --git a/src/components/AccountList.tsx b/src/components/AccountList.tsx
index a65eeb0722..2b09428f0f 100644
--- a/src/components/AccountList.tsx
+++ b/src/components/AccountList.tsx
@@ -1,8 +1,7 @@
 import {Fragment, useCallback} from 'react'
 import {View} from 'react-native'
 import {type AppBskyActorDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {isJwtExpired} from '#/lib/jwt'
@@ -33,7 +32,7 @@ export function AccountList({
 }) {
   const {currentAccount, accounts} = useSession()
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {data: profiles} = useProfilesQuery({
     handles: accounts.map(acc => acc.did),
   })
@@ -67,7 +66,7 @@ export function AccountList({
         testID="chooseAddAccountBtn"
         style={[a.flex_1]}
         onPress={pendingDid ? undefined : onPressAddAccount}
-        label={_(msg`Sign in to account that is not listed`)}>
+        label={l`Sign in to account that is not listed`}>
         {({hovered, pressed}) => (
           <View
             style={[
@@ -114,7 +113,7 @@ function AccountItem({
   isPendingAccount: boolean
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {isActive: live} = useActorStatus(profile)
 
   const onPress = useCallback(() => {
@@ -131,8 +130,8 @@ function AccountItem({
       onPress={onPress}
       label={
         isCurrentAccount
-          ? _(msg`Continue as ${account.handle} (currently signed in)`)
-          : _(msg`Sign in as ${account.handle}`)
+          ? l`Continue as ${account.handle} (currently signed in)`
+          : l`Sign in as ${account.handle}`
       }>
       {({hovered, pressed}) => (
         <View
diff --git a/src/components/AppLanguageDropdown.tsx b/src/components/AppLanguageDropdown.tsx
index 1114310f44..f799c389db 100644
--- a/src/components/AppLanguageDropdown.tsx
+++ b/src/components/AppLanguageDropdown.tsx
@@ -1,6 +1,5 @@
 import {useCallback} from 'react'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {sanitizeAppLanguageSetting} from '#/locale/helpers'
@@ -14,7 +13,7 @@ import {Earth_Stroke2_Corner2_Rounded as EarthIcon} from './icons/Globe'
 
 export function AppLanguageDropdown() {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const queryClient = useQueryClient()
   const langPrefs = useLanguagePrefs()
@@ -38,7 +37,7 @@ export function AppLanguageDropdown() {
     <Select.Root
       value={sanitizeAppLanguageSetting(langPrefs.appLanguage)}
       onValueChange={onChangeAppLanguage}>
-      <Select.Trigger label={_(msg`Change app language`)}>
+      <Select.Trigger label={l`Change app language`}>
         {({props}) => (
           <Button
             {...props}
@@ -60,7 +59,7 @@ export function AppLanguageDropdown() {
             ]}>
             <ButtonIcon icon={EarthIcon} size="md" />
             <Select.ValueText
-              placeholder={_(msg`Select an app language`)}
+              placeholder={l`Select an app language`}
               style={[t.atoms.text_contrast_medium]}
             />
             <Select.Icon style={[t.atoms.text_contrast_medium]} />
@@ -68,7 +67,7 @@ export function AppLanguageDropdown() {
         )}
       </Select.Trigger>
       <Select.Content
-        label={_(msg`Select language`)}
+        label={l`Select language`}
         renderItem={({label, value}) => (
           <Select.Item value={value} label={label} style={web([a.pointer])}>
             <Select.ItemIndicator />
diff --git a/src/components/ContextMenu/Backdrop.ios.tsx b/src/components/ContextMenu/Backdrop.ios.tsx
index 7d3e84f9d2..d611c65034 100644
--- a/src/components/ContextMenu/Backdrop.ios.tsx
+++ b/src/components/ContextMenu/Backdrop.ios.tsx
@@ -7,8 +7,7 @@ import Animated, {
   useAnimatedStyle,
 } from 'react-native-reanimated'
 import {BlurView} from 'expo-blur'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {atoms as a, useTheme} from '#/alf'
 import {useContextMenuContext} from './context'
@@ -32,7 +31,7 @@ export function Backdrop(props: Props) {
 }
 
 function BlurredBackdrop({animation, intensity = 50, onPress}: Props) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const animatedProps = useAnimatedProps(() => ({
     intensity: interpolate(
@@ -50,8 +49,8 @@ function BlurredBackdrop({animation, intensity = 50, onPress}: Props) {
       tint="systemMaterialDark">
       <Pressable
         style={a.flex_1}
-        accessibilityLabel={_(msg`Close menu`)}
-        accessibilityHint={_(msg`Tap to close context menu`)}
+        accessibilityLabel={l`Close menu`}
+        accessibilityHint={l`Tap to close context menu`}
         onPress={onPress}
       />
     </AnimatedBlurView>
@@ -60,7 +59,7 @@ function BlurredBackdrop({animation, intensity = 50, onPress}: Props) {
 
 function OpacityBackdrop({animation, onPress}: Props) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const animatedStyle = useAnimatedStyle(() => ({
     opacity: interpolate(
@@ -76,8 +75,8 @@ function OpacityBackdrop({animation, onPress}: Props) {
       style={[a.absolute, a.inset_0, t.atoms.bg_contrast_975, animatedStyle]}>
       <Pressable
         style={a.flex_1}
-        accessibilityLabel={_(msg`Close menu`)}
-        accessibilityHint={_(msg`Tap to close context menu`)}
+        accessibilityLabel={l`Close menu`}
+        accessibilityHint={l`Tap to close context menu`}
         onPress={onPress}
       />
     </Animated.View>
diff --git a/src/components/ContextMenu/Backdrop.tsx b/src/components/ContextMenu/Backdrop.tsx
index a441bf513c..9f48532c13 100644
--- a/src/components/ContextMenu/Backdrop.tsx
+++ b/src/components/ContextMenu/Backdrop.tsx
@@ -5,8 +5,7 @@ import Animated, {
   type SharedValue,
   useAnimatedStyle,
 } from 'react-native-reanimated'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {atoms as a, useTheme} from '#/alf'
 import {useContextMenuContext} from './context'
@@ -21,7 +20,7 @@ export function Backdrop({
   onPress?: () => void
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {mode} = useContextMenuContext()
 
   const reduced = mode === 'auxiliary-only'
@@ -42,8 +41,8 @@ export function Backdrop({
       style={[a.absolute, a.inset_0, t.atoms.bg_contrast_975, animatedStyle]}>
       <Pressable
         style={a.flex_1}
-        accessibilityLabel={_(msg`Close menu`)}
-        accessibilityHint={_(msg`Tap to close context menu`)}
+        accessibilityLabel={l`Close menu`}
+        accessibilityHint={l`Tap to close context menu`}
         onPress={onPress}
       />
     </Animated.View>
diff --git a/src/components/ContextMenu/index.tsx b/src/components/ContextMenu/index.tsx
index d09e0e60ec..3c3b5f27df 100644
--- a/src/components/ContextMenu/index.tsx
+++ b/src/components/ContextMenu/index.tsx
@@ -45,8 +45,7 @@ import {
 import {captureRef} from 'react-native-view-shot'
 import {scheduleOnRN} from 'react-native-worklets'
 import {Image, type ImageErrorEventData} from 'expo-image'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {useIsFocused} from '@react-navigation/native'
 import flattenReactChildren from 'react-keyed-flatten-children'
 
@@ -453,7 +452,7 @@ function TriggerClone({
   onDisplay: () => void
   label: string
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const animatedStyles = useAnimatedStyle(() => {
     const anim = animation.get()
@@ -504,7 +503,7 @@ function TriggerClone({
           height: measurement.height,
         }}
         accessibilityLabel={label}
-        accessibilityHint={_(msg`The subject of the context menu`)}
+        accessibilityHint={l`The subject of the context menu`}
         accessibilityIgnoresInvertColors={false}
         cachePolicy="none"
       />
diff --git a/src/components/Dialog/index.tsx b/src/components/Dialog/index.tsx
index 4f48dfce8d..e887c74d65 100644
--- a/src/components/Dialog/index.tsx
+++ b/src/components/Dialog/index.tsx
@@ -26,8 +26,7 @@ import Animated, {
 } from 'react-native-reanimated'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {scheduleOnRN} from 'react-native-worklets'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {ScrollProvider} from '#/lib/ScrollContext'
 import {logger} from '#/logger'
@@ -386,7 +385,7 @@ export function Handle({
   fill?: string
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {screenReaderEnabled} = useA11y()
   const {close} = useDialogContext()
 
@@ -395,8 +394,8 @@ export function Handle({
       <Pressable
         accessible={screenReaderEnabled}
         onPress={() => close()}
-        accessibilityLabel={_(msg`Dismiss`)}
-        accessibilityHint={_(msg`Double tap to close the dialog`)}>
+        accessibilityLabel={l`Dismiss`}
+        accessibilityHint={l`Double tap to close the dialog`}>
         <View
           style={[
             a.rounded_sm,
diff --git a/src/components/Dialog/index.web.tsx b/src/components/Dialog/index.web.tsx
index 5363fbf1bd..485c1e8325 100644
--- a/src/components/Dialog/index.web.tsx
+++ b/src/components/Dialog/index.web.tsx
@@ -17,8 +17,7 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {DismissableLayer, FocusGuards, FocusScope} from 'radix-ui/internal'
 import {RemoveScrollBar} from 'react-remove-scroll-bar'
 
@@ -55,7 +54,7 @@ export function Outer({
   onClose,
   webOptions,
 }: React.PropsWithChildren<DialogOuterProps>) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {gtMobile} = useBreakpoints()
   const [isOpen, setIsOpen] = useState(false)
   const {setDialogIsOpen} = useDialogStateControlContext()
@@ -126,7 +125,7 @@ export function Outer({
             <RemoveScrollBar />
             <Pressable
               accessibilityHint={undefined}
-              accessibilityLabel={_(msg`Close active dialog`)}
+              accessibilityLabel={l`Close active dialog`}
               onPress={handleBackgroundPress}>
               <View
                 style={[
@@ -321,7 +320,7 @@ export function FlatListFooter({
 }
 
 export function Close() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {close} = useContext(Context)
   return (
     <View
@@ -339,7 +338,7 @@ export function Close() {
         color="secondary"
         shape="round"
         onPress={() => close()}
-        label={_(msg`Close active dialog`)}>
+        label={l`Close active dialog`}>
         <ButtonIcon icon={X} size="md" />
       </Button>
     </View>
diff --git a/src/components/FocusScope/index.tsx b/src/components/FocusScope/index.tsx
index 48e013500e..54c61ab40a 100644
--- a/src/components/FocusScope/index.tsx
+++ b/src/components/FocusScope/index.tsx
@@ -14,8 +14,7 @@ import {
   Text,
   View,
 } from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {useA11y} from '#/state/a11y'
 
@@ -40,7 +39,7 @@ export function FocusScope({children}: {children: React.ReactNode}) {
  * remain within the active content section.
  */
 function FocusTrap({children}: {children: React.ReactNode}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const child = useRef<View>(null)
 
   /*
@@ -84,12 +83,8 @@ function FocusTrap({children}: {children: React.ReactNode}) {
     <>
       <Pressable
         accessible
-        accessibilityLabel={_(
-          msg`You've reached the start of the active content.`,
-        )}
-        accessibilityHint={_(
-          msg`Please go back, or activate this element to return to the start of the active content.`,
-        )}
+        accessibilityLabel={l`You've reached the start of the active content.`}
+        accessibilityHint={l`Please go back, or activate this element to return to the start of the active content.`}
         accessibilityActions={[{name: 'activate', label: 'activate'}]}
         onAccessibilityAction={event => {
           switch (event.nativeEvent.actionName) {
@@ -108,12 +103,8 @@ function FocusTrap({children}: {children: React.ReactNode}) {
         {decoratedChildren}
       </View>
       <Pressable
-        accessibilityLabel={_(
-          msg`You've reached the end of the active content.`,
-        )}
-        accessibilityHint={_(
-          msg`Please go back, or activate this element to return to the start of the active content.`,
-        )}
+        accessibilityLabel={l`You've reached the end of the active content.`}
+        accessibilityHint={l`Please go back, or activate this element to return to the start of the active content.`}
         accessibilityActions={[{name: 'activate', label: 'activate'}]}
         onAccessibilityAction={event => {
           switch (event.nativeEvent.actionName) {
diff --git a/src/components/InterestTabs.tsx b/src/components/InterestTabs.tsx
index 5df1fb62e3..8cb8951cc8 100644
--- a/src/components/InterestTabs.tsx
+++ b/src/components/InterestTabs.tsx
@@ -5,8 +5,7 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
 import {DraggableScrollView} from '#/view/com/pager/DraggableScrollView'
@@ -46,7 +45,7 @@ export function InterestTabs({
   gutterWidth?: number
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const listRef = useRef<ScrollView>(null)
   const [totalWidth, setTotalWidth] = useState(0)
   const [scrollX, setScrollX] = useState(0)
@@ -255,7 +254,7 @@ export function InterestTabs({
             }),
           ]}>
           <Button
-            label={_(msg`Scroll left`)}
+            label={l`Scroll left`}
             onPress={scrollLeft}
             onPressIn={() => startContinuousScroll('left')}
             onPressOut={stopContinuousScroll}
@@ -289,7 +288,7 @@ export function InterestTabs({
             }),
           ]}>
           <Button
-            label={_(msg`Scroll right`)}
+            label={l`Scroll right`}
             onPress={scrollRight}
             onPressIn={() => startContinuousScroll('right')}
             onPressOut={stopContinuousScroll}
@@ -327,22 +326,18 @@ function Tab({
   onLayout: (index: number, x: number, width: number) => void
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const label = active
-    ? _(
-        msg({
-          message: `"${interestsDisplayName}" category (active)`,
-          comment:
-            'Accessibility label for a category (e.g. Art, Video Games, Sports, etc.) that shows suggested accounts for the user to follow. The tab is currently selected.',
-        }),
-      )
-    : _(
-        msg({
-          message: `Select "${interestsDisplayName}" category`,
-          comment:
-            'Accessibility label for a category (e.g. Art, Video Games, Sports, etc.) that shows suggested accounts for the user to follow. The tab is not currently active and can be selected.',
-        }),
-      )
+    ? l({
+        message: `"${interestsDisplayName}" category (active)`,
+        comment:
+          'Accessibility label for a category (e.g. Art, Video Games, Sports, etc.) that shows suggested accounts for the user to follow. The tab is currently selected.',
+      })
+    : l({
+        message: `Select "${interestsDisplayName}" category`,
+        comment:
+          'Accessibility label for a category (e.g. Art, Video Games, Sports, etc.) that shows suggested accounts for the user to follow. The tab is not currently active and can be selected.',
+      })
 
   return (
     <View
diff --git a/src/components/InternationalPhoneCodeSelect.tsx b/src/components/InternationalPhoneCodeSelect.tsx
index f4646b0645..cf218e35fd 100644
--- a/src/components/InternationalPhoneCodeSelect.tsx
+++ b/src/components/InternationalPhoneCodeSelect.tsx
@@ -1,8 +1,7 @@
 import {Fragment, useMemo} from 'react'
 import {Text as RNText} from 'react-native'
 import {Image} from 'expo-image'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {
   type CountryCode,
@@ -28,7 +27,7 @@ export function InternationalPhoneCodeSelect({
   value?: CountryCode
   onChange: (value: CountryCode) => void
 }) {
-  const {_, i18n} = useLingui()
+  const {t: l, i18n} = useLingui()
   const location = useGeolocation()
 
   const defaultCountry = useMemo(() => {
@@ -65,7 +64,7 @@ export function InternationalPhoneCodeSelect({
 
   return (
     <Select.Root value={value} onValueChange={onChange as (v: string) => void}>
-      <Select.Trigger label={_(msg`Select telephone code`)}>
+      <Select.Trigger label={l`Select telephone code`}>
         <Select.ValueText placeholder="+..." webOverrideValue={selected}>
           {selected => (
             <>
@@ -77,7 +76,7 @@ export function InternationalPhoneCodeSelect({
         <Select.Icon />
       </Select.Trigger>
       <Select.Content
-        label={_(msg`Country code`)}
+        label={l`Country code`}
         items={items}
         renderItem={item => (
           <Fragment key={item.value}>
diff --git a/src/components/LabelingServiceCard/index.tsx b/src/components/LabelingServiceCard/index.tsx
index 10d8c97333..788c642e02 100644
--- a/src/components/LabelingServiceCard/index.tsx
+++ b/src/components/LabelingServiceCard/index.tsx
@@ -1,7 +1,6 @@
 import {View} from 'react-native'
 import {type AppBskyLabelerDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 
 import {getLabelingServiceTitle} from '#/lib/moderation'
@@ -52,14 +51,14 @@ export function Title({value}: {value: string}) {
 }
 
 export function Description({value, handle}: {value?: string; handle: string}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   return value ? (
     <Text numberOfLines={2}>
       <RichText value={value} />
     </Text>
   ) : (
     <Text emoji style={[a.leading_snug]}>
-      {_(msg`By ${sanitizeHandle(handle, '@')}`)}
+      {l`By ${sanitizeHandle(handle, '@')}`}
     </Text>
   )
 }
@@ -150,7 +149,7 @@ export function Link({
   children,
   labeler,
 }: LabelingServiceProps & Pick<LinkProps, 'children'>) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <InternalLink
@@ -160,9 +159,7 @@ export function Link({
           name: labeler.creator.did,
         },
       }}
-      label={_(
-        msg`View the labeling service provided by @${labeler.creator.handle}`,
-      )}>
+      label={l`View the labeling service provided by @${labeler.creator.handle}`}>
       {children}
     </InternalLink>
   )
diff --git a/src/components/LanguageSelect.tsx b/src/components/LanguageSelect.tsx
index 6bcaebe539..a602a92c65 100644
--- a/src/components/LanguageSelect.tsx
+++ b/src/components/LanguageSelect.tsx
@@ -1,5 +1,4 @@
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {sanitizeAppLanguageSetting} from '#/locale/helpers'
 import {APP_LANGUAGES} from '#/locale/languages'
@@ -21,7 +20,7 @@ export function LanguageSelect({
   label?: string
   disabledBlueskySupportedLanguageSanitization?: boolean
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const selectValue =
     value && !disabledBlueskySupportedLanguageSanitization
       ? sanitizeAppLanguageSetting(value)
@@ -38,8 +37,8 @@ export function LanguageSelect({
 
   return (
     <Select.Root value={selectValue} onValueChange={handleOnChange}>
-      <Select.Trigger label={_(msg`Select language`)}>
-        <Select.ValueText placeholder={_(msg`Select language`)} />
+      <Select.Trigger label={l`Select language`}>
+        <Select.ValueText placeholder={l`Select language`} />
         <Select.Icon />
       </Select.Trigger>
       <Select.Content
diff --git a/src/components/Layout/Header/index.tsx b/src/components/Layout/Header/index.tsx
index a0bd45c8fc..11909b1172 100644
--- a/src/components/Layout/Header/index.tsx
+++ b/src/components/Layout/Header/index.tsx
@@ -1,7 +1,6 @@
 import {createContext, useCallback, useContext} from 'react'
 import {type GestureResponderEvent, Keyboard, View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
 import {type NavigationProp} from '#/lib/routes/types'
@@ -112,7 +111,7 @@ export function Slot({children}: {children?: React.ReactNode}) {
 }
 
 export function BackButton({onPress, style, ...props}: Partial<ButtonProps>) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const navigation = useNavigation<NavigationProp>()
 
   const onPressBack = useCallback(
@@ -131,7 +130,7 @@ export function BackButton({onPress, style, ...props}: Partial<ButtonProps>) {
   return (
     <Slot>
       <Button
-        label={_(msg`Go back`)}
+        label={l`Go back`}
         size="small"
         variant="ghost"
         color="secondary"
@@ -151,7 +150,7 @@ export function BackButton({onPress, style, ...props}: Partial<ButtonProps>) {
 }
 
 export function MenuButton() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const setDrawerOpen = useSetDrawerOpen()
   const {gtMobile} = useBreakpoints()
@@ -165,7 +164,7 @@ export function MenuButton() {
   return gtMobile ? null : (
     <Slot>
       <Button
-        label={_(msg`Open drawer menu`)}
+        label={l`Open drawer menu`}
         size="small"
         variant="ghost"
         color="secondary"
diff --git a/src/components/LikedByList.tsx b/src/components/LikedByList.tsx
index fcaa50bbcc..db4fe262d0 100644
--- a/src/components/LikedByList.tsx
+++ b/src/components/LikedByList.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useMemo, useState} from 'react'
 import {type AppBskyFeedGetLikes as GetLikes} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender'
 import {cleanError} from '#/lib/strings/errors'
@@ -27,7 +26,7 @@ function keyExtractor(item: GetLikes.Like) {
 }
 
 export function LikedByList({uri}: {uri: string}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const initialNumToRender = useInitialNumToRender()
   const [isPTRing, setIsPTRing] = useState(false)
 
@@ -81,10 +80,8 @@ export function LikedByList({uri}: {uri: string}) {
         isLoading={isUriLoading || isLikedByLoading}
         isError={isError}
         emptyType="results"
-        emptyTitle={_(msg`No likes yet`)}
-        emptyMessage={_(
-          msg`Nobody has liked this yet. Maybe you should be the first!`,
-        )}
+        emptyTitle={l`No likes yet`}
+        emptyMessage={l`Nobody has liked this yet. Maybe you should be the first!`}
         errorMessage={cleanError(resolveError || error)}
         onRetry={isError ? refetch : undefined}
         topBorder={false}
diff --git a/src/components/ListCard.tsx b/src/components/ListCard.tsx
index 805c365566..57b269551d 100644
--- a/src/components/ListCard.tsx
+++ b/src/components/ListCard.tsx
@@ -6,8 +6,7 @@ import {
   moderateUserList,
   type ModerationUI,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -115,7 +114,7 @@ export function TitleAndByline({
   modUi?: ModerationUI
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount} = useSession()
 
   return (
@@ -142,15 +141,14 @@ export function TitleAndByline({
           </Text>
         </Hider.Content>
       </Hider.Outer>
-
       {creator && (
         <Text
           emoji
           style={[a.leading_snug, t.atoms.text_contrast_medium]}
           numberOfLines={1}>
           {purpose === MODLIST
-            ? _(msg`Moderation list by ${sanitizeHandle(creator.handle, '@')}`)
-            : _(msg`List by ${sanitizeHandle(creator.handle, '@')}`)}
+            ? l`Moderation list by ${sanitizeHandle(creator.handle, '@')}`
+            : l`List by ${sanitizeHandle(creator.handle, '@')}`}
         </Text>
       )}
     </View>
diff --git a/src/components/Lists.tsx b/src/components/Lists.tsx
index d0cb34215f..a8a61dc7c5 100644
--- a/src/components/Lists.tsx
+++ b/src/components/Lists.tsx
@@ -1,7 +1,6 @@
 import {memo} from 'react'
 import {type StyleProp, View, type ViewStyle} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {cleanError} from '#/lib/strings/errors'
@@ -75,7 +74,7 @@ function ListFooterMaybeError({
   onRetry?: () => Promise<unknown>
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   if (!error) return null
 
@@ -101,7 +100,7 @@ function ListFooterMaybeError({
         </Text>
         <Button
           variant="solid"
-          label={_(msg`Press to retry`)}
+          label={l`Press to retry`}
           style={[
             a.align_center,
             a.justify_center,
@@ -156,7 +155,7 @@ let ListMaybePlaceholder = ({
   useEmptyState?: boolean
 }): React.ReactNode => {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {gtMobile, gtTablet} = useBreakpoints()
 
   if (isLoading) {
@@ -181,8 +180,8 @@ let ListMaybePlaceholder = ({
   if (isError) {
     return (
       <Error
-        title={errorTitle ?? _(msg`Oops!`)}
-        message={errorMessage ?? _(msg`Something went wrong!`)}
+        title={errorTitle ?? l`Oops!`}
+        message={errorMessage ?? l`Something went wrong!`}
         onRetry={onRetry}
         onGoBack={onGoBack}
         hideBackButton={hideBackButton}
@@ -199,9 +198,7 @@ let ListMaybePlaceholder = ({
           icon={emptyStateIcon}
           message={
             emptyMessage ??
-            (emptyType === 'results'
-              ? _(msg`No results found`)
-              : _(msg`Page not found`))
+            (emptyType === 'results' ? l`No results found` : l`Page not found`)
           }
           button={emptyStateButton}
         />
@@ -214,13 +211,11 @@ let ListMaybePlaceholder = ({
       <Error
         title={
           emptyTitle ??
-          (emptyType === 'results'
-            ? _(msg`No results found`)
-            : _(msg`Page not found`))
+          (emptyType === 'results' ? l`No results found` : l`Page not found`)
         }
         message={
           emptyMessage ??
-          _(msg`We're sorry! We can't find the page you were looking for.`)
+          l`We're sorry! We can't find the page you were looking for.`
         }
         onRetry={onRetry}
         onGoBack={onGoBack}
diff --git a/src/components/Menu/index.web.tsx b/src/components/Menu/index.web.tsx
index fed19c81af..6d3e92bbb3 100644
--- a/src/components/Menu/index.web.tsx
+++ b/src/components/Menu/index.web.tsx
@@ -6,8 +6,7 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {DropdownMenu} from 'radix-ui'
 
 import {useA11y} from '#/state/a11y'
@@ -62,7 +61,7 @@ export function Root({
 }: React.PropsWithChildren<{
   control?: Dialog.DialogControlProps
 }>) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const defaultControl = useMenuControl()
   const context = useMemo<ContextType>(
     () => ({
@@ -89,9 +88,7 @@ export function Root({
             style={[a.fixed, a.inset_0, a.z_50]}
             onPress={() => context.control.close()}
             accessibilityHint=""
-            accessibilityLabel={_(
-              msg`Context menu backdrop, click to close the menu.`,
-            )}
+            accessibilityLabel={l`Context menu backdrop, click to close the menu.`}
           />
         </Portal>
       )}
diff --git a/src/components/NewskieDialog.tsx b/src/components/NewskieDialog.tsx
index 5b17ec4451..1ccf90950f 100644
--- a/src/components/NewskieDialog.tsx
+++ b/src/components/NewskieDialog.tsx
@@ -1,8 +1,7 @@
 import {useMemo, useState} from 'react'
 import {View} from 'react-native'
 import {type AppBskyActorDefs, moderateProfile} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {differenceInSeconds} from 'date-fns'
 
@@ -28,7 +27,7 @@ export function NewskieDialog({
   disabled?: boolean
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const control = useDialogControl()
 
   const createdAt = profile.createdAt
@@ -45,9 +44,7 @@ export function NewskieDialog({
     <View style={[a.pr_2xs]}>
       <Button
         disabled={disabled}
-        label={_(
-          msg`This user is new here. Press for more info about when they joined.`,
-        )}
+        label={l`This user is new here. Press for more info about when they joined.`}
         hitSlop={HITSLOP_10}
         onPress={control.open}>
         {({hovered, pressed}) => (
@@ -60,7 +57,6 @@ export function NewskieDialog({
           />
         )}
       </Button>
-
       <Dialog.Outer control={control} nativeOptions={{preventExpansion: true}}>
         <Dialog.Handle />
         <DialogInner profile={profile} createdAt={createdAt} now={now} />
@@ -79,7 +75,7 @@ function DialogInner({
   now: number
 }) {
   const control = Dialog.useDialogContext()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const moderationOpts = useModerationOpts()
   const {currentAccount} = useSession()
@@ -100,26 +96,22 @@ function DialogInner({
 
     if (isMe) {
       if (profile.joinedViaStarterPack) {
-        return _(
-          msg`You joined Bluesky using a starter pack ${timeAgoString} ago`,
-        )
+        return l`You joined Bluesky using a starter pack ${timeAgoString} ago`
       } else {
-        return _(msg`You joined Bluesky ${timeAgoString} ago`)
+        return l`You joined Bluesky ${timeAgoString} ago`
       }
     } else {
       if (profile.joinedViaStarterPack) {
-        return _(
-          msg`${profileName} joined Bluesky using a starter pack ${timeAgoString} ago`,
-        )
+        return l`${profileName} joined Bluesky using a starter pack ${timeAgoString} ago`
       } else {
-        return _(msg`${profileName} joined Bluesky ${timeAgoString} ago`)
+        return l`${profileName} joined Bluesky ${timeAgoString} ago`
       }
     }
   }
 
   return (
     <Dialog.ScrollableInner
-      label={_(msg`New user info dialog`)}
+      label={l`New user info dialog`}
       style={web({maxWidth: 400})}>
       <View style={[a.gap_md]}>
         <View style={[a.align_center]}>
@@ -166,7 +158,7 @@ function DialogInner({
 
         {IS_NATIVE && (
           <Button
-            label={_(msg`Close`)}
+            label={l`Close`}
             color="secondary"
             size="small"
             style={[a.mt_sm]}
@@ -177,7 +169,6 @@ function DialogInner({
           </Button>
         )}
       </View>
-
       <Dialog.Close />
     </Dialog.ScrollableInner>
   )
diff --git a/src/components/PolicyUpdateOverlay/updates/202508/index.tsx b/src/components/PolicyUpdateOverlay/updates/202508/index.tsx
index 5ade133131..bd98345820 100644
--- a/src/components/PolicyUpdateOverlay/updates/202508/index.tsx
+++ b/src/components/PolicyUpdateOverlay/updates/202508/index.tsx
@@ -1,7 +1,6 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useA11y} from '#/state/a11y'
@@ -16,7 +15,7 @@ import {IS_ANDROID} from '#/env'
 
 export function Content({state}: {state: PolicyUpdateState}) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {screenReaderEnabled} = useA11y()
 
   const handleClose = useCallback(() => {
@@ -28,27 +27,27 @@ export function Content({state}: {state: PolicyUpdateState}) {
     terms: {
       overridePresentation: false,
       to: `https://bsky.social/about/support/tos`,
-      label: _(msg`Terms of Service`),
+      label: l`Terms of Service`,
     },
     privacy: {
       overridePresentation: false,
       to: `https://bsky.social/about/support/privacy-policy`,
-      label: _(msg`Privacy Policy`),
+      label: l`Privacy Policy`,
     },
     copyright: {
       overridePresentation: false,
       to: `https://bsky.social/about/support/copyright`,
-      label: _(msg`Copyright Policy`),
+      label: l`Copyright Policy`,
     },
     guidelines: {
       overridePresentation: false,
       to: `https://bsky.social/about/support/community-guidelines`,
-      label: _(msg`Community Guidelines`),
+      label: l`Community Guidelines`,
     },
     blog: {
       overridePresentation: false,
       to: `https://bsky.social/about/blog/08-14-2025-updated-terms-and-policies`,
-      label: _(msg`Our blog post`),
+      label: l`Our blog post`,
     },
   }
   const linkButtonStyles = {
@@ -58,10 +57,8 @@ export function Content({state}: {state: PolicyUpdateState}) {
   } as const
 
   const label = IS_ANDROID
-    ? _(
-        msg`We’re updating our Terms of Service, Privacy Policy, and Copyright Policy, effective September 15th, 2025. We're also updating our Community Guidelines, and we want your input! These new guidelines will take effect on October 15th, 2025. Learn more about these changes and how to share your thoughts with us by reading our blog post.`,
-      )
-    : _(msg`We're updating our policies`)
+    ? l`We’re updating our Terms of Service, Privacy Policy, and Copyright Policy, effective September 15th, 2025. We're also updating our Community Guidelines, and we want your input! These new guidelines will take effect on October 15th, 2025. Learn more about these changes and how to share your thoughts with us by reading our blog post.`
+    : l`We're updating our policies`
 
   return (
     <Overlay label={label}>
@@ -160,10 +157,8 @@ export function Content({state}: {state: PolicyUpdateState}) {
 
         <View style={[a.w_full, a.gap_md]}>
           <Button
-            label={_(msg`Continue`)}
-            accessibilityHint={_(
-              msg`Tap to acknowledge that you understand and agree to these updates and continue using Bluesky`,
-            )}
+            label={l`Continue`}
+            accessibilityHint={l`Tap to acknowledge that you understand and agree to these updates and continue using Bluesky`}
             color="primary"
             size="large"
             onPress={handleClose}>
diff --git a/src/components/Post/Embed/ExternalEmbed/ExternalGif.tsx b/src/components/Post/Embed/ExternalEmbed/ExternalGif.tsx
index 529952f08e..2c2fb14d8b 100644
--- a/src/components/Post/Embed/ExternalEmbed/ExternalGif.tsx
+++ b/src/components/Post/Embed/ExternalEmbed/ExternalGif.tsx
@@ -6,8 +6,7 @@ import {
 } from 'react-native'
 import {Image} from 'expo-image'
 import {type AppBskyEmbedExternal} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {type EmbedPlayerParams} from '#/lib/strings/embed-player'
 import {useExternalEmbedsPrefs} from '#/state/preferences'
@@ -27,7 +26,7 @@ export function ExternalGif({
 }) {
   const t = useTheme()
   const externalEmbedsPrefs = useExternalEmbedsPrefs()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const consentDialogControl = useDialogControl()
 
   // Tracking if the placer has been activated
@@ -106,8 +105,8 @@ export function ExternalGif({
         ]}
         onPress={onPlayPress}
         accessibilityRole="button"
-        accessibilityHint={_(msg`Plays the GIF`)}
-        accessibilityLabel={_(msg`Play ${link.title}`)}>
+        accessibilityHint={l`Plays the GIF`}
+        accessibilityLabel={l`Play ${link.title}`}>
         <Image
           source={{
             uri:
diff --git a/src/components/Post/Embed/ExternalEmbed/ExternalPlayer.tsx b/src/components/Post/Embed/ExternalEmbed/ExternalPlayer.tsx
index 9decdea95b..eb3628b762 100644
--- a/src/components/Post/Embed/ExternalEmbed/ExternalPlayer.tsx
+++ b/src/components/Post/Embed/ExternalEmbed/ExternalPlayer.tsx
@@ -16,8 +16,7 @@ import {WebView} from 'react-native-webview'
 import {scheduleOnRN} from 'react-native-worklets'
 import {Image} from 'expo-image'
 import {type AppBskyEmbedExternal} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
 import {type NavigationProp} from '#/lib/routes/types'
@@ -49,7 +48,7 @@ function PlaceholderOverlay({
   isPlayerActive: boolean
   onPress: (event: GestureResponderEvent) => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   // If the player is active and not loading, we don't want to show the overlay.
   if (isPlayerActive && !isLoading) return null
@@ -58,8 +57,8 @@ function PlaceholderOverlay({
     <View style={[a.absolute, a.inset_0, {zIndex: 2}]}>
       <Pressable
         accessibilityRole="button"
-        accessibilityLabel={_(msg`Play Video`)}
-        accessibilityHint={_(msg`Plays the video`)}
+        accessibilityLabel={l`Play Video`}
+        accessibilityHint={l`Plays the video`}
         onPress={onPress}
         style={[a.flex_1, a.justify_center, a.align_center]}>
         {!isPlayerActive ? (
diff --git a/src/components/Post/Embed/ExternalEmbed/Gif.tsx b/src/components/Post/Embed/ExternalEmbed/Gif.tsx
index 24ea286ada..6b1ac6c1ab 100644
--- a/src/components/Post/Embed/ExternalEmbed/Gif.tsx
+++ b/src/components/Post/Embed/ExternalEmbed/Gif.tsx
@@ -1,7 +1,6 @@
 import {useRef, useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {type EmbedPlayerParams} from '#/lib/strings/embed-player'
 import {useAutoplayDisabled} from '#/state/preferences'
@@ -27,7 +26,7 @@ export function GifEmbed({
   hideAlt?: boolean
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const autoplayDisabled = useAutoplayDisabled()
 
   const playerRef = useRef<GifView>(null)
@@ -82,7 +81,7 @@ export function GifEmbed({
             autoplay={!autoplayDisabled}
             onPlayerStateChange={onPlayerStateChange}
             ref={playerRef}
-            accessibilityHint={_(msg`Animated GIF`)}
+            accessibilityHint={l`Animated GIF`}
             accessibilityLabel={altText}
           />
           {!playerState.isPlaying && (
diff --git a/src/components/Post/Embed/ExternalEmbed/index.tsx b/src/components/Post/Embed/ExternalEmbed/index.tsx
index f920359477..7078129c59 100644
--- a/src/components/Post/Embed/ExternalEmbed/index.tsx
+++ b/src/components/Post/Embed/ExternalEmbed/index.tsx
@@ -2,8 +2,7 @@ import {useMemo} from 'react'
 import {type StyleProp, View, type ViewStyle} from 'react-native'
 import {Image} from 'expo-image'
 import {type AppBskyEmbedExternal} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {parseAltFromGIFDescription} from '#/lib/gif-alt-text'
 import {useHaptics} from '#/lib/haptics'
@@ -35,7 +34,7 @@ export const ExternalEmbed = ({
   style?: StyleProp<ViewStyle>
   hideAlt?: boolean
 }) => {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const playHaptic = useHaptics()
   const externalEmbedPrefs = useExternalEmbedsPrefs()
@@ -85,7 +84,7 @@ export const ExternalEmbed = ({
 
   return (
     <Link
-      label={link.title || _(msg`Open link to ${niceUrl}`)}
+      label={link.title || l`Open link to ${niceUrl}`}
       to={link.uri}
       shouldProxy={true}
       peek
diff --git a/src/components/Post/Embed/VideoEmbed/GifPresentationControls.tsx b/src/components/Post/Embed/VideoEmbed/GifPresentationControls.tsx
index 048a925909..3ebfeeeca7 100644
--- a/src/components/Post/Embed/VideoEmbed/GifPresentationControls.tsx
+++ b/src/components/Post/Embed/VideoEmbed/GifPresentationControls.tsx
@@ -1,6 +1,5 @@
 import {ActivityIndicator, View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useLargeAltBadgeEnabled} from '#/state/preferences/large-alt-badge'
@@ -22,15 +21,15 @@ export function GifPresentationControls({
   isLoading?: boolean
   altText?: string
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const largeBadge = useLargeAltBadgeEnabled()
 
   return (
     <>
       <Button
-        label={isPlaying ? _(msg`Pause GIF`) : _(msg`Play GIF`)}
-        accessibilityHint={_(msg`Plays or pauses the GIF`)}
+        label={isPlaying ? l`Pause GIF` : l`Play GIF`}
+        accessibilityHint={l`Plays or pauses the GIF`}
         style={[
           a.absolute,
           a.align_center,
diff --git a/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx b/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx
index 7a09baaa8e..bfc925d01c 100644
--- a/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx
+++ b/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx
@@ -1,7 +1,7 @@
 import {type StyleProp, type ViewStyle} from 'react-native'
 import {View} from 'react-native'
-import {msg, plural} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {plural} from '@lingui/core/macro'
+import {useLingui} from '@lingui/react/macro'
 
 import {atoms as a, useTheme} from '#/alf'
 import {Text} from '#/components/Typography'
@@ -18,7 +18,7 @@ export function TimeIndicator({
   style?: StyleProp<ViewStyle>
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   if (isNaN(time)) {
     return null
@@ -30,12 +30,10 @@ export function TimeIndicator({
   return (
     <View
       pointerEvents="none"
-      accessibilityLabel={_(
-        msg`Time remaining: ${plural(Number(time) || 0, {
-          one: '# second',
-          other: '# seconds',
-        })}`,
-      )}
+      accessibilityLabel={l`Time remaining: ${plural(Number(time) || 0, {
+        one: '# second',
+        other: '# seconds',
+      })}`}
       accessibilityHint=""
       style={[
         {
diff --git a/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx b/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx
index bead58fd91..e8f7bda713 100644
--- a/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx
+++ b/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerNative.tsx
@@ -2,8 +2,7 @@ import {useImperativeHandle, useRef, useState} from 'react'
 import {Pressable, type StyleProp, View, type ViewStyle} from 'react-native'
 import {type AppBskyEmbedVideo} from '@atproto/api'
 import {BlueskyVideoView} from '@bsky.app/video'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {HITSLOP_30} from '#/lib/constants'
 import {useAutoplayDisabled} from '#/state/preferences'
@@ -39,7 +38,7 @@ export function VideoEmbedInnerNative({
    */
   onError?: (error: string) => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const videoRef = useRef<BlueskyVideoView>(null)
   const autoplayDisabled = useAutoplayDisabled()
   const isWithinMessage = useIsWithinMessage()
@@ -91,9 +90,7 @@ export function VideoEmbedInnerNative({
           setError(e.nativeEvent.error)
         }}
         ref={videoRef}
-        accessibilityLabel={
-          embed.alt ? _(msg`Video: ${embed.alt}`) : _(msg`Video`)
-        }
+        accessibilityLabel={embed.alt ? l`Video: ${embed.alt}` : l`Video`}
         accessibilityHint=""
       />
       {isGif ? (
@@ -144,7 +141,7 @@ function VideoPresentationControls({
   timeRemaining: number
   isPlaying: boolean
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const [muted] = useVideoMuteState()
 
@@ -159,14 +156,14 @@ function VideoPresentationControls({
       <Pressable
         onPress={enterFullscreen}
         style={a.flex_1}
-        accessibilityLabel={_(msg`Video`)}
-        accessibilityHint={_(msg`Enters full screen`)}
+        accessibilityLabel={l`Video`}
+        accessibilityHint={l`Enters full screen`}
         accessibilityRole="button"
       />
       <ControlButton
         onPress={togglePlayback}
-        label={isPlaying ? _(msg`Pause`) : _(msg`Play`)}
-        accessibilityHint={_(msg`Plays or pauses the video`)}
+        label={isPlaying ? l`Pause` : l`Play`}
+        accessibilityHint={l`Plays or pauses the video`}
         style={{left: 6}}>
         {isPlaying ? (
           <PauseIcon width={13} fill={t.palette.white} />
@@ -175,15 +172,14 @@ function VideoPresentationControls({
         )}
       </ControlButton>
       {showTime && <TimeIndicator time={timeRemaining} style={{left: 33}} />}
-
       <ControlButton
         onPress={toggleMuted}
         label={
           muted
-            ? _(msg({message: `Unmute`, context: 'video'}))
-            : _(msg({message: `Mute`, context: 'video'}))
+            ? l({message: `Unmute`, context: 'video'})
+            : l({message: `Mute`, context: 'video'})
         }
-        accessibilityHint={_(msg`Toggles the sound`)}
+        accessibilityHint={l`Toggles the sound`}
         style={{right: 6}}>
         {muted ? (
           <MuteIcon width={13} fill={t.palette.white} />
diff --git a/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerWeb.tsx b/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerWeb.tsx
index 6ece8f5a9b..48a6b09976 100644
--- a/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerWeb.tsx
+++ b/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoEmbedInnerWeb.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useEffect, useId, useRef, useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import type * as HlsTypes from 'hls.js'
 
 import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
@@ -36,7 +35,7 @@ export function VideoEmbedInnerWeb({
   const [hasSubtitleTrack, setHasSubtitleTrack] = useState(false)
   const [hlsLoading, setHlsLoading] = useState(false)
   const figId = useId()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const [isFullscreen] = useFullscreen(containerRef)
   const isGif = embed.presentation === 'gif'
 
@@ -63,7 +62,7 @@ export function VideoEmbedInnerWeb({
   return (
     <View
       style={[a.flex_1, a.rounded_md, a.overflow_hidden]}
-      accessibilityLabel={_(msg`Embedded video player`)}
+      accessibilityLabel={l`Embedded video player`}
       accessibilityHint="">
       <div ref={containerRef} style={{height: '100%', width: '100%'}}>
         <figure style={{margin: 0, position: 'absolute', inset: 0}}>
diff --git a/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoFallback.tsx b/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoFallback.tsx
index ad9f677e46..f9aa183a65 100644
--- a/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoFallback.tsx
+++ b/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/VideoFallback.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {atoms as a, useTheme} from '#/alf'
@@ -46,14 +45,14 @@ export function Text({children}: {children: React.ReactNode}) {
 }
 
 export function RetryButton({onPress}: {onPress: () => void}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <Button
       onPress={onPress}
       size="small"
       color="secondary_inverted"
-      label={_(msg`Retry`)}>
+      label={l`Retry`}>
       <ButtonIcon icon={ArrowRotateIcon} />
       <ButtonText>
         <Trans>Retry</Trans>
diff --git a/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/Scrubber.tsx b/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/Scrubber.tsx
index 13fe496a4f..47614e380b 100644
--- a/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/Scrubber.tsx
+++ b/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/Scrubber.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useEffect, useRef, useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {clamp} from '#/lib/numbers'
 import {atoms as a, useTheme, web} from '#/alf'
@@ -30,7 +29,7 @@ export function Scrubber({
   togglePlayPause: () => void
   drawFocus: () => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const [scrubberActive, setScrubberActive] = useState(false)
   const {
@@ -192,16 +191,12 @@ export function Scrubber({
         </View>
         <div
           ref={circleRef}
-          aria-label={_(
-            msg`Seek slider. Use the arrow keys to seek forwards and backwards, and space to play/pause`,
-          )}
+          aria-label={l`Seek slider. Use the arrow keys to seek forwards and backwards, and space to play/pause`}
           role="slider"
           aria-valuemax={duration}
           aria-valuemin={0}
           aria-valuenow={currentTime}
-          aria-valuetext={_(
-            msg`${formatTime(currentTime)} of ${formatTime(duration)}`,
-          )}
+          aria-valuetext={l`${formatTime(currentTime)} of ${formatTime(duration)}`}
           tabIndex={0}
           onFocus={onFocus}
           onBlur={onBlur}
diff --git a/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx b/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx
index 57f52e2f22..aa7d1a25cd 100644
--- a/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx
+++ b/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useEffect, useRef, useState} from 'react'
 import {Pressable, View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {clamp} from '#/lib/numbers'
@@ -64,7 +63,7 @@ export function Controls({
     canPlay,
   } = useVideoElement(videoRef)
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const subtitlesEnabled = useSubtitlesEnabled()
   const setSubtitlesEnabled = useSetSubtitlesEnabled()
   const {
@@ -326,11 +325,7 @@ export function Controls({
         onPointerMove={onPointerMoveEmptySpace}
         onPointerLeave={onPointerLeaveEmptySpace}
         accessibilityLabel={
-          !focused
-            ? _(msg`Unmute video`)
-            : playing
-              ? _(msg`Pause video`)
-              : _(msg`Play video`)
+          !focused ? l`Unmute video` : playing ? l`Pause video` : l`Play video`
         }
         accessibilityHint=""
         style={[
@@ -378,8 +373,8 @@ export function Controls({
           ]}>
           <ControlButton
             active={playing}
-            activeLabel={_(msg`Pause`)}
-            inactiveLabel={_(msg`Play`)}
+            activeLabel={l`Pause`}
+            inactiveLabel={l`Play`}
             activeIcon={PauseIcon}
             inactiveIcon={PlayIcon}
             onPress={onPressPlayPause}
@@ -397,8 +392,8 @@ export function Controls({
           {hasSubtitleTrack && (
             <ControlButton
               active={subtitlesEnabled}
-              activeLabel={_(msg`Disable captions`)}
-              inactiveLabel={_(msg`Enable captions`)}
+              activeLabel={l`Disable captions`}
+              inactiveLabel={l`Enable captions`}
               activeIcon={CCActiveIcon}
               inactiveIcon={CCInactiveIcon}
               onPress={onPressSubtitles}
@@ -415,8 +410,8 @@ export function Controls({
           {!IS_WEB_MOBILE_IOS && (
             <ControlButton
               active={isFullscreen}
-              activeLabel={_(msg`Exit fullscreen`)}
-              inactiveLabel={_(msg`Enter fullscreen`)}
+              activeLabel={l`Exit fullscreen`}
+              inactiveLabel={l`Enter fullscreen`}
               activeIcon={ArrowsInIcon}
               inactiveIcon={ArrowsOutIcon}
               onPress={onPressFullscreen}
diff --git a/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VolumeControl.tsx b/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VolumeControl.tsx
index 8edf6e8cce..4b013ae534 100644
--- a/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VolumeControl.tsx
+++ b/src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VolumeControl.tsx
@@ -1,8 +1,7 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
 import Animated, {FadeIn, FadeOut} from 'react-native-reanimated'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {atoms as a} from '#/alf'
 import {Mute_Stroke2_Corner0_Rounded as MuteIcon} from '#/components/icons/Mute'
@@ -26,7 +25,7 @@ export function VolumeControl({
   onEndHover: () => void
   drawFocus: () => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const [volume, setVolume] = useVideoVolumeState()
 
   const onVolumeChange = useCallback(
@@ -77,7 +76,7 @@ export function VolumeControl({
               min={0}
               max={100}
               value={sliderVolume}
-              aria-label={_(msg`Volume`)}
+              aria-label={l`Volume`}
               style={
                 // Ridiculous safari hack for old version of safari. Fixed in sonoma beta -h
                 IS_WEB_SAFARI
@@ -93,8 +92,8 @@ export function VolumeControl({
       )}
       <ControlButton
         active={muted || volume === 0}
-        activeLabel={_(msg({message: `Unmute`, context: 'video'}))}
-        inactiveLabel={_(msg({message: `Mute`, context: 'video'}))}
+        activeLabel={l({message: `Unmute`, context: 'video'})}
+        inactiveLabel={l({message: `Mute`, context: 'video'})}
         activeIcon={MuteIcon}
         inactiveIcon={UnmuteIcon}
         onPress={onPressMute}
diff --git a/src/components/Post/Embed/VideoEmbed/index.tsx b/src/components/Post/Embed/VideoEmbed/index.tsx
index d78aad4985..593f303ce8 100644
--- a/src/components/Post/Embed/VideoEmbed/index.tsx
+++ b/src/components/Post/Embed/VideoEmbed/index.tsx
@@ -2,8 +2,7 @@ import {useCallback, useEffect, useRef, useState} from 'react'
 import {ActivityIndicator, View} from 'react-native'
 import {ImageBackground} from 'expo-image'
 import {type AppBskyEmbedVideo} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {
@@ -70,7 +69,7 @@ export function VideoEmbed({embed}: Props) {
 }
 
 function InnerWrapper({embed}: Props) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const ref = useRef<{togglePlayback: () => void}>(null)
 
@@ -175,7 +174,7 @@ function InnerWrapper({embed}: Props) {
               onPress={() => {
                 ref.current?.togglePlayback()
               }}
-              label={_(msg`Play video`)}>
+              label={l`Play video`}>
               {showSpinner ? (
                 <View style={[a.align_center, a.justify_center]}>
                   <ActivityIndicator size="large" color="white" />
diff --git a/src/components/Post/Embed/VideoEmbed/index.web.tsx b/src/components/Post/Embed/VideoEmbed/index.web.tsx
index ee44ba33e8..cc5d7d30df 100644
--- a/src/components/Post/Embed/VideoEmbed/index.web.tsx
+++ b/src/components/Post/Embed/VideoEmbed/index.web.tsx
@@ -8,8 +8,7 @@ import {
 } from 'react'
 import {View} from 'react-native'
 import {type AppBskyEmbedVideo} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {ErrorBoundary} from '#/view/com/util/ErrorBoundary'
 import {atoms as a, useTheme} from '#/alf'
@@ -288,7 +287,7 @@ function VideoError({
   error: unknown
   retry: () => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
 
   let showRetryButton = true
@@ -296,16 +295,14 @@ function VideoError({
   let errorClass: string
 
   if (error instanceof VideoNotFoundError) {
-    text = _(msg`Video not found.`)
+    text = l`Video not found.`
     errorClass = 'VideoNotFoundError'
   } else if (error instanceof HLSUnsupportedError) {
     showRetryButton = false
-    text = _(
-      msg`This video can’t be played on your device. Your browser or system may be missing the required video codecs (H.264/AAC).`,
-    )
+    text = l`This video can’t be played on your device. Your browser or system may be missing the required video codecs (H.264/AAC).`
     errorClass = 'HLSUnsupportedError'
   } else {
-    text = _(msg`An error occurred while loading the video. Please try again.`)
+    text = l`An error occurred while loading the video. Please try again.`
     if (error instanceof HLSFatalError) {
       errorClass = error.detail
     } else if (error instanceof Error) {
diff --git a/src/components/PostControls/BookmarkButton.tsx b/src/components/PostControls/BookmarkButton.tsx
index b2ed043365..9da1d589a5 100644
--- a/src/components/PostControls/BookmarkButton.tsx
+++ b/src/components/PostControls/BookmarkButton.tsx
@@ -1,8 +1,7 @@
 import {memo} from 'react'
 import {type Insets} from 'react-native'
 import {type AppBskyFeedDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useCleanError} from '#/lib/hooks/useCleanError'
@@ -30,7 +29,7 @@ export const BookmarkButton = memo(function BookmarkButton({
 }): React.ReactNode {
   const t = useTheme()
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {mutateAsync: bookmark} = useBookmarkMutation()
   const cleanError = useCleanError()
   const requireAuth = useRequireAuth()
@@ -39,12 +38,10 @@ export const BookmarkButton = memo(function BookmarkButton({
   const {viewer} = post
   const isBookmarked = !!viewer?.bookmarked
 
-  const undoLabel = _(
-    msg({
-      message: `Undo`,
-      context: `Button label to undo saving/removing a post from saved posts.`,
-    }),
-  )
+  const undoLabel = l({
+    message: `Undo`,
+    context: `Button label to undo saving/removing a post from saved posts.`,
+  })
 
   const save = async () => {
     try {
@@ -115,11 +112,7 @@ export const BookmarkButton = memo(function BookmarkButton({
       big={big}
       active={isBookmarked}
       activeColor={t.palette.primary_500}
-      label={
-        isBookmarked
-          ? _(msg`Remove from saved posts`)
-          : _(msg`Add to saved posts`)
-      }
+      label={isBookmarked ? l`Remove from saved posts` : l`Add to saved posts`}
       onPress={onHandlePress}
       hitSlop={hitSlop}>
       <PostControlButtonIcon icon={isBookmarked ? BookmarkFilled : Bookmark} />
diff --git a/src/components/PostControls/RepostButton.tsx b/src/components/PostControls/RepostButton.tsx
index 734cafa3c8..998ff2e38f 100644
--- a/src/components/PostControls/RepostButton.tsx
+++ b/src/components/PostControls/RepostButton.tsx
@@ -1,7 +1,7 @@
 import {memo, useCallback} from 'react'
 import {View} from 'react-native'
-import {msg, plural} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {plural} from '@lingui/core/macro'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useHaptics} from '#/lib/haptics'
@@ -37,7 +37,7 @@ let RepostButton = ({
   embeddingDisabled,
 }: Props): React.ReactNode => {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const requireAuth = useRequireAuth()
   const dialogControl = Dialog.useDialogControl()
   const formatPostStatCount = useFormatPostStatCount()
@@ -64,26 +64,22 @@ let RepostButton = ({
         onLongPress={onLongPress}
         label={
           isReposted
-            ? _(
-                msg({
-                  message: `Undo repost (${plural(repostCount || 0, {
-                    one: '# repost',
-                    other: '# reposts',
-                  })})`,
-                  comment:
-                    'Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun',
-                }),
-              )
-            : _(
-                msg({
-                  message: `Repost (${plural(repostCount || 0, {
-                    one: '# repost',
-                    other: '# reposts',
-                  })})`,
-                  comment:
-                    'Accessibility label for the repost button when the post has not been reposted, verb form followed by number of reposts and noun form',
-                }),
-              )
+            ? l({
+                message: `Undo repost (${plural(repostCount || 0, {
+                  one: '# repost',
+                  other: '# reposts',
+                })})`,
+                comment:
+                  'Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun',
+              })
+            : l({
+                message: `Repost (${plural(repostCount || 0, {
+                  one: '# repost',
+                  other: '# reposts',
+                })})`,
+                comment:
+                  'Accessibility label for the repost button when the post has not been reposted, verb form followed by number of reposts and noun form',
+              })
         }>
         <PostControlButtonIcon icon={RepostIcon} />
         {typeof repostCount !== 'undefined' && repostCount > 0 && (
@@ -121,7 +117,7 @@ let RepostButtonDialogInner = ({
   embeddingDisabled: boolean
 }): React.ReactNode => {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const playHaptic = useHaptics()
   const control = Dialog.useDialogContext()
 
@@ -143,15 +139,15 @@ let RepostButtonDialogInner = ({
   const onPressClose = useCallback(() => control.close(), [control])
 
   return (
-    <Dialog.ScrollableInner label={_(msg`Repost or quote post`)}>
+    <Dialog.ScrollableInner label={l`Repost or quote post`}>
       <View style={a.gap_xl}>
         <View style={a.gap_xs}>
           <Button
             style={[a.justify_start, a.px_md, a.gap_sm]}
             label={
               isReposted
-                ? _(msg`Remove repost`)
-                : _(msg({message: `Repost`, context: 'action'}))
+                ? l`Remove repost`
+                : l({message: `Repost`, context: 'action'})
             }
             onPress={onPressRepost}
             size="large"
@@ -170,11 +166,7 @@ let RepostButtonDialogInner = ({
             disabled={embeddingDisabled}
             testID="quoteBtn"
             style={[a.justify_start, a.px_md, a.gap_sm]}
-            label={
-              embeddingDisabled
-                ? _(msg`Quote posts disabled`)
-                : _(msg`Quote post`)
-            }
+            label={embeddingDisabled ? l`Quote posts disabled` : l`Quote post`}
             onPress={onPressQuote}
             size="large"
             variant="ghost"
@@ -202,7 +194,7 @@ let RepostButtonDialogInner = ({
           </Button>
         </View>
         <Button
-          label={_(msg`Cancel quote post`)}
+          label={l`Cancel quote post`}
           onPress={onPressClose}
           size="large"
           color="secondary">
diff --git a/src/components/PostControls/RepostButton.web.tsx b/src/components/PostControls/RepostButton.web.tsx
index a5f5a6f7aa..f145cf4c4c 100644
--- a/src/components/PostControls/RepostButton.web.tsx
+++ b/src/components/PostControls/RepostButton.web.tsx
@@ -1,5 +1,4 @@
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {useRequireAuth, useSession} from '#/state/session'
 import {EventStopper} from '#/view/com/util/EventStopper'
@@ -32,7 +31,7 @@ export const RepostButton = ({
   embeddingDisabled,
 }: Props) => {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {hasSession} = useSession()
   const requireAuth = useRequireAuth()
   const formatPostStatCount = useFormatPostStatCount()
@@ -40,7 +39,7 @@ export const RepostButton = ({
   return hasSession ? (
     <EventStopper onKeyDown={false}>
       <Menu.Root>
-        <Menu.Trigger label={_(msg`Repost or quote post`)}>
+        <Menu.Trigger label={l`Repost or quote post`}>
           {({props}) => {
             return (
               <PostControlButton
@@ -64,31 +63,25 @@ export const RepostButton = ({
           <Menu.Item
             label={
               isReposted
-                ? _(msg`Undo repost`)
-                : _(msg({message: `Repost`, context: `action`}))
+                ? l`Undo repost`
+                : l({message: `Repost`, context: `action`})
             }
             testID="repostDropdownRepostBtn"
             onPress={onRepost}>
             <Menu.ItemText>
               {isReposted
-                ? _(msg`Undo repost`)
-                : _(msg({message: `Repost`, context: `action`}))}
+                ? l`Undo repost`
+                : l({message: `Repost`, context: `action`})}
             </Menu.ItemText>
             <Menu.ItemIcon icon={Repost} position="right" />
           </Menu.Item>
           <Menu.Item
             disabled={embeddingDisabled}
-            label={
-              embeddingDisabled
-                ? _(msg`Quote posts disabled`)
-                : _(msg`Quote post`)
-            }
+            label={embeddingDisabled ? l`Quote posts disabled` : l`Quote post`}
             testID="repostDropdownQuoteBtn"
             onPress={onQuote}>
             <Menu.ItemText>
-              {embeddingDisabled
-                ? _(msg`Quote posts disabled`)
-                : _(msg`Quote post`)}
+              {embeddingDisabled ? l`Quote posts disabled` : l`Quote post`}
             </Menu.ItemText>
             <Menu.ItemIcon icon={Quote} position="right" />
           </Menu.Item>
@@ -100,7 +93,7 @@ export const RepostButton = ({
       onPress={() => requireAuth(() => {})}
       active={isReposted}
       activeColor={t.palette.positive_500}
-      label={_(msg`Repost or quote post`)}
+      label={l`Repost or quote post`}
       big={big}>
       <PostControlButtonIcon icon={Repost} />
       {typeof repostCount !== 'undefined' && repostCount > 0 && (
diff --git a/src/components/PostControls/ShareMenu/RecentChats.tsx b/src/components/PostControls/ShareMenu/RecentChats.tsx
index bab3cbfded..3ee63d4313 100644
--- a/src/components/PostControls/ShareMenu/RecentChats.tsx
+++ b/src/components/PostControls/ShareMenu/RecentChats.tsx
@@ -4,8 +4,7 @@ import {
   moderateProfile,
   type ModerationOpts,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
@@ -118,7 +117,7 @@ function RecentChatItem({
   convo: ConvoWithDetails
   primaryMember: ChatBskyActorDefs.ProfileViewBasic
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
 
   const primaryProfile = useProfileShadow(primaryMember)
@@ -143,7 +142,7 @@ function RecentChatItem({
   return (
     <Button
       onPress={onPress}
-      label={_(msg`Send post to ${name}`)}
+      label={l`Send post to ${name}`}
       style={[
         a.flex_col,
         {width: WIDTH},
diff --git a/src/components/PostControls/ShareMenu/index.tsx b/src/components/PostControls/ShareMenu/index.tsx
index efac6a3f01..6ea0724363 100644
--- a/src/components/PostControls/ShareMenu/index.tsx
+++ b/src/components/PostControls/ShareMenu/index.tsx
@@ -7,8 +7,7 @@ import {
   AtUri,
   type RichText as RichTextAPI,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {makeProfileLink} from '#/lib/routes/links'
 import {shareUrl} from '#/lib/sharing'
@@ -48,7 +47,7 @@ let ShareMenuButton = ({
   logContext: 'FeedItem' | 'PostThreadItem' | 'Post' | 'ImmersiveVideo'
 }): React.ReactNode => {
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {feedDescriptor} = useFeedFeedbackContext()
 
   const menuControl = useMenuControl()
@@ -95,7 +94,7 @@ let ShareMenuButton = ({
   return (
     <EventStopper onKeyDown={false}>
       <Menu.Root control={lazyMenuControl}>
-        <Menu.Trigger label={_(msg`Open share menu`)}>
+        <Menu.Trigger label={l`Open share menu`}>
           {({props}) => {
             return (
               <PostControlButton
diff --git a/src/components/PostControls/util.ts b/src/components/PostControls/util.ts
index 6dc395882c..b3aafe3c79 100644
--- a/src/components/PostControls/util.ts
+++ b/src/components/PostControls/util.ts
@@ -1,5 +1,5 @@
 import {useCallback} from 'react'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 /**
  * This matches `formatCount` from `view/com/util/numeric/format.ts`, but has
diff --git a/src/components/ProfileHoverCard/index.web.tsx b/src/components/ProfileHoverCard/index.web.tsx
index 46dade016b..bbcb1dcf35 100644
--- a/src/components/ProfileHoverCard/index.web.tsx
+++ b/src/components/ProfileHoverCard/index.web.tsx
@@ -6,8 +6,8 @@ import {
   type ModerationOpts,
 } from '@atproto/api'
 import {flip, offset, shift, size, useFloating} from '@floating-ui/react-dom'
-import {msg, plural} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {plural} from '@lingui/core/macro'
+import {useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
 import {getModerationCauseKey} from '#/lib/moderation'
@@ -423,7 +423,7 @@ function Inner({
   hide: () => void
 }) {
   const t = useTheme()
-  const {_, i18n} = useLingui()
+  const {t: l, i18n} = useLingui()
   const {currentAccount} = useSession()
   const moderation = useMemo(
     () => moderateProfile(profile, moderationOpts),
@@ -462,7 +462,7 @@ function Inner({
   return (
     <View>
       <View style={[a.flex_row, a.justify_between, a.align_start]}>
-        <Link to={profileURL} label={_(msg`View profile`)} onPress={hide}>
+        <Link to={profileURL} label={l`View profile`} onPress={hide}>
           <UserAvatar
             size={64}
             avatar={profile.avatar}
@@ -476,24 +476,20 @@ function Inner({
           (isBlockedUser ? (
             <Link
               to={profileURL}
-              label={_(msg`View blocked user's profile`)}
+              label={l`View blocked user's profile`}
               onPress={hide}
               size="small"
               color="secondary"
               variant="solid"
               style={[a.rounded_full]}>
-              <ButtonText>{_(msg`View profile`)}</ButtonText>
+              <ButtonText>{l`View profile`}</ButtonText>
             </Link>
           ) : (
             <Button
               size="small"
               color={profileShadow.viewer?.following ? 'secondary' : 'primary'}
               variant="solid"
-              label={
-                profileShadow.viewer?.following
-                  ? _(msg`Following`)
-                  : _(msg`Follow`)
-              }
+              label={profileShadow.viewer?.following ? l`Following` : l`Follow`}
               style={[a.rounded_full]}
               onPress={profileShadow.viewer?.following ? unfollow : follow}>
               <ButtonIcon
@@ -501,15 +497,12 @@ function Inner({
                 icon={profileShadow.viewer?.following ? Check : Plus}
               />
               <ButtonText>
-                {profileShadow.viewer?.following
-                  ? _(msg`Following`)
-                  : _(msg`Follow`)}
+                {profileShadow.viewer?.following ? l`Following` : l`Follow`}
               </ButtonText>
             </Button>
           ))}
       </View>
-
-      <Link to={profileURL} label={_(msg`View profile`)} onPress={hide}>
+      <Link to={profileURL} label={l`View profile`} onPress={hide}>
         <View style={[a.pb_sm, a.flex_1]}>
           <View style={[a.flex_row, a.align_center, a.pt_md, a.pb_xs]}>
             <Text
@@ -540,7 +533,6 @@ function Inner({
           <ProfileHeaderHandle profile={profileShadow} disableTaps />
         </View>
       </Link>
-
       {isBlockedUser && (
         <View style={[a.flex_row, a.flex_wrap, a.gap_xs]}>
           {moderation.ui('profileView').alerts.map(cause => (
@@ -553,7 +545,6 @@ function Inner({
           ))}
         </View>
       )}
-
       {!isBlockedUser && (
         <>
           <View style={[a.flex_row, a.flex_wrap, a.gap_md, a.pt_xs]}>
@@ -569,7 +560,7 @@ function Inner({
             </InlineLinkText>
             <InlineLinkText
               to={makeProfileLink(profile, 'follows')}
-              label={_(msg`${following} following`)}
+              label={l`${following} following`}
               style={[t.atoms.text]}
               onPress={hide}>
               <Text style={[a.text_md, a.font_semi_bold]}>{following} </Text>
diff --git a/src/components/ProgressGuide/Toast.tsx b/src/components/ProgressGuide/Toast.tsx
index 961f3ed231..eb52204c2a 100644
--- a/src/components/ProgressGuide/Toast.tsx
+++ b/src/components/ProgressGuide/Toast.tsx
@@ -15,8 +15,7 @@ import Animated, {
 } from 'react-native-reanimated'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {scheduleOnRN} from 'react-native-worklets'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {atoms as a, useTheme} from '#/alf'
 import {Portal} from '#/components/Portal'
@@ -40,7 +39,7 @@ export const ProgressGuideToast = forwardRef<
   ProgressGuideToastProps
 >(function ProgressGuideToast({title, subtitle, visibleDuration}, ref) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const insets = useSafeAreaInsets()
   const [isOpen, setIsOpen] = useState(false)
   const translateY = useSharedValue(0)
@@ -156,7 +155,7 @@ export const ProgressGuideToast = forwardRef<
               },
             ]}
             onPress={close}
-            accessibilityLabel={_(msg`Tap to dismiss`)}
+            accessibilityLabel={l`Tap to dismiss`}
             accessibilityHint="">
             <AnimatedCheck
               fill={t.palette.primary_500}
diff --git a/src/components/RichTextTag.tsx b/src/components/RichTextTag.tsx
index acb25a74d7..3f8edf4f7b 100644
--- a/src/components/RichTextTag.tsx
+++ b/src/components/RichTextTag.tsx
@@ -1,7 +1,6 @@
 import {useMemo} from 'react'
 import {type StyleProp, Text as RNText, type TextStyle} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
@@ -35,7 +34,7 @@ export function RichTextTag({
   authorHandle?: string
   textStyle: StyleProp<TextStyle>
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {isLoading: isPreferencesLoading, data: preferences} =
     usePreferencesQuery()
   const {
@@ -50,10 +49,10 @@ export function RichTextTag({
   } = useRemoveMutedWordsMutation()
   const navigation = useNavigation<NavigationProp>()
   const isCashtag = tag.startsWith('$')
-  const label = isCashtag ? _(msg`Cashtag ${tag}`) : _(msg`Hashtag ${tag}`)
+  const label = isCashtag ? l`Cashtag ${tag}` : l`Hashtag ${tag}`
   const hint = IS_NATIVE
-    ? _(msg`Long press to open tag menu for ${isCashtag ? tag : `#${tag}`}`)
-    : _(msg`Click to open tag menu for ${isCashtag ? tag : `#${tag}`}`)
+    ? l`Long press to open tag menu for ${isCashtag ? tag : `#${tag}`}`
+    : l`Click to open tag menu for ${isCashtag ? tag : `#${tag}`}`
 
   const isMuted = Boolean(
     (preferences?.moderationPrefs.mutedWords?.find(
@@ -111,7 +110,7 @@ export function RichTextTag({
       <Menu.Outer>
         <Menu.Group>
           <Menu.Item
-            label={_(msg`See ${isCashtag ? tag : `#${tag}`} posts`)}
+            label={l`See ${isCashtag ? tag : `#${tag}`} posts`}
             onPress={() => {
               navigation.push('Hashtag', {
                 tag: encodeURIComponent(tag),
@@ -128,7 +127,7 @@ export function RichTextTag({
           </Menu.Item>
           {authorHandle && !isInvalidHandle(authorHandle) && (
             <Menu.Item
-              label={_(msg`See ${isCashtag ? tag : `#${tag}`} posts by user`)}
+              label={l`See ${isCashtag ? tag : `#${tag}`} posts by user`}
               onPress={() => {
                 navigation.push('Hashtag', {
                   tag: encodeURIComponent(tag),
@@ -150,8 +149,8 @@ export function RichTextTag({
         <Menu.Item
           label={
             isMuted
-              ? _(msg`Unmute ${isCashtag ? tag : `#${tag}`}`)
-              : _(msg`Mute ${isCashtag ? tag : `#${tag}`}`)
+              ? l`Unmute ${isCashtag ? tag : `#${tag}`}`
+              : l`Mute ${isCashtag ? tag : `#${tag}`}`
           }
           onPress={() => {
             if (isMuted) {
@@ -166,8 +165,8 @@ export function RichTextTag({
           }}>
           <Menu.ItemText>
             {isMuted
-              ? _(msg`Unmute ${isCashtag ? tag : `#${tag}`}`)
-              : _(msg`Mute ${isCashtag ? tag : `#${tag}`}`)}
+              ? l`Unmute ${isCashtag ? tag : `#${tag}`}`
+              : l`Mute ${isCashtag ? tag : `#${tag}`}`}
           </Menu.ItemText>
           <Menu.ItemIcon icon={isPreferencesLoading ? Loader : Mute} />
         </Menu.Item>
diff --git a/src/components/Select/index.tsx b/src/components/Select/index.tsx
index a7dd70d8e7..27b5d2e06d 100644
--- a/src/components/Select/index.tsx
+++ b/src/components/Select/index.tsx
@@ -7,8 +7,7 @@ import {
   useState,
 } from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {atoms as a, useTheme} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
@@ -170,7 +169,7 @@ function ContentInner<T>({
   valueExtractor,
   ...context
 }: ContentProps<T> & ContextType) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const [headerHeight, setHeaderHeight] = useState(61)
 
   const render = useCallback(
@@ -196,7 +195,7 @@ function ContentInner<T>({
         ]}>
         <Dialog.HeaderText
           style={[a.flex_1, a.px_xl, a.text_left, a.font_bold, a.text_2xl]}>
-          {label ?? _(msg`Select an option`)}
+          {label ?? l`Select an option`}
         </Dialog.HeaderText>
       </Dialog.Header>
       <Dialog.Handle />
diff --git a/src/components/StarterPack/Main/PostsList.tsx b/src/components/StarterPack/Main/PostsList.tsx
index ebd0dcf59d..1f6c471c5c 100644
--- a/src/components/StarterPack/Main/PostsList.tsx
+++ b/src/components/StarterPack/Main/PostsList.tsx
@@ -1,7 +1,6 @@
 import {forwardRef, useCallback, useImperativeHandle} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {type FeedDescriptor} from '#/state/queries/post-feed'
 import {PostFeed} from '#/view/com/posts/PostFeed'
@@ -20,7 +19,7 @@ interface ProfilesListProps {
 export const PostsList = forwardRef<SectionRef, ProfilesListProps>(
   function PostsListImpl({listUri, headerHeight, scrollElRef}, ref) {
     const feed: FeedDescriptor = `list|${listUri}`
-    const {_} = useLingui()
+    const {t: l} = useLingui()
 
     const onScrollToTop = useCallback(() => {
       scrollElRef.current?.scrollToOffset({
@@ -38,10 +37,10 @@ export const PostsList = forwardRef<SectionRef, ProfilesListProps>(
         <EmptyState
           icon={HashtagWideIcon}
           iconSize="2xl"
-          message={_(msg`This feed is empty.`)}
+          message={l`This feed is empty.`}
         />
       )
-    }, [_])
+    }, [l])
 
     return (
       <View>
diff --git a/src/components/StarterPack/ProfileStarterPacks.tsx b/src/components/StarterPack/ProfileStarterPacks.tsx
index 69d4b5130e..9827495a0d 100644
--- a/src/components/StarterPack/ProfileStarterPacks.tsx
+++ b/src/components/StarterPack/ProfileStarterPacks.tsx
@@ -7,8 +7,7 @@ import {
   type ViewStyle,
 } from 'react-native'
 import {type AppBskyGraphDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
@@ -90,7 +89,7 @@ export function ProfileStarterPacks({
   const {isTabletOrDesktop} = useWebMediaQueries()
 
   const items = data?.pages.flatMap(page => page.starterPacks)
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const EmptyComponent = useCallback(() => {
     if (emptyStateMessage || emptyStateButton || emptyStateIcon) {
@@ -101,9 +100,7 @@ export function ProfileStarterPacks({
             iconSize="3xl"
             message={
               emptyStateMessage ??
-              _(
-                msg`Starter packs let you share your favorite feeds and people with your friends.`,
-              )
+              l`Starter packs let you share your favorite feeds and people with your friends.`
             }
             button={emptyStateButton}
           />
@@ -111,7 +108,7 @@ export function ProfileStarterPacks({
       )
     }
     return <Empty />
-  }, [_, emptyStateMessage, emptyStateButton, emptyStateIcon])
+  }, [l, emptyStateMessage, emptyStateButton, emptyStateIcon])
 
   useImperativeHandle(ref, () => ({
     scrollToTop: () => {},
@@ -193,7 +190,7 @@ export function ProfileStarterPacks({
 }
 
 function CreateAnother() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const navigation = useNavigation<NavigationProp>()
 
@@ -207,7 +204,7 @@ function CreateAnother() {
         t.atoms.border_contrast_low,
       ]}>
       <Button
-        label={_(msg`Create a starter pack`)}
+        label={l`Create a starter pack`}
         variant="solid"
         color="secondary"
         size="small"
@@ -223,7 +220,7 @@ function CreateAnother() {
 }
 
 function Empty() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const navigation = useNavigation<NavigationProp>()
   const confirmDialogControl = useDialogControl()
   const followersDialogControl = useDialogControl()
@@ -303,7 +300,7 @@ function Empty() {
       </View>
       <View style={[a.flex_row, a.gap_md, {marginLeft: 'auto'}]}>
         <Button
-          label={_(msg`Create a starter pack for me`)}
+          label={l`Create a starter pack for me`}
           variant="ghost"
           color="primary"
           size="small"
@@ -316,7 +313,7 @@ function Empty() {
           {isGenerating && <Loader size="md" />}
         </Button>
         <Button
-          label={_(msg`Create a starter pack`)}
+          label={l`Create a starter pack`}
           variant="ghost"
           color="primary"
           size="small"
@@ -333,7 +330,6 @@ function Empty() {
           </ButtonText>
         </Button>
       </View>
-
       <Prompt.Outer control={confirmDialogControl}>
         <Prompt.Content>
           <Prompt.TitleText>
@@ -349,12 +345,12 @@ function Empty() {
         <Prompt.Actions>
           <Prompt.Action
             color="primary"
-            cta={_(msg`Choose for me`)}
+            cta={l`Choose for me`}
             onPress={generate}
           />
           <Prompt.Action
             color="secondary"
-            cta={_(msg`Let me choose`)}
+            cta={l`Let me choose`}
             onPress={() => {
               navigation.navigate('StarterPackWizard', {})
             }}
@@ -363,21 +359,17 @@ function Empty() {
       </Prompt.Outer>
       <Prompt.Basic
         control={followersDialogControl}
-        title={_(msg`Oops!`)}
-        description={_(
-          msg`You must be following at least seven other people to generate a starter pack.`,
-        )}
+        title={l`Oops!`}
+        description={l`You must be following at least seven other people to generate a starter pack.`}
         onConfirm={() => {}}
         showCancel={false}
       />
       <Prompt.Basic
         control={errorDialogControl}
-        title={_(msg`Oops!`)}
-        description={_(
-          msg`An error occurred while generating your starter pack. Want to try again?`,
-        )}
+        title={l`Oops!`}
+        description={l`An error occurred while generating your starter pack. Want to try again?`}
         onConfirm={generate}
-        confirmButtonCta={_(msg`Retry`)}
+        confirmButtonCta={l`Retry`}
       />
     </LinearGradientBackground>
   )
diff --git a/src/components/StarterPack/QrCodeDialog.tsx b/src/components/StarterPack/QrCodeDialog.tsx
index e239eee9a4..f965877f0b 100644
--- a/src/components/StarterPack/QrCodeDialog.tsx
+++ b/src/components/StarterPack/QrCodeDialog.tsx
@@ -4,8 +4,7 @@ import type ViewShot from 'react-native-view-shot'
 import {requestPermissionsAsync, saveToLibraryAsync} from 'expo-media-library'
 import * as Sharing from 'expo-sharing'
 import {type AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {logger} from '#/logger'
@@ -32,7 +31,7 @@ export function QrCodeDialog({
   link?: string
   control: DialogControlProps
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const {gtMobile} = useBreakpoints()
   const [isSaveProcessing, setIsSaveProcessing] = useState(false)
@@ -65,9 +64,7 @@ export function QrCodeDialog({
 
         if (!res.granted) {
           Toast.show(
-            _(
-              msg`You must grant access to your photo library to save a QR code`,
-            ),
+            l`You must grant access to your photo library to save a QR code`,
           )
           return
         }
@@ -78,7 +75,7 @@ export function QrCodeDialog({
           // works with the add-only permission on iOS (APP-2374)
           await saveToLibraryAsync(`file://${uri}`)
         } catch (e: unknown) {
-          Toast.show(_(msg`An error occurred while saving the QR code!`), {
+          Toast.show(l`An error occurred while saving the QR code!`, {
             type: 'error',
           })
           logger.error('Failed to save QR code', {error: e})
@@ -118,8 +115,8 @@ export function QrCodeDialog({
       setIsSaveProcessing(false)
       Toast.show(
         IS_WEB
-          ? _(msg`QR code has been downloaded!`)
-          : _(msg`QR code saved to your camera roll!`),
+          ? l`QR code has been downloaded!`
+          : l`QR code saved to your camera roll!`,
       )
       control.close()
     })
@@ -140,7 +137,7 @@ export function QrCodeDialog({
         shareType: 'qrcode',
         qrShareType: 'copy',
       })
-      Toast.show(_(msg`QR code copied to your clipboard!`))
+      Toast.show(l`QR code copied to your clipboard!`)
       setIsCopyProcessing(false)
       control.close()
     })
@@ -165,8 +162,7 @@ export function QrCodeDialog({
   return (
     <Dialog.Outer control={control} nativeOptions={{preventExpansion: true}}>
       <Dialog.Handle />
-      <Dialog.ScrollableInner
-        label={_(msg`Create a QR code for a starter pack`)}>
+      <Dialog.ScrollableInner label={l`Create a QR code for a starter pack`}>
         <View style={[a.flex_1, a.align_center, a.gap_5xl]}>
           <Suspense fallback={<Loading />}>
             {!link ? (
@@ -181,7 +177,7 @@ export function QrCodeDialog({
                     gtMobile && [a.flex_row, a.justify_center, a.flex_wrap],
                   ]}>
                   <Button
-                    label={_(msg`Copy QR code`)}
+                    label={l`Copy QR code`}
                     color="primary_subtle"
                     size="large"
                     onPress={IS_WEB ? onCopyPress : onSharePress}>
@@ -199,7 +195,7 @@ export function QrCodeDialog({
                     </ButtonText>
                   </Button>
                   <Button
-                    label={_(msg`Save QR code`)}
+                    label={l`Save QR code`}
                     color="secondary"
                     size="large"
                     onPress={onSavePress}>
diff --git a/src/components/StarterPack/ShareDialog.tsx b/src/components/StarterPack/ShareDialog.tsx
index 0dd640d3c0..9fbd70000e 100644
--- a/src/components/StarterPack/ShareDialog.tsx
+++ b/src/components/StarterPack/ShareDialog.tsx
@@ -1,8 +1,7 @@
 import {View} from 'react-native'
 import {Image} from 'expo-image'
 import {type AppBskyGraphDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useSaveImageToMediaLibrary} from '#/lib/media/save-image'
@@ -46,7 +45,7 @@ function ShareDialogInner({
   qrDialogControl,
   control,
 }: Props) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const t = useTheme()
   const {gtMobile} = useBreakpoints()
@@ -71,7 +70,7 @@ function ShareDialogInner({
 
   return (
     <>
-      <Dialog.ScrollableInner label={_(msg`Share link dialog`)}>
+      <Dialog.ScrollableInner label={l`Share link dialog`}>
         {!imageLoaded || !link ? (
           <View style={[a.align_center, a.justify_center, {minHeight: 350}]}>
             <Loader size="xl" />
@@ -112,7 +111,7 @@ function ShareDialogInner({
                 ],
               ]}>
               <Button
-                label={IS_WEB ? _(msg`Copy link`) : _(msg`Share link`)}
+                label={IS_WEB ? l`Copy link` : l`Share link`}
                 color="primary_subtle"
                 size="large"
                 onPress={onShareLink}>
@@ -126,7 +125,7 @@ function ShareDialogInner({
                 </ButtonText>
               </Button>
               <Button
-                label={_(msg`Share QR code`)}
+                label={l`Share QR code`}
                 color="primary_subtle"
                 size="large"
                 onPress={() => {
@@ -141,7 +140,7 @@ function ShareDialogInner({
               </Button>
               {IS_NATIVE && (
                 <Button
-                  label={_(msg`Save image`)}
+                  label={l`Save image`}
                   color="secondary"
                   size="large"
                   onPress={onSave}>
diff --git a/src/components/StarterPack/StarterPackCard.tsx b/src/components/StarterPack/StarterPackCard.tsx
index 2ddfe642a9..4932fcc63f 100644
--- a/src/components/StarterPack/StarterPackCard.tsx
+++ b/src/components/StarterPack/StarterPackCard.tsx
@@ -2,8 +2,7 @@ import {useMemo} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
 import {AppBskyGraphStarterpack, AtUri} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -58,7 +57,7 @@ export function Card({
 }) {
   const {record, creator, joinedAllTimeCount} = starterPack
 
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const {currentAccount} = useSession()
 
@@ -87,8 +86,8 @@ export function Card({
             style={[a.leading_snug, t.atoms.text_contrast_medium]}
             numberOfLines={1}>
             {creator?.did === currentAccount?.did
-              ? _(msg`Starter pack by you`)
-              : _(msg`Starter pack by ${sanitizeHandle(creator.handle, '@')}`)}
+              ? l`Starter pack by you`
+              : l`Starter pack by ${sanitizeHandle(creator.handle, '@')}`}
           </Text>
         </View>
       </View>
@@ -113,7 +112,7 @@ export function useStarterPackLink({
 }: {
   view: bsky.starterPack.AnyStarterPackView
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const qc = useQueryClient()
   const {rkey, handleOrDid} = useMemo(() => {
     const rkey = new AtUri(view.uri).rkey
@@ -131,8 +130,8 @@ export function useStarterPackLink({
       view.record,
       AppBskyGraphStarterpack.isRecord,
     )
-      ? _(msg`Navigate to ${view.record.name}`)
-      : _(msg`Navigate to starter pack`),
+      ? l`Navigate to ${view.record.name}`
+      : l`Navigate to starter pack`,
     precache,
   }
 }
@@ -145,7 +144,7 @@ export function Link({
   onPress?: () => void
   children: BaseLinkProps['children']
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const queryClient = useQueryClient()
   const {record} = starterPack
   const {rkey, handleOrDid} = useMemo(() => {
@@ -166,7 +165,7 @@ export function Link({
   return (
     <BaseLink
       to={`/starter-pack/${handleOrDid}/${rkey}`}
-      label={_(msg`Navigate to ${record.name}`)}
+      label={l`Navigate to ${record.name}`}
       onPress={() => {
         precacheResolvedUri(
           queryClient,
diff --git a/src/components/StarterPack/Wizard/WizardEditListDialog.tsx b/src/components/StarterPack/Wizard/WizardEditListDialog.tsx
index d0c5d546db..a49fa1f97e 100644
--- a/src/components/StarterPack/Wizard/WizardEditListDialog.tsx
+++ b/src/components/StarterPack/Wizard/WizardEditListDialog.tsx
@@ -6,8 +6,7 @@ import {
   type AppBskyFeedDefs,
   type ModerationOpts,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender'
@@ -46,7 +45,7 @@ export function WizardEditListDialog({
   moderationOpts: ModerationOpts
   profile: AppBskyActorDefs.ProfileViewDetailed
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const initialNumToRender = useInitialNumToRender()
 
@@ -119,7 +118,7 @@ export function WizardEditListDialog({
             <View style={{width: 60}}>
               {IS_WEB && (
                 <Button
-                  label={_(msg`Close`)}
+                  label={l`Close`}
                   variant="ghost"
                   color="primary"
                   size="small"
diff --git a/src/components/StarterPack/Wizard/WizardListCard.tsx b/src/components/StarterPack/Wizard/WizardListCard.tsx
index b48c656a08..b58ed0e519 100644
--- a/src/components/StarterPack/Wizard/WizardListCard.tsx
+++ b/src/components/StarterPack/Wizard/WizardListCard.tsx
@@ -7,8 +7,7 @@ import {
   type ModerationOpts,
   type ModerationUI,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {DISCOVER_FEED_URI, STARTER_PACK_MAX_SIZE} from '#/lib/constants'
@@ -52,15 +51,15 @@ function WizardListCard({
   moderationUi: ModerationUI
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <Toggle.Item
-      name={type === 'user' ? _(msg`Person toggle`) : _(msg`Feed toggle`)}
+      name={type === 'user' ? l`Person toggle` : l`Feed toggle`}
       label={
         included
-          ? _(msg`Remove ${displayName} from starter pack`)
-          : _(msg`Add ${displayName} to starter pack`)
+          ? l`Remove ${displayName} from starter pack`
+          : l`Add ${displayName} to starter pack`
       }
       value={included}
       disabled={btnType === 'remove' || disabled}
@@ -103,7 +102,7 @@ function WizardListCard({
         <Checkbox />
       ) : !disabled ? (
         <Button
-          label={_(msg`Remove`)}
+          label={l`Remove`}
           variant="solid"
           color="secondary"
           size="small"
diff --git a/src/components/WhoCanReply.tsx b/src/components/WhoCanReply.tsx
index be7636ff4b..6c8763e497 100644
--- a/src/components/WhoCanReply.tsx
+++ b/src/components/WhoCanReply.tsx
@@ -12,8 +12,7 @@ import {
   type AppBskyGraphDefs,
   AtUri,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {HITSLOP_10} from '#/lib/constants'
@@ -49,7 +48,7 @@ interface WhoCanReplyProps {
 export function WhoCanReply({post, isThreadAuthor, style}: WhoCanReplyProps) {
   const t = useTheme()
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const infoDialogControl = useDialogControl()
   const editDialogControl = useDialogControl()
 
@@ -82,10 +81,10 @@ export function WhoCanReply({post, isThreadAuthor, style}: WhoCanReplyProps) {
     settings.length === 1 && settings[0].type === 'everybody'
   const noOneCanReply = settings.length === 1 && settings[0].type === 'nobody'
   const description = anyoneCanReply
-    ? _(msg`Everybody can reply`)
+    ? l`Everybody can reply`
     : noOneCanReply
-      ? _(msg`Replies disabled`)
-      : _(msg`Some people can reply`)
+      ? l`Replies disabled`
+      : l`Some people can reply`
 
   const onPressOpen = () => {
     if (IS_NATIVE && Keyboard.isVisible()) {
@@ -112,9 +111,7 @@ export function WhoCanReply({post, isThreadAuthor, style}: WhoCanReplyProps) {
   return (
     <>
       <Button
-        label={
-          isThreadAuthor ? _(msg`Edit who can reply`) : _(msg`Who can reply`)
-        }
+        label={isThreadAuthor ? l`Edit who can reply` : l`Who can reply`}
         onPress={onPressOpen}
         {...(isThreadAuthor
           ? Platform.select({
@@ -161,7 +158,6 @@ export function WhoCanReply({post, isThreadAuthor, style}: WhoCanReplyProps) {
           </View>
         )}
       </Button>
-
       {isThreadAuthor ? (
         <PostInteractionSettingsDialog
           postUri={post.uri}
@@ -213,13 +209,13 @@ function WhoCanReplyDialog({
   settings: ThreadgateAllowUISetting[]
   embeddingDisabled: boolean
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <Dialog.Outer control={control} nativeOptions={{preventExpansion: true}}>
       <Dialog.Handle />
       <Dialog.ScrollableInner
-        label={_(msg`Dialog: adjust who can interact with this post`)}
+        label={l`Dialog: adjust who can interact with this post`}
         style={web({maxWidth: 400})}>
         <View style={[a.gap_sm]}>
           <Text style={[a.font_semi_bold, a.text_xl, a.pb_sm]}>
@@ -233,7 +229,7 @@ function WhoCanReplyDialog({
         </View>
         {IS_NATIVE && (
           <Button
-            label={_(msg`Close`)}
+            label={l`Close`}
             onPress={() => control.close()}
             size="small"
             variant="solid"
diff --git a/src/components/activity-notifications/SubscribeProfileDialog.tsx b/src/components/activity-notifications/SubscribeProfileDialog.tsx
index 8a6b8314cd..419b352220 100644
--- a/src/components/activity-notifications/SubscribeProfileDialog.tsx
+++ b/src/components/activity-notifications/SubscribeProfileDialog.tsx
@@ -6,8 +6,7 @@ import {
   type ModerationOpts,
   type Un$Typed,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {
   type InfiniteData,
@@ -72,7 +71,7 @@ function DialogInner({
   includeProfile?: boolean
 }) {
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const agent = useAgent()
   const control = Dialog.useDialogContext()
@@ -136,9 +135,7 @@ function DialogInner({
         if (!activitySubscription.post && !activitySubscription.reply) {
           ax.metric('activitySubscription:disable', {})
           Toast.show(
-            _(
-              msg`You will no longer receive notifications for ${sanitizeHandle(profile.handle, '@')}`,
-            ),
+            l`You will no longer receive notifications for ${sanitizeHandle(profile.handle, '@')}`,
             {
               type: 'success',
             },
@@ -168,15 +165,13 @@ function DialogInner({
           })
           if (!initialState.post && !initialState.reply) {
             Toast.show(
-              _(
-                msg`You'll start receiving notifications for ${sanitizeHandle(profile.handle, '@')}!`,
-              ),
+              l`You'll start receiving notifications for ${sanitizeHandle(profile.handle, '@')}!`,
               {
                 type: 'success',
               },
             )
           } else {
-            Toast.show(_(msg`Changes saved`), {
+            Toast.show(l`Changes saved`, {
               type: 'success',
             })
           }
@@ -195,7 +190,7 @@ function DialogInner({
 
     if (isDirty) {
       return {
-        label: _(msg`Save changes`),
+        label: l`Save changes`,
         color: hasAny ? 'primary' : 'negative',
         onPress: () => saveChanges(state),
         disabled: isSaving,
@@ -204,26 +199,26 @@ function DialogInner({
       // on web, a disabled save button feels more natural than a massive close button
       if (IS_WEB) {
         return {
-          label: _(msg`Save changes`),
+          label: l`Save changes`,
           color: 'secondary',
           disabled: true,
         }
       } else {
         return {
-          label: _(msg`Cancel`),
+          label: l`Cancel`,
           color: 'secondary',
           onPress: () => control.close(),
         }
       }
     }
-  }, [state, initialState, control, _, isSaving, saveChanges])
+  }, [state, initialState, control, l, isSaving, saveChanges])
 
   const name = createSanitizedDisplayName(profile, false)
 
   return (
     <Dialog.ScrollableInner
       style={web({maxWidth: 400})}
-      label={_(msg`Get notified of new posts from ${name}`)}>
+      label={l`Get notified of new posts from ${name}`}>
       <View style={[a.gap_lg]}>
         <View style={[a.gap_xs]}>
           <Text style={[a.font_bold, a.text_2xl]}>
@@ -249,12 +244,12 @@ function DialogInner({
         )}
 
         <Toggle.Group
-          label={_(msg`Subscribe to account activity`)}
+          label={l`Subscribe to account activity`}
           values={values}
           onChange={onChange}>
           <View style={[a.gap_sm]}>
             <Toggle.Item
-              label={_(msg`Posts`)}
+              label={l`Posts`}
               name="post"
               style={[
                 a.flex_1,
@@ -271,7 +266,7 @@ function DialogInner({
               <Toggle.Switch />
             </Toggle.Item>
             <Toggle.Item
-              label={_(msg`Replies`)}
+              label={l`Replies`}
               name="reply"
               style={[
                 a.flex_1,
@@ -301,7 +296,6 @@ function DialogInner({
           {isSaving && <ButtonIcon icon={Loader} />}
         </Button>
       </View>
-
       <Dialog.Close />
     </Dialog.ScrollableInner>
   )
diff --git a/src/components/ageAssurance/AgeAssuranceAdmonition.tsx b/src/components/ageAssurance/AgeAssuranceAdmonition.tsx
index 46610b9dea..32d33d961e 100644
--- a/src/components/ageAssurance/AgeAssuranceAdmonition.tsx
+++ b/src/components/ageAssurance/AgeAssuranceAdmonition.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {atoms as a, select, useTheme, type ViewStyleProp} from '#/alf'
@@ -40,7 +39,7 @@ function Inner({
   control: Dialog.DialogControlProps
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
 
   return (
@@ -90,7 +89,7 @@ function Inner({
               <Trans>
                 Learn more in your{' '}
                 <InlineLinkText
-                  label={_(msg`Go to account settings`)}
+                  label={l`Go to account settings`}
                   to={'/settings/account'}
                   style={[a.text_sm, a.leading_snug, a.font_semi_bold]}
                   onPress={() => {
diff --git a/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx b/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx
index 1ee126eb28..5359b6457c 100644
--- a/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx
+++ b/src/components/ageAssurance/AgeAssuranceAppealDialog.tsx
@@ -1,8 +1,7 @@
 import {useState} from 'react'
 import {View} from 'react-native'
 import {ToolsOzoneReportDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useMutation} from '@tanstack/react-query'
 
@@ -23,12 +22,12 @@ export function AgeAssuranceAppealDialog({
 }: {
   control: Dialog.DialogControlProps
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   return (
     <Dialog.Outer control={control}>
       <Dialog.Handle />
       <Dialog.ScrollableInner
-        label={_(msg`Contact our moderation team`)}
+        label={l`Contact our moderation team`}
         style={[web({maxWidth: 400})]}>
         <Inner control={control} />
         <Dialog.Close />
@@ -38,7 +37,7 @@ export function AgeAssuranceAppealDialog({
 }
 
 function Inner({control}: {control: Dialog.DialogControlProps}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const {currentAccount} = useSession()
   const {gtPhone} = useBreakpoints()
@@ -68,22 +67,17 @@ function Inner({control}: {control: Dialog.DialogControlProps}) {
     },
     onError: err => {
       logger.error('AgeAssuranceAppealDialog failed', {safeMessage: err})
-      Toast.show(
-        _(msg`Age assurance inquiry failed to send, please try again.`),
-        {
-          type: 'error',
-        },
-      )
+      Toast.show(l`Age assurance inquiry failed to send, please try again.`, {
+        type: 'error',
+      })
     },
     onSuccess: () => {
       control.close()
       Toast.show(
-        _(
-          msg({
-            message: 'Age assurance inquiry was submitted',
-            context: 'toast',
-          }),
-        ),
+        l({
+          message: 'Age assurance inquiry was submitted',
+          context: 'toast',
+        }),
       )
     },
   })
@@ -93,18 +87,15 @@ function Inner({control}: {control: Dialog.DialogControlProps}) {
       <View style={[a.align_start]}>
         <AgeAssuranceBadge />
       </View>
-
       <Text style={[a.text_2xl, a.font_bold, a.pt_md, a.leading_tight]}>
         <Trans>Contact us</Trans>
       </Text>
-
       <Text style={[a.text_sm, a.pt_sm, a.leading_snug]}>
         <Trans>
           Please provide any additional details you feel moderators may need in
           order to properly assess your Age Assurance status.
         </Trans>
       </Text>
-
       <View style={[a.pt_md]}>
         <Dialog.Input
           multiline
@@ -113,13 +104,13 @@ function Inner({control}: {control: Dialog.DialogControlProps}) {
           onChangeText={details => {
             setDetails(details)
           }}
-          label={_(msg`Additional details (limit 1000 characters)`)}
+          label={l`Additional details (limit 1000 characters)`}
           numberOfLines={4}
           onSubmitEditing={() => mutate()}
         />
         <View style={[a.pt_md, a.gap_sm, gtPhone && [a.flex_row_reverse]]}>
           <Button
-            label={_(msg`Submit`)}
+            label={l`Submit`}
             size="small"
             variant="solid"
             color="primary"
@@ -130,7 +121,7 @@ function Inner({control}: {control: Dialog.DialogControlProps}) {
             {isPending && <ButtonIcon icon={Loader} position="right" />}
           </Button>
           <Button
-            label={_(msg`Cancel`)}
+            label={l`Cancel`}
             size="small"
             variant="solid"
             color="secondary"
diff --git a/src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx b/src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx
index 841e622b1b..3899aa22ce 100644
--- a/src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx
+++ b/src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx
@@ -1,7 +1,6 @@
 import {useMemo} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {Nux, useNux, useSaveNux} from '#/state/queries/nuxs'
 import {atoms as a, select, useTheme} from '#/alf'
@@ -43,7 +42,7 @@ export function useInternalState() {
 export function AgeAssuranceDismissibleFeedBanner() {
   const t = useTheme()
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {visible, close} = useInternalState()
   const copy = useAgeAssuranceCopy()
 
@@ -63,7 +62,7 @@ export function AgeAssuranceDismissibleFeedBanner() {
         },
       ]}>
       <Link
-        label={_(msg`Learn more about age assurance`)}
+        label={l`Learn more about age assurance`}
         to="/settings/account"
         onPress={() => {
           close()
@@ -100,9 +99,8 @@ export function AgeAssuranceDismissibleFeedBanner() {
           </View>
         </View>
       </Link>
-
       <Button
-        label={_(msg`Don't show again`)}
+        label={l`Don't show again`}
         size="small"
         onPress={() => {
           close()
diff --git a/src/components/ageAssurance/AgeAssuranceDismissibleNotice.tsx b/src/components/ageAssurance/AgeAssuranceDismissibleNotice.tsx
index 14361de678..c9cccc62d0 100644
--- a/src/components/ageAssurance/AgeAssuranceDismissibleNotice.tsx
+++ b/src/components/ageAssurance/AgeAssuranceDismissibleNotice.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {Nux, useNux, useSaveNux} from '#/state/queries/nuxs'
 import {atoms as a, type ViewStyleProp} from '#/alf'
@@ -13,7 +12,7 @@ import {useAgeAssurance} from '#/ageAssurance'
 import {useAnalytics} from '#/analytics'
 
 export function AgeAssuranceDismissibleNotice({style}: ViewStyleProp & {}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const aa = useAgeAssurance()
   const {nux} = useNux(Nux.AgeAssuranceDismissibleNotice)
@@ -35,7 +34,7 @@ export function AgeAssuranceDismissibleNotice({style}: ViewStyleProp & {}) {
           <AgeAssuranceAdmonition>{copy.notice}</AgeAssuranceAdmonition>
 
           <Button
-            label={_(msg`Don't show again`)}
+            label={l`Don't show again`}
             size="tiny"
             variant="solid"
             color="secondary_inverted"
diff --git a/src/components/ageAssurance/AgeAssuranceErrors.tsx b/src/components/ageAssurance/AgeAssuranceErrors.tsx
index fe8f57ab16..e1e373477d 100644
--- a/src/components/ageAssurance/AgeAssuranceErrors.tsx
+++ b/src/components/ageAssurance/AgeAssuranceErrors.tsx
@@ -1,5 +1,4 @@
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {type ViewStyleProp} from '#/alf'
@@ -9,7 +8,7 @@ import {ArrowRotateCounterClockwise_Stroke2_Corner0_Rounded as RetryIcon} from '
 import {refetchConfig} from '#/ageAssurance/data'
 
 export function AgeAssuranceConfigUnavailableError(props: ViewStyleProp) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   return (
     <Admonition.Outer type="error" style={props.style}>
       <Admonition.Row>
@@ -25,7 +24,7 @@ export function AgeAssuranceConfigUnavailableError(props: ViewStyleProp) {
         </Admonition.Content>
         <Admonition.Button
           color="negative_subtle"
-          label={_(msg`Retry`)}
+          label={l`Retry`}
           onPress={() => refetchConfig().catch(() => {})}>
           <ButtonText>
             <Trans>Retry</Trans>
diff --git a/src/components/ageAssurance/AgeAssuranceInitDialog.tsx b/src/components/ageAssurance/AgeAssuranceInitDialog.tsx
index 9d74b0c6dc..1cbec73d4f 100644
--- a/src/components/ageAssurance/AgeAssuranceInitDialog.tsx
+++ b/src/components/ageAssurance/AgeAssuranceInitDialog.tsx
@@ -1,8 +1,7 @@
 import {useState} from 'react'
 import {View} from 'react-native'
 import {XRPCError} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {validate as validateEmail} from 'email-validator'
 
@@ -41,15 +40,12 @@ export function AgeAssuranceInitDialog({
 }: {
   control: Dialog.DialogControlProps
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   return (
     <Dialog.Outer control={control}>
       <Dialog.Handle />
-
       <Dialog.ScrollableInner
-        label={_(
-          msg`Begin the age assurance process by completing the fields below.`,
-        )}
+        label={l`Begin the age assurance process by completing the fields below.`}
         style={[
           web({
             maxWidth: 400,
@@ -63,7 +59,7 @@ export function AgeAssuranceInitDialog({
 }
 
 function Inner() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const {currentAccount} = useSession()
   const langPrefs = useLanguagePrefs()
@@ -98,9 +94,7 @@ function Inner() {
 
       if (tlds && isEmailMaybeInvalid(email, tlds)) {
         setEmailError(
-          _(
-            msg`Please double-check that you have entered your email address correctly.`,
-          ),
+          l`Please double-check that you have entered your email address correctly.`,
         )
         return {status: 'maybe'}
       }
@@ -108,7 +102,7 @@ function Inner() {
       return {status: 'valid'}
     }
 
-    setEmailError(_(msg`Please enter a valid email address.`))
+    setEmailError(l`Please enter a valid email address.`)
     setDisabled(true)
 
     return {status: 'invalid'}
@@ -135,15 +129,11 @@ function Inner() {
 
       setSuccess(true)
     } catch (e) {
-      let error: React.ReactNode = _(
-        msg`Something went wrong, please try again`,
-      )
+      let error: React.ReactNode = l`Something went wrong, please try again`
 
       if (e instanceof XRPCError) {
         if (e.error === 'InvalidEmail') {
-          error = _(
-            msg`Please enter a valid, non-temporary email address. You may need to access this email in the future.`,
-          )
+          error = l`Please enter a valid, non-temporary email address. You may need to access this email in the future.`
           ax.metric('ageAssurance:initDialogError', {code: 'InvalidEmail'})
         } else if (e.error === 'DidTooLong') {
           error = (
@@ -153,7 +143,7 @@ function Inner() {
                 your account. Please{' '}
                 <SimpleInlineLinkText
                   to={createSupportLink({code: SupportCode.AA_DID, email})}
-                  label={_(msg`Contact support`)}>
+                  label={l`Contact support`}>
                   contact support
                 </SimpleInlineLinkText>{' '}
                 for assistance.
@@ -197,7 +187,7 @@ function Inner() {
                 <Trans>
                   We have partnered with{' '}
                   <SimpleInlineLinkText
-                    label={_(msg`KWS website`)}
+                    label={l`KWS website`}
                     to={urls.kwsHome}
                     style={[a.text_sm, a.leading_snug]}>
                     KWS
@@ -220,7 +210,7 @@ function Inner() {
         {success ? (
           <View style={[a.w_full]}>
             <Button
-              label={_(msg`Close dialog`)}
+              label={l`Close dialog`}
               size="large"
               variant="solid"
               color="secondary"
@@ -253,8 +243,8 @@ function Inner() {
                 </TextField.LabelText>
                 <TextField.Root isInvalid={!!emailError}>
                   <TextField.Input
-                    label={_(msg`Your email`)}
-                    placeholder={_(msg`Your email`)}
+                    label={l`Your email`}
+                    placeholder={l`Your email`}
                     value={email}
                     onChangeText={setEmail}
                     onFocus={() => setEmailError('')}
@@ -289,7 +279,7 @@ function Inner() {
                   <Trans>Your preferred language</Trans>
                 </TextField.LabelText>
                 <LanguageSelect
-                  label={_(msg`Preferred language`)}
+                  label={l`Preferred language`}
                   value={language}
                   onChange={value => {
                     setLanguage(value)
@@ -310,7 +300,7 @@ function Inner() {
 
               <Button
                 disabled={disabled}
-                label={_(msg`Begin age assurance process`)}
+                label={l`Begin age assurance process`}
                 size="large"
                 variant="solid"
                 color="primary"
diff --git a/src/components/ageAssurance/AgeAssuranceRedirectDialog.tsx b/src/components/ageAssurance/AgeAssuranceRedirectDialog.tsx
index ad584ca203..67557abaf4 100644
--- a/src/components/ageAssurance/AgeAssuranceRedirectDialog.tsx
+++ b/src/components/ageAssurance/AgeAssuranceRedirectDialog.tsx
@@ -1,7 +1,6 @@
 import {useEffect, useRef, useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {retry} from '#/lib/async/retry'
@@ -61,7 +60,7 @@ export function useAgeAssuranceRedirectDialogControl() {
 }
 
 export function AgeAssuranceRedirectDialog() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const control = useAgeAssuranceRedirectDialogControl()
 
   // for testing
@@ -70,9 +69,8 @@ export function AgeAssuranceRedirectDialog() {
   return (
     <Dialog.Outer control={control.control} onClose={() => control.clear()}>
       <Dialog.Handle />
-
       <Dialog.ScrollableInner
-        label={_(msg`Verifying your age assurance status`)}
+        label={l`Verifying your age assurance status`}
         style={[web({maxWidth: 400})]}>
         <Inner optimisticState={control.value} />
       </Dialog.ScrollableInner>
@@ -83,7 +81,7 @@ export function AgeAssuranceRedirectDialog() {
 export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
   const t = useTheme()
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const agent = useAgent()
   const polling = useRef(false)
   const unmounted = useRef(false)
@@ -171,7 +169,7 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
           {IS_NATIVE && (
             <View style={[a.w_full, a.pt_lg]}>
               <Button
-                label={_(msg`Close`)}
+                label={l`Close`}
                 size="large"
                 variant="solid"
                 color="secondary"
@@ -183,7 +181,6 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
             </View>
           )}
         </View>
-
         <Dialog.Close />
       </>
     )
@@ -230,7 +227,7 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
         {error && IS_NATIVE && (
           <View style={[a.w_full, a.pt_lg]}>
             <Button
-              label={_(msg`Close`)}
+              label={l`Close`}
               size="large"
               variant="solid"
               color="secondary"
@@ -242,7 +239,6 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
           </View>
         )}
       </View>
-
       {error && <Dialog.Close />}
     </>
   )
diff --git a/src/components/ageAssurance/AgeRestrictedScreen.tsx b/src/components/ageAssurance/AgeRestrictedScreen.tsx
index c20dd09bd2..addf89222a 100644
--- a/src/components/ageAssurance/AgeRestrictedScreen.tsx
+++ b/src/components/ageAssurance/AgeRestrictedScreen.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {atoms as a} from '#/alf'
@@ -27,7 +26,7 @@ export function AgeRestrictedScreen({
   infoText?: string
   rightHeaderSlot?: React.ReactNode
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const copy = useAgeAssuranceCopy()
   const aa = useAgeAssurance()
@@ -70,7 +69,7 @@ export function AgeRestrictedScreen({
           <View
             style={[a.flex_row, a.justify_between, a.align_center, a.pb_xl]}>
             <Link
-              label={_(msg`Go to account settings`)}
+              label={l`Go to account settings`}
               to="/settings/account"
               size="small"
               variant="solid"
diff --git a/src/components/ageAssurance/useAgeAssuranceCopy.ts b/src/components/ageAssurance/useAgeAssuranceCopy.ts
index fd92edd321..5775d7b56a 100644
--- a/src/components/ageAssurance/useAgeAssuranceCopy.ts
+++ b/src/components/ageAssurance/useAgeAssuranceCopy.ts
@@ -1,11 +1,10 @@
 import {useMemo} from 'react'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {useAgeAssurance} from '#/ageAssurance'
 
 export function useAgeAssuranceCopy() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const aa = useAgeAssurance()
 
   const hasCompletedFlow = aa.state.status === aa.Status.Assured
@@ -13,18 +12,10 @@ export function useAgeAssuranceCopy() {
   return useMemo(() => {
     return {
       notice: hasCompletedFlow
-        ? _(
-            msg`You have completed the Age Assurance process, but based on the results, we cannot be sure that you are 18 years of age or older. Due to laws in your region, certain features on Bluesky must remain restricted until you're able to verify you're an adult.`,
-          )
-        : _(
-            msg`Due to laws in your region, certain features on Bluesky are currently restricted until you're able to verify you're an adult.`,
-          ),
-      banner: _(
-        msg`The laws in your region require you to verify you're an adult to access certain features. Tap to learn more.`,
-      ),
-      chatsInfoText: _(
-        msg`Don't worry! All existing messages and settings are saved and will be available after you verify you're an adult.`,
-      ),
+        ? l`You have completed the Age Assurance process, but based on the results, we cannot be sure that you are 18 years of age or older. Due to laws in your region, certain features on Bluesky must remain restricted until you're able to verify you're an adult.`
+        : l`Due to laws in your region, certain features on Bluesky are currently restricted until you're able to verify you're an adult.`,
+      banner: l`The laws in your region require you to verify you're an adult to access certain features. Tap to learn more.`,
+      chatsInfoText: l`Don't worry! All existing messages and settings are saved and will be available after you verify you're an adult.`,
     }
-  }, [_, hasCompletedFlow])
+  }, [l, hasCompletedFlow])
 }
diff --git a/src/components/contacts/FindContactsBannerNUX.tsx b/src/components/contacts/FindContactsBannerNUX.tsx
index 417379fa2b..4d1aa9c978 100644
--- a/src/components/contacts/FindContactsBannerNUX.tsx
+++ b/src/components/contacts/FindContactsBannerNUX.tsx
@@ -2,8 +2,7 @@ import {useMemo} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
 import {LinearGradient} from 'expo-linear-gradient'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {HITSLOP_10} from '#/lib/constants'
@@ -19,7 +18,7 @@ import {useIsFindContactsFeatureEnabledBasedOnGeolocation} from './country-allow
 
 export function FindContactsBannerNUX() {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const {visible, close} = useInternalState()
 
@@ -30,7 +29,7 @@ export function FindContactsBannerNUX() {
       <View style={a.w_full}>
         <Link
           to={{screen: 'FindContactsFlow'}}
-          label={_(msg`Import contacts to find your friends`)}
+          label={l`Import contacts to find your friends`}
           onPress={() => {
             ax.metric('contacts:nux:bannerPressed', {})
           }}
@@ -75,7 +74,7 @@ export function FindContactsBannerNUX() {
           </LinearGradient>
         </Link>
         <Button
-          label={_(msg`Dismiss banner`)}
+          label={l`Dismiss banner`}
           hitSlop={HITSLOP_10}
           onPress={close}
           style={[a.absolute, {top: 14, right: 14}]}
diff --git a/src/components/contacts/components/HeroImage.tsx b/src/components/contacts/components/HeroImage.tsx
index 42a57157a6..fdd97a2acc 100644
--- a/src/components/contacts/components/HeroImage.tsx
+++ b/src/components/contacts/components/HeroImage.tsx
@@ -1,13 +1,12 @@
 import {View} from 'react-native'
 import {Image} from 'expo-image'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {atoms as a, useTheme} from '#/alf'
 
 export function ContactsHeroImage() {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <View
@@ -24,9 +23,7 @@ export function ContactsHeroImage() {
         source={require('../../../../assets/images/find_friends_illustration.webp')}
         accessibilityIgnoresInvertColors
         style={[a.w_full, {aspectRatio: 1278 / 661}]}
-        alt={_(
-          msg`An illustration depicting user avatars flowing from a contact book into the Bluesky app`,
-        )}
+        alt={l`An illustration depicting user avatars flowing from a contact book into the Bluesky app`}
         useAppleWebpCodec
       />
     </View>
diff --git a/src/components/contacts/components/InviteInfo.tsx b/src/components/contacts/components/InviteInfo.tsx
index 07c4d741fe..81a5b1da16 100644
--- a/src/components/contacts/components/InviteInfo.tsx
+++ b/src/components/contacts/components/InviteInfo.tsx
@@ -1,6 +1,5 @@
 import {type StyleProp, type TextStyle} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {HITSLOP_20} from '#/lib/constants'
@@ -22,7 +21,7 @@ export function InviteInfo({
    */
   iconOffset?: number
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const control = Dialog.useDialogControl()
 
   const style = [a.text_md, a.leading_snug, a.mt_xs]
@@ -30,16 +29,15 @@ export function InviteInfo({
   return (
     <>
       <Button
-        label={_(msg`Learn more about how inviting friends works`)}
+        label={l`Learn more about how inviting friends works`}
         onPress={control.open}
         hitSlop={HITSLOP_20}
         style={android({transform: [{translateY: iconOffset}]})}>
         <InfoIcon style={iconStyle} size="sm" />
       </Button>
-
       <Dialog.Outer control={control} nativeOptions={{preventExpansion: true}}>
         <Dialog.Handle />
-        <Dialog.ScrollableInner label={_(msg`Invite Friends`)}>
+        <Dialog.ScrollableInner label={l`Invite Friends`}>
           <Text style={[a.text_2xl, a.font_bold]}>
             <Trans>Invite Friends</Trans>
           </Text>
@@ -70,7 +68,7 @@ export function InviteInfo({
           </Text>
 
           <Button
-            label={_(msg`Done`)}
+            label={l`Done`}
             onPress={() => control.close()}
             size="large"
             color="primary"
diff --git a/src/components/contacts/components/OTPInput.tsx b/src/components/contacts/components/OTPInput.tsx
index 9834f6af9f..b272d6448f 100644
--- a/src/components/contacts/components/OTPInput.tsx
+++ b/src/components/contacts/components/OTPInput.tsx
@@ -5,8 +5,7 @@ import {
   type TextInputSelectionChangeEvent,
   View,
 } from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {mergeRefs} from '#/lib/merge-refs'
 import {atoms as a, ios, platform, useTheme} from '#/alf'
@@ -30,7 +29,7 @@ export function OTPInput({
   onComplete?: (code: string) => void
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const innerRef = useRef<TextInput>(null)
   const {state: focused, onIn: onFocus, onOut: onBlur} = useInteractionState()
   const [selection, setSelection] = useState({start: 0, end: 0})
@@ -52,7 +51,7 @@ export function OTPInput({
 
   return (
     <Pressable
-      accessibilityLabel={_(msg`Focus code input`)}
+      accessibilityLabel={l`Focus code input`}
       accessibilityRole="button"
       accessibilityHint=""
       style={[a.w_full, a.relative]}
diff --git a/src/components/contacts/screens/GetContacts.tsx b/src/components/contacts/screens/GetContacts.tsx
index 879864b162..e4d6d3fe15 100644
--- a/src/components/contacts/screens/GetContacts.tsx
+++ b/src/components/contacts/screens/GetContacts.tsx
@@ -8,8 +8,8 @@ import {
   AppBskyContactImportContacts,
   type Un$Typed,
 } from '@atproto/api'
-import {msg, t} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {t} from '@lingui/core/macro'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
@@ -52,7 +52,7 @@ export function GetContacts({
   onCancel: () => void
   context: 'Onboarding' | 'Standalone'
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const agent = useAgent()
   const insets = useSafeAreaInsets()
@@ -143,32 +143,26 @@ export function GetContacts({
       })
       if (isNetworkError(err)) {
         Toast.show(
-          _(
-            msg`There was a problem with your internet connection, please try again`,
-          ),
+          l`There was a problem with your internet connection, please try again`,
           {type: 'error'},
         )
       } else if (
         err instanceof AppBskyContactImportContacts.TooManyContactsError
       ) {
         Toast.show(
-          _(
-            msg`Too many contacts - you've exceeded the number of contacts you can import to find your friends`,
-          ),
+          l`Too many contacts - you've exceeded the number of contacts you can import to find your friends`,
           {type: 'error'},
         )
       } else if (
         err instanceof AppBskyContactImportContacts.InvalidTokenError
       ) {
         Toast.show(
-          _(
-            msg`Could not upload contacts. You need to re-verify your phone number to proceed`,
-          ),
+          l`Could not upload contacts. You need to re-verify your phone number to proceed`,
           {type: 'error'},
         )
       } else {
         logger.error('Error uploading contacts', {safeMessage: err})
-        Toast.show(_(msg`Could not upload contacts. ${cleanError(err)}`), {
+        Toast.show(l`Could not upload contacts. ${cleanError(err)}`, {
           type: 'error',
         })
       }
@@ -270,7 +264,7 @@ export function GetContacts({
           </Trans>
         </Text>
         <Button
-          label={_(msg`Find my friends`)}
+          label={l`Find my friends`}
           size="large"
           color="primary"
           onPress={() => getContacts()}
@@ -289,7 +283,7 @@ export function GetContacts({
           )}
         </Button>
         <Button
-          label={_(msg`Cancel`)}
+          label={l`Cancel`}
           size="large"
           color="secondary"
           onPress={onCancel}>
diff --git a/src/components/contacts/screens/PhoneInput.tsx b/src/components/contacts/screens/PhoneInput.tsx
index 6904789a6e..7c9a09c195 100644
--- a/src/components/contacts/screens/PhoneInput.tsx
+++ b/src/components/contacts/screens/PhoneInput.tsx
@@ -3,8 +3,7 @@ import {Keyboard, View} from 'react-native'
 import {KeyboardAvoidingView} from 'react-native-keyboard-controller'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {AppBskyContactStartPhoneVerification} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useMutation} from '@tanstack/react-query'
 
@@ -53,7 +52,7 @@ export function PhoneInput({
   context: 'Onboarding' | 'Standalone'
   onSkip: () => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const t = useTheme()
   const agent = useAgent()
@@ -98,26 +97,22 @@ export function PhoneInput({
     onError: err => {
       if (isNetworkError(err)) {
         setError(
-          _(
-            msg`A network error occurred. Please check your internet connection`,
-          ),
+          l`A network error occurred. Please check your internet connection`,
         )
       } else if (
         err instanceof
         AppBskyContactStartPhoneVerification.RateLimitExceededError
       ) {
-        setError(_(msg`Rate limit exceeded. Please try again later.`))
+        setError(l`Rate limit exceeded. Please try again later.`)
       } else if (
         err instanceof AppBskyContactStartPhoneVerification.InvalidPhoneError
       ) {
         setError(
-          _(
-            msg`The verification provider was unable to send a code to your phone number. Please check your phone number and try again.`,
-          ),
+          l`The verification provider was unable to send a code to your phone number. Please check your phone number and try again.`,
         )
       } else {
         logger.error('Verify phone number failed', {safeMessage: err})
-        setError(_(msg`An error occurred. ${cleanError(err)}`))
+        setError(l`An error occurred. ${cleanError(err)}`)
       }
     },
   })
@@ -139,7 +134,7 @@ export function PhoneInput({
         phoneNumber: result.formatted,
       })
     } else {
-      setFormatError(result.reason ?? _(msg`Invalid phone number`))
+      setFormatError(result.reason ?? l`Invalid phone number`)
     }
   }
 
@@ -157,7 +152,7 @@ export function PhoneInput({
             size="small"
             color="secondary"
             variant="ghost"
-            label={_(msg`Skip contact sharing and continue to the app`)}
+            label={l`Skip contact sharing and continue to the app`}
             onPress={onSkip}>
             <ButtonText>
               <Trans>Skip</Trans>
@@ -201,7 +196,7 @@ export function PhoneInput({
             <View style={[a.flex_1]}>
               <TextField.Root isInvalid={!!formatError || !isFeatureEnabled}>
                 <TextField.Input
-                  label={_(msg`Phone number`)}
+                  label={l`Phone number`}
                   value={phoneNumber}
                   onChangeText={text => {
                     if (formatError) setFormatError('')
@@ -252,7 +247,7 @@ export function PhoneInput({
         <View style={[gutters, {paddingBottom}]}>
           <Button
             disabled={!phoneNumber || isPending}
-            label={_(msg`Send code`)}
+            label={l`Send code`}
             size="large"
             color="primary"
             onPress={onSubmitNumber}>
@@ -269,7 +264,7 @@ export function PhoneInput({
 
 function LegalDisclaimer() {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const style = [a.text_xs, t.atoms.text_contrast_medium, a.leading_snug]
 
@@ -299,12 +294,10 @@ function LegalDisclaimer() {
           time by visiting settings.{' '}
           <InlineLinkText
             to={urls.website.support.findFriendsPrivacyPolicy}
-            label={_(
-              msg({
-                message: `Learn more about importing contacts`,
-                context: `english-only-resource`,
-              }),
-            )}
+            label={l({
+              message: `Learn more about importing contacts`,
+              context: `english-only-resource`,
+            })}
             style={[a.text_xs, a.leading_snug]}>
             <Trans context="english-only-resource">Learn more</Trans>
           </InlineLinkText>
diff --git a/src/components/contacts/screens/VerifyNumber.tsx b/src/components/contacts/screens/VerifyNumber.tsx
index f9d062f691..767289c4fb 100644
--- a/src/components/contacts/screens/VerifyNumber.tsx
+++ b/src/components/contacts/screens/VerifyNumber.tsx
@@ -4,8 +4,7 @@ import {
   AppBskyContactStartPhoneVerification,
   AppBskyContactVerifyPhone,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useMutation} from '@tanstack/react-query'
 
@@ -41,7 +40,7 @@ export function VerifyNumber({
   onSkip: () => void
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const agent = useAgent()
   const gutters = useGutters([0, 'wide'])
@@ -95,23 +94,19 @@ export function VerifyNumber({
         setError({
           retryable: true,
           isResendError: false,
-          message: _(
-            msg`A network error occurred. Please check your internet connection.`,
-          ),
+          message: l`A network error occurred. Please check your internet connection.`,
         })
       } else if (err instanceof AppBskyContactVerifyPhone.InvalidCodeError) {
         setError({
           retryable: true,
           isResendError: true,
-          message: _(msg`This code is invalid. Resend to get a new code.`),
+          message: l`This code is invalid. Resend to get a new code.`,
         })
       } else if (err instanceof AppBskyContactVerifyPhone.InvalidPhoneError) {
         setError({
           retryable: false,
           isResendError: false,
-          message: _(
-            msg`The verification provider was unable to send a code to your phone number. Please check your phone number and try again.`,
-          ),
+          message: l`The verification provider was unable to send a code to your phone number. Please check your phone number and try again.`,
         })
       } else if (
         err instanceof AppBskyContactVerifyPhone.RateLimitExceededError
@@ -119,16 +114,14 @@ export function VerifyNumber({
         setError({
           retryable: true,
           isResendError: false,
-          message: _(
-            msg`Too many attempts. Please wait a few minutes and try again.`,
-          ),
+          message: l`Too many attempts. Please wait a few minutes and try again.`,
         })
       } else {
         logger.error('Verify phone number failed', {safeMessage: err})
         setError({
           retryable: true,
           isResendError: false,
-          message: _(msg`An error occurred. ${cleanError(err)}`),
+          message: l`An error occurred. ${cleanError(err)}`,
         })
       }
     },
@@ -140,7 +133,7 @@ export function VerifyNumber({
     },
     onSuccess: () => {
       dispatch({type: 'RESEND_VERIFICATION_CODE'})
-      Toast.show(_(msg`A new code has been sent`))
+      Toast.show(l`A new code has been sent`)
     },
     onMutate: () => {
       setOtpCode('')
@@ -151,9 +144,7 @@ export function VerifyNumber({
         setError({
           retryable: true,
           isResendError: true,
-          message: _(
-            msg`A network error occurred. Please check your internet connection.`,
-          ),
+          message: l`A network error occurred. Please check your internet connection.`,
         })
       } else if (
         err instanceof AppBskyContactStartPhoneVerification.InvalidPhoneError
@@ -161,9 +152,7 @@ export function VerifyNumber({
         setError({
           retryable: false,
           isResendError: true,
-          message: _(
-            msg`The verification provider was unable to send a code to your phone number. Please check your phone number and try again.`,
-          ),
+          message: l`The verification provider was unable to send a code to your phone number. Please check your phone number and try again.`,
         })
       } else if (
         err instanceof
@@ -172,16 +161,14 @@ export function VerifyNumber({
         setError({
           retryable: true,
           isResendError: true,
-          message: _(
-            msg`Too many codes sent. Please wait a few minutes and try again.`,
-          ),
+          message: l`Too many codes sent. Please wait a few minutes and try again.`,
         })
       } else {
         logger.error('Resend failed', {safeMessage: err})
         setError({
           retryable: true,
           isResendError: true,
-          message: _(msg`An error occurred. ${cleanError(err)}`),
+          message: l`An error occurred. ${cleanError(err)}`,
         })
       }
     },
@@ -199,7 +186,7 @@ export function VerifyNumber({
             size="small"
             color="secondary"
             variant="ghost"
-            label={_(msg`Skip contact sharing and continue to the app`)}
+            label={l`Skip contact sharing and continue to the app`}
             onPress={onSkip}>
             <ButtonText>
               <Trans>Skip</Trans>
@@ -227,9 +214,7 @@ export function VerifyNumber({
         </Text>
         <View style={[a.mt_2xl]}>
           <OTPInput
-            label={_(
-              msg`Enter 6-digit code that was sent to your phone number`,
-            )}
+            label={l`Enter 6-digit code that was sent to your phone number`}
             value={otpCode}
             onChange={setOtpCode}
             onComplete={code => verifyNumber(code)}
@@ -276,7 +261,7 @@ function OTPStatus({
   onRetry: () => void
   lastCodeSentAt: Date | null
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
 
   const [time, setTime] = useState(Date.now())
@@ -301,10 +286,10 @@ function OTPStatus({
 
   if (isSuccess) {
     Icon = CircleCheckIcon
-    text = _(msg`Phone number verified`)
+    text = l`Phone number verified`
     textColor = t.palette.positive_500
   } else if (isPending) {
-    text = _(msg`Verifying...`)
+    text = l`Verifying...`
   } else if (error) {
     Icon = WarningIcon
     text = error.message
@@ -342,12 +327,11 @@ function OTPStatus({
           </Text>
         </View>
       )}
-
       {showRetryButton && (
         <Button
           size="small"
           color="secondary_inverted"
-          label={_(msg`Retry`)}
+          label={l`Retry`}
           onPress={onRetry}
           style={[a.mt_2xl]}>
           <ButtonIcon icon={RetryIcon} />
@@ -356,13 +340,12 @@ function OTPStatus({
           </ButtonText>
         </Button>
       )}
-
       {showResendButton && (
         <Button
           size="large"
           color="secondary"
           variant="ghost"
-          label={_(msg`Resend code`)}
+          label={l`Resend code`}
           disabled={isResendingCode || isWaiting}
           onPress={onResend}
           style={[a.mt_2xl]}>
diff --git a/src/components/contacts/screens/ViewMatches.tsx b/src/components/contacts/screens/ViewMatches.tsx
index 3543c604f5..15e065bce4 100644
--- a/src/components/contacts/screens/ViewMatches.tsx
+++ b/src/components/contacts/screens/ViewMatches.tsx
@@ -3,8 +3,7 @@ import {View} from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import * as SMS from 'expo-sms'
 import {type ModerationOpts} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
@@ -84,7 +83,7 @@ export function ViewMatches({
   onNext: () => void
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const gutter = useGutters([0, 'wide'])
   const moderationOpts = useModerationOpts()
@@ -141,11 +140,11 @@ export function ViewMatches({
       }),
     onSuccess: () => {
       setDidFollowAll(true)
-      Toast.show(_(msg`All friends followed!`), {type: 'success'})
+      Toast.show(l`All friends followed!`, {type: 'success'})
       cumulativeFollowCount.current += followableDids.length
     },
     onError: _err => {
-      Toast.show(_(msg`Failed to follow all your friends, please try again`), {
+      Toast.show(l`Failed to follow all your friends, please try again`, {
         type: 'error',
       })
       for (const did of followableDids) {
@@ -232,15 +231,13 @@ export function ViewMatches({
       dispatch({type: 'DISMISS_MATCH_FAILED', payload: {did}})
       if (isNetworkError(err)) {
         Toast.show(
-          _(
-            msg`Failed to hide suggestion, please check your internet connection`,
-          ),
+          l`Failed to hide suggestion, please check your internet connection`,
           {type: 'error'},
         )
       } else {
         logger.error('Dismissing match failed', {safeMessage: err})
         Toast.show(
-          _(msg`An error occurred while hiding suggestion. ${cleanError(err)}`),
+          l`An error occurred while hiding suggestion. ${cleanError(err)}`,
           {type: 'error'},
         )
       }
@@ -273,7 +270,7 @@ export function ViewMatches({
             }>
             {item.count > 1 && (
               <Button
-                label={_(msg`Follow all`)}
+                label={l`Follow all`}
                 size="small"
                 color="primary_subtle"
                 onPress={() => followAll()}
@@ -309,7 +306,7 @@ export function ViewMatches({
       case 'no matches header':
         return (
           <Header
-            titleText={_(msg`You got here first`)}
+            titleText={l`You got here first`}
             largeTitle
             subtitleText={
               <Trans>
@@ -353,7 +350,7 @@ export function ViewMatches({
           ]}>
           {context === 'Onboarding' && <OnboardingPosition />}
           <SearchInput
-            placeholder={_(msg`Search contacts`)}
+            placeholder={l`Search contacts`}
             value={search}
             onFocus={() => {
               onFocus()
@@ -392,7 +389,7 @@ export function ViewMatches({
           {paddingBottom: insets.bottom + tokens.space.md},
         ]}>
         <Button
-          label={context === 'Onboarding' ? _(msg`Next`) : _(msg`Done`)}
+          label={context === 'Onboarding' ? l`Next` : l`Done`}
           onPress={() => {
             if (context === 'Onboarding') {
               ax.metric('onboarding:contacts:nextPressed', {
@@ -444,19 +441,19 @@ function MatchItem({
 }) {
   const gutter = useGutters([0, 'wide'])
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const shadow = useProfileShadow(profile)
 
   const contactName = useMemo(() => {
     if (!contact) return null
 
     const name = contact.name ?? contact.firstName ?? contact.lastName
-    if (name) return _(msg`Your contact ${name}`)
+    if (name) return l`Your contact ${name}`
     const phone =
       contact.phoneNumbers?.find(p => p.isPrimary) ?? contact.phoneNumbers?.[0]
     if (phone?.number) return phone.number
     return null
-  }, [contact, _])
+  }, [contact, l])
 
   if (!moderationOpts) return null
 
@@ -497,7 +494,7 @@ function MatchItem({
           <Button
             color="secondary"
             variant="ghost"
-            label={_(msg`Remove suggestion`)}
+            label={l`Remove suggestion`}
             onPress={() => onRemoveSuggestion(profile.did)}
             hoverStyle={[a.bg_transparent, {opacity: 0.5}]}
             hitSlop={8}>
@@ -518,7 +515,7 @@ function ContactItem({
 }) {
   const gutter = useGutters([0, 'wide'])
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const {currentAccount} = useSession()
 
@@ -564,7 +561,7 @@ function ContactItem({
         </Text>
         {phoneNumber && currentAccount && (
           <Button
-            label={_(msg`Invite ${name} to join Bluesky`)}
+            label={l`Invite ${name} to join Bluesky`}
             color="secondary"
             size="small"
             onPress={async () => {
@@ -574,12 +571,10 @@ function ContactItem({
               try {
                 await SMS.sendSMSAsync(
                   [phoneNumber],
-                  _(
-                    msg`I'm on Bluesky as ${currentAccount.handle} - come find me! https://bsky.app/download`,
-                  ),
+                  l`I'm on Bluesky as ${currentAccount.handle} - come find me! https://bsky.app/download`,
                 )
               } catch (err) {
-                Toast.show(_(msg`Failed to launch SMS app`), {type: 'error'})
+                Toast.show(l`Failed to launch SMS app`, {type: 'error'})
                 logger.error('Could not launch SMS', {safeMessage: err})
               }
             }}>
diff --git a/src/components/dialogs/DeviceLocationRequestDialog.tsx b/src/components/dialogs/DeviceLocationRequestDialog.tsx
index 05d9d99539..0fad4f6991 100644
--- a/src/components/dialogs/DeviceLocationRequestDialog.tsx
+++ b/src/components/dialogs/DeviceLocationRequestDialog.tsx
@@ -1,7 +1,6 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {wait} from '#/lib/async/wait'
@@ -32,13 +31,12 @@ export function DeviceLocationRequestDialog({
 }: Props & {
   control: Dialog.DialogOuterProps['control']
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   return (
     <Dialog.Outer control={control}>
       <Dialog.Handle />
-
       <Dialog.ScrollableInner
-        label={_(msg`Update your location`)}
+        label={l`Update your location`}
         style={[web({maxWidth: 380})]}>
         <DeviceLocationRequestDialogInner
           onLocationAcquired={onLocationAcquired}
@@ -51,7 +49,7 @@ export function DeviceLocationRequestDialog({
 
 function DeviceLocationRequestDialogInner({onLocationAcquired}: Props) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {close} = Dialog.useDialogContext()
   const requestDeviceLocation = useRequestDeviceGeolocation()
   const cleanError = useCleanError()
@@ -78,13 +76,11 @@ function DeviceLocationRequestDialogInner({onLocationAcquired}: Props) {
             closeDialog: close,
           })
         } else {
-          setError(_(msg`Failed to resolve location. Please try again.`))
+          setError(l`Failed to resolve location. Please try again.`)
         }
       } else {
         setError(
-          _(
-            msg`Unable to access location. You'll need to visit your system settings to enable location services for Bluesky.`,
-          ),
+          l`Unable to access location. You'll need to visit your system settings to enable location services for Bluesky.`,
         )
       }
     } catch (e: any) {
@@ -114,18 +110,16 @@ function DeviceLocationRequestDialogInner({onLocationAcquired}: Props) {
           </Trans>
         </Text>
       </View>
-
       {error && (
         <View style={[a.pb_xs]}>
           <Admonition type="error">{error}</Admonition>
         </View>
       )}
-
       <View style={[a.gap_sm]}>
         {!dialogDisabled && (
           <Button
             disabled={isRequesting}
-            label={_(msg`Allow location access`)}
+            label={l`Allow location access`}
             onPress={onPressConfirm}
             size={IS_WEB ? 'small' : 'large'}
             color="primary">
@@ -138,7 +132,7 @@ function DeviceLocationRequestDialogInner({onLocationAcquired}: Props) {
 
         {!IS_WEB && (
           <Button
-            label={_(msg`Cancel`)}
+            label={l`Cancel`}
             onPress={() => close()}
             size={IS_WEB ? 'small' : 'large'}
             color="secondary">
diff --git a/src/components/dialogs/Embed.tsx b/src/components/dialogs/Embed.tsx
index 105895ce3d..a70d8f7809 100644
--- a/src/components/dialogs/Embed.tsx
+++ b/src/components/dialogs/Embed.tsx
@@ -1,8 +1,7 @@
 import {memo, useEffect, useMemo, useState} from 'react'
 import {View} from 'react-native'
 import {type AppBskyActorDefs, type AppBskyFeedPost, AtUri} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {EMBED_SCRIPT} from '#/lib/constants'
@@ -51,7 +50,7 @@ function EmbedDialogInner({
   timestamp,
 }: Omit<EmbedDialogProps, 'control'>) {
   const t = useTheme()
-  const {_, i18n} = useLingui()
+  const {t: l, i18n} = useLingui()
   const [copied, setCopied] = useState(false)
   const [showCustomisation, setShowCustomisation] = useState(false)
   const [colorMode, setColorMode] = useState<ColorModeValues>('system')
@@ -102,7 +101,7 @@ function EmbedDialogInner({
   }, [i18n, postUri, postCid, record, timestamp, postAuthor, colorMode])
 
   return (
-    <Dialog.Inner label={_(msg`Embed post`)} style={[{maxWidth: 500}]}>
+    <Dialog.Inner label={l`Embed post`} style={[{maxWidth: 500}]}>
       <View style={[a.gap_lg]}>
         <View style={[a.gap_sm]}>
           <Text style={[a.text_2xl, a.font_bold]}>
@@ -121,8 +120,8 @@ function EmbedDialogInner({
           <Button
             label={
               showCustomisation
-                ? _(msg`Hide customization options`)
-                : _(msg`Show customization options`)
+                ? l`Hide customization options`
+                : l`Show customization options`
             }
             color="secondary"
             variant="ghost"
@@ -147,21 +146,21 @@ function EmbedDialogInner({
                 <Trans>Color theme</Trans>
               </Text>
               <SegmentedControl.Root
-                label={_(msg`Color mode`)}
+                label={l`Color mode`}
                 type="radio"
                 value={colorMode}
                 onChange={setColorMode}>
-                <SegmentedControl.Item value="system" label={_(msg`System`)}>
+                <SegmentedControl.Item value="system" label={l`System`}>
                   <SegmentedControl.ItemText>
                     <Trans>System</Trans>
                   </SegmentedControl.ItemText>
                 </SegmentedControl.Item>
-                <SegmentedControl.Item value="light" label={_(msg`Light`)}>
+                <SegmentedControl.Item value="light" label={l`Light`}>
                   <SegmentedControl.ItemText>
                     <Trans>Light</Trans>
                   </SegmentedControl.ItemText>
                 </SegmentedControl.Item>
-                <SegmentedControl.Item value="dark" label={_(msg`Dark`)}>
+                <SegmentedControl.Item value="dark" label={l`Dark`}>
                   <SegmentedControl.ItemText>
                     <Trans>Dark</Trans>
                   </SegmentedControl.ItemText>
@@ -175,7 +174,7 @@ function EmbedDialogInner({
             <TextField.Root>
               <TextField.Icon icon={CodeBracketsIcon} />
               <TextField.Input
-                label={_(msg`Embed HTML code`)}
+                label={l`Embed HTML code`}
                 editable={false}
                 selection={{start: 0, end: snippet.length}}
                 value={snippet}
@@ -183,7 +182,7 @@ function EmbedDialogInner({
             </TextField.Root>
           </View>
           <Button
-            label={_(msg`Copy code`)}
+            label={l`Copy code`}
             color="primary"
             size="large"
             onPress={() => {
diff --git a/src/components/dialogs/EmbedConsent.tsx b/src/components/dialogs/EmbedConsent.tsx
index 8a17f18ae7..6f0f1a5839 100644
--- a/src/components/dialogs/EmbedConsent.tsx
+++ b/src/components/dialogs/EmbedConsent.tsx
@@ -1,7 +1,6 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {
@@ -25,7 +24,7 @@ export function EmbedConsentDialog({
   source: EmbedPlayerSource
   onAccept: () => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const setExternalEmbedPref = useSetExternalEmbedPref()
 
   const onShowAllPress = useCallback(() => {
@@ -51,7 +50,7 @@ export function EmbedConsentDialog({
     <Dialog.Outer control={control} nativeOptions={{preventExpansion: true}}>
       <Dialog.Handle />
       <Dialog.ScrollableInner
-        label={_(msg`External Media`)}
+        label={l`External Media`}
         style={web({maxWidth: 400})}>
         <View style={a.gap_sm}>
           <Text style={[a.text_2xl, a.font_bold]}>
@@ -77,7 +76,7 @@ export function EmbedConsentDialog({
         </View>
         <View style={a.gap_md}>
           <Button
-            label={_(msg`Enable external media`)}
+            label={l`Enable external media`}
             onPress={onShowAllPress}
             onAccessibilityEscape={control.close}
             color="primary"
@@ -87,7 +86,7 @@ export function EmbedConsentDialog({
             </ButtonText>
           </Button>
           <Button
-            label={_(msg`Enable this source only`)}
+            label={l`Enable this source only`}
             onPress={onShowPress}
             onAccessibilityEscape={control.close}
             color="secondary"
@@ -97,7 +96,7 @@ export function EmbedConsentDialog({
             </ButtonText>
           </Button>
           <Button
-            label={_(msg`No thanks`)}
+            label={l`No thanks`}
             onAccessibilityEscape={control.close}
             onPress={onHidePress}
             color="secondary"
diff --git a/src/components/dialogs/InAppBrowserConsent.tsx b/src/components/dialogs/InAppBrowserConsent.tsx
index cfcddda4a4..75343e2393 100644
--- a/src/components/dialogs/InAppBrowserConsent.tsx
+++ b/src/components/dialogs/InAppBrowserConsent.tsx
@@ -1,7 +1,6 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useOpenLink} from '#/lib/hooks/useOpenLink'
@@ -32,7 +31,7 @@ export function InAppBrowserConsentDialog() {
 
 function InAppBrowserConsentInner({href}: {href?: string}) {
   const control = Dialog.useDialogContext()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const setInAppBrowser = useSetInAppBrowser()
   const openLink = useOpenLink()
@@ -60,7 +59,7 @@ function InAppBrowserConsentInner({href}: {href?: string}) {
   }, [control])
 
   return (
-    <Dialog.ScrollableInner label={_(msg`How should we open this link?`)}>
+    <Dialog.ScrollableInner label={l`How should we open this link?`}>
       <View style={[a.gap_2xl]}>
         <View style={[a.gap_sm]}>
           <Text style={[a.font_bold, a.text_2xl]}>
@@ -75,7 +74,7 @@ function InAppBrowserConsentInner({href}: {href?: string}) {
         </View>
         <View style={[a.gap_sm]}>
           <Button
-            label={_(msg`Use in-app browser`)}
+            label={l`Use in-app browser`}
             onPress={onUseIAB}
             size="large"
             variant="solid"
@@ -85,7 +84,7 @@ function InAppBrowserConsentInner({href}: {href?: string}) {
             </ButtonText>
           </Button>
           <Button
-            label={_(msg`Use my default browser`)}
+            label={l`Use my default browser`}
             onPress={onUseLinking}
             size="large"
             variant="solid"
@@ -96,7 +95,7 @@ function InAppBrowserConsentInner({href}: {href?: string}) {
             <ButtonIcon position="right" icon={External} />
           </Button>
           <Button
-            label={_(msg`Cancel`)}
+            label={l`Cancel`}
             onPress={onCancel}
             size="large"
             variant="ghost"
diff --git a/src/components/dialogs/LanguageSelectDialog.tsx b/src/components/dialogs/LanguageSelectDialog.tsx
index 3460a92044..8b9b05592f 100644
--- a/src/components/dialogs/LanguageSelectDialog.tsx
+++ b/src/components/dialogs/LanguageSelectDialog.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {languageName} from '#/locale/helpers'
@@ -107,7 +106,7 @@ export function DialogInner({
   const [search, setSearch] = useState('')
 
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const handleClose = () => {
     control.close(() => {
@@ -218,7 +217,7 @@ export function DialogInner({
             size="small"
             color="secondary"
             shape="round"
-            label={_(msg`Close dialog`)}
+            label={l`Close dialog`}
             onPress={handleClose}>
             <ButtonIcon icon={XIcon} />
           </Button>
@@ -229,8 +228,8 @@ export function DialogInner({
         <SearchInput
           value={search}
           onChangeText={setSearch}
-          placeholder={_(msg`Search languages`)}
-          label={_(msg`Search languages`)}
+          placeholder={l`Search languages`}
+          label={l`Search languages`}
           maxLength={50}
           onClearText={() => setSearch('')}
         />
@@ -246,13 +245,13 @@ export function DialogInner({
 
   const flatListData = [
     ...(isCheckedRecentEmpty
-      ? [{type: 'header', label: _(msg`Recently used`)}]
+      ? [{type: 'header', label: l`Recently used`}]
       : []),
     ...displayedLanguages.checkedRecent.map(lang => ({type: 'item', lang})),
     ...displayedLanguages.uncheckedRecent.map(lang => ({type: 'item', lang})),
     ...(isDisplayedLanguagesEmpty
       ? []
-      : [{type: 'header', label: _(msg`All languages`)}]),
+      : [{type: 'header', label: l`All languages`}]),
     ...displayedLanguages.all.map(lang => ({type: 'item', lang})),
   ]
 
@@ -264,7 +263,7 @@ export function DialogInner({
       onChange={setCheckedLanguagesCode2}
       type="checkbox"
       maxSelections={maxLanguages}
-      label={_(msg`Select languages`)}
+      label={l`Select languages`}
       style={web([a.contents])}>
       <Dialog.InnerFlatList
         data={flatListData}
@@ -319,7 +318,7 @@ export function DialogInner({
           <Dialog.FlatListFooter
             onLayout={evt => setFooterHeight(evt.nativeEvent.layout.height)}>
             <Button
-              label={_(msg`Close dialog`)}
+              label={l`Close dialog`}
               onPress={handleClose}
               color="primary"
               size="large">
@@ -335,23 +334,19 @@ export function DialogInner({
 }
 
 function DialogError({details}: {details?: string}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const control = Dialog.useDialogContext()
 
   return (
-    <Dialog.ScrollableInner
-      style={a.gap_md}
-      label={_(msg`An error has occurred`)}>
+    <Dialog.ScrollableInner style={a.gap_md} label={l`An error has occurred`}>
       <Dialog.Close />
       <ErrorScreen
-        title={_(msg`Oh no!`)}
-        message={_(
-          msg`There was an unexpected issue in the application. Please let us know if this happened to you!`,
-        )}
+        title={l`Oh no!`}
+        message={l`There was an unexpected issue in the application. Please let us know if this happened to you!`}
         details={details}
       />
       <Button
-        label={_(msg`Close dialog`)}
+        label={l`Close dialog`}
         onPress={() => control.close()}
         color="primary"
         size="large">
diff --git a/src/components/dialogs/LinkWarning.tsx b/src/components/dialogs/LinkWarning.tsx
index 07fc332ec2..0285ee955d 100644
--- a/src/components/dialogs/LinkWarning.tsx
+++ b/src/components/dialogs/LinkWarning.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useMemo} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useOpenLink} from '#/lib/hooks/useOpenLink'
@@ -49,7 +48,7 @@ function LinkWarningDialogInner({
   link?: {href: string; displayText: string; share?: boolean}
 }) {
   const control = Dialog.useDialogContext()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const openLink = useOpenLink()
   const {gtMobile} = useBreakpoints()
@@ -79,8 +78,8 @@ function LinkWarningDialogInner({
       style={web({maxWidth: 450})}
       label={
         potentiallyMisleading
-          ? _(msg`Potentially misleading link warning`)
-          : _(msg`Leaving Bluesky`)
+          ? l`Potentially misleading link warning`
+          : l`Leaving Bluesky`
       }>
       <View style={[a.gap_2xl]}>
         <View style={[a.gap_sm]}>
@@ -109,8 +108,8 @@ function LinkWarningDialogInner({
             gtMobile && [a.flex_row_reverse, a.justify_start],
           ]}>
           <Button
-            label={link?.share ? _(msg`Share link`) : _(msg`Visit site`)}
-            accessibilityHint={_(msg`Opens link ${link?.href ?? ''}`)}
+            label={link?.share ? l`Share link` : l`Visit site`}
+            accessibilityHint={l`Opens link ${link?.href ?? ''}`}
             onPress={onPressVisit}
             size="large"
             variant="solid"
@@ -124,7 +123,7 @@ function LinkWarningDialogInner({
             </ButtonText>
           </Button>
           <Button
-            label={_(msg`Go back`)}
+            label={l`Go back`}
             onPress={onCancel}
             size="large"
             variant="ghost"
diff --git a/src/components/dialogs/MutedWords.tsx b/src/components/dialogs/MutedWords.tsx
index a885f1bf5f..a7678ef995 100644
--- a/src/components/dialogs/MutedWords.tsx
+++ b/src/components/dialogs/MutedWords.tsx
@@ -1,8 +1,7 @@
 import {useCallback, useState} from 'react'
 import {View} from 'react-native'
 import {type AppBskyActorDefs, sanitizeMutedWordValue} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {logger} from '#/logger'
@@ -50,7 +49,7 @@ export function MutedWordsDialog() {
 
 function MutedWordsInner() {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {gtMobile} = useBreakpoints()
   const {
     isLoading: isPreferencesLoading,
@@ -86,7 +85,7 @@ function MutedWordsInner() {
 
     if (!sanitizedValue || !surfaces.length) {
       setField('')
-      setError(_(msg`Please enter a valid word, tag, or phrase to mute`))
+      setError(l`Please enter a valid word, tag, or phrase to mute`)
       return
     }
 
@@ -105,10 +104,10 @@ function MutedWordsInner() {
       logger.error(`Failed to save muted word`, {message: e.message})
       setError(e.message)
     }
-  }, [_, field, targets, addMutedWord, setField, durations, excludeFollowing])
+  }, [l, field, targets, addMutedWord, setField, durations, excludeFollowing])
 
   return (
-    <Dialog.ScrollableInner label={_(msg`Manage your muted words and tags`)}>
+    <Dialog.ScrollableInner label={l`Manage your muted words and tags`}>
       <View>
         <Text
           style={[
@@ -133,8 +132,8 @@ function MutedWordsInner() {
             autoCapitalize="none"
             autoComplete="off"
             returnKeyType="done"
-            label={_(msg`Enter a word or tag`)}
-            placeholder={_(msg`Enter a word or tag`)}
+            label={l`Enter a word or tag`}
+            placeholder={l`Enter a word or tag`}
             value={field}
             onChangeText={value => {
               if (error) {
@@ -148,7 +147,7 @@ function MutedWordsInner() {
 
         <View style={[a.pb_xl, a.gap_sm]}>
           <Toggle.Group
-            label={_(msg`Select how long to mute this word for.`)}
+            label={l`Select how long to mute this word for.`}
             type="radio"
             values={durations}
             onChange={setDurations}>
@@ -176,7 +175,7 @@ function MutedWordsInner() {
                   a.gap_sm,
                 ]}>
                 <Toggle.Item
-                  label={_(msg`Mute this word until you unmute it`)}
+                  label={l`Mute this word until you unmute it`}
                   name="forever"
                   style={[a.flex_1]}>
                   <TargetToggle>
@@ -191,7 +190,7 @@ function MutedWordsInner() {
                 </Toggle.Item>
 
                 <Toggle.Item
-                  label={_(msg`Mute this word for 24 hours`)}
+                  label={l`Mute this word for 24 hours`}
                   name="24_hours"
                   style={[a.flex_1]}>
                   <TargetToggle>
@@ -215,7 +214,7 @@ function MutedWordsInner() {
                   a.gap_sm,
                 ]}>
                 <Toggle.Item
-                  label={_(msg`Mute this word for 7 days`)}
+                  label={l`Mute this word for 7 days`}
                   name="7_days"
                   style={[a.flex_1]}>
                   <TargetToggle>
@@ -230,7 +229,7 @@ function MutedWordsInner() {
                 </Toggle.Item>
 
                 <Toggle.Item
-                  label={_(msg`Mute this word for 30 days`)}
+                  label={l`Mute this word for 30 days`}
                   name="30_days"
                   style={[a.flex_1]}>
                   <TargetToggle>
@@ -248,7 +247,7 @@ function MutedWordsInner() {
           </Toggle.Group>
 
           <Toggle.Group
-            label={_(msg`Select what content this mute word should apply to.`)}
+            label={l`Select what content this mute word should apply to.`}
             type="radio"
             values={targets}
             onChange={setTargets}>
@@ -264,7 +263,7 @@ function MutedWordsInner() {
 
             <View style={[a.flex_row, a.align_center, a.gap_sm, a.flex_wrap]}>
               <Toggle.Item
-                label={_(msg`Mute this word in post text and tags`)}
+                label={l`Mute this word in post text and tags`}
                 name="content"
                 style={[a.flex_1]}>
                 <TargetToggle>
@@ -280,7 +279,7 @@ function MutedWordsInner() {
               </Toggle.Item>
 
               <Toggle.Item
-                label={_(msg`Mute this word in tags only`)}
+                label={l`Mute this word in tags only`}
                 name="tag"
                 style={[a.flex_1]}>
                 <TargetToggle>
@@ -308,7 +307,7 @@ function MutedWordsInner() {
               <Trans>Options:</Trans>
             </Text>
             <Toggle.Item
-              label={_(msg`Do not apply this mute word to users you follow`)}
+              label={l`Do not apply this mute word to users you follow`}
               name="exclude_following"
               style={[a.flex_row, a.justify_between]}
               value={excludeFollowing}
@@ -327,7 +326,7 @@ function MutedWordsInner() {
           <View style={[a.pt_xs]}>
             <Button
               disabled={isPending || !field}
-              label={_(msg`Add mute word with chosen settings`)}
+              label={l`Add mute word with chosen settings`}
               size="large"
               color="primary"
               variant="solid"
@@ -412,7 +411,6 @@ function MutedWordsInner() {
 
         {IS_NATIVE && <View style={{height: 20}} />}
       </View>
-
       <Dialog.Close />
     </Dialog.ScrollableInner>
   )
@@ -423,7 +421,7 @@ function MutedWordRow({
   word,
 }: ViewStyleProp & {word: AppBskyActorDefs.MutedWord}) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {isPending, mutateAsync: removeMutedWord} = useRemoveMutedWordMutation()
   const {mutateAsync: updateMutedWord} = useUpdateMutedWordMutation()
   const control = Prompt.usePromptControl()
@@ -449,15 +447,12 @@ function MutedWordRow({
     <>
       <Prompt.Basic
         control={control}
-        title={_(msg`Are you sure?`)}
-        description={_(
-          msg`This will delete "${word.value}" from your muted words. You can always add it back later.`,
-        )}
+        title={l`Are you sure?`}
+        description={l`This will delete "${word.value}" from your muted words. You can always add it back later.`}
         onConfirm={remove}
-        confirmButtonCta={_(msg`Remove`)}
+        confirmButtonCta={l`Remove`}
         confirmButtonColor="negative"
       />
-
       <View
         style={[
           a.flex_row,
@@ -528,7 +523,7 @@ function MutedWordRow({
                       {' · '}
                     </Text>
                     <Menu.Root>
-                      <Menu.Trigger label={_(msg`Renew mute word`)}>
+                      <Menu.Trigger label={l`Renew mute word`}>
                         {({props}) => (
                           <Text
                             {...props}
@@ -548,29 +543,25 @@ function MutedWordRow({
                         </Menu.LabelText>
                         <Menu.Group>
                           <Menu.Item
-                            label={_(msg`24 hours`)}
+                            label={l`24 hours`}
                             onPress={() => renew(1)}>
                             <Menu.ItemText>
                               <Trans>24 hours</Trans>
                             </Menu.ItemText>
                           </Menu.Item>
-                          <Menu.Item
-                            label={_(msg`7 days`)}
-                            onPress={() => renew(7)}>
+                          <Menu.Item label={l`7 days`} onPress={() => renew(7)}>
                             <Menu.ItemText>
                               <Trans>7 days</Trans>
                             </Menu.ItemText>
                           </Menu.Item>
                           <Menu.Item
-                            label={_(msg`30 days`)}
+                            label={l`30 days`}
                             onPress={() => renew(30)}>
                             <Menu.ItemText>
                               <Trans>30 days</Trans>
                             </Menu.ItemText>
                           </Menu.Item>
-                          <Menu.Item
-                            label={_(msg`Forever`)}
-                            onPress={() => renew()}>
+                          <Menu.Item label={l`Forever`} onPress={() => renew()}>
                             <Menu.ItemText>
                               <Trans>Forever</Trans>
                             </Menu.ItemText>
@@ -610,7 +601,7 @@ function MutedWordRow({
         </View>
 
         <Button
-          label={_(msg`Remove mute word from your list`)}
+          label={l`Remove mute word from your list`}
           size="tiny"
           shape="round"
           variant="outline"
diff --git a/src/components/dialogs/PostInteractionSettingsDialog.tsx b/src/components/dialogs/PostInteractionSettingsDialog.tsx
index 8a5c7101cc..984e655f38 100644
--- a/src/components/dialogs/PostInteractionSettingsDialog.tsx
+++ b/src/components/dialogs/PostInteractionSettingsDialog.tsx
@@ -5,8 +5,7 @@ import {
   type AppBskyFeedPostgate,
   AtUri,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -109,11 +108,11 @@ export function PostInteractionSettingsControlledDialog({
 }
 
 function DialogInner(props: Omit<PostInteractionSettingsFormProps, 'control'>) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <Dialog.ScrollableInner
-      label={_(msg`Edit post interaction settings`)}
+      label={l`Edit post interaction settings`}
       style={[web({maxWidth: 400}), a.w_full]}>
       <Header />
       <PostInteractionSettingsForm {...props} />
@@ -164,7 +163,7 @@ export function PostInteractionSettingsDialogControlledInner(
   props: PostInteractionSettingsDialogProps,
 ) {
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount} = useSession()
   const [isSaving, setIsSaving] = useState(false)
 
@@ -237,9 +236,7 @@ export function PostInteractionSettingsDialogControlledInner(
         safeMessage: e.message,
       })
       Toast.show(
-        _(
-          msg`There was an issue. Please check your internet connection and try again.`,
-        ),
+        l`There was an issue. Please check your internet connection and try again.`,
         {
           type: 'error',
         },
@@ -248,7 +245,7 @@ export function PostInteractionSettingsDialogControlledInner(
       setIsSaving(false)
     }
   }, [
-    _,
+    l,
     ax,
     props.postUri,
     props.rootPostUri,
@@ -263,7 +260,7 @@ export function PostInteractionSettingsDialogControlledInner(
 
   return (
     <Dialog.ScrollableInner
-      label={_(msg`Edit post interaction settings`)}
+      label={l`Edit post interaction settings`}
       style={[web({maxWidth: 400}), a.w_full]}>
       {isLoading ? (
         <View
@@ -312,7 +309,7 @@ export function PostInteractionSettingsForm({
   onChangePersist,
 }: PostInteractionSettingsFormProps) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const playHaptic = useHaptics()
   const [showLists, setShowLists] = useState(false)
   const {
@@ -428,7 +425,7 @@ export function PostInteractionSettingsForm({
           </Text>
 
           <Toggle.Group
-            label={_(msg`Set who can reply to your post`)}
+            label={l`Set who can reply to your post`}
             type="radio"
             maxSelections={1}
             disabled={replySettingsDisabled}
@@ -448,7 +445,7 @@ export function PostInteractionSettingsForm({
               <Toggle.Item
                 name="everyone"
                 type="checkbox"
-                label={_(msg`Allow anyone to reply`)}
+                label={l`Allow anyone to reply`}
                 style={[a.flex_1]}>
                 {({selected}) => (
                   <Toggle.Panel active={selected}>
@@ -462,7 +459,7 @@ export function PostInteractionSettingsForm({
               <Toggle.Item
                 name="nobody"
                 type="checkbox"
-                label={_(msg`Disable replies entirely`)}
+                label={l`Disable replies entirely`}
                 style={[a.flex_1]}>
                 {({selected}) => (
                   <Toggle.Panel active={selected}>
@@ -477,9 +474,7 @@ export function PostInteractionSettingsForm({
           </Toggle.Group>
 
           <Toggle.Group
-            label={_(
-              msg`Set precisely which groups of people can reply to your post`,
-            )}
+            label={l`Set precisely which groups of people can reply to your post`}
             values={toggleGroupValues}
             onChange={toggleGroupOnChange}
             disabled={replySettingsDisabled}>
@@ -487,7 +482,7 @@ export function PostInteractionSettingsForm({
               <Toggle.Item
                 name="followers"
                 type="checkbox"
-                label={_(msg`Allow your followers to reply`)}
+                label={l`Allow your followers to reply`}
                 hitSlop={0}>
                 {({selected}) => (
                   <Toggle.Panel active={selected} adjacent="trailing">
@@ -501,7 +496,7 @@ export function PostInteractionSettingsForm({
               <Toggle.Item
                 name="following"
                 type="checkbox"
-                label={_(msg`Allow people you follow to reply`)}
+                label={l`Allow people you follow to reply`}
                 hitSlop={0}>
                 {({selected}) => (
                   <Toggle.Panel active={selected} adjacent="both">
@@ -515,7 +510,7 @@ export function PostInteractionSettingsForm({
               <Toggle.Item
                 name="mention"
                 type="checkbox"
-                label={_(msg`Allow people you mention to reply`)}
+                label={l`Allow people you mention to reply`}
                 hitSlop={0}>
                 {({selected}) => (
                   <Toggle.Panel active={selected} adjacent="both">
@@ -530,8 +525,8 @@ export function PostInteractionSettingsForm({
               <Button
                 label={
                   showLists
-                    ? _(msg`Hide lists`)
-                    : _(msg`Show lists of users to select from`)
+                    ? l`Hide lists`
+                    : l`Show lists of users to select from`
                 }
                 accessibilityRole="togglebutton"
                 hitSlop={0}
@@ -595,7 +590,7 @@ export function PostInteractionSettingsForm({
                       key={list.uri}
                       name={`list:${list.uri}`}
                       type="checkbox"
-                      label={_(msg`Allow users in ${list.name} to reply`)}
+                      label={l`Allow users in ${list.name} to reply`}
                       hitSlop={0}>
                       {({selected}) => (
                         <Toggle.Panel
@@ -619,14 +614,13 @@ export function PostInteractionSettingsForm({
           </Toggle.Group>
         </View>
       </View>
-
       <Toggle.Item
         name="quoteposts"
         type="checkbox"
         label={
           quotesEnabled
-            ? _(msg`Disable quote posts of this post`)
-            : _(msg`Enable quote posts of this post`)
+            ? l`Disable quote posts of this post`
+            : l`Enable quote posts of this post`
         }
         value={quotesEnabled}
         onChange={onChangeQuotesEnabled}>
@@ -639,14 +633,13 @@ export function PostInteractionSettingsForm({
           </Toggle.Panel>
         )}
       </Toggle.Item>
-
       {typeof persist !== 'undefined' && (
         <View style={[{minHeight: 24}, a.justify_center]}>
           {isDirty ? (
             <Toggle.Item
               name="persist"
               type="checkbox"
-              label={_(msg`Save these options for next time`)}
+              label={l`Save these options for next time`}
               value={persist}
               onChange={() => onChangePersist?.(!persist)}>
               <Toggle.Checkbox />
@@ -662,10 +655,9 @@ export function PostInteractionSettingsForm({
           )}
         </View>
       )}
-
       <Button
         disabled={!canSave || isSaving}
-        label={_(msg`Save`)}
+        label={l`Save`}
         onPress={onSave}
         color="primary"
         size="large">
diff --git a/src/components/dialogs/ServerInput.tsx b/src/components/dialogs/ServerInput.tsx
index 2b6ddf19dd..4e69e00bed 100644
--- a/src/components/dialogs/ServerInput.tsx
+++ b/src/components/dialogs/ServerInput.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useImperativeHandle, useRef, useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {BSKY_SERVICE} from '#/lib/constants'
@@ -78,7 +77,7 @@ function DialogInner({
   initialCustomAddress: string
 }) {
   const control = Dialog.useDialogContext()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const {accounts} = useSession()
   const {gtMobile} = useBreakpoints()
@@ -135,24 +134,20 @@ function DialogInner({
         </Text>
         <SegmentedControl.Root
           type="tabs"
-          label={_(msg`Hosting provider`)}
+          label={l`Hosting provider`}
           value={fixedOption}
           onChange={setFixedOption}>
           <SegmentedControl.Item
             testID="bskyServiceSelectBtn"
             value={BSKY_SERVICE}
-            label={_(msg`Bluesky`)}>
-            <SegmentedControl.ItemText>
-              {_(msg`Bluesky`)}
-            </SegmentedControl.ItemText>
+            label={l`Bluesky`}>
+            <SegmentedControl.ItemText>{l`Bluesky`}</SegmentedControl.ItemText>
           </SegmentedControl.Item>
           <SegmentedControl.Item
             testID="customSelectBtn"
             value="custom"
-            label={_(msg`Custom`)}>
-            <SegmentedControl.ItemText>
-              {_(msg`Custom`)}
-            </SegmentedControl.ItemText>
+            label={l`Custom`}>
+            <SegmentedControl.ItemText>{l`Custom`}</SegmentedControl.ItemText>
           </SegmentedControl.Item>
         </SegmentedControl.Root>
 
@@ -217,7 +212,7 @@ function DialogInner({
               </Trans>
             )}{' '}
             <InlineLinkText
-              label={_(msg`Learn more about self hosting your PDS.`)}
+              label={l`Learn more about self hosting your PDS.`}
               to="https://atproto.com/guides/self-hosting">
               <Trans>Learn more.</Trans>
             </InlineLinkText>
@@ -234,7 +229,7 @@ function DialogInner({
               web: 'small',
             })}
             onPress={() => control.close()}
-            label={_(msg`Done`)}>
+            label={l`Done`}>
             <ButtonText>
               <Trans>Done</Trans>
             </ButtonText>
diff --git a/src/components/dialogs/Signin.tsx b/src/components/dialogs/Signin.tsx
index d98299a985..917a5965b2 100644
--- a/src/components/dialogs/Signin.tsx
+++ b/src/components/dialogs/Signin.tsx
@@ -1,7 +1,6 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useLoggedOutViewControls} from '#/state/shell/logged-out'
@@ -27,7 +26,7 @@ export function SigninDialog() {
 
 function SigninDialogInner({}: {control: Dialog.DialogOuterProps['control']}) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {gtMobile} = useBreakpoints()
   const {requestSwitchToAccount} = useLoggedOutViewControls()
   const closeAllActiveElements = useCloseAllActiveElements()
@@ -44,7 +43,7 @@ function SigninDialogInner({}: {control: Dialog.DialogOuterProps['control']}) {
 
   return (
     <Dialog.ScrollableInner
-      label={_(msg`Sign in to Bluesky or create a new account`)}
+      label={l`Sign in to Bluesky or create a new account`}
       style={[gtMobile ? {width: 'auto', maxWidth: 420} : a.w_full]}>
       <View style={[!IS_NATIVE && a.p_2xl]}>
         <View
@@ -84,7 +83,7 @@ function SigninDialogInner({}: {control: Dialog.DialogOuterProps['control']}) {
             color="primary"
             size="large"
             onPress={showCreateAccount}
-            label={_(msg`Create an account`)}>
+            label={l`Create an account`}>
             <ButtonText>
               <Trans>Create an account</Trans>
             </ButtonText>
@@ -95,7 +94,7 @@ function SigninDialogInner({}: {control: Dialog.DialogOuterProps['control']}) {
             color="secondary"
             size="large"
             onPress={showSignIn}
-            label={_(msg`Sign in`)}>
+            label={l`Sign in`}>
             <ButtonText>
               <Trans>Sign in</Trans>
             </ButtonText>
@@ -104,7 +103,6 @@ function SigninDialogInner({}: {control: Dialog.DialogOuterProps['control']}) {
 
         {IS_NATIVE && <View style={{height: 10}} />}
       </View>
-
       <Dialog.Close />
     </Dialog.ScrollableInner>
   )
diff --git a/src/components/dialogs/StarterPackDialog.tsx b/src/components/dialogs/StarterPackDialog.tsx
index 2a77292f42..1c32bea374 100644
--- a/src/components/dialogs/StarterPackDialog.tsx
+++ b/src/components/dialogs/StarterPackDialog.tsx
@@ -4,8 +4,7 @@ import {
   type AppBskyGraphGetStarterPacksWithMembership,
   AppBskyGraphStarterpack,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
@@ -88,7 +87,7 @@ export function StarterPackDialog({
 }
 
 function Empty({onStartWizard}: {onStartWizard: () => void}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
 
   return (
@@ -102,10 +101,9 @@ function Empty({onStartWizard}: {onStartWizard: () => void}) {
           <Trans>You have no starter packs.</Trans>
         </Text>
       </View>
-
       <View style={[a.align_center]}>
         <Button
-          label={_(msg`Create starter pack`)}
+          label={l`Create starter pack`}
           color="secondary_inverted"
           size="small"
           onPress={onStartWizard}>
@@ -131,7 +129,7 @@ function StarterPackList({
   enabled?: boolean
 }) {
   const control = Dialog.useDialogContext()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {data: subject} = useProfileQuery({did: targetDid})
 
   const {
@@ -184,7 +182,7 @@ function StarterPackList({
           <Trans>Add to starter packs</Trans>
         </Text>
         <Button
-          label={_(msg`Close`)}
+          label={l`Close`}
           onPress={onClose}
           variant="ghost"
           color="secondary"
@@ -202,7 +200,7 @@ function StarterPackList({
               <Trans>New starter pack</Trans>
             </Text>
             <Button
-              label={_(msg`Create starter pack`)}
+              label={l`Create starter pack`}
               color="secondary_inverted"
               size="small"
               onPress={onStartWizard}>
@@ -260,7 +258,7 @@ function StarterPackItem({
 }) {
   const t = useTheme()
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount} = useSession()
   const isSelf = subject?.did === currentAccount?.did
 
@@ -271,26 +269,26 @@ function StarterPackItem({
     useListMembershipAddMutation({
       subject,
       onSuccess: () => {
-        Toast.show(_(msg`Added to starter pack`))
+        Toast.show(l`Added to starter pack`)
       },
       onError: err => {
         if (!isNetworkError(err)) {
           logger.error('Failed to add to starter pack', {safeMessage: err})
         }
-        Toast.show(_(msg`Failed to add to starter pack`), {type: 'error'})
+        Toast.show(l`Failed to add to starter pack`, {type: 'error'})
       },
     })
 
   const {mutate: removeMembership, isPending: isPendingRemove} =
     useListMembershipRemoveMutation({
       onSuccess: () => {
-        Toast.show(_(msg`Removed from starter pack`))
+        Toast.show(l`Removed from starter pack`)
       },
       onError: err => {
         if (!isNetworkError(err)) {
           logger.error('Failed to remove from starter pack', {safeMessage: err})
         }
-        Toast.show(_(msg`Failed to remove from starter pack`), {type: 'error'})
+        Toast.show(l`Failed to remove from starter pack`, {type: 'error'})
       },
     })
 
@@ -371,9 +369,8 @@ function StarterPackItem({
             )}
         </View>
       </View>
-
       <Button
-        label={isInPack ? _(msg`Remove`) : _(msg`Add`)}
+        label={isInPack ? l`Remove` : l`Add`}
         color={isInPack ? 'secondary' : 'primary_subtle'}
         size="tiny"
         disabled={isPending || isSelf}
diff --git a/src/components/dialogs/SwitchAccount.tsx b/src/components/dialogs/SwitchAccount.tsx
index 2dc550a7c8..cda1741dd0 100644
--- a/src/components/dialogs/SwitchAccount.tsx
+++ b/src/components/dialogs/SwitchAccount.tsx
@@ -1,7 +1,6 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useAccountSwitcher} from '#/lib/hooks/useAccountSwitcher'
@@ -17,7 +16,7 @@ export function SwitchAccountDialog({
 }: {
   control: Dialog.DialogControlProps
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount} = useSession()
   const {onPressSwitchAccount, pendingDid} = useAccountSwitcher()
   const {setShowLoggedOut} = useLoggedOutViewControls()
@@ -44,7 +43,7 @@ export function SwitchAccountDialog({
   return (
     <Dialog.Outer control={control} nativeOptions={{preventExpansion: true}}>
       <Dialog.Handle />
-      <Dialog.ScrollableInner label={_(msg`Switch account`)}>
+      <Dialog.ScrollableInner label={l`Switch account`}>
         <View style={[a.gap_lg]}>
           <Text style={[a.text_2xl, a.font_semi_bold]}>
             <Trans>Switch account</Trans>
@@ -53,7 +52,7 @@ export function SwitchAccountDialog({
           <AccountList
             onSelectAccount={onSelectAccount}
             onSelectOther={onPressAddAccount}
-            otherLabel={_(msg`Add account`)}
+            otherLabel={l`Add account`}
             pendingDid={pendingDid}
           />
         </View>
diff --git a/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx b/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx
index 3e74de5c67..397a2a8b03 100644
--- a/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx
+++ b/src/components/dialogs/lists/CreateListFromStarterPackDialog.tsx
@@ -8,8 +8,7 @@ import {
   type ComAtprotoRepoApplyWrites,
 } from '@atproto/api'
 import {TID} from '@atproto/common-web'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
@@ -38,7 +37,7 @@ export function CreateListFromStarterPackDialog({
   control: Dialog.DialogControlProps
   starterPack: AppBskyGraphDefs.StarterPackView
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const agent = useAgent()
   const ax = useAnalytics()
@@ -124,7 +123,7 @@ export function CreateListFromStarterPackDialog({
       })
     } catch (e) {
       logger.error('Failed to add members to list', {safeMessage: e})
-      Toast.show(_(msg`List created, but failed to add some members`), {
+      Toast.show(l`List created, but failed to add some members`, {
         type: 'error',
       })
     }
@@ -145,7 +144,7 @@ export function CreateListFromStarterPackDialog({
         nativeOptions={{preventExpansion: true}}>
         <Dialog.Handle />
         <Dialog.ScrollableInner
-          label={_(msg`Create list from starter pack`)}
+          label={l`Create list from starter pack`}
           style={web({maxWidth: 400})}>
           <View style={[a.gap_lg]}>
             <Text style={[a.text_xl, a.font_bold]}>
@@ -177,7 +176,7 @@ export function CreateListFromStarterPackDialog({
                 a.pt_sm,
               ]}>
               <Button
-                label={_(msg`Create list`)}
+                label={l`Create list`}
                 onPress={onPressCreate}
                 size={platform({
                   web: 'small',
@@ -189,7 +188,7 @@ export function CreateListFromStarterPackDialog({
                 </ButtonText>
               </Button>
               <Button
-                label={_(msg`Cancel`)}
+                label={l`Cancel`}
                 onPress={() => control.close()}
                 size={platform({
                   web: 'small',
@@ -205,7 +204,6 @@ export function CreateListFromStarterPackDialog({
           <Dialog.Close />
         </Dialog.ScrollableInner>
       </Dialog.Outer>
-
       <CreateOrEditListDialog
         control={createDialogControl}
         purpose="app.bsky.graph.defs#curatelist"
@@ -216,13 +214,12 @@ export function CreateListFromStarterPackDialog({
           avatar: starterPack.list?.avatar,
         }}
       />
-
       <Dialog.Outer
         control={loadingDialogControl}
         nativeOptions={{preventDismiss: true}}>
         <Dialog.Handle />
         <Dialog.ScrollableInner
-          label={_(msg`Adding members to list...`)}
+          label={l`Adding members to list...`}
           style={web({maxWidth: 400})}>
           <View style={[a.align_center, a.gap_lg, a.py_5xl]}>
             <Loader size="xl" />
diff --git a/src/components/dialogs/lists/CreateOrEditListDialog.tsx b/src/components/dialogs/lists/CreateOrEditListDialog.tsx
index 7164c3ebeb..e793d0ffa0 100644
--- a/src/components/dialogs/lists/CreateOrEditListDialog.tsx
+++ b/src/components/dialogs/lists/CreateOrEditListDialog.tsx
@@ -1,8 +1,7 @@
 import {useCallback, useEffect, useMemo, useState} from 'react'
 import {View} from 'react-native'
 import {type AppBskyGraphDefs, RichText as RichTextAPI} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 
 import {cleanError} from '#/lib/strings/errors'
@@ -50,7 +49,7 @@ export function CreateOrEditListDialog({
   onSave?: (uri: string) => void
   initialValues?: InitialListValues
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const cancelControl = Dialog.useDialogControl()
   const [dirty, setDirty] = useState(false)
 
@@ -92,13 +91,12 @@ export function CreateOrEditListDialog({
         onPressCancel={onPressCancel}
         initialValues={initialValues}
       />
-
       <Prompt.Basic
         control={cancelControl}
-        title={_(msg`Discard changes?`)}
-        description={_(msg`Are you sure you want to discard your changes?`)}
+        title={l`Discard changes?`}
+        description={l`Are you sure you want to discard your changes?`}
         onConfirm={() => control.close()}
-        confirmButtonCta={_(msg`Discard`)}
+        confirmButtonCta={l`Discard`}
         confirmButtonColor="negative"
       />
     </Dialog.Outer>
@@ -131,7 +129,7 @@ function DialogInner({
   }, [list, purpose])
   const isCurateList = activePurpose === 'app.bsky.graph.defs#curatelist'
 
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const agent = useAgent()
   const control = Dialog.useDialogContext()
@@ -238,8 +236,8 @@ function DialogInner({
         })
         Toast.show(
           isCurateList
-            ? _(msg({message: 'User list updated', context: 'toast'}))
-            : _(msg({message: 'Moderation list updated', context: 'toast'})),
+            ? l({message: 'User list updated', context: 'toast'})
+            : l({message: 'Moderation list updated', context: 'toast'}),
         )
         control.close(() => onSave?.(list.uri))
       } else {
@@ -252,8 +250,8 @@ function DialogInner({
         })
         Toast.show(
           isCurateList
-            ? _(msg({message: 'User list created', context: 'toast'}))
-            : _(msg({message: 'Moderation list created', context: 'toast'})),
+            ? l({message: 'User list created', context: 'toast'})
+            : l({message: 'Moderation list created', context: 'toast'}),
         )
         control.close(() => onSave?.(uri))
       }
@@ -273,7 +271,7 @@ function DialogInner({
     activePurpose,
     isCurateList,
     agent,
-    _,
+    l,
   ])
 
   const displayNameTooLong = isOverMaxGraphemeCount({
@@ -288,7 +286,7 @@ function DialogInner({
   const cancelButton = useCallback(
     () => (
       <Button
-        label={_(msg`Cancel`)}
+        label={l`Cancel`}
         onPress={onPressCancel}
         size="small"
         color="primary"
@@ -300,13 +298,13 @@ function DialogInner({
         </ButtonText>
       </Button>
     ),
-    [onPressCancel, _],
+    [onPressCancel, l],
   )
 
   const saveButton = useCallback(
     () => (
       <Button
-        label={_(msg`Save`)}
+        label={l`Save`}
         onPress={onPressSave}
         disabled={
           !dirty ||
@@ -327,7 +325,7 @@ function DialogInner({
       </Button>
     ),
     [
-      _,
+      l,
       t,
       dirty,
       onPressSave,
@@ -360,19 +358,19 @@ function DialogInner({
 
   const title = list
     ? isCurateList
-      ? _(msg`Edit user list`)
-      : _(msg`Edit moderation list`)
+      ? l`Edit user list`
+      : l`Edit moderation list`
     : isCurateList
-      ? _(msg`Create user list`)
-      : _(msg`Create moderation list`)
+      ? l`Create user list`
+      : l`Create moderation list`
 
   const displayNamePlaceholder = isCurateList
-    ? _(msg`e.g. Great Posters`)
-    : _(msg`e.g. Spammers`)
+    ? l`e.g. Great Posters`
+    : l`e.g. Spammers`
 
   const descriptionPlaceholder = isCurateList
-    ? _(msg`e.g. The posters who never miss.`)
-    : _(msg`e.g. Users that repeatedly reply with ads.`)
+    ? l`e.g. The posters who never miss.`
+    : l`e.g. Users that repeatedly reply with ads.`
 
   return (
     <Dialog.ScrollableInner
@@ -413,7 +411,7 @@ function DialogInner({
             <Dialog.Input
               defaultValue={displayName}
               onChangeText={onChangeDisplayName}
-              label={_(msg`Name`)}
+              label={l`Name`}
               placeholder={displayNamePlaceholder}
               testID="editListNameInput"
             />
@@ -450,7 +448,7 @@ function DialogInner({
               defaultValue={descriptionRt.text}
               onChangeText={onChangeDescription}
               multiline
-              label={_(msg`Description`)}
+              label={l`Description`}
               placeholder={descriptionPlaceholder}
               testID="editListDescriptionInput"
             />
diff --git a/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx b/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx
index 8129e9bdb4..d12258c724 100644
--- a/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx
+++ b/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx
@@ -1,8 +1,7 @@
 import {useCallback, useMemo} from 'react'
 import {View} from 'react-native'
 import {type AppBskyGraphDefs, type ModerationOpts} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {cleanError} from '#/lib/strings/errors'
@@ -57,7 +56,7 @@ function DialogInner({
     profile: bsky.profile.AnyProfileView,
   ) => void | undefined
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const moderationOpts = useModerationOpts()
   const {data: listMembers} = useAllListMembersQuery(list.uri)
 
@@ -78,7 +77,7 @@ function DialogInner({
 
   return (
     <SearchablePeopleList
-      title={_(msg`Add people to list`)}
+      title={l`Add people to list`}
       renderProfileCard={renderProfileCard}
     />
   )
@@ -114,7 +113,7 @@ function UserResult({
   ) => void | undefined
   moderationOpts?: ModerationOpts
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const membership = useMemo(
     () => getMembership(listMembers, profile.did),
     [listMembers, profile.did],
@@ -122,7 +121,7 @@ function UserResult({
   const {mutate: listMembershipAdd, isPending: isAddingPending} =
     useListMembershipAddMutation({
       onSuccess: () => {
-        Toast.show(_(msg`Added to list`))
+        Toast.show(l`Added to list`)
         onChange?.('add', profile)
       },
       onError: e =>
@@ -133,7 +132,7 @@ function UserResult({
   const {mutate: listMembershipRemove, isPending: isRemovingPending} =
     useListMembershipRemoveMutation({
       onSuccess: () => {
-        Toast.show(_(msg`Removed from list`))
+        Toast.show(l`Removed from list`)
         onChange?.('remove', profile)
       },
       onError: e =>
@@ -175,8 +174,8 @@ function UserResult({
           <Button
             label={
               membership === false
-                ? _(msg`Add user to list`)
-                : _(msg`Remove user from list`)
+                ? l`Add user to list`
+                : l`Remove user from list`
             }
             onPress={onToggleMembership}
             disabled={isMutating}
diff --git a/src/components/dialogs/nuxs/ActivitySubscriptions.tsx b/src/components/dialogs/nuxs/ActivitySubscriptions.tsx
index 318b130414..f30643a29e 100644
--- a/src/components/dialogs/nuxs/ActivitySubscriptions.tsx
+++ b/src/components/dialogs/nuxs/ActivitySubscriptions.tsx
@@ -1,8 +1,7 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {atoms as a, useTheme, web} from '#/alf'
@@ -15,7 +14,7 @@ import {IS_WEB} from '#/env'
 
 export function ActivitySubscriptionsNUX() {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const nuxDialogs = useNuxDialogContext()
   const control = Dialog.useDialogControl()
 
@@ -28,9 +27,8 @@ export function ActivitySubscriptionsNUX() {
   return (
     <Dialog.Outer control={control} onClose={onClose}>
       <Dialog.Handle />
-
       <Dialog.ScrollableInner
-        label={_(msg`Introducing activity notifications`)}
+        label={l`Introducing activity notifications`}
         style={[web({maxWidth: 400})]}
         contentContainerStyle={[
           {
@@ -110,9 +108,7 @@ export function ActivitySubscriptionsNUX() {
                     aspectRatio: 398 / 268,
                   },
                 ]}
-                alt={_(
-                  msg`A screenshot of a profile page with a bell icon next to the follow button, indicating the new activity notifications feature.`,
-                )}
+                alt={l`A screenshot of a profile page with a bell icon next to the follow button, indicating the new activity notifications feature.`}
                 useAppleWebpCodec
               />
             </View>
@@ -157,7 +153,7 @@ export function ActivitySubscriptionsNUX() {
 
           {!IS_WEB && (
             <Button
-              label={_(msg`Close`)}
+              label={l`Close`}
               size="large"
               variant="solid"
               color="primary"
diff --git a/src/components/dialogs/nuxs/BookmarksAnnouncement.tsx b/src/components/dialogs/nuxs/BookmarksAnnouncement.tsx
index 153130f8ec..45a39a791c 100644
--- a/src/components/dialogs/nuxs/BookmarksAnnouncement.tsx
+++ b/src/components/dialogs/nuxs/BookmarksAnnouncement.tsx
@@ -2,8 +2,7 @@ import {useCallback} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
 import {LinearGradient} from 'expo-linear-gradient'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {atoms as a, useTheme, web} from '#/alf'
@@ -17,7 +16,7 @@ import {IS_WEB} from '#/env'
 
 export function BookmarksAnnouncement() {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const nuxDialogs = useNuxDialogContext()
   const control = Dialog.useDialogControl()
 
@@ -33,9 +32,8 @@ export function BookmarksAnnouncement() {
       onClose={onClose}
       nativeOptions={{preventExpansion: true}}>
       <Dialog.Handle />
-
       <Dialog.ScrollableInner
-        label={_(msg`Introducing saved posts AKA bookmarks`)}
+        label={l`Introducing saved posts AKA bookmarks`}
         style={[web({maxWidth: 440})]}
         contentContainerStyle={[
           {
@@ -117,13 +115,11 @@ export function BookmarksAnnouncement() {
                     aspectRatio: 333 / 104,
                   },
                 ]}
-                alt={_(
-                  msg({
-                    message: `A screenshot of a post with a new button next to the share button that allows you to save the post to your bookmarks. The post is from @jcsalterego.bsky.social and reads "inventing a saturday that immediately follows monday".`,
-                    comment:
-                      'Contains a post that originally appeared in English. Consider translating the post text if it makes sense in your language, and noting that the post was translated from English.',
-                  }),
-                )}
+                alt={l({
+                  message: `A screenshot of a post with a new button next to the share button that allows you to save the post to your bookmarks. The post is from @jcsalterego.bsky.social and reads "inventing a saturday that immediately follows monday".`,
+                  comment:
+                    'Contains a post that originally appeared in English. Consider translating the post text if it makes sense in your language, and noting that the post was translated from English.',
+                })}
                 useAppleWebpCodec
               />
             </View>
@@ -162,7 +158,7 @@ export function BookmarksAnnouncement() {
 
           {!IS_WEB && (
             <Button
-              label={_(msg`Close`)}
+              label={l`Close`}
               size="large"
               color="primary"
               onPress={() => {
diff --git a/src/components/dialogs/nuxs/DraftsAnnouncement.tsx b/src/components/dialogs/nuxs/DraftsAnnouncement.tsx
index 37b93bda70..cd05b8d758 100644
--- a/src/components/dialogs/nuxs/DraftsAnnouncement.tsx
+++ b/src/components/dialogs/nuxs/DraftsAnnouncement.tsx
@@ -2,8 +2,7 @@ import {useCallback} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
 import {LinearGradient} from 'expo-linear-gradient'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {atoms as a, useTheme, web} from '#/alf'
@@ -28,7 +27,7 @@ export const enabled = createIsEnabledCheck(props => {
 
 export function DraftsAnnouncement() {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const nuxDialogs = useNuxDialogContext()
   const control = Dialog.useDialogControl()
 
@@ -44,9 +43,8 @@ export function DraftsAnnouncement() {
       onClose={onClose}
       nativeOptions={{preventExpansion: true}}>
       <Dialog.Handle fill={t.palette.primary_400} />
-
       <Dialog.ScrollableInner
-        label={_(msg`Introducing drafts`)}
+        label={l`Introducing drafts`}
         style={[web({maxWidth: 440})]}
         contentContainerStyle={[
           {
@@ -94,13 +92,11 @@ export function DraftsAnnouncement() {
                 aspectRatio: 393 / 226,
               },
             ]}
-            alt={_(
-              msg({
-                message: `A screenshot of the post composer with a new button next to the post button that says "Drafts", with a rainbow firework effect. Below, the text in the composer reads "Hey, did you hear the news? Bluesky has drafts now!!!".`,
-                comment:
-                  'Contains a post that originally appeared in English. Consider translating the post text if it makes sense in your language, and noting that the post was translated from English.',
-              }),
-            )}
+            alt={l({
+              message: `A screenshot of the post composer with a new button next to the post button that says "Drafts", with a rainbow firework effect. Below, the text in the composer reads "Hey, did you hear the news? Bluesky has drafts now!!!".`,
+              comment:
+                'Contains a post that originally appeared in English. Consider translating the post text if it makes sense in your language, and noting that the post was translated from English.',
+            })}
             useAppleWebpCodec
           />
         </View>
@@ -137,7 +133,7 @@ export function DraftsAnnouncement() {
 
           {!IS_WEB && (
             <Button
-              label={_(msg`Close`)}
+              label={l`Close`}
               size="large"
               color="primary"
               onPress={() => control.close()}
diff --git a/src/components/dialogs/nuxs/FindContactsAnnouncement.tsx b/src/components/dialogs/nuxs/FindContactsAnnouncement.tsx
index 70f29ef157..2b735e6b21 100644
--- a/src/components/dialogs/nuxs/FindContactsAnnouncement.tsx
+++ b/src/components/dialogs/nuxs/FindContactsAnnouncement.tsx
@@ -2,8 +2,7 @@ import {useCallback} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
 import {LinearGradient} from 'expo-linear-gradient'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {atoms as a, useTheme, web} from '#/alf'
@@ -34,7 +33,7 @@ export const enabled = createIsEnabledCheck(props => {
 
 export function FindContactsAnnouncement() {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const nuxDialogs = useNuxDialogContext()
   const control = Dialog.useDialogControl()
@@ -51,9 +50,8 @@ export function FindContactsAnnouncement() {
       onClose={onClose}
       nativeOptions={{preventExpansion: true}}>
       <Dialog.Handle />
-
       <Dialog.ScrollableInner
-        label={_(msg`Introducing finding friends via contacts`)}
+        label={l`Introducing finding friends via contacts`}
         style={[web({maxWidth: 440})]}
         contentContainerStyle={[
           {
@@ -75,9 +73,7 @@ export function FindContactsAnnouncement() {
               accessibilityIgnoresInvertColors
               source={require('../../../../assets/images/find_friends_illustration.webp')}
               style={[a.w_full, {aspectRatio: 1278 / 661}]}
-              alt={_(
-                msg`An illustration depicting user avatars flowing from a contact book into the Bluesky app`,
-              )}
+              alt={l`An illustration depicting user avatars flowing from a contact book into the Bluesky app`}
               useAppleWebpCodec
             />
           </View>
@@ -113,7 +109,7 @@ export function FindContactsAnnouncement() {
           </View>
 
           <Button
-            label={_(msg`Import Contacts`)}
+            label={l`Import Contacts`}
             size="large"
             color="primary"
             onPress={() => {
diff --git a/src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx b/src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx
index cbe2555aac..3083a939c6 100644
--- a/src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx
+++ b/src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx
@@ -1,8 +1,7 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {urls} from '#/lib/constants'
@@ -19,7 +18,7 @@ import {IS_NATIVE} from '#/env'
 
 export function InitialVerificationAnnouncement() {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const {gtMobile} = useBreakpoints()
   const nuxDialogs = useNuxDialogContext()
@@ -34,9 +33,8 @@ export function InitialVerificationAnnouncement() {
   return (
     <Dialog.Outer control={control} onClose={onClose}>
       <Dialog.Handle />
-
       <Dialog.ScrollableInner
-        label={_(msg`Announcing verification on Bluesky`)}
+        label={l`Announcing verification on Bluesky`}
         style={[
           gtMobile ? {width: 'auto', maxWidth: 400, minWidth: 200} : a.w_full,
         ]}>
@@ -82,9 +80,7 @@ export function InitialVerificationAnnouncement() {
                   aspectRatio: 353 / 160,
                 },
               ]}
-              alt={_(
-                msg`An illustration showing that Bluesky selects trusted verifiers, and trusted verifiers in turn verify individual user accounts.`,
-              )}
+              alt={l`An illustration showing that Bluesky selects trusted verifiers, and trusted verifiers in turn verify individual user accounts.`}
               useAppleWebpCodec
             />
           </View>
@@ -117,9 +113,7 @@ export function InitialVerificationAnnouncement() {
                   aspectRatio: 353 / 196,
                 },
               ]}
-              alt={_(
-                msg`An mockup of a iPhone showing the Bluesky app open to the profile of a verified user with a blue checkmark next to their display name.`,
-              )}
+              alt={l`An mockup of a iPhone showing the Bluesky app open to the profile of a verified user with a blue checkmark next to their display name.`}
               useAppleWebpCodec
             />
           </View>
@@ -159,7 +153,7 @@ export function InitialVerificationAnnouncement() {
             <Link
               overridePresentation
               to={urls.website.blog.initialVerificationAnnouncement}
-              label={_(msg`Read blog post`)}
+              label={l`Read blog post`}
               size="small"
               variant="solid"
               color="primary"
@@ -175,7 +169,7 @@ export function InitialVerificationAnnouncement() {
             </Link>
             {IS_NATIVE && (
               <Button
-                label={_(msg`Close`)}
+                label={l`Close`}
                 size="small"
                 variant="solid"
                 color="secondary"
diff --git a/src/components/dialogs/nuxs/LiveNowBetaDialog.tsx b/src/components/dialogs/nuxs/LiveNowBetaDialog.tsx
index e389e11175..f72946080d 100644
--- a/src/components/dialogs/nuxs/LiveNowBetaDialog.tsx
+++ b/src/components/dialogs/nuxs/LiveNowBetaDialog.tsx
@@ -2,8 +2,7 @@ import {useCallback, useMemo} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
 import {LinearGradient} from 'expo-linear-gradient'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {atoms as a, select, useTheme, utils, web} from '#/alf'
@@ -31,7 +30,7 @@ export const enabled = createIsEnabledCheck(props => {
 
 export function LiveNowBetaDialog() {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const nuxDialogs = useNuxDialogContext()
   const control = Dialog.useDialogControl()
 
@@ -55,9 +54,8 @@ export function LiveNowBetaDialog() {
       onClose={onClose}
       nativeOptions={{preventExpansion: true}}>
       <Dialog.Handle fill={t.palette.primary_700} />
-
       <Dialog.ScrollableInner
-        label={_(msg`Show when you’re live`)}
+        label={l`Show when you’re live`}
         style={[web({maxWidth: 440})]}
         contentContainerStyle={[
           {
@@ -143,13 +141,11 @@ export function LiveNowBetaDialog() {
                     aspectRatio: 652 / 211,
                   },
                 ]}
-                alt={_(
-                  msg({
-                    message: `A screenshot of a post from @esb.lol, showing the user is currently livestreaming content on Twitch. The post reads: "Hello! I'm live on Twitch, and I'm testing Bluesky's latest feature too!"`,
-                    comment:
-                      'Contains a post that originally appeared in English. Consider translating the post text if it makes sense in your language, and noting that the post was translated from English.',
-                  }),
-                )}
+                alt={l({
+                  message: `A screenshot of a post from @esb.lol, showing the user is currently livestreaming content on Twitch. The post reads: "Hello! I'm live on Twitch, and I'm testing Bluesky's latest feature too!"`,
+                  comment:
+                    'Contains a post that originally appeared in English. Consider translating the post text if it makes sense in your language, and noting that the post was translated from English.',
+                })}
                 useAppleWebpCodec
               />
             </View>
@@ -189,7 +185,7 @@ export function LiveNowBetaDialog() {
 
           {!IS_WEB && (
             <Button
-              label={_(msg`Close`)}
+              label={l`Close`}
               size="large"
               color="primary"
               onPress={() => {
diff --git a/src/components/dms/BlockedByListDialog.tsx b/src/components/dms/BlockedByListDialog.tsx
index 2532122087..4138b09543 100644
--- a/src/components/dms/BlockedByListDialog.tsx
+++ b/src/components/dms/BlockedByListDialog.tsx
@@ -1,8 +1,7 @@
 import {Fragment} from 'react'
 import {View} from 'react-native'
 import {type ModerationCause} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {listUriToHref} from '#/lib/strings/url-helpers'
 import {atoms as a, useTheme} from '#/alf'
@@ -19,23 +18,21 @@ export function BlockedByListDialog({
   control: DialogControlProps
   listBlocks: ModerationCause[]
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
 
   return (
     <Prompt.Outer control={control} testID="blockedByListDialog">
-      <Prompt.TitleText>{_(msg`User blocked by list`)}</Prompt.TitleText>
+      <Prompt.TitleText>{l`User blocked by list`}</Prompt.TitleText>
       <View style={[a.gap_sm, a.pb_lg]}>
         <Text
           selectable
           style={[a.text_md, a.leading_snug, t.atoms.text_contrast_high]}>
-          {_(
-            msg`This account is blocked by one or more of your moderation lists. To unblock, please visit the lists directly and remove this user.`,
-          )}{' '}
+          {l`This account is blocked by one or more of your moderation lists. To unblock, please visit the lists directly and remove this user.`}{' '}
         </Text>
 
         <Text style={[a.text_md, a.leading_snug, t.atoms.text_contrast_high]}>
-          {_(msg`Lists blocking this user:`)}{' '}
+          {l`Lists blocking this user:`}{' '}
           {listBlocks.map((block, i) =>
             block.source.type === 'list' ? (
               <Fragment key={block.source.list.uri}>
@@ -52,7 +49,7 @@ export function BlockedByListDialog({
         </Text>
       </View>
       <Prompt.Actions>
-        <Prompt.Action cta={_(msg`I understand`)} onPress={() => {}} />
+        <Prompt.Action cta={l`I understand`} onPress={() => {}} />
       </Prompt.Actions>
       <Dialog.Close />
     </Prompt.Outer>
diff --git a/src/components/dms/EmojiPopup.android.tsx b/src/components/dms/EmojiPopup.android.tsx
index 3e55596071..62f296b3ce 100644
--- a/src/components/dms/EmojiPopup.android.tsx
+++ b/src/components/dms/EmojiPopup.android.tsx
@@ -1,8 +1,7 @@
 import {useState} from 'react'
 import {Modal, Pressable, View} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {atoms as a, useTheme} from '#/alf'
@@ -19,19 +18,18 @@ export function EmojiPopup({
   onEmojiSelected: (emoji: string) => void
 }) {
   const [modalVisible, setModalVisible] = useState(false)
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
 
   return (
     <>
       <Pressable
-        accessibilityLabel={_(msg`Open full emoji list`)}
+        accessibilityLabel={l`Open full emoji list`}
         accessibilityHint=""
         accessibilityRole="button"
         onPress={() => setModalVisible(true)}>
         {children}
       </Pressable>
-
       <Modal
         animationType="slide"
         visible={modalVisible}
@@ -56,7 +54,7 @@ export function EmojiPopup({
               <Trans>Add Reaction</Trans>
             </Text>
             <Button
-              label={_(msg`Close`)}
+              label={l`Close`}
               onPress={() => setModalVisible(false)}
               size="small"
               variant="ghost"
diff --git a/src/components/dms/EmojiReactionPicker.tsx b/src/components/dms/EmojiReactionPicker.tsx
index de2b818b96..a2077092e0 100644
--- a/src/components/dms/EmojiReactionPicker.tsx
+++ b/src/components/dms/EmojiReactionPicker.tsx
@@ -1,8 +1,7 @@
 import {useMemo, useState} from 'react'
 import {useWindowDimensions, View} from 'react-native'
 import {type ChatBskyConvoDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {useSession} from '#/state/session'
 import {atoms as a, tokens, useTheme} from '#/alf'
@@ -25,7 +24,7 @@ export function EmojiReactionPicker({
   children?: TriggerProps['children']
   onEmojiSelect: (emoji: string) => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount} = useSession()
   const t = useTheme()
   const isFromSelf = message.sender?.did === currentAccount?.did
@@ -77,7 +76,7 @@ export function EmojiReactionPicker({
         return (
           <ContextMenu.Item
             position={position}
-            label={_(msg`React with ${emoji}`)}
+            label={l`React with ${emoji}`}
             key={emoji}
             onPress={() => onEmojiSelect(emoji)}
             unstyled
diff --git a/src/components/dms/MessageProfileButton.tsx b/src/components/dms/MessageProfileButton.tsx
index ede352218b..ca2e91d2b6 100644
--- a/src/components/dms/MessageProfileButton.tsx
+++ b/src/components/dms/MessageProfileButton.tsx
@@ -1,8 +1,7 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
 import {type AppBskyActorDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
@@ -22,7 +21,7 @@ export function MessageProfileButton({
 }: {
   profile: AppBskyActorDefs.ProfileViewDetailed
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const ax = useAnalytics()
   const navigation = useNavigation<NavigationProp>()
@@ -35,7 +34,7 @@ export function MessageProfileButton({
       navigation.navigate('MessagesConversation', {conversation: convo.id})
     },
     onError: () => {
-      Toast.show(_(msg`Failed to create conversation`))
+      Toast.show(l`Failed to create conversation`)
     },
   })
 
@@ -96,7 +95,7 @@ export function MessageProfileButton({
           color="secondary"
           variant="solid"
           shape="round"
-          label={_(msg`Message ${profile.handle}`)}
+          label={l`Message ${profile.handle}`}
           style={[a.justify_center]}
           onPress={wrappedOnPress}>
           <ButtonIcon icon={Message} size="md" />
diff --git a/src/components/forms/DateField/index.android.tsx b/src/components/forms/DateField/index.android.tsx
index 3b058a2643..dd8a259586 100644
--- a/src/components/forms/DateField/index.android.tsx
+++ b/src/components/forms/DateField/index.android.tsx
@@ -1,7 +1,7 @@
 import {useCallback, useImperativeHandle, useState} from 'react'
 import {Keyboard} from 'react-native'
 import DatePicker from 'react-native-date-picker'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {useTheme} from '#/alf'
 import {type DateFieldProps} from '#/components/forms/DateField/types'
diff --git a/src/components/forms/DateField/index.shared.tsx b/src/components/forms/DateField/index.shared.tsx
index f19306afee..0bbfc547ad 100644
--- a/src/components/forms/DateField/index.shared.tsx
+++ b/src/components/forms/DateField/index.shared.tsx
@@ -1,5 +1,5 @@
 import {Pressable, View} from 'react-native'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {atoms as a, native, useTheme, web} from '#/alf'
 import * as TextField from '#/components/forms/TextField'
diff --git a/src/components/forms/DateField/index.tsx b/src/components/forms/DateField/index.tsx
index 3c909fb335..0a0e6453ef 100644
--- a/src/components/forms/DateField/index.tsx
+++ b/src/components/forms/DateField/index.tsx
@@ -1,8 +1,7 @@
 import {useCallback, useImperativeHandle, useState} from 'react'
 import {Keyboard, View} from 'react-native'
 import DatePicker from 'react-native-date-picker'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {atoms as a, useTheme} from '#/alf'
@@ -37,7 +36,7 @@ export function DateField({
   maximumDate,
   minimumDate,
 }: DateFieldProps) {
-  const {_, i18n} = useLingui()
+  const {t: l, i18n} = useLingui()
   const t = useTheme()
   const control = Dialog.useDialogControl()
 
@@ -125,7 +124,7 @@ export function DateField({
               />
             </View>
             <Button
-              label={_(msg`Done`)}
+              label={l`Done`}
               onPress={() => {
                 /*
                  * Commit the currently shown date even if the user never
diff --git a/src/components/forms/HostingProvider.tsx b/src/components/forms/HostingProvider.tsx
index 735de0cf03..e8b6a154dd 100644
--- a/src/components/forms/HostingProvider.tsx
+++ b/src/components/forms/HostingProvider.tsx
@@ -1,7 +1,6 @@
 import {useCallback} from 'react'
 import {Keyboard, View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {toNiceDomain} from '#/lib/strings/url-helpers'
@@ -26,7 +25,7 @@ export function HostingProvider({
 }) {
   const serverInputControl = useDialogControl()
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const onPressSelectService = useCallback(() => {
     Keyboard.dismiss()
@@ -47,7 +46,7 @@ export function HostingProvider({
           </Text>
           <Button
             label={toNiceDomain(serviceUrl)}
-            accessibilityHint={_(msg`Changes hosting provider`)}
+            accessibilityHint={l`Changes hosting provider`}
             onPress={onPressSelectService}
             variant="ghost"
             color="secondary"
@@ -67,7 +66,7 @@ export function HostingProvider({
         <Button
           testID="selectServiceButton"
           label={toNiceDomain(serviceUrl)}
-          accessibilityHint={_(msg`Changes hosting provider`)}
+          accessibilityHint={l`Changes hosting provider`}
           variant="solid"
           color="secondary"
           style={[
diff --git a/src/components/hooks/useFollowMethods.ts b/src/components/hooks/useFollowMethods.ts
index cb9cdaa245..9f80d8b4bc 100644
--- a/src/components/hooks/useFollowMethods.ts
+++ b/src/components/hooks/useFollowMethods.ts
@@ -1,6 +1,5 @@
 import {useCallback} from 'react'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {logger} from '#/logger'
 import {type Shadow} from '#/state/cache/types'
@@ -18,7 +17,7 @@ export function useFollowMethods({
   logContext: Metrics['profile:follow']['logContext'] &
     Metrics['profile:unfollow']['logContext']
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const requireAuth = useRequireAuth()
   const [queueFollow, queueUnfollow] = useProfileFollowMutationQueue(
     profile,
@@ -32,13 +31,13 @@ export function useFollowMethods({
       } catch (e: any) {
         logger.error(`useFollowMethods: failed to follow`, {message: String(e)})
         if (e?.name !== 'AbortError') {
-          Toast.show(_(msg`An issue occurred, please try again.`), {
+          Toast.show(l`An issue occurred, please try again.`, {
             type: 'error',
           })
         }
       }
     })
-  }, [_, queueFollow, requireAuth])
+  }, [l, queueFollow, requireAuth])
 
   const unfollow = useCallback(() => {
     requireAuth(async () => {
@@ -49,13 +48,13 @@ export function useFollowMethods({
           message: String(e),
         })
         if (e?.name !== 'AbortError') {
-          Toast.show(_(msg`An issue occurred, please try again.`), {
+          Toast.show(l`An issue occurred, please try again.`, {
             type: 'error',
           })
         }
       }
     })
-  }, [_, queueUnfollow, requireAuth])
+  }, [l, queueUnfollow, requireAuth])
 
   return {
     follow,
diff --git a/src/components/images/AutoSizedImage.tsx b/src/components/images/AutoSizedImage.tsx
index fdc7d1988a..ef15c78d68 100644
--- a/src/components/images/AutoSizedImage.tsx
+++ b/src/components/images/AutoSizedImage.tsx
@@ -7,8 +7,7 @@ import Animated, {
 import {Image} from 'expo-image'
 import {type AppBskyEmbedImages} from '@atproto/api'
 import {utils} from '@bsky.app/alf'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {type Dimensions} from '#/lib/media/types'
@@ -86,7 +85,7 @@ export function AutoSizedImage({
   onDimsChange?: (dims: Dimensions) => void
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const largeAlt = useLargeAltBadgeEnabled()
   const containerRef = useAnimatedRef()
   const fetchedDimsRef = useRef<{width: number; height: number} | null>(null)
@@ -219,7 +218,7 @@ export function AutoSizedImage({
         onPressIn={onPressIn}
         // alt here is what screen readers actually use
         accessibilityLabel={image.alt}
-        accessibilityHint={_(msg`Views full image`)}
+        accessibilityHint={l`Views full image`}
         accessibilityRole="button"
         android_ripple={{
           color: utils.alpha(t.atoms.bg.backgroundColor, 0.2),
@@ -251,7 +250,7 @@ export function AutoSizedImage({
           onPressIn={onPressIn}
           // alt here is what screen readers actually use
           accessibilityLabel={image.alt}
-          accessibilityHint={_(msg`Views full image`)}
+          accessibilityHint={l`Views full image`}
           accessibilityRole="button"
           android_ripple={{
             color: utils.alpha(t.atoms.bg.backgroundColor, 0.2),
diff --git a/src/components/images/ImageLayoutGridItem.tsx b/src/components/images/ImageLayoutGridItem.tsx
index 8a3202df37..aca4116f57 100644
--- a/src/components/images/ImageLayoutGridItem.tsx
+++ b/src/components/images/ImageLayoutGridItem.tsx
@@ -3,8 +3,7 @@ import {type AnimatedRef} from 'react-native-reanimated'
 import {Image, type ImageStyle} from 'expo-image'
 import {type AppBskyEmbedImages} from '@atproto/api'
 import {utils} from '@bsky.app/alf'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {type Dimensions} from '#/lib/media/types'
@@ -47,7 +46,7 @@ export function GalleryItem({
   thumbDimsRef,
 }: Props) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const largeAltBadge = useLargeAltBadgeEnabled()
   const image = images[index]
   const hasAlt = !!image.alt
@@ -88,7 +87,7 @@ export function GalleryItem({
             imageStyle,
           ]}
           accessibilityRole="button"
-          accessibilityLabel={image.alt || _(msg`Image`)}
+          accessibilityLabel={image.alt || l`Image`}
           accessibilityHint="">
           <Image
             source={{uri: image.thumb}}
diff --git a/src/components/intents/VerifyEmailIntentDialog.tsx b/src/components/intents/VerifyEmailIntentDialog.tsx
index b3504766f8..fe7775fef5 100644
--- a/src/components/intents/VerifyEmailIntentDialog.tsx
+++ b/src/components/intents/VerifyEmailIntentDialog.tsx
@@ -1,7 +1,6 @@
 import {useEffect, useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useAgent, useSession} from '#/state/session'
@@ -31,7 +30,7 @@ export function VerifyEmailIntentDialog() {
 function Inner({}: {control: DialogControlProps}) {
   const t = useTheme()
   const {gtMobile} = useBreakpoints()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {verifyEmailState: state} = useIntentDialogs()
   const [status, setStatus] = useState<
     'loading' | 'success' | 'failure' | 'resent'
@@ -59,7 +58,7 @@ function Inner({}: {control: DialogControlProps}) {
 
   return (
     <Dialog.ScrollableInner
-      label={_(msg`Verify email dialog`)}
+      label={l`Verify email dialog`}
       style={[
         gtMobile ? {width: 'auto', maxWidth: 400, minWidth: 200} : a.w_full,
       ]}>
@@ -114,7 +113,7 @@ function Inner({}: {control: DialogControlProps}) {
           <>
             <Divider />
             <Button
-              label={_(msg`Resend Verification Email`)}
+              label={l`Resend Verification Email`}
               onPress={onPressResendEmail}
               color="secondary_inverted"
               size="large"
@@ -127,7 +126,6 @@ function Inner({}: {control: DialogControlProps}) {
           </>
         )}
       </View>
-
       <Dialog.Close />
     </Dialog.ScrollableInner>
   )
diff --git a/src/components/moderation/AppealForm.tsx b/src/components/moderation/AppealForm.tsx
index 5432672d1e..8668b271ec 100644
--- a/src/components/moderation/AppealForm.tsx
+++ b/src/components/moderation/AppealForm.tsx
@@ -2,8 +2,7 @@ import {useState} from 'react'
 import {View} from 'react-native'
 import {type ComAtprotoLabelDefs, ToolsOzoneReportDefs} from '@atproto/api'
 import {XRPCError} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useMutation} from '@tanstack/react-query'
 
@@ -32,7 +31,7 @@ export function AppealForm({
   control: Dialog.DialogOuterProps['control']
   onPressBack: () => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {labeler, strings} = useLabelInfo(label)
   const {gtMobile} = useBreakpoints()
   const [details, setDetails] = useState('')
@@ -69,18 +68,16 @@ export function AppealForm({
     onError: err => {
       if (err instanceof XRPCError && err.error === 'AlreadyAppealed') {
         setError(
-          _(
-            msg`You've already appealed this label and it's being reviewed by our moderation team.`,
-          ),
+          l`You've already appealed this label and it's being reviewed by our moderation team.`,
         )
       } else {
-        setError(_(msg`Failed to submit appeal, please try again.`))
+        setError(l`Failed to submit appeal, please try again.`)
       }
       logger.error('Failed to submit label appeal', {message: err})
     },
     onSuccess: () => {
       control.close()
-      Toast.show(_(msg({message: 'Appeal submitted', context: 'toast'})))
+      Toast.show(l({message: 'Appeal submitted', context: 'toast'}))
     },
   })
 
@@ -115,12 +112,10 @@ export function AppealForm({
       )}
       <View style={[a.my_md]}>
         <Dialog.Input
-          label={_(msg`Text input field`)}
-          placeholder={_(
-            msg`Please explain why you think this label was incorrectly applied by ${
-              labeler ? sanitizeHandle(labeler.creator.handle, '@') : label.src
-            }`,
-          )}
+          label={l`Text input field`}
+          placeholder={l`Please explain why you think this label was incorrectly applied by ${
+            labeler ? sanitizeHandle(labeler.creator.handle, '@') : label.src
+          }`}
           value={details}
           onChangeText={setDetails}
           autoFocus={true}
@@ -129,7 +124,6 @@ export function AppealForm({
           maxLength={300}
         />
       </View>
-
       <View
         style={
           gtMobile
@@ -142,8 +136,8 @@ export function AppealForm({
           color="secondary"
           size="large"
           onPress={onPressBack}
-          label={_(msg`Back`)}>
-          <ButtonText>{_(msg`Back`)}</ButtonText>
+          label={l`Back`}>
+          <ButtonText>{l`Back`}</ButtonText>
         </Button>
         <Button
           testID="submitBtn"
@@ -151,8 +145,8 @@ export function AppealForm({
           color="primary"
           size="large"
           onPress={onSubmit}
-          label={_(msg`Submit`)}>
-          <ButtonText>{_(msg`Submit`)}</ButtonText>
+          label={l`Submit`}>
+          <ButtonText>{l`Submit`}</ButtonText>
           {isPending && <ButtonIcon icon={Loader} />}
         </Button>
       </View>
diff --git a/src/components/moderation/LabelPreference.tsx b/src/components/moderation/LabelPreference.tsx
index a654b46e24..42ffb0ea14 100644
--- a/src/components/moderation/LabelPreference.tsx
+++ b/src/components/moderation/LabelPreference.tsx
@@ -3,8 +3,7 @@ import {
   type InterpretedLabelValueDefinition,
   type LabelPreference,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useGlobalLabelStrings} from '#/lib/moderation/useGlobalLabelStrings'
@@ -78,15 +77,13 @@ export function Buttons({
   hideLabel?: string
   disabled?: boolean
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <View style={[{minHeight: 35}, a.w_full]}>
       <ToggleButton.Group
         disabled={disabled}
-        label={_(
-          msg`Configure content filtering setting for category: ${name}`,
-        )}
+        label={l`Configure content filtering setting for category: ${name}`}
         values={values}
         onChange={onChange}>
         {ignoreLabel && (
@@ -120,7 +117,7 @@ export function GlobalLabelPreference({
   labelDefinition: InterpretedLabelValueDefinition
   disabled?: boolean
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const {identifier} = labelDefinition
   const {data: preferences} = usePreferencesQuery()
@@ -138,9 +135,9 @@ export function GlobalLabelPreference({
         }
 
   const labelOptions = {
-    hide: _(msg`Hide`),
-    warn: _(msg`Warn`),
-    ignore: _(msg`Show`),
+    hide: l`Hide`,
+    warn: l`Warn`,
+    ignore: l`Show`,
   }
 
   return (
@@ -180,7 +177,7 @@ export function LabelerLabelPreference({
   disabled?: boolean
   labelerDid?: string
 }) {
-  const {_, i18n} = useLingui()
+  const {t: l, i18n} = useLingui()
   const t = useTheme()
   const {gtPhone} = useBreakpoints()
 
@@ -254,7 +251,7 @@ export function LabelerLabelPreference({
                 <Trans>
                   Configured in{' '}
                   <InlineLinkText
-                    label={_(msg`moderation settings`)}
+                    label={l`moderation settings`}
                     to="/moderation"
                     style={a.text_sm}>
                     moderation settings
@@ -266,7 +263,6 @@ export function LabelerLabelPreference({
           </View>
         )}
       </Content>
-
       {showConfig && (
         <>
           {cantConfigure ? (
diff --git a/src/components/moderation/LabelsOnMe.tsx b/src/components/moderation/LabelsOnMe.tsx
index 85cb1e4a3a..dc4557469d 100644
--- a/src/components/moderation/LabelsOnMe.tsx
+++ b/src/components/moderation/LabelsOnMe.tsx
@@ -1,7 +1,6 @@
 import {type StyleProp, View, type ViewStyle} from 'react-native'
 import {type ComAtprotoLabelDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Plural} from '@lingui/react/macro'
 
 import {filterUserFacingLabels} from '#/lib/moderation'
@@ -28,7 +27,7 @@ export function LabelsOnMe({
   size?: ButtonSize
   style?: StyleProp<ViewStyle>
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount} = useSession()
   const control = useLabelsOnMeDialogControl()
 
@@ -43,12 +42,11 @@ export function LabelsOnMe({
   return (
     <View style={[a.flex_row, style]}>
       <LabelsOnMeDialog control={control} labels={labels} type="account" />
-
       <Button
         variant="solid"
         color="secondary"
         size={size || 'small'}
-        label={_(msg`View information about these labels`)}
+        label={l`View information about these labels`}
         onPress={() => {
           control.open()
         }}>
diff --git a/src/components/moderation/LabelsOnMeDialog.tsx b/src/components/moderation/LabelsOnMeDialog.tsx
index 963e4b762a..ef0f874603 100644
--- a/src/components/moderation/LabelsOnMeDialog.tsx
+++ b/src/components/moderation/LabelsOnMeDialog.tsx
@@ -1,8 +1,7 @@
 import {useMemo, useState} from 'react'
 import {View} from 'react-native'
 import {type ComAtprotoLabelDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useGetTimeAgo} from '#/lib/hooks/useTimeAgo'
@@ -44,7 +43,7 @@ export function LabelsOnMeDialog(props: LabelsOnMeDialogProps) {
 }
 
 function LabelsOnMeDialogInner(props: LabelsOnMeDialogProps) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount} = useSession()
   const [appealingLabel, setAppealingLabel] = useState<
     ComAtprotoLabelDefs.Label | undefined
@@ -60,8 +59,8 @@ function LabelsOnMeDialogInner(props: LabelsOnMeDialogProps) {
     <Dialog.ScrollableInner
       label={
         isAccount
-          ? _(msg`The following labels were applied to your account.`)
-          : _(msg`The following labels were applied to this post.`)
+          ? l`The following labels were applied to your account.`
+          : l`The following labels were applied to this post.`
       }>
       {appealingLabel ? (
         <AppealForm
@@ -129,7 +128,7 @@ function Label({
   onPressAppeal: (label: ComAtprotoLabelDefs.Label) => void
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {labeler, strings} = useLabelInfo(label)
   const sourceName = labeler
     ? sanitizeHandle(labeler.creator.handle, '@')
@@ -166,7 +165,7 @@ function Label({
               variant="solid"
               color="primary_subtle"
               size="small"
-              label={_(msg`Appeal`)}
+              label={l`Appeal`}
               onPress={() => onPressAppeal(label)}>
               <ButtonText>
                 <Trans>Appeal</Trans>
@@ -175,9 +174,7 @@ function Label({
           </View>
         )}
       </View>
-
       <Divider />
-
       <View style={[a.px_md, a.py_sm, t.atoms.bg_contrast_25]}>
         {isSelfLabel ? (
           <Text style={[t.atoms.text_contrast_medium]}>
diff --git a/src/components/moderation/ModerationDetailsDialog.tsx b/src/components/moderation/ModerationDetailsDialog.tsx
index bf19dc0363..df53baf9ed 100644
--- a/src/components/moderation/ModerationDetailsDialog.tsx
+++ b/src/components/moderation/ModerationDetailsDialog.tsx
@@ -1,8 +1,7 @@
 import {useState} from 'react'
 import {View} from 'react-native'
 import {type ModerationCause} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useGetTimeAgo} from '#/lib/hooks/useTimeAgo'
@@ -46,7 +45,7 @@ function ModerationDetailsDialogInner({
 }) {
   const t = useTheme()
   const xGutters = useGutters([0, 'base'])
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const desc = useModerationCauseDescription(modcause)
   const {currentAccount} = useSession()
   const timeDiff = useGetTimeAgo({future: true})
@@ -67,14 +66,12 @@ function ModerationDetailsDialogInner({
   let name
   let description
   if (!modcause) {
-    name = _(msg`Content Warning`)
-    description = _(
-      msg`Moderator has chosen to set a general warning on the content.`,
-    )
+    name = l`Content Warning`
+    description = l`Moderator has chosen to set a general warning on the content.`
   } else if (modcause.type === 'blocking') {
     if (modcause.source.type === 'list') {
       const list = modcause.source.list
-      name = _(msg`User Blocked by List`)
+      name = l`User Blocked by List`
       description = (
         <Trans>
           This user is included in the{' '}
@@ -88,25 +85,19 @@ function ModerationDetailsDialogInner({
         </Trans>
       )
     } else {
-      name = _(msg`User Blocked`)
-      description = _(
-        msg`You have blocked this user. You cannot view their content.`,
-      )
+      name = l`User Blocked`
+      description = l`You have blocked this user. You cannot view their content.`
     }
   } else if (modcause.type === 'blocked-by') {
-    name = _(msg`User Blocks You`)
-    description = _(
-      msg`This user has blocked you. You cannot view their content.`,
-    )
+    name = l`User Blocks You`
+    description = l`This user has blocked you. You cannot view their content.`
   } else if (modcause.type === 'block-other') {
-    name = _(msg`Content Not Available`)
-    description = _(
-      msg`This content is not available because one of the users involved has blocked the other.`,
-    )
+    name = l`Content Not Available`
+    description = l`This content is not available because one of the users involved has blocked the other.`
   } else if (modcause.type === 'muted') {
     if (modcause.source.type === 'list') {
       const list = modcause.source.list
-      name = _(msg`Account Muted by List`)
+      name = l`Account Muted by List`
       description = (
         <Trans>
           This user is included in the{' '}
@@ -120,23 +111,21 @@ function ModerationDetailsDialogInner({
         </Trans>
       )
     } else {
-      name = _(msg`Account Muted`)
-      description = _(msg`You have muted this account.`)
+      name = l`Account Muted`
+      description = l`You have muted this account.`
     }
   } else if (modcause.type === 'mute-word') {
-    name = _(msg`Post Hidden by Muted Word`)
-    description = _(msg`You've chosen to hide a word or tag within this post.`)
+    name = l`Post Hidden by Muted Word`
+    description = l`You've chosen to hide a word or tag within this post.`
   } else if (modcause.type === 'hidden') {
-    name = _(msg`Post Hidden by You`)
-    description = _(msg`You have hidden this post.`)
+    name = l`Post Hidden by You`
+    description = l`You have hidden this post.`
   } else if (modcause.type === 'reply-hidden') {
     const isYou = currentAccount?.did === modcause.source.did
-    name = isYou
-      ? _(msg`Reply Hidden by You`)
-      : _(msg`Reply Hidden by Thread Author`)
+    name = isYou ? l`Reply Hidden by You` : l`Reply Hidden by Thread Author`
     description = isYou
-      ? _(msg`You hid this reply.`)
-      : _(msg`The author of this thread has hidden this reply.`)
+      ? l`You hid this reply.`
+      : l`The author of this thread has hidden this reply.`
   } else if (modcause.type === 'label') {
     name = desc.name
     description = (
@@ -151,12 +140,12 @@ function ModerationDetailsDialogInner({
   }
 
   const sourceName =
-    desc.source || desc.sourceDisplayName || _(msg`an unknown labeler`)
+    desc.source || desc.sourceDisplayName || l`an unknown labeler`
 
   if (isAppealing && modcause?.type === 'label') {
     return (
       <Dialog.ScrollableInner
-        label={_(msg`Appeal label`)}
+        label={l`Appeal label`}
         style={web({
           maxWidth: 460,
         })}>
@@ -172,7 +161,7 @@ function ModerationDetailsDialogInner({
 
   return (
     <Dialog.ScrollableInner
-      label={_(msg`Moderation details`)}
+      label={l`Moderation details`}
       contentContainerStyle={{
         paddingLeft: 0,
         paddingRight: 0,
@@ -216,7 +205,7 @@ function ModerationDetailsDialogInner({
               variant="solid"
               color="primary_subtle"
               size="small"
-              label={_(msg`Appeal this label`)}
+              label={l`Appeal this label`}
               style={[gtPhone ? undefined : a.w_full]}
               onPress={() => setIsAppealing(true)}>
               <ButtonText>
@@ -235,7 +224,6 @@ function ModerationDetailsDialogInner({
           </Admonition>
         )}
       </View>
-
       {modcause?.type === 'label' && (
         <View
           style={[
@@ -302,9 +290,7 @@ function ModerationDetailsDialogInner({
           )}
         </View>
       )}
-
       {IS_NATIVE && <View style={{height: 40}} />}
-
       <Dialog.Close />
     </Dialog.ScrollableInner>
   )
diff --git a/src/components/moderation/PostHider.tsx b/src/components/moderation/PostHider.tsx
index 5019b7c3e3..bc00a31331 100644
--- a/src/components/moderation/PostHider.tsx
+++ b/src/components/moderation/PostHider.tsx
@@ -12,8 +12,7 @@ import {
   type ModerationCause,
   type ModerationUI,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -55,7 +54,7 @@ export function PostHider({
 }: Props) {
   const queryClient = useQueryClient()
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const [override, setOverride] = useState(false)
   const control = useModerationDetailsDialogControl()
   const blur =
@@ -91,7 +90,7 @@ export function PostHider({
       }}
       accessibilityRole="button"
       accessibilityLabel={
-        override ? _(msg`Hides the content`) : _(msg`Shows the content`)
+        override ? l`Hides the content` : l`Shows the content`
       }
       accessibilityHint=""
       style={[
@@ -113,7 +112,7 @@ export function PostHider({
           control.open()
         }}
         accessibilityRole="button"
-        accessibilityLabel={_(msg`Learn more about this warning`)}
+        accessibilityLabel={l`Learn more about this warning`}
         accessibilityHint="">
         <View
           style={[
diff --git a/src/components/moderation/ReportDialog/action.ts b/src/components/moderation/ReportDialog/action.ts
index ac702abd67..4ff243af6d 100644
--- a/src/components/moderation/ReportDialog/action.ts
+++ b/src/components/moderation/ReportDialog/action.ts
@@ -3,8 +3,7 @@ import {
   type ChatBskyConvoDefs,
   type ComAtprotoModerationCreateReport,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {useMutation} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
@@ -14,7 +13,7 @@ import {type ReportState} from './state'
 import {type ParsedReportSubject} from './types'
 
 export function useSubmitReportMutation() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const agent = useAgent()
 
   return useMutation({
@@ -26,10 +25,10 @@ export function useSubmitReportMutation() {
       state: ReportState
     }) {
       if (!state.selectedOption) {
-        throw new Error(_(msg`Please select a reason for this report`))
+        throw new Error(l`Please select a reason for this report`)
       }
       if (!state.selectedLabeler) {
-        throw new Error(_(msg`Please select a moderation service`))
+        throw new Error(l`Please select a moderation service`)
       }
 
       const labeler = state.selectedLabeler
diff --git a/src/components/moderation/ReportDialog/copy.ts b/src/components/moderation/ReportDialog/copy.ts
index f682bc59af..e81cc8acc9 100644
--- a/src/components/moderation/ReportDialog/copy.ts
+++ b/src/components/moderation/ReportDialog/copy.ts
@@ -1,71 +1,70 @@
 import {useMemo} from 'react'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {type ParsedReportSubject} from './types'
 
 export function useCopyForSubject(subject: ParsedReportSubject) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   return useMemo(() => {
     switch (subject.type) {
       case 'account': {
         return {
-          title: _(msg`Report this user`),
-          subtitle: _(msg`Why should this user be reviewed?`),
+          title: l`Report this user`,
+          subtitle: l`Why should this user be reviewed?`,
         }
       }
       case 'status': {
         return {
-          title: _(msg`Report this livestream`),
-          subtitle: _(msg`Why should this livestream be reviewed?`),
+          title: l`Report this livestream`,
+          subtitle: l`Why should this livestream be reviewed?`,
         }
       }
       case 'post': {
         return {
-          title: _(msg`Report this post`),
-          subtitle: _(msg`Why should this post be reviewed?`),
+          title: l`Report this post`,
+          subtitle: l`Why should this post be reviewed?`,
         }
       }
       case 'list': {
         return {
-          title: _(msg`Report this list`),
-          subtitle: _(msg`Why should this list be reviewed?`),
+          title: l`Report this list`,
+          subtitle: l`Why should this list be reviewed?`,
         }
       }
       case 'feed': {
         return {
-          title: _(msg`Report this feed`),
-          subtitle: _(msg`Why should this feed be reviewed?`),
+          title: l`Report this feed`,
+          subtitle: l`Why should this feed be reviewed?`,
         }
       }
       case 'starterPack': {
         return {
-          title: _(msg`Report this starter pack`),
-          subtitle: _(msg`Why should this starter pack be reviewed?`),
+          title: l`Report this starter pack`,
+          subtitle: l`Why should this starter pack be reviewed?`,
         }
       }
       case 'convoMessage': {
         switch (subject.view) {
           case 'convo': {
             return {
-              title: _(msg`Report this conversation`),
-              subtitle: _(msg`Why should this conversation be reviewed?`),
+              title: l`Report this conversation`,
+              subtitle: l`Why should this conversation be reviewed?`,
             }
           }
           case 'message': {
             return {
-              title: _(msg`Report this message`),
-              subtitle: _(msg`Why should this message be reviewed?`),
+              title: l`Report this message`,
+              subtitle: l`Why should this message be reviewed?`,
             }
           }
         }
       }
       case 'convo': {
         return {
-          title: _(msg`Report this conversation`),
-          subtitle: _(msg`Why should this conversation be reviewed?`),
+          title: l`Report this conversation`,
+          subtitle: l`Why should this conversation be reviewed?`,
         }
       }
     }
-  }, [_, subject])
+  }, [l, subject])
 }
diff --git a/src/components/moderation/ReportDialog/utils/useReportOptions.ts b/src/components/moderation/ReportDialog/utils/useReportOptions.ts
index 87553ce6ed..494057e7a6 100644
--- a/src/components/moderation/ReportDialog/utils/useReportOptions.ts
+++ b/src/components/moderation/ReportDialog/utils/useReportOptions.ts
@@ -1,7 +1,6 @@
 import {useMemo} from 'react'
 import {ToolsOzoneReportDefs as OzoneReportDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 export type ReportCategory =
   | 'childSafety'
@@ -26,220 +25,218 @@ export type ReportOption = {
 }
 
 export function useReportOptions() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return useMemo(() => {
     const categories: Record<ReportCategory, ReportCategoryConfig> = {
       misleading: {
         key: 'misleading',
-        title: _(msg`Misleading`),
-        description: _(msg`Spam or other inauthentic behavior or deception`),
+        title: l`Misleading`,
+        description: l`Spam or other inauthentic behavior or deception`,
         options: [
           {
-            title: _(msg`Spam`),
+            title: l`Spam`,
             reason: OzoneReportDefs.REASONMISLEADINGSPAM,
           },
           {
-            title: _(msg`Scam`),
+            title: l`Scam`,
             reason: OzoneReportDefs.REASONMISLEADINGSCAM,
           },
           {
-            title: _(msg`Fake account or bot`),
+            title: l`Fake account or bot`,
             reason: OzoneReportDefs.REASONMISLEADINGBOT,
           },
           {
-            title: _(msg`Impersonation`),
+            title: l`Impersonation`,
             reason: OzoneReportDefs.REASONMISLEADINGIMPERSONATION,
           },
           {
-            title: _(msg`False information about elections`),
+            title: l`False information about elections`,
             reason: OzoneReportDefs.REASONMISLEADINGELECTIONS,
           },
           {
-            title: _(msg`Other misleading content`),
+            title: l`Other misleading content`,
             reason: OzoneReportDefs.REASONMISLEADINGOTHER,
           },
         ],
       },
       sexualAdultContent: {
         key: 'sexualAdultContent',
-        title: _(msg`Adult content`),
-        description: _(
-          msg`Unlabeled, abusive, or non-consensual adult content`,
-        ),
+        title: l`Adult content`,
+        description: l`Unlabeled, abusive, or non-consensual adult content`,
         options: [
           {
-            title: _(msg`Unlabeled adult content`),
+            title: l`Unlabeled adult content`,
             reason: OzoneReportDefs.REASONSEXUALUNLABELED,
           },
           {
-            title: _(msg`Adult sexual abuse content`),
+            title: l`Adult sexual abuse content`,
             reason: OzoneReportDefs.REASONSEXUALABUSECONTENT,
           },
           {
-            title: _(msg`Non-consensual intimate imagery`),
+            title: l`Non-consensual intimate imagery`,
             reason: OzoneReportDefs.REASONSEXUALNCII,
           },
           {
-            title: _(msg`Deepfake adult content`),
+            title: l`Deepfake adult content`,
             reason: OzoneReportDefs.REASONSEXUALDEEPFAKE,
           },
           {
-            title: _(msg`Animal sexual abuse`),
+            title: l`Animal sexual abuse`,
             reason: OzoneReportDefs.REASONSEXUALANIMAL,
           },
           {
-            title: _(msg`Other sexual violence content`),
+            title: l`Other sexual violence content`,
             reason: OzoneReportDefs.REASONSEXUALOTHER,
           },
         ],
       },
       harassmentHate: {
         key: 'harassmentHate',
-        title: _(msg`Harassment or hate`),
-        description: _(msg`Abusive or discriminatory behavior`),
+        title: l`Harassment or hate`,
+        description: l`Abusive or discriminatory behavior`,
         options: [
           {
-            title: _(msg`Trolling`),
+            title: l`Trolling`,
             reason: OzoneReportDefs.REASONHARASSMENTTROLL,
           },
           {
-            title: _(msg`Targeted harassment`),
+            title: l`Targeted harassment`,
             reason: OzoneReportDefs.REASONHARASSMENTTARGETED,
           },
           {
-            title: _(msg`Hate speech`),
+            title: l`Hate speech`,
             reason: OzoneReportDefs.REASONHARASSMENTHATESPEECH,
           },
           {
-            title: _(msg`Doxxing`),
+            title: l`Doxxing`,
             reason: OzoneReportDefs.REASONHARASSMENTDOXXING,
           },
           {
-            title: _(msg`Other harassing or hateful content`),
+            title: l`Other harassing or hateful content`,
             reason: OzoneReportDefs.REASONHARASSMENTOTHER,
           },
         ],
       },
       violencePhysicalHarm: {
         key: 'violencePhysicalHarm',
-        title: _(msg`Violence`),
-        description: _(msg`Violent or threatening content`),
+        title: l`Violence`,
+        description: l`Violent or threatening content`,
         options: [
           {
-            title: _(msg`Animal welfare`),
+            title: l`Animal welfare`,
             reason: OzoneReportDefs.REASONVIOLENCEANIMAL,
           },
           {
-            title: _(msg`Threats or incitement`),
+            title: l`Threats or incitement`,
             reason: OzoneReportDefs.REASONVIOLENCETHREATS,
           },
           {
-            title: _(msg`Graphic violent content`),
+            title: l`Graphic violent content`,
             reason: OzoneReportDefs.REASONVIOLENCEGRAPHICCONTENT,
           },
           {
-            title: _(msg`Glorification of violence`),
+            title: l`Glorification of violence`,
             reason: OzoneReportDefs.REASONVIOLENCEGLORIFICATION,
           },
           {
-            title: _(msg`Extremist content`),
+            title: l`Extremist content`,
             reason: OzoneReportDefs.REASONVIOLENCEEXTREMISTCONTENT,
           },
           {
-            title: _(msg`Human trafficking`),
+            title: l`Human trafficking`,
             reason: OzoneReportDefs.REASONVIOLENCETRAFFICKING,
           },
           {
-            title: _(msg`Other violent content`),
+            title: l`Other violent content`,
             reason: OzoneReportDefs.REASONVIOLENCEOTHER,
           },
         ],
       },
       childSafety: {
         key: 'childSafety',
-        title: _(msg`Child safety`),
-        description: _(msg`Harming or endangering minors`),
+        title: l`Child safety`,
+        description: l`Harming or endangering minors`,
         options: [
           {
-            title: _(msg`Child Sexual Abuse Material (CSAM)`),
+            title: l`Child Sexual Abuse Material (CSAM)`,
             reason: OzoneReportDefs.REASONCHILDSAFETYCSAM,
           },
           {
-            title: _(msg`Grooming or predatory behavior`),
+            title: l`Grooming or predatory behavior`,
             reason: OzoneReportDefs.REASONCHILDSAFETYGROOM,
           },
           {
-            title: _(msg`Privacy violation of a minor`),
+            title: l`Privacy violation of a minor`,
             reason: OzoneReportDefs.REASONCHILDSAFETYPRIVACY,
           },
           {
-            title: _(msg`Minor harassment or bullying`),
+            title: l`Minor harassment or bullying`,
             reason: OzoneReportDefs.REASONCHILDSAFETYHARASSMENT,
           },
           {
-            title: _(msg`Other child safety issue`),
+            title: l`Other child safety issue`,
             reason: OzoneReportDefs.REASONCHILDSAFETYOTHER,
           },
         ],
       },
       selfHarm: {
         key: 'selfHarm',
-        title: _(msg`Self-harm or dangerous behaviors`),
-        description: _(msg`Harmful or high-risk activities`),
+        title: l`Self-harm or dangerous behaviors`,
+        description: l`Harmful or high-risk activities`,
         options: [
           {
-            title: _(msg`Content promoting or depicting self-harm`),
+            title: l`Content promoting or depicting self-harm`,
             reason: OzoneReportDefs.REASONSELFHARMCONTENT,
           },
           {
-            title: _(msg`Eating disorders`),
+            title: l`Eating disorders`,
             reason: OzoneReportDefs.REASONSELFHARMED,
           },
           {
-            title: _(msg`Dangerous challenges or activities`),
+            title: l`Dangerous challenges or activities`,
             reason: OzoneReportDefs.REASONSELFHARMSTUNTS,
           },
           {
-            title: _(msg`Dangerous substances or drug abuse`),
+            title: l`Dangerous substances or drug abuse`,
             reason: OzoneReportDefs.REASONSELFHARMSUBSTANCES,
           },
           {
-            title: _(msg`Other dangerous content`),
+            title: l`Other dangerous content`,
             reason: OzoneReportDefs.REASONSELFHARMOTHER,
           },
         ],
       },
       ruleBreaking: {
         key: 'ruleBreaking',
-        title: _(msg`Breaking site rules`),
-        description: _(msg`Banned activities or security violations`),
+        title: l`Breaking site rules`,
+        description: l`Banned activities or security violations`,
         options: [
           {
-            title: _(msg`Hacking or system attacks`),
+            title: l`Hacking or system attacks`,
             reason: OzoneReportDefs.REASONRULESITESECURITY,
           },
           {
-            title: _(msg`Promoting or selling prohibited items or services`),
+            title: l`Promoting or selling prohibited items or services`,
             reason: OzoneReportDefs.REASONRULEPROHIBITEDSALES,
           },
           {
-            title: _(msg`Banned user returning`),
+            title: l`Banned user returning`,
             reason: OzoneReportDefs.REASONRULEBANEVASION,
           },
           {
-            title: _(msg`Other network rule-breaking`),
+            title: l`Other network rule-breaking`,
             reason: OzoneReportDefs.REASONRULEOTHER,
           },
         ],
       },
       other: {
         key: 'other',
-        title: _(msg`Other`),
-        description: _(msg`An issue not included in these options`),
+        title: l`Other`,
+        description: l`An issue not included in these options`,
         options: [
           {
-            title: _(msg`Other`),
+            title: l`Other`,
             reason: OzoneReportDefs.REASONOTHER,
           },
         ],
@@ -252,5 +249,5 @@ export function useReportOptions() {
         return categories[reasonName]
       },
     }
-  }, [_])
+  }, [l])
 }
diff --git a/src/components/verification/VerificationCreatePrompt.tsx b/src/components/verification/VerificationCreatePrompt.tsx
index ea374128ce..6ade5d6ab7 100644
--- a/src/components/verification/VerificationCreatePrompt.tsx
+++ b/src/components/verification/VerificationCreatePrompt.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {logger} from '#/logger'
@@ -26,7 +25,7 @@ export function VerificationCreatePrompt({
   control: DialogControlProps
   profile: bsky.profile.AnyProfileView
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {gtMobile} = useBreakpoints()
   const moderationOpts = useModerationOpts()
   const {mutateAsync: create, isPending} = useVerificationCreateMutation()
@@ -34,28 +33,27 @@ export function VerificationCreatePrompt({
   const onConfirm = useCallback(async () => {
     try {
       await create({profile})
-      Toast.show(_(msg`Successfully verified`))
+      Toast.show(l`Successfully verified`)
       control.close()
     } catch (e) {
-      setError(_(msg`Verification failed, please try again.`))
+      setError(l`Verification failed, please try again.`)
       logger.error('Failed to create a verification', {
         safeMessage: e,
       })
     }
-  }, [_, profile, create, control])
+  }, [l, profile, create, control])
 
   return (
     <Prompt.Outer control={control}>
       <View style={[a.flex_row, a.align_center, a.gap_sm, a.pb_sm]}>
         <VerifiedCheck width={18} />
         <Prompt.TitleText style={[a.pb_0]}>
-          {_(msg`Verify this account?`)}
+          {l`Verify this account?`}
         </Prompt.TitleText>
       </View>
       <Prompt.DescriptionText>
-        {_(msg`This action can be undone at any time.`)}
+        {l`This action can be undone at any time.`}
       </Prompt.DescriptionText>
-
       {moderationOpts ? (
         <ProfileCard.Header>
           <ProfileCard.Avatar
@@ -68,13 +66,11 @@ export function VerificationCreatePrompt({
           />
         </ProfileCard.Header>
       ) : null}
-
       {error && (
         <View style={[a.pt_lg]}>
           <Admonition type="error">{error}</Admonition>
         </View>
       )}
-
       <View style={[a.pt_xl]}>
         {profile.displayName ? (
           <Prompt.Actions>
@@ -82,9 +78,9 @@ export function VerificationCreatePrompt({
               variant="solid"
               color="primary"
               size={gtMobile ? 'small' : 'large'}
-              label={_(msg`Verify account`)}
+              label={l`Verify account`}
               onPress={onConfirm}>
-              <ButtonText>{_(msg`Verify account`)}</ButtonText>
+              <ButtonText>{l`Verify account`}</ButtonText>
               {isPending && <ButtonIcon icon={Loader} />}
             </Button>
             <Prompt.Cancel />
@@ -98,7 +94,6 @@ export function VerificationCreatePrompt({
           </Admonition>
         )}
       </View>
-
       <Dialog.Close />
     </Prompt.Outer>
   )
diff --git a/src/components/verification/VerificationRemovePrompt.tsx b/src/components/verification/VerificationRemovePrompt.tsx
index 96b119ceb1..4a3fa94d0c 100644
--- a/src/components/verification/VerificationRemovePrompt.tsx
+++ b/src/components/verification/VerificationRemovePrompt.tsx
@@ -1,7 +1,6 @@
 import {useCallback} from 'react'
 import {type AppBskyActorDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {logger} from '#/logger'
 import {useVerificationsRemoveMutation} from '#/state/queries/verification/useVerificationsRemoveMutation'
@@ -23,29 +22,29 @@ export function VerificationRemovePrompt({
   verifications: AppBskyActorDefs.VerificationView[]
   onConfirm?: () => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {mutateAsync: remove} = useVerificationsRemoveMutation()
   const onConfirm = useCallback(async () => {
     onConfirmInner?.()
     try {
       await remove({profile, verifications})
-      Toast.show(_(msg`Removed verification`))
+      Toast.show(l`Removed verification`)
     } catch (e) {
-      Toast.show(_(msg`Failed to remove verification`), {
+      Toast.show(l`Failed to remove verification`, {
         type: 'error',
       })
       logger.error('Failed to remove verification', {
         safeMessage: e,
       })
     }
-  }, [_, profile, verifications, remove, onConfirmInner])
+  }, [l, profile, verifications, remove, onConfirmInner])
 
   return (
     <Prompt.Basic
       control={control}
-      title={_(msg`Remove your verification for this account?`)}
+      title={l`Remove your verification for this account?`}
       onConfirm={onConfirm}
-      confirmButtonCta={_(msg`Remove verification`)}
+      confirmButtonCta={l`Remove verification`}
       confirmButtonColor="negative"
     />
   )
diff --git a/src/components/verification/VerificationsDialog.tsx b/src/components/verification/VerificationsDialog.tsx
index cb24b182a5..be33dbfc0e 100644
--- a/src/components/verification/VerificationsDialog.tsx
+++ b/src/components/verification/VerificationsDialog.tsx
@@ -1,7 +1,6 @@
 import {View} from 'react-native'
 import {type AppBskyActorDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {urls} from '#/lib/constants'
@@ -57,22 +56,20 @@ function Inner({
 }) {
   const t = useTheme()
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {gtMobile} = useBreakpoints()
 
   const userName = getUserDisplayName(profile)
   const label = state.profile.isViewer
     ? state.profile.isVerified
-      ? _(msg`You are verified`)
-      : _(msg`Your verifications`)
+      ? l`You are verified`
+      : l`Your verifications`
     : state.profile.isVerified
-      ? _(msg`${userName} is verified`)
-      : _(
-          msg({
-            message: `${userName}'s verifications`,
-            comment: `Possessive, meaning "the verifications of {userName}"`,
-          }),
-        )
+      ? l`${userName} is verified`
+      : l({
+          message: `${userName}'s verifications`,
+          comment: `Possessive, meaning "the verifications of {userName}"`,
+        })
 
   return (
     <Dialog.ScrollableInner
@@ -98,7 +95,6 @@ function Inner({
           )}
         </Text>
       </View>
-
       {profile.verification ? (
         <View style={[a.pb_xl, a.gap_md]}>
           <Text style={[a.text_sm, t.atoms.text_contrast_medium]}>
@@ -124,7 +120,6 @@ function Inner({
             )}
         </View>
       ) : null}
-
       <View
         style={[
           a.w_full,
@@ -135,7 +130,7 @@ function Inner({
             : [a.flex_col],
         ]}>
         <Button
-          label={_(msg`Close dialog`)}
+          label={l`Close dialog`}
           size="small"
           variant="solid"
           color="primary"
@@ -149,12 +144,10 @@ function Inner({
         <Link
           overridePresentation
           to={urls.website.blog.initialVerificationAnnouncement}
-          label={_(
-            msg({
-              message: `Learn more about verification on Bluesky`,
-              context: `english-only-resource`,
-            }),
-          )}
+          label={l({
+            message: `Learn more about verification on Bluesky`,
+            context: `english-only-resource`,
+          })}
           size="small"
           variant="solid"
           color="secondary"
@@ -169,7 +162,6 @@ function Inner({
           </ButtonText>
         </Link>
       </View>
-
       <Dialog.Close />
     </Dialog.ScrollableInner>
   )
@@ -185,7 +177,7 @@ function VerifierCard({
   outerDialogControl: Dialog.DialogControlProps
 }) {
   const t = useTheme()
-  const {_, i18n} = useLingui()
+  const {t: l, i18n} = useLingui()
   const {currentAccount} = useSession()
   const moderationOpts = useModerationOpts()
   const {data: profile, error} = useProfileQuery({did: verification.issuer})
@@ -247,7 +239,7 @@ function VerifierCard({
               {canAdminister && (
                 <View>
                   <Button
-                    label={_(msg`Remove verification`)}
+                    label={l`Remove verification`}
                     size="small"
                     variant="outline"
                     color="negative"
@@ -268,7 +260,6 @@ function VerifierCard({
           )}
         </ProfileCard.Header>
       </ProfileCard.Outer>
-
       <VerificationRemovePrompt
         control={verificationRemovePromptControl}
         profile={subject}
diff --git a/src/components/verification/VerifierDialog.tsx b/src/components/verification/VerifierDialog.tsx
index e8944024ca..adc5abb394 100644
--- a/src/components/verification/VerifierDialog.tsx
+++ b/src/components/verification/VerifierDialog.tsx
@@ -1,7 +1,6 @@
 import {Text as RNText, View} from 'react-native'
 import {Image} from 'expo-image'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {urls} from '#/lib/constants'
@@ -51,15 +50,15 @@ function Inner({
 }) {
   const t = useTheme()
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {gtMobile} = useBreakpoints()
   const {currentAccount} = useSession()
 
   const isSelf = profile.did === currentAccount?.did
   const userName = getUserDisplayName(profile)
   const label = isSelf
-    ? _(msg`You are a trusted verifier`)
-    : _(msg`${userName} is a trusted verifier`)
+    ? l`You are a trusted verifier`
+    : l`${userName} is a trusted verifier`
 
   return (
     <Dialog.ScrollableInner
@@ -84,9 +83,7 @@ function Inner({
                 aspectRatio: 353 / 160,
               },
             ]}
-            alt={_(
-              msg`An illustration showing that Bluesky selects trusted verifiers, and trusted verifiers in turn verify individual user accounts.`,
-            )}
+            alt={l`An illustration showing that Bluesky selects trusted verifiers, and trusted verifiers in turn verify individual user accounts.`}
             useAppleWebpCodec
           />
         </View>
@@ -118,12 +115,10 @@ function Inner({
           <Link
             overridePresentation
             to={urls.website.blog.initialVerificationAnnouncement}
-            label={_(
-              msg({
-                message: `Learn more about verification on Bluesky`,
-                context: `english-only-resource`,
-              }),
-            )}
+            label={l({
+              message: `Learn more about verification on Bluesky`,
+              context: `english-only-resource`,
+            })}
             size="small"
             color="primary"
             style={[a.justify_center]}
@@ -137,7 +132,7 @@ function Inner({
             </ButtonText>
           </Link>
           <Button
-            label={_(msg`Close dialog`)}
+            label={l`Close dialog`}
             size="small"
             color="secondary"
             onPress={() => {
diff --git a/src/features/liveEvents/components/DiscoverFeedLiveEventFeedsAndTrendingBanner.tsx b/src/features/liveEvents/components/DiscoverFeedLiveEventFeedsAndTrendingBanner.tsx
index de45b308b1..4688b12281 100644
--- a/src/features/liveEvents/components/DiscoverFeedLiveEventFeedsAndTrendingBanner.tsx
+++ b/src/features/liveEvents/components/DiscoverFeedLiveEventFeedsAndTrendingBanner.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {atoms as a, useLayoutBreakpoints} from '#/alf'
@@ -28,7 +27,7 @@ export function DiscoverFeedLiveEventFeedsAndTrendingBanner() {
 }
 
 function Inner({feed}: {feed: LiveEventFeed}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const layout = feed.layouts.wide
 
   const {mutate: update, variables} = useUpdateLiveEventPreferences({
@@ -47,7 +46,7 @@ function Inner({feed}: {feed: LiveEventFeed}) {
           </Toast.Text>
           {undoAction && (
             <Toast.Action
-              label={_(msg`Undo`)}
+              label={l`Undo`}
               onPress={() => {
                 if (undoAction) {
                   update(undoAction)
@@ -71,7 +70,7 @@ function Inner({feed}: {feed: LiveEventFeed}) {
           <LiveEventFeedCardWide feed={feed} metricContext="discover" />
 
           <Button
-            label={_(msg`Dismiss live event banner`)}
+            label={l`Dismiss live event banner`}
             size="tiny"
             shape="round"
             style={[a.absolute, a.z_10, {top: 6, right: 6}]}
diff --git a/src/features/liveEvents/components/LiveEventFeedCardCompact.tsx b/src/features/liveEvents/components/LiveEventFeedCardCompact.tsx
index 9d2f948eb6..d348bfa349 100644
--- a/src/features/liveEvents/components/LiveEventFeedCardCompact.tsx
+++ b/src/features/liveEvents/components/LiveEventFeedCardCompact.tsx
@@ -2,8 +2,7 @@ import {useMemo} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
 import {LinearGradient} from 'expo-linear-gradient'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {useCallOnce} from '#/lib/once'
 import {isBskyCustomFeedUrl} from '#/lib/strings/url-helpers'
@@ -26,7 +25,7 @@ export function LiveEventFeedCardCompact({
   feed: LiveEventFeed
   metricContext: LiveEventFeedMetricContext
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
 
   const layout = feed.layouts.compact
@@ -50,7 +49,7 @@ export function LiveEventFeedCardCompact({
   return (
     <Link
       to={url}
-      label={_(msg`Live event happening now: ${feed.title}`)}
+      label={l`Live event happening now: ${feed.title}`}
       style={[a.w_full]}
       onPress={() => {
         ax.metric('liveEvents:feedBanner:click', {
diff --git a/src/features/liveEvents/components/LiveEventFeedCardWide.tsx b/src/features/liveEvents/components/LiveEventFeedCardWide.tsx
index 2349ce0d3a..08cc52c843 100644
--- a/src/features/liveEvents/components/LiveEventFeedCardWide.tsx
+++ b/src/features/liveEvents/components/LiveEventFeedCardWide.tsx
@@ -2,8 +2,7 @@ import {useMemo} from 'react'
 import {View} from 'react-native'
 import {Image} from 'expo-image'
 import {LinearGradient} from 'expo-linear-gradient'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useCallOnce} from '#/lib/once'
@@ -27,7 +26,7 @@ export function LiveEventFeedCardWide({
   metricContext: LiveEventFeedMetricContext
 }) {
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {gtPhone} = useBreakpoints()
 
   const layout = feed.layouts.wide
@@ -51,7 +50,7 @@ export function LiveEventFeedCardWide({
   return (
     <Link
       to={url}
-      label={_(msg`Live event happening now: ${feed.title}`)}
+      label={l`Live event happening now: ${feed.title}`}
       style={[a.w_full]}
       onPress={() => {
         ax.metric('liveEvents:feedBanner:click', {
diff --git a/src/features/liveEvents/components/SidebarLiveEventFeedsBanner.tsx b/src/features/liveEvents/components/SidebarLiveEventFeedsBanner.tsx
index c5b6cc5e75..6915d05038 100644
--- a/src/features/liveEvents/components/SidebarLiveEventFeedsBanner.tsx
+++ b/src/features/liveEvents/components/SidebarLiveEventFeedsBanner.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {atoms as a} from '#/alf'
@@ -18,7 +17,7 @@ export function SidebarLiveEventFeedsBanner() {
 }
 
 function Inner({feed}: {feed: LiveEventFeed}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const layout = feed.layouts.wide
 
   const {mutate: update, variables} = useUpdateLiveEventPreferences({
@@ -37,7 +36,7 @@ function Inner({feed}: {feed: LiveEventFeed}) {
           </Toast.Text>
           {undoAction && (
             <Toast.Action
-              label={_(msg`Undo`)}
+              label={l`Undo`}
               onPress={() => {
                 if (undoAction) {
                   update(undoAction)
@@ -57,11 +56,10 @@ function Inner({feed}: {feed: LiveEventFeed}) {
   return (
     <View style={[a.relative]}>
       <LiveEventFeedCardCompact feed={feed} metricContext="sidebar" />
-
       <View
         style={[a.justify_center, a.absolute, {top: 0, right: 6, bottom: 0}]}>
         <Button
-          label={_(msg`Dismiss live event banner`)}
+          label={l`Dismiss live event banner`}
           size="tiny"
           shape="round"
           style={[a.z_10]}
diff --git a/src/features/liveNow/components/EditLiveDialog.tsx b/src/features/liveNow/components/EditLiveDialog.tsx
index cf913541a1..eeeb6d1bde 100644
--- a/src/features/liveNow/components/EditLiveDialog.tsx
+++ b/src/features/liveNow/components/EditLiveDialog.tsx
@@ -1,8 +1,7 @@
 import {useMemo, useState} from 'react'
 import {View} from 'react-native'
 import {type AppBskyActorDefs, type AppBskyEmbedExternal} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {differenceInMinutes} from 'date-fns'
 
@@ -52,7 +51,7 @@ function DialogInner({
   embed: AppBskyEmbedExternal.View
 }) {
   const control = Dialog.useDialogContext()
-  const {_, i18n} = useLingui()
+  const {t: l, i18n} = useLingui()
   const t = useTheme()
 
   const [liveLink, setLiveLink] = useState(embed.external.uri)
@@ -110,7 +109,7 @@ function DialogInner({
 
   return (
     <Dialog.ScrollableInner
-      label={_(msg`You are Live`)}
+      label={l`You are Live`}
       style={web({maxWidth: 420})}>
       <View style={[a.gap_lg]}>
         <View style={[a.gap_sm]}>
@@ -143,8 +142,8 @@ function DialogInner({
             </TextField.LabelText>
             <TextField.Root isInvalid={!!liveLinkError || !!linkMetaError}>
               <TextField.Input
-                label={_(msg`Live link`)}
-                placeholder={_(msg`www.mylivestream.tv`)}
+                label={l`Live link`}
+                placeholder={l`www.mylivestream.tv`}
                 value={liveLink}
                 onChangeText={setLiveLink}
                 onFocus={() => setLiveLinkError('')}
@@ -194,7 +193,7 @@ function DialogInner({
           })}>
           {isDirty ? (
             <Button
-              label={_(msg`Save`)}
+              label={l`Save`}
               size={platform({native: 'large', web: 'small'})}
               color="primary"
               variant="solid"
@@ -207,7 +206,7 @@ function DialogInner({
             </Button>
           ) : (
             <Button
-              label={_(msg`Close`)}
+              label={l`Close`}
               size={platform({native: 'large', web: 'small'})}
               color="primary"
               variant="solid"
@@ -218,7 +217,7 @@ function DialogInner({
             </Button>
           )}
           <Button
-            label={_(msg`Remove live status`)}
+            label={l`Remove live status`}
             onPress={() => removeLiveStatus()}
             size={platform({native: 'large', web: 'small'})}
             color="negative_subtle"
diff --git a/src/features/liveNow/components/GoLiveDialog.tsx b/src/features/liveNow/components/GoLiveDialog.tsx
index 72438fdddc..73962b9126 100644
--- a/src/features/liveNow/components/GoLiveDialog.tsx
+++ b/src/features/liveNow/components/GoLiveDialog.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useDebouncedValue} from '#/lib/hooks/useDebouncedValue'
@@ -50,7 +49,7 @@ const DURATIONS = Array.from({length: (4 * 60) / 5}).map((_, i) => (i + 1) * 5)
 
 function DialogInner({profile}: {profile: bsky.profile.AnyProfileView}) {
   const control = Dialog.useDialogContext()
-  const {_, i18n} = useLingui()
+  const {t: l, i18n} = useLingui()
   const t = useTheme()
   const [liveLinkError, setLiveLinkError] = useState('')
   const [duration, setDuration] = useState(60)
@@ -102,9 +101,7 @@ function DialogInner({profile}: {profile: bsky.profile.AnyProfileView}) {
   const hasLink = !!debouncedUrl && !isSourceInvalid
 
   return (
-    <Dialog.ScrollableInner
-      label={_(msg`Go Live`)}
-      style={web({maxWidth: 420})}>
+    <Dialog.ScrollableInner label={l`Go Live`} style={web({maxWidth: 420})}>
       <View style={[a.gap_xl]}>
         <View style={[a.gap_sm]}>
           <Text style={[a.font_semi_bold, a.text_2xl]}>
@@ -138,8 +135,8 @@ function DialogInner({profile}: {profile: bsky.profile.AnyProfileView}) {
             </TextField.LabelText>
             <TextField.Root isInvalid={isSourceInvalid}>
               <TextField.Input
-                label={_(msg`Live link`)}
-                placeholder={_(msg`www.mylivestream.tv`)}
+                label={l`Live link`}
+                placeholder={l`www.mylivestream.tv`}
                 value={liveLink}
                 onChangeText={setLiveLink}
                 onFocus={() => setLiveLinkError('')}
@@ -183,7 +180,7 @@ function DialogInner({profile}: {profile: bsky.profile.AnyProfileView}) {
             <Select.Root
               value={String(duration)}
               onValueChange={onChangeDuration}>
-              <Select.Trigger label={_(msg`Select duration`)}>
+              <Select.Trigger label={l`Select duration`}>
                 <Text style={[ios(a.py_xs)]}>
                   {displayDuration(i18n, duration)}
                   {'  '}
@@ -236,7 +233,7 @@ function DialogInner({profile}: {profile: bsky.profile.AnyProfileView}) {
           })}>
           {hasLink && (
             <Button
-              label={_(msg`Go Live`)}
+              label={l`Go Live`}
               size={platform({native: 'large', web: 'small'})}
               color="primary"
               variant="solid"
@@ -251,7 +248,7 @@ function DialogInner({profile}: {profile: bsky.profile.AnyProfileView}) {
             </Button>
           )}
           <Button
-            label={_(msg`Cancel`)}
+            label={l`Cancel`}
             onPress={() => control.close()}
             size={platform({native: 'large', web: 'small'})}
             color="secondary"
diff --git a/src/features/liveNow/components/GoLiveDisabledDialog.tsx b/src/features/liveNow/components/GoLiveDisabledDialog.tsx
index 7eeccdc22b..b729e64ed4 100644
--- a/src/features/liveNow/components/GoLiveDisabledDialog.tsx
+++ b/src/features/liveNow/components/GoLiveDisabledDialog.tsx
@@ -1,8 +1,7 @@
 import {useCallback, useState} from 'react'
 import {View} from 'react-native'
 import {type AppBskyActorDefs, ToolsOzoneReportDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useMutation} from '@tanstack/react-query'
 
@@ -38,7 +37,7 @@ export function DialogInner({
   control: Dialog.DialogControlProps
   status: AppBskyActorDefs.StatusView
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const agent = useAgent()
   const [details, setDetails] = useState('')
 
@@ -74,13 +73,13 @@ export function DialogInner({
       }
     },
     onError: () => {
-      Toast.show(_(msg`Failed to submit appeal, please try again.`), {
+      Toast.show(l`Failed to submit appeal, please try again.`, {
         type: 'error',
       })
     },
     onSuccess: () => {
       control.close()
-      Toast.show(_(msg({message: 'Appeal submitted', context: 'toast'})), {
+      Toast.show(l({message: 'Appeal submitted', context: 'toast'}), {
         type: 'success',
       })
     },
@@ -90,7 +89,7 @@ export function DialogInner({
 
   return (
     <Dialog.ScrollableInner
-      label={_(msg`Appeal livestream suspension`)}
+      label={l`Appeal livestream suspension`}
       style={[web({maxWidth: 400})]}>
       <View style={[a.gap_lg]}>
         <View style={[a.gap_md]}>
@@ -119,10 +118,8 @@ export function DialogInner({
 
         <View style={[a.gap_md]}>
           <Dialog.Input
-            label={_(msg`Text input field`)}
-            placeholder={_(
-              msg`Please explain why you think your Go Live access was incorrectly disabled.`,
-            )}
+            label={l`Text input field`}
+            placeholder={l`Please explain why you think your Go Live access was incorrectly disabled.`}
             value={details}
             onChangeText={setDetails}
             autoFocus={true}
@@ -136,8 +133,8 @@ export function DialogInner({
             color="primary"
             size="large"
             onPress={onSubmit}
-            label={_(msg`Submit`)}>
-            <ButtonText>{_(msg`Submit`)}</ButtonText>
+            label={l`Submit`}>
+            <ButtonText>{l`Submit`}</ButtonText>
             {isPending && <ButtonIcon icon={Loader} />}
           </Button>
         </View>
diff --git a/src/features/liveNow/index.tsx b/src/features/liveNow/index.tsx
index fb1f04b728..87ea3e313d 100644
--- a/src/features/liveNow/index.tsx
+++ b/src/features/liveNow/index.tsx
@@ -9,8 +9,7 @@ import {
   moderateStatus,
 } from '@atproto/api'
 import {retry} from '@atproto/common-web'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
 import {isAfter, parseISO} from 'date-fns'
 
@@ -185,7 +184,7 @@ export function isStatusValidForViewers(
 
 export function useLiveLinkMetaQuery(url: string | null) {
   const liveNowConfig = useLiveNowConfig()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const agent = useAgent()
   return useQuery({
@@ -199,9 +198,7 @@ export function useLiveLinkMetaQuery(url: string | null) {
           liveNowConfig.currentAccountAllowedHosts,
         )
         throw new Error(
-          _(
-            msg`This service is not supported while the Live feature is in beta. Allowed services: ${formatted}.`,
-          ),
+          l`This service is not supported while the Live feature is in beta. Allowed services: ${formatted}.`,
         )
       }
 
@@ -220,7 +217,7 @@ export function useUpsertLiveStatusMutation(
   const agent = useAgent()
   const queryClient = useQueryClient()
   const control = useDialogContext()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return useMutation({
     mutationFn: async () => {
@@ -312,7 +309,7 @@ export function useUpsertLiveStatusMutation(
         ax.metric('live:create', {duration: record.durationMinutes})
       }
 
-      Toast.show(_(msg`You are now live!`))
+      Toast.show(l`You are now live!`)
       control.close(() => {
         if (!currentAccount) return
 
@@ -350,7 +347,7 @@ export function useRemoveLiveStatusMutation() {
   const agent = useAgent()
   const queryClient = useQueryClient()
   const control = useDialogContext()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return useMutation({
     mutationFn: async () => {
@@ -368,7 +365,7 @@ export function useRemoveLiveStatusMutation() {
     },
     onSuccess: () => {
       ax.metric('live:remove', {})
-      Toast.show(_(msg`You are no longer live`))
+      Toast.show(l`You are no longer live`)
       control.close(() => {
         if (!currentAccount) return
 
diff --git a/src/lib/generate-starterpack.ts b/src/lib/generate-starterpack.ts
index a53e95a6a3..4fc14650c2 100644
--- a/src/lib/generate-starterpack.ts
+++ b/src/lib/generate-starterpack.ts
@@ -6,8 +6,7 @@ import {
   type ComAtprotoRepoApplyWrites,
   type Facet,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {useMutation} from '@tanstack/react-query'
 
 import {until} from '#/lib/async/until'
@@ -59,7 +58,7 @@ export function useGenerateStarterPackMutation({
   onSuccess: ({uri, cid}: {uri: string; cid: string}) => void
   onError: (e: Error) => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const agent = useAgent()
 
   return useMutation<{uri: string; cid: string}, Error, void>({
@@ -101,7 +100,7 @@ export function useGenerateStarterPackMutation({
         25,
         true,
       )
-      const starterPackName = _(msg`${displayName}'s Starter Pack`)
+      const starterPackName = l`${displayName}'s Starter Pack`
 
       const list = await createStarterPackList({
         name: starterPackName,
diff --git a/src/lib/hooks/useAccountSwitcher.ts b/src/lib/hooks/useAccountSwitcher.ts
index 106e92d37a..bb1ffcfa33 100644
--- a/src/lib/hooks/useAccountSwitcher.ts
+++ b/src/lib/hooks/useAccountSwitcher.ts
@@ -1,6 +1,5 @@
 import {useCallback, useState} from 'react'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {logger} from '#/logger'
 import {type SessionAccount, useSessionApi} from '#/state/session'
@@ -13,7 +12,7 @@ import {IS_WEB} from '#/env'
 export function useAccountSwitcher() {
   const ax = useAnalytics()
   const [pendingDid, setPendingDid] = useState<string | null>(null)
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {resumeSession} = useSessionApi()
   const {requestSwitchToAccount} = useLoggedOutViewControls()
 
@@ -39,10 +38,10 @@ export function useAccountSwitcher() {
           }
           await resumeSession(account, true)
           ax.metric('account:loggedIn', {logContext, withPassword: false})
-          Toast.show(_(msg`Signed in as @${account.handle}`))
+          Toast.show(l`Signed in as @${account.handle}`)
         } else {
           requestSwitchToAccount({requestedAccount: account.did})
-          Toast.show(_(msg`Please sign in as @${account.handle}`), {
+          Toast.show(l`Please sign in as @${account.handle}`, {
             type: 'warning',
           })
         }
@@ -51,14 +50,14 @@ export function useAccountSwitcher() {
           message: e.message,
         })
         requestSwitchToAccount({requestedAccount: account.did})
-        Toast.show(_(msg`Please sign in as @${account.handle}`), {
+        Toast.show(l`Please sign in as @${account.handle}`, {
           type: 'warning',
         })
       } finally {
         setPendingDid(null)
       }
     },
-    [_, ax, resumeSession, requestSwitchToAccount, pendingDid],
+    [l, ax, resumeSession, requestSwitchToAccount, pendingDid],
   )
 
   return {onPressSwitchAccount, pendingDid}
diff --git a/src/lib/hooks/useCreateSupportLink.ts b/src/lib/hooks/useCreateSupportLink.ts
index 5f5bfd5720..757b229569 100644
--- a/src/lib/hooks/useCreateSupportLink.ts
+++ b/src/lib/hooks/useCreateSupportLink.ts
@@ -1,6 +1,5 @@
 import {useCallback} from 'react'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {useSession} from '#/state/session'
 
@@ -16,7 +15,7 @@ export enum SupportCode {
  * {@link https://support.zendesk.com/hc/en-us/articles/4408839114522-Creating-pre-filled-ticket-forms}
  */
 export function useCreateSupportLink() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount} = useSession()
 
   return useCallback(
@@ -26,7 +25,7 @@ export function useCreateSupportLink() {
         url.search = new URLSearchParams({
           tf_anonymous_requester_email: email || currentAccount.email || '', // email will be defined
           tf_description:
-            `[Code: ${code}] — ` + _(msg`Please write your message below:`),
+            `[Code: ${code}] — ` + l`Please write your message below:`,
           /**
            * Custom field specific to {@link ZENDESK_SUPPORT_URL} form
            */
@@ -35,6 +34,6 @@ export function useCreateSupportLink() {
       }
       return url.toString()
     },
-    [_, currentAccount],
+    [l, currentAccount],
   )
 }
diff --git a/src/lib/interests.ts b/src/lib/interests.ts
index 45f9183d1e..4a2b41321d 100644
--- a/src/lib/interests.ts
+++ b/src/lib/interests.ts
@@ -1,6 +1,5 @@
 import {useMemo} from 'react'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 export const interests = [
   'animals',
@@ -44,35 +43,35 @@ export const popularInterests = [
 ] satisfies Interest[]
 
 export function useInterestsDisplayNames() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return useMemo<Record<string, string>>(() => {
     return {
       // Keep this alphabetized
-      animals: _(msg`Animals`),
-      art: _(msg`Art`),
-      books: _(msg`Books`),
-      comedy: _(msg`Comedy`),
-      comics: _(msg`Comics`),
-      culture: _(msg`Culture`),
-      dev: _(msg`Software Dev`),
-      education: _(msg`Education`),
-      finance: _(msg`Finance`),
-      food: _(msg`Food`),
-      gaming: _(msg`Video Games`),
-      journalism: _(msg`Journalism`),
-      movies: _(msg`Movies`),
-      music: _(msg`Music`),
-      nature: _(msg`Nature`),
-      news: _(msg`News`),
-      pets: _(msg`Pets`),
-      photography: _(msg`Photography`),
-      politics: _(msg`Politics`),
-      science: _(msg`Science`),
-      sports: _(msg`Sports`),
-      tech: _(msg`Tech`),
-      tv: _(msg`TV`),
-      writers: _(msg`Writers`),
+      animals: l`Animals`,
+      art: l`Art`,
+      books: l`Books`,
+      comedy: l`Comedy`,
+      comics: l`Comics`,
+      culture: l`Culture`,
+      dev: l`Software Dev`,
+      education: l`Education`,
+      finance: l`Finance`,
+      food: l`Food`,
+      gaming: l`Video Games`,
+      journalism: l`Journalism`,
+      movies: l`Movies`,
+      music: l`Music`,
+      nature: l`Nature`,
+      news: l`News`,
+      pets: l`Pets`,
+      photography: l`Photography`,
+      politics: l`Politics`,
+      science: l`Science`,
+      sports: l`Sports`,
+      tech: l`Tech`,
+      tv: l`TV`,
+      writers: l`Writers`,
     } satisfies Record<Interest, string>
-  }, [_])
+  }, [l])
 }
diff --git a/src/lib/media/save-image.ios.ts b/src/lib/media/save-image.ios.ts
index 7bd270de8a..135f6685f8 100644
--- a/src/lib/media/save-image.ios.ts
+++ b/src/lib/media/save-image.ios.ts
@@ -1,6 +1,5 @@
 import {useCallback} from 'react'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import * as Toast from '#/components/Toast'
 import {IS_NATIVE} from '#/env'
@@ -13,7 +12,7 @@ import {saveImageToMediaLibrary} from './manip'
  * so this file is platform-split as it's much simpler than the Android version.
  */
 export function useSaveImageToMediaLibrary() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   return useCallback(
     async (uri: string) => {
       if (!IS_NATIVE) {
@@ -22,11 +21,11 @@ export function useSaveImageToMediaLibrary() {
 
       try {
         await saveImageToMediaLibrary({uri})
-        Toast.show(_(msg`Image saved`))
+        Toast.show(l`Image saved`)
       } catch (e: any) {
-        Toast.show(_(msg`Failed to save image: ${String(e)}`), {type: 'error'})
+        Toast.show(l`Failed to save image: ${String(e)}`, {type: 'error'})
       }
     },
-    [_],
+    [l],
   )
 }
diff --git a/src/lib/media/save-image.ts b/src/lib/media/save-image.ts
index bf48d8e685..a08d36100c 100644
--- a/src/lib/media/save-image.ts
+++ b/src/lib/media/save-image.ts
@@ -1,7 +1,6 @@
 import {useCallback} from 'react'
 import * as MediaLibrary from 'expo-media-library'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import * as Toast from '#/components/Toast'
 import {IS_NATIVE} from '#/env'
@@ -11,7 +10,7 @@ import {saveImageToMediaLibrary} from './manip'
  * Same as `saveImageToMediaLibrary`, but also handles permissions and toasts
  */
 export function useSaveImageToMediaLibrary() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const [permissionResponse, requestPermission, getPermission] =
     MediaLibrary.usePermissions({
       granularPermissions: ['photo'],
@@ -26,9 +25,9 @@ export function useSaveImageToMediaLibrary() {
         try {
           await saveImageToMediaLibrary({uri})
 
-          Toast.show(_(msg`Image saved`))
+          Toast.show(l`Image saved`)
         } catch (e: any) {
-          Toast.show(_(msg`Failed to save image: ${String(e)}`), {
+          Toast.show(l`Failed to save image: ${String(e)}`, {
             type: 'error',
           })
         }
@@ -47,22 +46,18 @@ export function useSaveImageToMediaLibrary() {
           } else {
             // since we've been explicitly denied, show a toast.
             Toast.show(
-              _(
-                msg`Images cannot be saved unless permission is granted to access your photo library.`,
-              ),
+              l`Images cannot be saved unless permission is granted to access your photo library.`,
               {type: 'error'},
             )
           }
         } else {
           Toast.show(
-            _(
-              msg`Permission to access your photo library was denied. Please enable it in your system settings.`,
-            ),
+            l`Permission to access your photo library was denied. Please enable it in your system settings.`,
             {type: 'error'},
           )
         }
       }
     },
-    [permissionResponse, requestPermission, getPermission, _],
+    [permissionResponse, requestPermission, getPermission, l],
   )
 }
diff --git a/src/lib/moderation/useGlobalLabelStrings.ts b/src/lib/moderation/useGlobalLabelStrings.ts
index f308e04d1d..9896668546 100644
--- a/src/lib/moderation/useGlobalLabelStrings.ts
+++ b/src/lib/moderation/useGlobalLabelStrings.ts
@@ -1,6 +1,5 @@
 import {useMemo} from 'react'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 export type GlobalLabelStrings = Record<
   string,
@@ -11,46 +10,42 @@ export type GlobalLabelStrings = Record<
 >
 
 export function useGlobalLabelStrings(): GlobalLabelStrings {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   return useMemo(
     () => ({
       '!hide': {
-        name: _(msg`Content Blocked`),
-        description: _(msg`This content has been hidden by the moderators.`),
+        name: l`Content Blocked`,
+        description: l`This content has been hidden by the moderators.`,
       },
       '!warn': {
-        name: _(msg`Content Warning`),
-        description: _(
-          msg`This content has received a general warning from moderators.`,
-        ),
+        name: l`Content Warning`,
+        description: l`This content has received a general warning from moderators.`,
       },
       '!no-unauthenticated': {
-        name: _(msg`Sign-in Required`),
-        description: _(
-          msg`This user has requested that their content only be shown to signed-in users.`,
-        ),
+        name: l`Sign-in Required`,
+        description: l`This user has requested that their content only be shown to signed-in users.`,
       },
       porn: {
-        name: _(msg`Adult Content`),
-        description: _(msg`Explicit sexual images.`),
+        name: l`Adult Content`,
+        description: l`Explicit sexual images.`,
       },
       sexual: {
-        name: _(msg`Sexually Suggestive`),
-        description: _(msg`Does not include nudity.`),
+        name: l`Sexually Suggestive`,
+        description: l`Does not include nudity.`,
       },
       nudity: {
-        name: _(msg`Non-sexual Nudity`),
-        description: _(msg`E.g. artistic nudes.`),
+        name: l`Non-sexual Nudity`,
+        description: l`E.g. artistic nudes.`,
       },
       'graphic-media': {
-        name: _(msg`Graphic Media`),
-        description: _(msg`Explicit or potentially disturbing media.`),
+        name: l`Graphic Media`,
+        description: l`Explicit or potentially disturbing media.`,
       },
       gore: {
-        name: _(msg`Graphic Media`),
-        description: _(msg`Explicit or potentially disturbing media.`),
+        name: l`Graphic Media`,
+        description: l`Explicit or potentially disturbing media.`,
       },
     }),
-    [_],
+    [l],
   )
 }
diff --git a/src/lib/moderation/useLabelBehaviorDescription.ts b/src/lib/moderation/useLabelBehaviorDescription.ts
index cdded25924..e7ff1784de 100644
--- a/src/lib/moderation/useLabelBehaviorDescription.ts
+++ b/src/lib/moderation/useLabelBehaviorDescription.ts
@@ -2,37 +2,36 @@ import {
   type InterpretedLabelValueDefinition,
   type LabelPreference,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 export function useLabelBehaviorDescription(
   labelValueDef: InterpretedLabelValueDefinition,
   pref: LabelPreference,
 ) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   if (pref === 'ignore') {
-    return _(msg`Off`)
+    return l`Off`
   }
   if (labelValueDef.blurs === 'content' || labelValueDef.blurs === 'media') {
     if (pref === 'hide') {
-      return _(msg`Hide`)
+      return l`Hide`
     }
-    return _(msg`Warn`)
+    return l`Warn`
   } else if (labelValueDef.severity === 'alert') {
     if (pref === 'hide') {
-      return _(msg`Hide`)
+      return l`Hide`
     }
-    return _(msg`Warn`)
+    return l`Warn`
   } else if (labelValueDef.severity === 'inform') {
     if (pref === 'hide') {
-      return _(msg`Hide`)
+      return l`Hide`
     }
-    return _(msg`Show badge`)
+    return l`Show badge`
   } else {
     if (pref === 'hide') {
-      return _(msg`Hide`)
+      return l`Hide`
     }
-    return _(msg`Disabled`)
+    return l`Disabled`
   }
 }
 
@@ -40,34 +39,34 @@ export function useLabelLongBehaviorDescription(
   labelValueDef: InterpretedLabelValueDefinition,
   pref: LabelPreference,
 ) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   if (pref === 'ignore') {
-    return _(msg`Disabled`)
+    return l`Disabled`
   }
   if (labelValueDef.blurs === 'content') {
     if (pref === 'hide') {
-      return _(msg`Warn content and filter from feeds`)
+      return l`Warn content and filter from feeds`
     }
-    return _(msg`Warn content`)
+    return l`Warn content`
   } else if (labelValueDef.blurs === 'media') {
     if (pref === 'hide') {
-      return _(msg`Blur images and filter from feeds`)
+      return l`Blur images and filter from feeds`
     }
-    return _(msg`Blur images`)
+    return l`Blur images`
   } else if (labelValueDef.severity === 'alert') {
     if (pref === 'hide') {
-      return _(msg`Show warning and filter from feeds`)
+      return l`Show warning and filter from feeds`
     }
-    return _(msg`Show warning`)
+    return l`Show warning`
   } else if (labelValueDef.severity === 'inform') {
     if (pref === 'hide') {
-      return _(msg`Show badge and filter from feeds`)
+      return l`Show badge and filter from feeds`
     }
-    return _(msg`Show badge`)
+    return l`Show badge`
   } else {
     if (pref === 'hide') {
-      return _(msg`Filter from feeds`)
+      return l`Filter from feeds`
     }
-    return _(msg`Disabled`)
+    return l`Disabled`
   }
 }
diff --git a/src/lib/moderation/useLabelInfo.ts b/src/lib/moderation/useLabelInfo.ts
index f398406078..5708b68ec0 100644
--- a/src/lib/moderation/useLabelInfo.ts
+++ b/src/lib/moderation/useLabelInfo.ts
@@ -5,7 +5,7 @@ import {
   interpretLabelValueDefinition,
   LABELS,
 } from '@atproto/api'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import * as bcp47Match from 'bcp-47-match'
 
 import {
diff --git a/src/lib/moderation/useModerationCauseDescription.ts b/src/lib/moderation/useModerationCauseDescription.ts
index d11d16dca3..eea5bf6343 100644
--- a/src/lib/moderation/useModerationCauseDescription.ts
+++ b/src/lib/moderation/useModerationCauseDescription.ts
@@ -4,8 +4,7 @@ import {
   type ModerationCause,
   type ModerationCauseSource,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {sanitizeHandle} from '#/lib/strings/handles'
 import {useLabelDefinitions} from '#/state/preferences'
@@ -35,7 +34,7 @@ export function useModerationCauseDescription(
   cause: ModerationCause | AppModerationCause | undefined,
 ): ModerationCauseDescription {
   const {currentAccount} = useSession()
-  const {_, i18n} = useLingui()
+  const {t: l, i18n} = useLingui()
   const {labelDefs, labelers} = useLabelDefinitions()
   const globalLabelStrings = useGlobalLabelStrings()
 
@@ -43,90 +42,76 @@ export function useModerationCauseDescription(
     if (!cause) {
       return {
         icon: Warning,
-        name: _(msg`Content Warning`),
-        description: _(
-          msg`Moderator has chosen to set a general warning on the content.`,
-        ),
+        name: l`Content Warning`,
+        description: l`Moderator has chosen to set a general warning on the content.`,
       }
     }
     if (cause.type === 'blocking') {
       if (cause.source.type === 'list') {
         return {
           icon: CircleBanSign,
-          name: _(msg`User Blocked by "${cause.source.list.name}"`),
-          description: _(
-            msg`You have blocked this user. You cannot view their content.`,
-          ),
+          name: l`User Blocked by "${cause.source.list.name}"`,
+          description: l`You have blocked this user. You cannot view their content.`,
         }
       } else {
         return {
           icon: CircleBanSign,
-          name: _(msg`User Blocked`),
-          description: _(
-            msg`You have blocked this user. You cannot view their content.`,
-          ),
+          name: l`User Blocked`,
+          description: l`You have blocked this user. You cannot view their content.`,
         }
       }
     }
     if (cause.type === 'blocked-by') {
       return {
         icon: CircleBanSign,
-        name: _(msg`User Blocking You`),
-        description: _(
-          msg`This user has blocked you. You cannot view their content.`,
-        ),
+        name: l`User Blocking You`,
+        description: l`This user has blocked you. You cannot view their content.`,
       }
     }
     if (cause.type === 'block-other') {
       return {
         icon: CircleBanSign,
-        name: _(msg`Content Not Available`),
-        description: _(
-          msg`This content is not available because one of the users involved has blocked the other.`,
-        ),
+        name: l`Content Not Available`,
+        description: l`This content is not available because one of the users involved has blocked the other.`,
       }
     }
     if (cause.type === 'muted') {
       if (cause.source.type === 'list') {
         return {
           icon: EyeSlash,
-          name: _(msg`Muted by "${cause.source.list.name}"`),
-          description: _(msg`You have muted this user`),
+          name: l`Muted by "${cause.source.list.name}"`,
+          description: l`You have muted this user`,
         }
       } else {
         return {
           icon: EyeSlash,
-          name: _(msg`Account Muted`),
-          description: _(msg`You have muted this account.`),
+          name: l`Account Muted`,
+          description: l`You have muted this account.`,
         }
       }
     }
     if (cause.type === 'mute-word') {
       return {
         icon: EyeSlash,
-        name: _(msg`Post Hidden by Muted Word`),
-        description: _(
-          msg`You've chosen to hide a word or tag within this post.`,
-        ),
+        name: l`Post Hidden by Muted Word`,
+        description: l`You've chosen to hide a word or tag within this post.`,
       }
     }
     if (cause.type === 'hidden') {
       return {
         icon: EyeSlash,
-        name: _(msg`Post Hidden by You`),
-        description: _(msg`You have hidden this post`),
+        name: l`Post Hidden by You`,
+        description: l`You have hidden this post`,
       }
     }
     if (cause.type === 'reply-hidden') {
       const isMe = currentAccount?.did === cause.source.did
       return {
         icon: EyeSlash,
-        name: isMe
-          ? _(msg`Reply Hidden by You`)
-          : _(msg`Reply Hidden by Thread Author`),
+        name: isMe ? l`Reply Hidden by You` : l`Reply Hidden by Thread Author`,
         description: isMe
-          ? _(msg`You hid this reply.`)
-          : _(msg`The author of this thread has hidden this reply.`),
+          ? l`You hid this reply.`
+          : l`The author of this thread has hidden this reply.`,
       }
     }
     if (cause.type === 'label') {
@@ -142,11 +127,11 @@ export function useModerationCauseDescription(
           source = 'moderation.bsky.app'
           sourceDisplayName = 'Bluesky Moderation Service'
         } else {
-          source = _(msg`an unknown labeler`)
+          source = l`an unknown labeler`
         }
       }
       if (def.identifier === 'porn' || def.identifier === 'sexual') {
-        strings.name = _(msg`Adult Content`)
+        strings.name = l`Adult Content`
       }
 
       return {
@@ -177,7 +162,7 @@ export function useModerationCauseDescription(
     labelers,
     globalLabelStrings,
     cause,
-    _,
+    l,
     i18n.locale,
     currentAccount?.did,
   ])
diff --git a/src/screens/Bookmarks.tsx b/src/screens/Bookmarks.tsx
index fdeb91777c..4bca1979ba 100644
--- a/src/screens/Bookmarks.tsx
+++ b/src/screens/Bookmarks.tsx
@@ -5,8 +5,7 @@ import {
   type AppBskyBookmarkDefs,
   AppBskyFeedDefs,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {
   type NavigationProp,
@@ -202,13 +201,13 @@ function BookmarkNotFound({
   post: $Typed<AppBskyFeedDefs.NotFoundPost>
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {mutateAsync: bookmark} = useBookmarkMutation()
 
   const remove = async () => {
     try {
       await bookmark({action: 'delete', uri: post.uri})
-      toast.show(_(msg`Removed from saved posts`), {
+      toast.show(l`Removed from saved posts`, {
         type: 'info',
       })
     } catch (err) {
@@ -249,7 +248,7 @@ function BookmarkNotFound({
         </Text>
       </View>
       <Button
-        label={_(msg`Remove from saved posts`)}
+        label={l`Remove from saved posts`}
         size="tiny"
         color="secondary"
         onPress={() => void remove()}>
@@ -283,17 +282,17 @@ function BookmarkItem({
 
 function BookmarksEmpty() {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const navigation = useNavigation<NavigationProp<CommonNavigatorParams>>()
 
   return (
     <EmptyState
       icon={BookmarkDeleteLarge}
-      message={_(msg`Nothing saved yet`)}
+      message={l`Nothing saved yet`}
       textStyle={[t.atoms.text_contrast_medium, a.font_medium]}
       button={{
-        label: _(msg`Button to go back to the home timeline`),
-        text: _(msg`Go home`),
+        label: l`Button to go back to the home timeline`,
+        text: l`Go home`,
         onPress: () => navigation.navigate('Home' as never),
         size: 'small',
         color: 'secondary',
diff --git a/src/screens/Deactivated.tsx b/src/screens/Deactivated.tsx
index 2782c5ef0d..7fd2d84a25 100644
--- a/src/screens/Deactivated.tsx
+++ b/src/screens/Deactivated.tsx
@@ -1,8 +1,7 @@
 import {useCallback, useState} from 'react'
 import {View} from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -29,7 +28,7 @@ import {IS_WEB} from '#/env'
 const COL_WIDTH = 400
 
 export function Deactivated() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const insets = useSafeAreaInsets()
   const {currentAccount, accounts} = useSession()
@@ -77,13 +76,11 @@ export function Deactivated() {
       switch (e.message) {
         case 'Bad token scope':
           setError(
-            _(
-              msg`You're signed in with an App Password. Please sign in with your main password to continue deactivating your account.`,
-            ),
+            l`You're signed in with an App Password. Please sign in with your main password to continue deactivating your account.`,
           )
           break
         default:
-          setError(_(msg`Something went wrong, please try again`))
+          setError(l`Something went wrong, please try again`)
           break
       }
 
@@ -93,7 +90,7 @@ export function Deactivated() {
     } finally {
       setPending(false)
     }
-  }, [_, agent, setPending, setError, queryClient])
+  }, [l, agent, setPending, setError, queryClient])
 
   return (
     <View style={[a.util_screen_outer, a.flex_1]}>
@@ -130,7 +127,7 @@ export function Deactivated() {
 
             <View style={[a.gap_sm]}>
               <Button
-                label={_(msg`Reactivate your account`)}
+                label={l`Reactivate your account`}
                 size="large"
                 variant="solid"
                 color="primary"
@@ -141,7 +138,7 @@ export function Deactivated() {
                 {pending && <ButtonIcon icon={Loader} position="right" />}
               </Button>
               <Button
-                label={_(msg`Cancel reactivation and sign out`)}
+                label={l`Cancel reactivation and sign out`}
                 size="large"
                 variant="solid"
                 color="secondary"
@@ -181,7 +178,7 @@ export function Deactivated() {
               <AccountList
                 onSelectAccount={onSelectAccount}
                 onSelectOther={onPressAddAccount}
-                otherLabel={_(msg`Add account`)}
+                otherLabel={l`Add account`}
                 pendingDid={pendingDid}
               />
             </>
@@ -192,7 +189,7 @@ export function Deactivated() {
                 <Trans>Or, continue with another account.</Trans>
               </Text>
               <Button
-                label={_(msg`Sign in or create an account`)}
+                label={l`Sign in or create an account`}
                 size="large"
                 variant="solid"
                 color="secondary"
diff --git a/src/screens/Feeds/NoFollowingFeed.tsx b/src/screens/Feeds/NoFollowingFeed.tsx
index 5a0efb7814..5f3c6dd08e 100644
--- a/src/screens/Feeds/NoFollowingFeed.tsx
+++ b/src/screens/Feeds/NoFollowingFeed.tsx
@@ -1,6 +1,5 @@
 import {type GestureResponderEvent, View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {TIMELINE_SAVED_FEED} from '#/lib/constants'
@@ -11,7 +10,7 @@ import {Text} from '#/components/Typography'
 
 export function NoFollowingFeed({onAddFeed}: {onAddFeed?: () => void}) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {mutateAsync: addSavedFeeds} = useAddSavedFeedsMutation()
 
   const addRecommendedFeeds = (e: GestureResponderEvent) => {
@@ -37,7 +36,7 @@ export function NoFollowingFeed({onAddFeed}: {onAddFeed?: () => void}) {
           Looks like you're missing a following feed.{' '}
           <InlineLinkText
             to="#"
-            label={_(msg`Add the default feed of only people you follow`)}
+            label={l`Add the default feed of only people you follow`}
             onPress={addRecommendedFeeds}
             style={[a.leading_snug]}>
             Click here to add one.
diff --git a/src/screens/Feeds/NoSavedFeedsOfAnyType.tsx b/src/screens/Feeds/NoSavedFeedsOfAnyType.tsx
index aba1ddf55c..07fca27928 100644
--- a/src/screens/Feeds/NoSavedFeedsOfAnyType.tsx
+++ b/src/screens/Feeds/NoSavedFeedsOfAnyType.tsx
@@ -1,7 +1,6 @@
 import {View} from 'react-native'
 import {TID} from '@atproto/common-web'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {RECOMMENDED_SAVED_FEEDS} from '#/lib/constants'
@@ -22,7 +21,7 @@ export function NoSavedFeedsOfAnyType({
   onAddRecommendedFeeds?: () => void
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {isPending, mutateAsync: overwriteSavedFeeds} =
     useOverwriteSavedFeedsMutation()
 
@@ -46,15 +45,14 @@ export function NoSavedFeedsOfAnyType({
           browse more below.
         </Trans>
       </Text>
-
       <Button
         disabled={isPending}
-        label={_(msg`Apply default recommended feeds`)}
+        label={l`Apply default recommended feeds`}
         size="small"
         color="primary_subtle"
         onPress={addRecommendedFeeds}>
         <ButtonIcon icon={Plus} />
-        <ButtonText>{_(msg`Use recommended`)}</ButtonText>
+        <ButtonText>{l`Use recommended`}</ButtonText>
       </Button>
     </View>
   )
diff --git a/src/screens/FindContactsFlowScreen.tsx b/src/screens/FindContactsFlowScreen.tsx
index 0a7ebc2f6c..eacc47ace5 100644
--- a/src/screens/FindContactsFlowScreen.tsx
+++ b/src/screens/FindContactsFlowScreen.tsx
@@ -1,7 +1,6 @@
 import {useState} from 'react'
 import {LayoutAnimationConfig} from 'react-native-reanimated'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {usePreventRemove} from '@react-navigation/native'
 
 import {
@@ -18,7 +17,7 @@ import {IS_NATIVE} from '#/env'
 
 type Props = NativeStackScreenProps<AllNavigatorParams, 'FindContactsFlow'>
 export function FindContactsFlowScreen({navigation}: Props) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const [state, dispatch] = useFindContactsFlowState()
 
@@ -59,8 +58,8 @@ export function FindContactsFlowScreen({navigation}: Props) {
         </LayoutAnimationConfig>
       ) : (
         <ErrorScreen
-          title={_(msg`Not available on this platform.`)}
-          message={_(msg`Please use the native app to sync your contacts.`)}
+          title={l`Not available on this platform.`}
+          message={l`Please use the native app to sync your contacts.`}
           showHeader
         />
       )}
diff --git a/src/screens/Home/NoFeedsPinned.tsx b/src/screens/Home/NoFeedsPinned.tsx
index 54957c3fe1..ff06b3669b 100644
--- a/src/screens/Home/NoFeedsPinned.tsx
+++ b/src/screens/Home/NoFeedsPinned.tsx
@@ -1,8 +1,7 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
 import {TID} from '@atproto/common-web'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {DISCOVER_SAVED_FEED, TIMELINE_SAVED_FEED} from '#/lib/constants'
@@ -22,7 +21,7 @@ export function NoFeedsPinned({
 }: {
   preferences: UsePreferencesQueryResponse
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const headerOffset = useHeaderOffset()
   const {isPending, mutateAsync: overwriteSavedFeeds} =
     useOverwriteSavedFeedsMutation()
@@ -91,23 +90,23 @@ export function NoFeedsPinned({
         <View style={[a.flex_row, a.gap_md, a.justify_center, a.flex_wrap]}>
           <Button
             disabled={isPending}
-            label={_(msg`Apply default recommended feeds`)}
+            label={l`Apply default recommended feeds`}
             size="large"
             variant="solid"
             color="primary"
             onPress={addRecommendedFeeds}>
             <ButtonIcon icon={Plus} position="left" />
-            <ButtonText>{_(msg`Add recommended feeds`)}</ButtonText>
+            <ButtonText>{l`Add recommended feeds`}</ButtonText>
           </Button>
 
           <Link
-            label={_(msg`Browse other feeds`)}
+            label={l`Browse other feeds`}
             to="/feeds"
             size="large"
             variant="solid"
             color="secondary">
             <ButtonIcon icon={ListSparkle} position="left" />
-            <ButtonText>{_(msg`Browse other feeds`)}</ButtonText>
+            <ButtonText>{l`Browse other feeds`}</ButtonText>
           </Link>
         </View>
       </View>
diff --git a/src/screens/List/ListHiddenScreen.tsx b/src/screens/List/ListHiddenScreen.tsx
index aea2465d7f..a6f5fd2602 100644
--- a/src/screens/List/ListHiddenScreen.tsx
+++ b/src/screens/List/ListHiddenScreen.tsx
@@ -1,8 +1,7 @@
 import {useState} from 'react'
 import {View} from 'react-native'
 import {AppBskyGraphDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -35,7 +34,7 @@ export function ListHiddenScreen({
   list: AppBskyGraphDefs.ListView
   preferences: UsePreferencesQueryResponse
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const {currentAccount} = useSession()
   const {gtMobile} = useBreakpoints()
@@ -63,9 +62,7 @@ export function ListHiddenScreen({
         setIsProcessing(false)
         logger.error('Failed to unmute list', {message: e})
         Toast.show(
-          _(
-            msg`There was an issue. Please check your internet connection and try again.`,
-          ),
+          l`There was an issue. Please check your internet connection and try again.`,
         )
         return
       }
@@ -77,9 +74,7 @@ export function ListHiddenScreen({
         setIsProcessing(false)
         logger.error('Failed to unblock list', {message: e})
         Toast.show(
-          _(
-            msg`There was an issue. Please check your internet connection and try again.`,
-          ),
+          l`There was an issue. Please check your internet connection and try again.`,
         )
         return
       }
@@ -87,7 +82,7 @@ export function ListHiddenScreen({
     queryClient.invalidateQueries({
       queryKey: [listQueryRoot],
     })
-    Toast.show(_(msg`Unsubscribed from list`))
+    Toast.show(l`Unsubscribed from list`)
     setIsProcessing(false)
   }
 
@@ -95,13 +90,11 @@ export function ListHiddenScreen({
     if (!savedFeedConfig) return
     try {
       await removeSavedFeed(savedFeedConfig)
-      Toast.show(_(msg`Removed from saved feeds`))
+      Toast.show(l`Removed from saved feeds`)
     } catch (e) {
       logger.error('Failed to remove list from saved feeds', {message: e})
       Toast.show(
-        _(
-          msg`There was an issue. Please check your internet connection and try again.`,
-        ),
+        l`There was an issue. Please check your internet connection and try again.`,
       )
     } finally {
       setIsProcessing(false)
@@ -171,7 +164,7 @@ export function ListHiddenScreen({
               variant="solid"
               color="secondary"
               size="large"
-              label={_(msg`Remove from saved feeds`)}
+              label={l`Remove from saved feeds`}
               onPress={onRemoveList}
               disabled={isProcessing}>
               <ButtonText>
@@ -187,7 +180,7 @@ export function ListHiddenScreen({
               variant="solid"
               color="secondary"
               size="large"
-              label={_(msg`Show list anyway`)}
+              label={l`Show list anyway`}
               onPress={() => setIsContentVisible(true)}
               disabled={isProcessing}>
               <ButtonText>
@@ -199,7 +192,7 @@ export function ListHiddenScreen({
               variant="solid"
               color="secondary"
               size="large"
-              label={_(msg`Unsubscribe from list`)}
+              label={l`Unsubscribe from list`}
               onPress={() => {
                 if (isModList) {
                   onUnsubscribe()
@@ -220,7 +213,7 @@ export function ListHiddenScreen({
         <Button
           variant="solid"
           color="primary"
-          label={_(msg`Return to previous page`)}
+          label={l`Return to previous page`}
           onPress={goBack}
           size="large"
           disabled={isProcessing}>
diff --git a/src/screens/Log.tsx b/src/screens/Log.tsx
index b7e5c1cf54..56be67c2af 100644
--- a/src/screens/Log.tsx
+++ b/src/screens/Log.tsx
@@ -1,7 +1,6 @@
 import {useState} from 'react'
 import {LayoutAnimation, Pressable, View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useGetTimeAgo} from '#/lib/hooks/useTimeAgo'
@@ -26,7 +25,7 @@ export function LogScreen({}: NativeStackScreenProps<
   'Log'
 >) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const [expanded, setExpanded] = useState<string[]>([])
   const timeAgo = useGetTimeAgo()
   const tick = useTickEveryMinute()
@@ -69,10 +68,8 @@ export function LogScreen({}: NativeStackScreenProps<
                     a.gap_sm,
                   ]}
                   onPress={toggler(entry.id)}
-                  accessibilityLabel={_(msg`View debug entry`)}
-                  accessibilityHint={_(
-                    msg`Opens additional details for a debug entry`,
-                  )}>
+                  accessibilityLabel={l`View debug entry`}
+                  accessibilityHint={l`Opens additional details for a debug entry`}>
                   {entry.level === 'warn' || entry.level === 'error' ? (
                     <WarningIcon size="sm" fill={t.palette.negative_500} />
                   ) : (
diff --git a/src/screens/Moderation/VerificationSettings.tsx b/src/screens/Moderation/VerificationSettings.tsx
index 052d10cd6a..61fad60efc 100644
--- a/src/screens/Moderation/VerificationSettings.tsx
+++ b/src/screens/Moderation/VerificationSettings.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {urls} from '#/lib/constants'
@@ -20,7 +19,7 @@ import {Loader} from '#/components/Loader'
 import {useAnalytics} from '#/analytics'
 
 export function Screen() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const gutters = useGutters(['base'])
   const {data: preferences} = usePreferencesQuery()
@@ -46,12 +45,10 @@ export function Screen() {
                 <InlineLinkText
                   overridePresentation
                   to={urls.website.blog.initialVerificationAnnouncement}
-                  label={_(
-                    msg({
-                      message: `Learn more`,
-                      context: `english-only-resource`,
-                    }),
-                  )}
+                  label={l({
+                    message: `Learn more`,
+                    context: `english-only-resource`,
+                  })}
                   onPress={() => {
                     ax.metric('verification:learn-more', {
                       location: 'verificationSettings',
@@ -76,7 +73,7 @@ export function Screen() {
 }
 
 function Inner({preferences}: {preferences: UsePreferencesQueryResponse}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {hideBadges} = preferences.verificationPrefs
   const {mutate: setVerificationPrefs, isPending} =
     useSetVerificationPrefsMutation()
@@ -85,7 +82,7 @@ function Inner({preferences}: {preferences: UsePreferencesQueryResponse}) {
     <Toggle.Item
       type="checkbox"
       name="hideBadges"
-      label={_(msg`Hide verification badges`)}
+      label={l`Hide verification badges`}
       value={hideBadges}
       disabled={isPending}
       onChange={value => {
diff --git a/src/screens/Moderation/index.tsx b/src/screens/Moderation/index.tsx
index 9aea34b89d..dca7447ece 100644
--- a/src/screens/Moderation/index.tsx
+++ b/src/screens/Moderation/index.tsx
@@ -1,8 +1,7 @@
 import {Fragment, useCallback} from 'react'
 import {Linking, View} from 'react-native'
 import {LABELS} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {getLabelingServiceTitle, isAppLabeler} from '#/lib/moderation'
@@ -81,7 +80,7 @@ function ErrorState({error}: {error: string}) {
 export function ModerationScreen(
   _props: NativeStackScreenProps<CommonNavigatorParams, 'Moderation'>,
 ) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {
     isLoading: isPreferencesLoading,
     error: preferencesError,
@@ -109,7 +108,7 @@ export function ModerationScreen(
           <ErrorState
             error={
               preferencesError?.toString() ||
-              _(msg`Something went wrong, please try again.`)
+              l`Something went wrong, please try again.`
             }
           />
         ) : (
@@ -157,7 +156,7 @@ export function ModerationScreenInner({
 }: {
   preferences: UsePreferencesQueryResponse
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const {gtMobile} = useBreakpoints()
   const {mutedWordsDialogControl} = useGlobalDialogsControlContext()
@@ -184,7 +183,7 @@ export function ModerationScreenInner({
   const handleCleanup = async () => {
     try {
       await removeLabelers({dids: unavailableDids})
-      Toast.show(_(msg`Removed unavailable services`), {
+      Toast.show(l`Removed unavailable services`, {
         type: 'success',
       })
     } catch (e: any) {
@@ -234,7 +233,7 @@ export function ModerationScreenInner({
               your{' '}
               <InlineLinkText
                 to="/settings/account"
-                label={_(msg`Go to account settings`)}>
+                label={l`Go to account settings`}>
                 account settings
               </InlineLinkText>
               .
@@ -242,7 +241,6 @@ export function ModerationScreenInner({
           </Admonition.Admonition>
         </View>
       )}
-
       <Text
         style={[
           a.text_md,
@@ -252,7 +250,6 @@ export function ModerationScreenInner({
         ]}>
         <Trans>Moderation tools</Trans>
       </Text>
-
       <View
         style={[
           a.w_full,
@@ -261,12 +258,12 @@ export function ModerationScreenInner({
           t.atoms.bg_contrast_25,
         ]}>
         <Link
-          label={_(msg`View your default post interaction settings`)}
+          label={l`View your default post interaction settings`}
           testID="interactionSettingsBtn"
           to="/moderation/interaction-settings">
           {state => (
             <SubItem
-              title={_(msg`Interaction settings`)}
+              title={l`Interaction settings`}
               icon={EditBig}
               style={[
                 (state.hovered || state.pressed) && [t.atoms.bg_contrast_50],
@@ -277,11 +274,11 @@ export function ModerationScreenInner({
         <Divider />
         <Button
           testID="mutedWordsBtn"
-          label={_(msg`Open muted words and tags settings`)}
+          label={l`Open muted words and tags settings`}
           onPress={() => mutedWordsDialogControl.open()}>
           {state => (
             <SubItem
-              title={_(msg`Muted words & tags`)}
+              title={l`Muted words & tags`}
               icon={Filter}
               style={[
                 (state.hovered || state.pressed) && [t.atoms.bg_contrast_50],
@@ -291,12 +288,12 @@ export function ModerationScreenInner({
         </Button>
         <Divider />
         <Link
-          label={_(msg`View your moderation lists`)}
+          label={l`View your moderation lists`}
           testID="moderationlistsBtn"
           to="/moderation/modlists">
           {state => (
             <SubItem
-              title={_(msg`Moderation lists`)}
+              title={l`Moderation lists`}
               icon={Group}
               style={[
                 (state.hovered || state.pressed) && [t.atoms.bg_contrast_50],
@@ -306,12 +303,12 @@ export function ModerationScreenInner({
         </Link>
         <Divider />
         <Link
-          label={_(msg`View your muted accounts`)}
+          label={l`View your muted accounts`}
           testID="mutedAccountsBtn"
           to="/moderation/muted-accounts">
           {state => (
             <SubItem
-              title={_(msg`Muted accounts`)}
+              title={l`Muted accounts`}
               icon={Person}
               style={[
                 (state.hovered || state.pressed) && [t.atoms.bg_contrast_50],
@@ -321,12 +318,12 @@ export function ModerationScreenInner({
         </Link>
         <Divider />
         <Link
-          label={_(msg`View your blocked accounts`)}
+          label={l`View your blocked accounts`}
           testID="blockedAccountsBtn"
           to="/moderation/blocked-accounts">
           {state => (
             <SubItem
-              title={_(msg`Blocked accounts`)}
+              title={l`Blocked accounts`}
               icon={CircleBanSign}
               style={[
                 (state.hovered || state.pressed) && [t.atoms.bg_contrast_50],
@@ -336,12 +333,12 @@ export function ModerationScreenInner({
         </Link>
         <Divider />
         <Link
-          label={_(msg`Manage verification settings`)}
+          label={l`Manage verification settings`}
           testID="verificationSettingsBtn"
           to="/moderation/verification-settings">
           {state => (
             <SubItem
-              title={_(msg`Verification settings`)}
+              title={l`Verification settings`}
               icon={CircleCheck}
               style={[
                 (state.hovered || state.pressed) && [t.atoms.bg_contrast_50],
@@ -350,7 +347,6 @@ export function ModerationScreenInner({
           )}
         </Link>
       </View>
-
       <Text
         style={[
           a.pt_2xl,
@@ -361,11 +357,9 @@ export function ModerationScreenInner({
         ]}>
         <Trans>Content filters</Trans>
       </Text>
-
       <AgeAssuranceAdmonition style={[a.pb_md]}>
         {aaCopy.notice}
       </AgeAssuranceAdmonition>
-
       <View style={[a.gap_md]}>
         <View
           style={[
@@ -389,7 +383,7 @@ export function ModerationScreenInner({
                   <Trans>Enable adult content</Trans>
                 </Text>
                 <Toggle.Item
-                  label={_(msg`Toggle to enable or disable adult content`)}
+                  label={l`Toggle to enable or disable adult content`}
                   disabled={adultContentUIDisabled}
                   name="adultContent"
                   value={adultContentEnabled}
@@ -412,7 +406,7 @@ export function ModerationScreenInner({
                     <Trans>
                       Adult content can only be enabled via the Web at{' '}
                       <InlineLinkText
-                        label={_(msg`The Bluesky web application`)}
+                        label={l`The Bluesky web application`}
                         to=""
                         onPress={evt => {
                           evt.preventDefault()
@@ -445,7 +439,6 @@ export function ModerationScreenInner({
           )}
         </View>
       </View>
-
       <Text
         style={[
           a.text_md,
@@ -456,7 +449,6 @@ export function ModerationScreenInner({
         ]}>
         <Trans>Advanced</Trans>
       </Text>
-
       {unavailableDids.length > 0 && (
         <Admonition.Outer type="tip" style={[a.mb_md]}>
           <Admonition.Row>
@@ -470,7 +462,7 @@ export function ModerationScreenInner({
             </Admonition.Content>
             <Admonition.Button
               color="primary_subtle"
-              label={_(msg`Remove unavailable moderation services`)}
+              label={l`Remove unavailable moderation services`}
               onPress={handleCleanup}
               disabled={isRemovingLabelers}>
               <ButtonText>
@@ -481,7 +473,6 @@ export function ModerationScreenInner({
           </Admonition.Row>
         </Admonition.Outer>
       )}
-
       {isLabelersLoading ? (
         <View style={[a.w_full, a.align_center, a.p_lg]}>
           <Loader size="xl" />
diff --git a/src/screens/ModerationInteractionSettings/index.tsx b/src/screens/ModerationInteractionSettings/index.tsx
index 261e6b55ae..8328e367e2 100644
--- a/src/screens/ModerationInteractionSettings/index.tsx
+++ b/src/screens/ModerationInteractionSettings/index.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import deepEqual from 'fast-deep-equal'
 
@@ -60,7 +59,7 @@ export function Screen() {
 }
 
 function Inner({preferences}: {preferences: UsePreferencesQueryResponse}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {mutateAsync: setPostInteractionSettings, isPending} =
     usePostInteractionSettingsMutation()
   const [error, setError] = useState<string | undefined>(undefined)
@@ -100,15 +99,15 @@ function Inner({preferences}: {preferences: UsePreferencesQueryResponse}) {
           threadgateAllowUISettingToAllowRecordValue(maybeEditedAllowUI),
         postgateEmbeddingRules: maybeEditedPostgate.embeddingRules ?? [],
       })
-      Toast.show(_(msg({message: 'Settings saved', context: 'toast'})))
+      Toast.show(l({message: 'Settings saved', context: 'toast'}))
     } catch (e: any) {
       logger.error(`Failed to save post interaction settings`, {
         source: 'ModerationInteractionSettingsScreen',
         safeMessage: e.message,
       })
-      setError(_(msg`Failed to save settings. Please try again.`))
+      setError(l`Failed to save settings. Please try again.`)
     }
-  }, [_, maybeEditedPostgate, maybeEditedAllowUI, setPostInteractionSettings])
+  }, [l, maybeEditedPostgate, maybeEditedAllowUI, setPostInteractionSettings])
 
   return (
     <>
diff --git a/src/screens/Notifications/ActivityList.tsx b/src/screens/Notifications/ActivityList.tsx
index 9ff5db505c..8566271f25 100644
--- a/src/screens/Notifications/ActivityList.tsx
+++ b/src/screens/Notifications/ActivityList.tsx
@@ -1,5 +1,4 @@
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
 
@@ -20,7 +19,7 @@ export function NotificationsActivityListScreen({
   },
 }: Props) {
   const uris = decodeURIComponent(posts)
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <Layout.Screen testID="NotificationsActivityListScreen">
@@ -40,7 +39,7 @@ export function NotificationsActivityListScreen({
           <EmptyState
             icon={EditIcon}
             iconSize="2xl"
-            message={_(msg`No posts here`)}
+            message={l`No posts here`}
           />
         )}
         renderEndOfFeed={() => <ListFooter />}
diff --git a/src/screens/Onboarding/Layout.tsx b/src/screens/Onboarding/Layout.tsx
index 240346b660..7dc50dad5c 100644
--- a/src/screens/Onboarding/Layout.tsx
+++ b/src/screens/Onboarding/Layout.tsx
@@ -1,8 +1,7 @@
 import {useEffect, useRef, useState} from 'react'
 import {ScrollView, View} from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useOnboardingDispatch} from '#/state/shell'
@@ -29,7 +28,7 @@ export const OnboardingControls = createPortalGroup()
 export const OnboardingHeaderSlot = createPortalGroup()
 
 export function Layout({children}: React.PropsWithChildren<{}>) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const insets = useSafeAreaInsets()
   const {gtMobile} = useBreakpoints()
@@ -45,7 +44,7 @@ export function Layout({children}: React.PropsWithChildren<{}>) {
     }
   }, [state])
 
-  const dialogLabel = _(msg`Set up your account`)
+  const dialogLabel = l`Set up your account`
 
   const [headerHeight, setHeaderHeight] = useState(0)
   const [footerHeight, setFooterHeight] = useState(0)
@@ -57,7 +56,7 @@ export function Layout({children}: React.PropsWithChildren<{}>) {
       aria-role="dialog"
       aria-label={dialogLabel}
       accessibilityLabel={dialogLabel}
-      accessibilityHint={_(msg`Customizes your Bluesky experience`)}
+      accessibilityHint={l`Customizes your Bluesky experience`}
       style={[IS_WEB ? a.fixed : a.absolute, a.inset_0, a.flex_1, t.atoms.bg]}>
       {!gtMobile ? (
         <View
@@ -94,7 +93,7 @@ export function Layout({children}: React.PropsWithChildren<{}>) {
                   variant="ghost"
                   shape="round"
                   size="small"
-                  label={_(msg`Go back to previous step`)}
+                  label={l`Go back to previous step`}
                   onPress={() => dispatch({type: 'prev'})}>
                   <ButtonIcon icon={ArrowLeft} size="lg" />
                 </Button>
@@ -141,7 +140,6 @@ export function Layout({children}: React.PropsWithChildren<{}>) {
           )}
         </>
       )}
-
       <ScrollView
         ref={scrollview}
         style={[a.h_full, a.w_full]}
@@ -163,7 +161,6 @@ export function Layout({children}: React.PropsWithChildren<{}>) {
           </View>
         </View>
       </ScrollView>
-
       <View
         onLayout={evt => setFooterHeight(evt.nativeEvent.layout.height)}
         style={[
@@ -195,7 +192,7 @@ export function Layout({children}: React.PropsWithChildren<{}>) {
                 variant="ghost"
                 shape="square"
                 size="small"
-                label={_(msg`Go back to previous step`)}
+                label={l`Go back to previous step`}
                 onPress={() => dispatch({type: 'prev'})}>
                 <ButtonIcon icon={ArrowLeft} size="lg" />
               </Button>
diff --git a/src/screens/Onboarding/StepFindContactsIntro/index.tsx b/src/screens/Onboarding/StepFindContactsIntro/index.tsx
index bc6f309b7b..b66f244dc9 100644
--- a/src/screens/Onboarding/StepFindContactsIntro/index.tsx
+++ b/src/screens/Onboarding/StepFindContactsIntro/index.tsx
@@ -1,7 +1,6 @@
 import {View} from 'react-native'
 import * as Contacts from 'expo-contacts'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useQuery} from '@tanstack/react-query'
 
@@ -23,7 +22,7 @@ import {useOnboardingInternalState} from '../state'
 
 export function StepFindContactsIntro() {
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {dispatch} = useOnboardingInternalState()
 
   useCallOnce(() => {
@@ -49,12 +48,10 @@ export function StepFindContactsIntro() {
           control what happens next.{' '}
           <InlineLinkText
             to={urls.website.blog.findFriendsAnnouncement}
-            label={_(
-              msg({
-                message: `Learn more about importing contacts`,
-                context: `english-only-resource`,
-              }),
-            )}
+            label={l({
+              message: `Learn more about importing contacts`,
+              context: `english-only-resource`,
+            })}
             style={[a.text_md, a.leading_snug]}>
             <Trans context="english-only-resource">Learn more</Trans>
           </InlineLinkText>
@@ -68,12 +65,11 @@ export function StepFindContactsIntro() {
           </Trans>
         </Admonition>
       )}
-
       <OnboardingControls.Portal>
         <View style={[a.gap_md]}>
           <Button
             onPress={() => dispatch({type: 'next'})}
-            label={_(msg`Import contacts`)}
+            label={l`Import contacts`}
             size="large"
             color="primary"
             disabled={!isAvailable}>
@@ -83,7 +79,7 @@ export function StepFindContactsIntro() {
           </Button>
           <Button
             onPress={() => dispatch({type: 'skip-contacts'})}
-            label={_(msg`Skip`)}
+            label={l`Skip`}
             size="large"
             color="secondary">
             <ButtonText>
diff --git a/src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx b/src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx
index 5b0da24ccf..78ecdb35d8 100644
--- a/src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx
+++ b/src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {atoms as a, useTheme} from '#/alf'
 
@@ -15,35 +14,23 @@ export type ValuePropositionPagerProps = {
 }
 
 export function useValuePropText(step: 0 | 1 | 2) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return [
     {
-      title: _(msg`Free your feed`),
-      description: _(
-        msg`No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you.`,
-      ),
-      alt: _(
-        msg`A collection of popular feeds you can find on Bluesky, including News, Booksky, Game Dev, Blacksky, and Fountain Pens`,
-      ),
+      title: l`Free your feed`,
+      description: l`No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you.`,
+      alt: l`A collection of popular feeds you can find on Bluesky, including News, Booksky, Game Dev, Blacksky, and Fountain Pens`,
     },
     {
-      title: _(msg`Find your people`),
-      description: _(
-        msg`Ditch the trolls and clickbait. Find real people and conversations that matter to you.`,
-      ),
-      alt: _(
-        msg`Your profile picture surrounded by concentric circles of other users' profile pictures`,
-      ),
+      title: l`Find your people`,
+      description: l`Ditch the trolls and clickbait. Find real people and conversations that matter to you.`,
+      alt: l`Your profile picture surrounded by concentric circles of other users' profile pictures`,
     },
     {
-      title: _(msg`Forget the noise`),
-      description: _(
-        msg`No ads, no invasive tracking, no engagement traps. Bluesky respects your time and attention.`,
-      ),
-      alt: _(
-        msg`An illustration of several Bluesky posts alongside repost, like, and comment icons`,
-      ),
+      title: l`Forget the noise`,
+      description: l`No ads, no invasive tracking, no engagement traps. Bluesky respects your time and attention.`,
+      alt: l`An illustration of several Bluesky posts alongside repost, like, and comment icons`,
     },
   ][step]
 }
diff --git a/src/screens/Onboarding/StepFinished/ValuePropositionPager.tsx b/src/screens/Onboarding/StepFinished/ValuePropositionPager.tsx
index f617c01888..df01503651 100644
--- a/src/screens/Onboarding/StepFinished/ValuePropositionPager.tsx
+++ b/src/screens/Onboarding/StepFinished/ValuePropositionPager.tsx
@@ -2,8 +2,7 @@ import {useRef, useState} from 'react'
 import {View} from 'react-native'
 import PagerView from 'react-native-pager-view'
 import {Image} from 'expo-image'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {atoms as a, tokens, useTheme} from '#/alf'
 import {Text} from '#/components/Typography'
@@ -65,7 +64,7 @@ function Page({
   image: string
   avatarUri?: string
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const {title, description, alt} = useValuePropText(page)
 
@@ -99,11 +98,10 @@ function Page({
             ]}
             accessibilityIgnoresInvertColors
             useAppleWebpCodec
-            alt={_(msg`Your profile picture`)}
+            alt={l`Your profile picture`}
           />
         )}
       </View>
-
       <View style={[a.mt_4xl, a.gap_2xl, a.px_xl, a.align_center]}>
         <View style={[a.flex_row, a.gap_sm]}>
           <Dot active={page === 0} />
diff --git a/src/screens/Onboarding/StepFinished/ValuePropositionPager.web.tsx b/src/screens/Onboarding/StepFinished/ValuePropositionPager.web.tsx
index ba71a5681f..1d07de2b1d 100644
--- a/src/screens/Onboarding/StepFinished/ValuePropositionPager.web.tsx
+++ b/src/screens/Onboarding/StepFinished/ValuePropositionPager.web.tsx
@@ -1,7 +1,6 @@
 import {View} from 'react-native'
 import {Image} from 'expo-image'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {atoms as a, useTheme} from '#/alf'
 import {Text} from '#/components/Typography'
@@ -17,7 +16,7 @@ export function ValuePropositionPager({
   avatarUri,
 }: ValuePropositionPagerProps) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const image = [PROP_1[t.name], PROP_2[t.name], PROP_3[t.name]][step]
 
@@ -51,11 +50,10 @@ export function ValuePropositionPager({
               },
             ]}
             accessibilityIgnoresInvertColors
-            alt={_(msg`Your profile picture`)}
+            alt={l`Your profile picture`}
           />
         )}
       </View>
-
       <View style={[a.mt_4xl, a.gap_2xl, a.align_center]}>
         <View style={[a.flex_row, a.gap_sm]}>
           <Dot active={step === 0} />
diff --git a/src/screens/Onboarding/StepFinished/index.tsx b/src/screens/Onboarding/StepFinished/index.tsx
index 11dfd35ceb..13b36d98f3 100644
--- a/src/screens/Onboarding/StepFinished/index.tsx
+++ b/src/screens/Onboarding/StepFinished/index.tsx
@@ -8,8 +8,7 @@ import {
   type Un$Typed,
 } from '@atproto/api'
 import {TID} from '@atproto/common-web'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -260,7 +259,7 @@ function ValueProposition({
   state: OnboardingState
 }) {
   const [subStep, setSubStep] = useState<0 | 1 | 2>(0)
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const {gtMobile} = useBreakpoints()
 
@@ -285,7 +284,7 @@ function ValueProposition({
             variant="ghost"
             color="secondary"
             size="small"
-            label={_(msg`Skip introduction and start using your account`)}
+            label={l`Skip introduction and start using your account`}
             onPress={() => {
               ax.metric('onboarding:valueProp:skipPressed', {})
               finishOnboarding()
@@ -297,13 +296,11 @@ function ValueProposition({
           </Button>
         </OnboardingHeaderSlot.Portal>
       )}
-
       <ValuePropositionPager
         step={subStep}
         setStep={ss => setSubStep(ss)}
         avatarUri={state.profileStepResults.imageUri}
       />
-
       <OnboardingControls.Portal>
         <View style={gtMobile && [a.gap_md, a.flex_row]}>
           {gtMobile && (IS_WEB ? subStep !== 2 : true) && (
@@ -311,7 +308,7 @@ function ValueProposition({
               disabled={saving}
               color="secondary"
               size="large"
-              label={_(msg`Skip introduction and start using your account`)}
+              label={l`Skip introduction and start using your account`}
               onPress={() => finishOnboarding()}>
               <ButtonText>
                 <Trans>Skip</Trans>
@@ -326,8 +323,8 @@ function ValueProposition({
             size="large"
             label={
               subStep === 2
-                ? _(msg`Complete onboarding and start using your account`)
-                : _(msg`Next`)
+                ? l`Complete onboarding and start using your account`
+                : l`Next`
             }
             onPress={onPress}>
             <ButtonText>
diff --git a/src/screens/Onboarding/StepInterests/index.tsx b/src/screens/Onboarding/StepInterests/index.tsx
index 2b9afa0630..8681cc30a6 100644
--- a/src/screens/Onboarding/StepInterests/index.tsx
+++ b/src/screens/Onboarding/StepInterests/index.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {interests, useInterestsDisplayNames} from '#/lib/interests'
@@ -22,7 +21,7 @@ import {Loader} from '#/components/Loader'
 import {useAnalytics} from '#/analytics'
 
 export function StepInterests() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const interestsDisplayNames = useInterestsDisplayNames()
 
@@ -61,12 +60,11 @@ export function StepInterests() {
       <OnboardingDescriptionText>
         <Trans>We'll use this to help customize your experience.</Trans>
       </OnboardingDescriptionText>
-
       <View style={[a.w_full, a.pt_lg]}>
         <Toggle.Group
           values={selectedInterests}
           onChange={setSelectedInterests}
-          label={_(msg`Select your interests from the options below`)}>
+          label={l`Select your interests from the options below`}>
           <View style={[a.flex_row, a.gap_md, a.flex_wrap]}>
             {interests.map(interest => (
               <Toggle.Item
@@ -79,7 +77,6 @@ export function StepInterests() {
           </View>
         </Toggle.Group>
       </View>
-
       <OnboardingControls.Portal>
         <Button
           disabled={saving}
@@ -87,7 +84,7 @@ export function StepInterests() {
           variant="solid"
           color="primary"
           size="large"
-          label={_(msg`Continue to next step`)}
+          label={l`Continue to next step`}
           onPress={saveInterests}>
           <ButtonText>
             <Trans>Continue</Trans>
diff --git a/src/screens/Onboarding/StepSuggestedAccounts/index.tsx b/src/screens/Onboarding/StepSuggestedAccounts/index.tsx
index 514e892895..eefadb9201 100644
--- a/src/screens/Onboarding/StepSuggestedAccounts/index.tsx
+++ b/src/screens/Onboarding/StepSuggestedAccounts/index.tsx
@@ -1,8 +1,7 @@
 import {useCallback, useEffect, useMemo, useRef, useState} from 'react'
 import {View} from 'react-native'
 import {type ModerationOpts} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 import * as bcp47Match from 'bcp-47-match'
@@ -37,7 +36,7 @@ import type * as bsky from '#/types/bsky'
 import {bulkWriteFollows} from '../util'
 
 export function StepSuggestedAccounts() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const t = useTheme()
   const {gtMobile} = useBreakpoints()
@@ -129,7 +128,7 @@ export function StepSuggestedAccounts() {
       return followableDids
     },
     onSuccess: newlyFollowed => {
-      toast.show(_(msg`Followed all accounts!`), {type: 'success'})
+      toast.show(l`Followed all accounts!`, {type: 'success'})
       setFollowedUsers(followed => [...followed, ...newlyFollowed])
     },
     onError: e => {
@@ -139,10 +138,9 @@ export function StepSuggestedAccounts() {
           safeMessage: e,
         },
       )
-      toast.show(
-        _(msg`Failed to follow all suggested accounts, please try again`),
-        {type: 'error'},
-      )
+      toast.show(l`Failed to follow all suggested accounts, please try again`, {
+        type: 'error',
+      })
     },
   })
 
@@ -183,7 +181,6 @@ export function StepSuggestedAccounts() {
           Suggested for you
         </Trans>
       </OnboardingTitleText>
-
       <View
         style={[
           a.overflow_hidden,
@@ -197,12 +194,10 @@ export function StepSuggestedAccounts() {
         <TabBar
           selectedInterest={selectedInterest}
           onSelectInterest={setSelectedInterest}
-          defaultTabLabel={_(
-            msg({
-              message: 'All',
-              comment: 'the default tab in the interests tab bar',
-            }),
-          )}
+          defaultTabLabel={l({
+            message: 'All',
+            comment: 'the default tab in the interests tab bar',
+          })}
           selectedInterests={state.interestsStepResults.selectedInterests}
         />
 
@@ -257,7 +252,6 @@ export function StepSuggestedAccounts() {
           </View>
         )}
       </View>
-
       <OnboardingControls.Portal>
         {isError ? (
           <View style={[a.gap_md, gtMobile ? a.flex_row : a.flex_col]}>
@@ -265,7 +259,7 @@ export function StepSuggestedAccounts() {
               disabled={isRefetching}
               color="secondary"
               size="large"
-              label={_(msg`Retry`)}
+              label={l`Retry`}
               onPress={() => void refetch()}>
               <ButtonText>
                 <Trans>Retry</Trans>
@@ -275,7 +269,7 @@ export function StepSuggestedAccounts() {
             <Button
               color="secondary"
               size="large"
-              label={_(msg`Skip to next step`)}
+              label={l`Skip to next step`}
               onPress={() => dispatch({type: 'next'})}>
               <ButtonText>
                 <Trans>Skip</Trans>
@@ -288,7 +282,7 @@ export function StepSuggestedAccounts() {
               disabled={!canFollowAll}
               color="secondary"
               size="large"
-              label={_(msg`Follow all accounts`)}
+              label={l`Follow all accounts`}
               onPress={() => followAll()}>
               <ButtonText>
                 <Trans>Follow all</Trans>
@@ -299,7 +293,7 @@ export function StepSuggestedAccounts() {
               disabled={isFollowingAll}
               color="primary"
               size="large"
-              label={_(msg`Continue to next step`)}
+              label={l`Continue to next step`}
               onPress={() => dispatch({type: 'next'})}>
               <ButtonText>
                 <Trans>Continue</Trans>
@@ -325,7 +319,7 @@ function TabBar({
   hideDefaultTab?: boolean
   defaultTabLabel?: string
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const interestsDisplayNames = useInterestsDisplayNames()
   const interests = Object.keys(interestsDisplayNames)
@@ -346,7 +340,7 @@ function TabBar({
         hideDefaultTab
           ? interestsDisplayNames
           : {
-              all: defaultTabLabel || _(msg`For You`),
+              all: defaultTabLabel || l`For You`,
               ...interestsDisplayNames,
             }
       }
diff --git a/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx b/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx
index b016af65db..d6b3d4d20f 100644
--- a/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx
+++ b/src/screens/Onboarding/StepSuggestedStarterpacks/StarterPackCard.tsx
@@ -1,8 +1,7 @@
 import {useState} from 'react'
 import {View} from 'react-native'
 import {type AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -31,7 +30,7 @@ export function StarterPackCard({
   view: AppBskyGraphDefs.StarterPackView
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const {currentAccount} = useSession()
   const {gtPhone} = useBreakpoints()
@@ -51,7 +50,7 @@ export function StarterPackCard({
       listItems = await getAllListMembers(agent, view.list.uri)
     } catch (e) {
       setIsProcessing(false)
-      Toast.show(_(msg`An error occurred while trying to follow all`), {
+      Toast.show(l`An error occurred while trying to follow all`, {
         type: 'error',
       })
       logger.error('Failed to get list members for starter pack', {
@@ -79,7 +78,7 @@ export function StarterPackCard({
       })
     } catch (e) {
       setIsProcessing(false)
-      Toast.show(_(msg`An error occurred while trying to follow all`), {
+      Toast.show(l`An error occurred while trying to follow all`, {
         type: 'error',
       })
       logger.error('Failed to follow all accounts', {safeMessage: e})
@@ -94,7 +93,7 @@ export function StarterPackCard({
         })
       }
     })
-    Toast.show(_(msg`All accounts have been followed!`), {type: 'success'})
+    Toast.show(l`All accounts have been followed!`, {type: 'success'})
     ax.metric('starterPack:followAll', {
       logContext: 'Onboarding',
       starterPack: view.uri,
@@ -132,7 +131,6 @@ export function StarterPackCard({
         numPending={profileCount}
         total={view.list?.listItemCount}
       />
-
       <View
         style={[
           a.w_full,
@@ -159,7 +157,7 @@ export function StarterPackCard({
           </Text>
         </View>
         <Button
-          label={_(msg`Follow all`)}
+          label={l`Follow all`}
           disabled={isProcessing || isFollowingAll}
           onPress={onFollowAll}
           color="secondary"
diff --git a/src/screens/Onboarding/StepSuggestedStarterpacks/index.tsx b/src/screens/Onboarding/StepSuggestedStarterpacks/index.tsx
index baf6fb942d..e526e50baf 100644
--- a/src/screens/Onboarding/StepSuggestedStarterpacks/index.tsx
+++ b/src/screens/Onboarding/StepSuggestedStarterpacks/index.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
@@ -19,7 +18,7 @@ import {Loader} from '#/components/Loader'
 import {StarterPackCard} from './StarterPackCard'
 
 export function StepSuggestedStarterpacks() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {gtMobile} = useBreakpoints()
   const moderationOpts = useModerationOpts()
 
@@ -44,7 +43,6 @@ export function StepSuggestedStarterpacks() {
           Find people to follow
         </Trans>
       </OnboardingTitleText>
-
       <View
         style={[
           a.overflow_hidden,
@@ -81,7 +79,6 @@ export function StepSuggestedStarterpacks() {
           </View>
         )}
       </View>
-
       <OnboardingControls.Portal>
         {isError ? (
           <View style={[a.gap_md, gtMobile ? a.flex_row : a.flex_col]}>
@@ -89,7 +86,7 @@ export function StepSuggestedStarterpacks() {
               disabled={isRefetching}
               color="secondary"
               size="large"
-              label={_(msg`Retry`)}
+              label={l`Retry`}
               onPress={() => refetch()}>
               <ButtonText>
                 <Trans>Retry</Trans>
@@ -99,7 +96,7 @@ export function StepSuggestedStarterpacks() {
             <Button
               color="secondary"
               size="large"
-              label={_(msg`Skip to next step`)}
+              label={l`Skip to next step`}
               onPress={() => dispatch({type: 'next'})}>
               <ButtonText>
                 <Trans>Skip</Trans>
@@ -111,7 +108,7 @@ export function StepSuggestedStarterpacks() {
             <Button
               color="primary"
               size="large"
-              label={_(msg`Continue to next step`)}
+              label={l`Continue to next step`}
               onPress={() => dispatch({type: 'next'})}>
               <ButtonText>
                 <Trans>Continue</Trans>
diff --git a/src/screens/PostThread/components/HeaderDropdown.tsx b/src/screens/PostThread/components/HeaderDropdown.tsx
index 4e856d52a4..9acf7b935a 100644
--- a/src/screens/PostThread/components/HeaderDropdown.tsx
+++ b/src/screens/PostThread/components/HeaderDropdown.tsx
@@ -1,5 +1,4 @@
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {HITSLOP_10} from '#/lib/constants'
@@ -19,13 +18,13 @@ export function HeaderDropdown({
   'sort' | 'setSort' | 'view' | 'setView'
 >): React.ReactNode {
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   return (
     <Menu.Root>
-      <Menu.Trigger label={_(msg`Thread options`)}>
+      <Menu.Trigger label={l`Thread options`}>
         {({props: {onPress, ...props}}) => (
           <Button
-            label={_(msg`Thread options`)}
+            label={l`Thread options`}
             size="small"
             variant="ghost"
             color="secondary"
@@ -46,7 +45,7 @@ export function HeaderDropdown({
         </Menu.LabelText>
         <Menu.Group>
           <Menu.Item
-            label={_(msg`Linear`)}
+            label={l`Linear`}
             onPress={() => {
               setView('linear')
             }}>
@@ -56,7 +55,7 @@ export function HeaderDropdown({
             <Menu.ItemRadio selected={view === 'linear'} />
           </Menu.Item>
           <Menu.Item
-            label={_(msg`Threaded`)}
+            label={l`Threaded`}
             onPress={() => {
               setView('tree')
             }}>
@@ -72,7 +71,7 @@ export function HeaderDropdown({
         </Menu.LabelText>
         <Menu.Group>
           <Menu.Item
-            label={_(msg`Top replies first`)}
+            label={l`Top replies first`}
             onPress={() => {
               setSort('top')
             }}>
@@ -82,7 +81,7 @@ export function HeaderDropdown({
             <Menu.ItemRadio selected={sort === 'top'} />
           </Menu.Item>
           <Menu.Item
-            label={_(msg`Oldest replies first`)}
+            label={l`Oldest replies first`}
             onPress={() => {
               setSort('oldest')
             }}>
@@ -92,7 +91,7 @@ export function HeaderDropdown({
             <Menu.ItemRadio selected={sort === 'oldest'} />
           </Menu.Item>
           <Menu.Item
-            label={_(msg`Newest replies first`)}
+            label={l`Newest replies first`}
             onPress={() => {
               setSort('newest')
             }}>
diff --git a/src/screens/PostThread/components/ThreadComposePrompt.tsx b/src/screens/PostThread/components/ThreadComposePrompt.tsx
index 11e76e4e42..c5a389d497 100644
--- a/src/screens/PostThread/components/ThreadComposePrompt.tsx
+++ b/src/screens/PostThread/components/ThreadComposePrompt.tsx
@@ -1,7 +1,6 @@
 import {type StyleProp, View, type ViewStyle} from 'react-native'
 import {LinearGradient} from 'expo-linear-gradient'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {PressableScale} from '#/lib/custom-animations/PressableScale'
@@ -24,7 +23,7 @@ export function ThreadComposePrompt({
 }) {
   const {currentAccount} = useSession()
   const {data: profile} = useProfileQuery({did: currentAccount?.did})
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {gtMobile} = useBreakpoints()
   const t = useTheme()
   const playHaptic = useHaptics()
@@ -60,8 +59,8 @@ export function ThreadComposePrompt({
       )}
       <PressableScale
         accessibilityRole="button"
-        accessibilityLabel={_(msg`Compose reply`)}
-        accessibilityHint={_(msg`Opens composer`)}
+        accessibilityLabel={l`Compose reply`}
+        accessibilityHint={l`Opens composer`}
         onPress={() => {
           onPressCompose()
           playHaptic('Light')
diff --git a/src/screens/PostThread/components/ThreadError.tsx b/src/screens/PostThread/components/ThreadError.tsx
index 6a68c65ad9..3f2fc80dd3 100644
--- a/src/screens/PostThread/components/ThreadError.tsx
+++ b/src/screens/PostThread/components/ThreadError.tsx
@@ -1,7 +1,6 @@
 import {useMemo} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useCleanError} from '#/lib/hooks/useCleanError'
@@ -20,22 +19,22 @@ export function ThreadError({
   onRetry: () => void
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const cleanError = useCleanError()
 
   const {title, message} = useMemo(() => {
-    let title = _(msg`Error loading post`)
-    let message = _(msg`Something went wrong. Please try again in a moment.`)
+    let title = l`Error loading post`
+    let message = l`Something went wrong. Please try again in a moment.`
 
     const {raw, clean} = cleanError(error)
 
     if (error.message.startsWith('Post not found')) {
-      title = _(msg`Post not found`)
+      title = l`Post not found`
       message = clean || raw || message
     }
 
     return {title, message}
-  }, [_, error, cleanError])
+  }, [l, error, cleanError])
 
   return (
     <Layout.Center>
@@ -78,7 +77,7 @@ export function ThreadError({
             </Text>
           </View>
           <Button
-            label={_(msg`Retry`)}
+            label={l`Retry`}
             size="small"
             variant="solid"
             color="secondary_inverted"
diff --git a/src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx b/src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx
index f7ea1c53fb..04d2d86aa0 100644
--- a/src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx
+++ b/src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useEffect, useMemo, useState} from 'react'
 import {type AppBskyActorDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
@@ -60,7 +59,7 @@ function PostThreadFollowBtnLoaded({
   profile: AppBskyActorDefs.ProfileViewDetailed
 }) {
   const navigation = useNavigation()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {gtMobile} = useBreakpoints()
   const profile = useProfileShadow(profileUnshadowed)
   const [queueFollow, queueUnfollow] = useProfileFollowMutationQueue(
@@ -114,7 +113,7 @@ function PostThreadFollowBtnLoaded({
         } catch (e: any) {
           if (e?.name !== 'AbortError') {
             logger.error('Failed to follow', {message: String(e)})
-            Toast.show(_(msg`There was an issue! ${e.toString()}`), {
+            Toast.show(l`There was an issue! ${e.toString()}`, {
               type: 'error',
             })
           }
@@ -127,21 +126,21 @@ function PostThreadFollowBtnLoaded({
         } catch (e: any) {
           if (e?.name !== 'AbortError') {
             logger.error('Failed to unfollow', {message: String(e)})
-            Toast.show(_(msg`There was an issue! ${e.toString()}`), {
+            Toast.show(l`There was an issue! ${e.toString()}`, {
               type: 'error',
             })
           }
         }
       })
     }
-  }, [isFollowing, requireAuth, queueFollow, _, queueUnfollow])
+  }, [isFollowing, requireAuth, queueFollow, l, queueUnfollow])
 
   if (!showFollowBtn) return null
 
   return (
     <Button
       testID="followBtn"
-      label={_(msg`Follow ${profile.handle}`)}
+      label={l`Follow ${profile.handle}`}
       onPress={onPress}
       size="small"
       color={isFollowing ? 'secondary' : 'secondary_inverted'}
diff --git a/src/screens/PostThread/components/ThreadItemPostTombstone.tsx b/src/screens/PostThread/components/ThreadItemPostTombstone.tsx
index 8494d1e338..6d85329582 100644
--- a/src/screens/PostThread/components/ThreadItemPostTombstone.tsx
+++ b/src/screens/PostThread/components/ThreadItemPostTombstone.tsx
@@ -1,7 +1,6 @@
 import {useMemo} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {LINEAR_AVI_WIDTH, OUTER_SPACE} from '#/screens/PostThread/const'
 import {atoms as a, useTheme} from '#/alf'
@@ -15,16 +14,16 @@ export type ThreadItemPostTombstoneProps = {
 
 export function ThreadItemPostTombstone({type}: ThreadItemPostTombstoneProps) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {copy, Icon} = useMemo(() => {
     switch (type) {
       case 'blocked':
-        return {copy: _(msg`Post blocked`), Icon: PersonXIcon}
+        return {copy: l`Post blocked`, Icon: PersonXIcon}
       case 'not-found':
       default:
-        return {copy: _(msg`Post not found`), Icon: TrashIcon}
+        return {copy: l`Post not found`, Icon: TrashIcon}
     }
-  }, [_, type])
+  }, [l, type])
 
   return (
     <View
diff --git a/src/screens/PostThread/components/ThreadItemReadMore.tsx b/src/screens/PostThread/components/ThreadItemReadMore.tsx
index 3125230669..c8a37d217d 100644
--- a/src/screens/PostThread/components/ThreadItemReadMore.tsx
+++ b/src/screens/PostThread/components/ThreadItemReadMore.tsx
@@ -1,7 +1,6 @@
 import {memo} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 
 import {
@@ -27,7 +26,7 @@ export const ThreadItemReadMore = memo(function ThreadItemReadMore({
   view: PostThreadParams['view']
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const isTreeView = view === 'tree'
   const indent = Math.max(0, item.depth - 1)
 
@@ -69,7 +68,7 @@ export const ThreadItemReadMore = memo(function ThreadItemReadMore({
         ]}
       />
       <Link
-        label={_(msg`Read more replies`)}
+        label={l`Read more replies`}
         to={item.href}
         style={[a.pt_sm, a.pb_md, a.gap_xs]}>
         {({hovered, pressed}) => {
diff --git a/src/screens/PostThread/components/ThreadItemReadMoreUp.tsx b/src/screens/PostThread/components/ThreadItemReadMoreUp.tsx
index 335ab9040a..347b1184c8 100644
--- a/src/screens/PostThread/components/ThreadItemReadMoreUp.tsx
+++ b/src/screens/PostThread/components/ThreadItemReadMoreUp.tsx
@@ -1,7 +1,6 @@
 import {memo} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {type ThreadItem} from '#/state/queries/usePostThread'
@@ -21,11 +20,11 @@ export const ThreadItemReadMoreUp = memo(function ThreadItemReadMoreUp({
   item: Extract<ThreadItem, {type: 'readMoreUp'}>
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <Link
-      label={_(msg`Continue thread`)}
+      label={l`Continue thread`}
       to={item.href}
       style={[
         a.gap_xs,
diff --git a/src/screens/PostThread/components/ThreadItemShowOtherReplies.tsx b/src/screens/PostThread/components/ThreadItemShowOtherReplies.tsx
index 2ea95dcdeb..22fa559b0a 100644
--- a/src/screens/PostThread/components/ThreadItemShowOtherReplies.tsx
+++ b/src/screens/PostThread/components/ThreadItemShowOtherReplies.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {atoms as a, useTheme} from '#/alf'
 import {Button} from '#/components/Button'
@@ -11,8 +10,8 @@ import {useAnalytics} from '#/analytics'
 export function ThreadItemShowOtherReplies({onPress}: {onPress: () => void}) {
   const t = useTheme()
   const ax = useAnalytics()
-  const {_} = useLingui()
-  const label = _(msg`Show more replies`)
+  const {t: l} = useLingui()
+  const label = l`Show more replies`
 
   return (
     <Button
diff --git a/src/screens/Profile/ErrorState.tsx b/src/screens/Profile/ErrorState.tsx
index 52d2a6d050..43ddb5cea3 100644
--- a/src/screens/Profile/ErrorState.tsx
+++ b/src/screens/Profile/ErrorState.tsx
@@ -1,7 +1,6 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
@@ -13,7 +12,7 @@ import {Text} from '#/components/Typography'
 
 export function ErrorState({error}: {error: string}) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const navigation = useNavigation<NavigationProp>()
 
   const onPressBack = useCallback(() => {
@@ -27,7 +26,6 @@ export function ErrorState({error}: {error: string}) {
   return (
     <View style={[a.px_xl]}>
       <CircleInfo width={48} style={[t.atoms.text_contrast_low]} />
-
       <Text style={[a.text_xl, a.font_semi_bold, a.pb_md, a.pt_xl]}>
         <Trans>Hmmmm, we couldn't load that moderation service.</Trans>
       </Text>
@@ -54,13 +52,12 @@ export function ErrorState({error}: {error: string}) {
         ]}>
         <Text style={[a.text_md, a.leading_normal]}>{error}</Text>
       </View>
-
       <View style={{flexDirection: 'row'}}>
         <Button
           size="small"
           color="secondary"
           variant="solid"
-          label={_(msg`Go Back`)}
+          label={l`Go Back`}
           accessibilityHint="Returns to previous page"
           onPress={onPressBack}>
           <ButtonText>
diff --git a/src/screens/Profile/Header/EditProfileDialog.tsx b/src/screens/Profile/Header/EditProfileDialog.tsx
index 1715328f54..712568b70f 100644
--- a/src/screens/Profile/Header/EditProfileDialog.tsx
+++ b/src/screens/Profile/Header/EditProfileDialog.tsx
@@ -1,8 +1,7 @@
 import {useCallback, useEffect, useState} from 'react'
 import {View} from 'react-native'
 import {type AppBskyActorDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 
 import {MAX_DESCRIPTION, MAX_DISPLAY_NAME, urls} from '#/lib/constants'
@@ -35,7 +34,7 @@ export function EditProfileDialog({
   control: Dialog.DialogControlProps
   onUpdate?: () => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const cancelControl = Dialog.useDialogControl()
   const [dirty, setDirty] = useState(false)
 
@@ -70,13 +69,12 @@ export function EditProfileDialog({
         setDirty={setDirty}
         onPressCancel={onPressCancel}
       />
-
       <Prompt.Basic
         control={cancelControl}
-        title={_(msg`Discard changes?`)}
-        description={_(msg`Are you sure you want to discard your changes?`)}
+        title={l`Discard changes?`}
+        description={l`Are you sure you want to discard your changes?`}
         onConfirm={() => control.close()}
-        confirmButtonCta={_(msg`Discard`)}
+        confirmButtonCta={l`Discard`}
         confirmButtonColor="negative"
       />
     </Dialog.Outer>
@@ -94,7 +92,7 @@ function DialogInner({
   setDirty: (dirty: boolean) => void
   onPressCancel: () => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const control = Dialog.useDialogContext()
   const verification = useSimpleVerificationState({
@@ -183,7 +181,7 @@ function DialogInner({
         newUserBanner,
       })
       control.close(() => onUpdate?.())
-      Toast.show(_(msg({message: 'Profile updated', context: 'toast'})))
+      Toast.show(l({message: 'Profile updated', context: 'toast'}))
     } catch (e: any) {
       logger.error('Failed to update user profile', {message: String(e)})
     }
@@ -197,7 +195,7 @@ function DialogInner({
     newUserAvatar,
     newUserBanner,
     setImageError,
-    _,
+    l,
   ])
 
   const displayNameTooLong = isOverMaxGraphemeCount({
@@ -212,7 +210,7 @@ function DialogInner({
   const cancelButton = useCallback(
     () => (
       <Button
-        label={_(msg`Cancel`)}
+        label={l`Cancel`}
         onPress={onPressCancel}
         size="small"
         color="primary"
@@ -224,13 +222,13 @@ function DialogInner({
         </ButtonText>
       </Button>
     ),
-    [onPressCancel, _],
+    [onPressCancel, l],
   )
 
   const saveButton = useCallback(
     () => (
       <Button
-        label={_(msg`Save`)}
+        label={l`Save`}
         onPress={onPressSave}
         disabled={
           !dirty ||
@@ -250,7 +248,7 @@ function DialogInner({
       </Button>
     ),
     [
-      _,
+      l,
       t,
       dirty,
       onPressSave,
@@ -262,7 +260,7 @@ function DialogInner({
 
   return (
     <Dialog.ScrollableInner
-      label={_(msg`Edit profile`)}
+      label={l`Edit profile`}
       style={[a.overflow_hidden]}
       contentContainerStyle={[a.px_0, a.pt_0]}
       header={
@@ -313,8 +311,8 @@ function DialogInner({
             <Dialog.Input
               defaultValue={displayName}
               onChangeText={setDisplayName}
-              label={_(msg`Display name`)}
-              placeholder={_(msg`e.g. Alice Lastname`)}
+              label={l`Display name`}
+              placeholder={l`e.g. Alice Lastname`}
               testID="editProfileDisplayNameInput"
             />
           </TextField.Root>
@@ -342,12 +340,10 @@ function DialogInner({
                 You are verified. You will lose your verification status if you
                 change your display name.{' '}
                 <InlineLinkText
-                  label={_(
-                    msg({
-                      message: `Learn more`,
-                      context: `english-only-resource`,
-                    }),
-                  )}
+                  label={l({
+                    message: `Learn more`,
+                    context: `english-only-resource`,
+                  })}
                   to={urls.website.blog.initialVerificationAnnouncement}>
                   <Trans context="english-only-resource">Learn more.</Trans>
                 </InlineLinkText>
@@ -364,8 +360,8 @@ function DialogInner({
               defaultValue={description}
               onChangeText={setDescription}
               multiline
-              label={_(msg`Description`)}
-              placeholder={_(msg`Tell us a bit about yourself`)}
+              label={l`Description`}
+              placeholder={l`Tell us a bit about yourself`}
               testID="editProfileDescriptionInput"
             />
           </TextField.Root>
diff --git a/src/screens/Profile/Header/Handle.tsx b/src/screens/Profile/Header/Handle.tsx
index f659b923cd..3657f70a05 100644
--- a/src/screens/Profile/Header/Handle.tsx
+++ b/src/screens/Profile/Header/Handle.tsx
@@ -1,7 +1,6 @@
 import {View} from 'react-native'
 import {type AppBskyActorDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {isInvalidHandle, sanitizeHandle} from '#/lib/strings/handles'
@@ -19,7 +18,7 @@ export function ProfileHeaderHandle({
   disableTaps?: boolean
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const invalidHandle = isInvalidHandle(profile.handle)
   const blockHide = profile.viewer?.blocking || profile.viewer?.blockedBy
   return (
@@ -55,7 +54,7 @@ export function ProfileHeaderHandle({
           }),
         ]}>
         {invalidHandle
-          ? _(msg`⚠Invalid Handle`)
+          ? l`⚠Invalid Handle`
           : sanitizeHandle(
               profile.handle,
               '@',
diff --git a/src/screens/Profile/Header/Metrics.tsx b/src/screens/Profile/Header/Metrics.tsx
index 45f09597bc..60a17f562a 100644
--- a/src/screens/Profile/Header/Metrics.tsx
+++ b/src/screens/Profile/Header/Metrics.tsx
@@ -1,7 +1,7 @@
 import {View} from 'react-native'
 import {type AppBskyActorDefs} from '@atproto/api'
-import {msg, plural} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {plural} from '@lingui/core/macro'
+import {useLingui} from '@lingui/react/macro'
 
 import {makeProfileLink} from '#/lib/routes/links'
 import {type Shadow} from '#/state/cache/types'
@@ -16,7 +16,7 @@ export function ProfileHeaderMetrics({
   profile: Shadow<AppBskyActorDefs.ProfileViewDetailed>
 }) {
   const t = useTheme()
-  const {_, i18n} = useLingui()
+  const {t: l, i18n} = useLingui()
   const following = formatCount(i18n, profile.followsCount || 0)
   const followers = formatCount(i18n, profile.followersCount || 0)
   const pluralizedFollowers = plural(profile.followersCount || 0, {
@@ -46,7 +46,7 @@ export function ProfileHeaderMetrics({
         testID="profileHeaderFollowsButton"
         style={[a.flex_row, t.atoms.text]}
         to={makeProfileLink(profile, 'follows')}
-        label={_(msg`${profile.followsCount || 0} following`)}>
+        label={l`${profile.followsCount || 0} following`}>
         <Text style={[a.font_semi_bold, a.text_md]}>{following} </Text>
         <Text style={[t.atoms.text_contrast_medium, a.text_md]}>
           {pluralizedFollowings}
diff --git a/src/screens/Profile/Header/ProfileHeaderLabeler.tsx b/src/screens/Profile/Header/ProfileHeaderLabeler.tsx
index 96e136da5c..cb5f83febf 100644
--- a/src/screens/Profile/Header/ProfileHeaderLabeler.tsx
+++ b/src/screens/Profile/Header/ProfileHeaderLabeler.tsx
@@ -7,8 +7,8 @@ import {
   type ModerationOpts,
   type RichText as RichTextAPI,
 } from '@atproto/api'
-import {msg, plural} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {plural} from '@lingui/core/macro'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -64,7 +64,7 @@ let ProfileHeaderLabeler = ({
     useProfileShadow(profileUnshadowed)
   const t = useTheme()
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount, hasSession} = useSession()
   const playHaptic = useHaptics()
   const isSelf = currentAccount?.did === profile.did
@@ -97,14 +97,12 @@ let ProfileHeaderLabeler = ({
       }
     } catch (e: any) {
       Toast.show(
-        _(
-          msg`There was an issue contacting the server, please check your internet connection and try again.`,
-        ),
+        l`There was an issue contacting the server, please check your internet connection and try again.`,
         {type: 'error'},
       )
       ax.logger.error(`Failed to toggle labeler like`, {message: e.message})
     }
-  }, [ax, labeler, playHaptic, likeUri, unlikeMod, likeMod, _])
+  }, [ax, labeler, playHaptic, likeUri, unlikeMod, likeMod, l])
 
   return (
     <ProfileHeaderShell
@@ -146,7 +144,7 @@ let ProfileHeaderLabeler = ({
                   size="small"
                   color="secondary"
                   shape="round"
-                  label={_(msg`Like this labeler`)}
+                  label={l`Like this labeler`}
                   disabled={!hasSession || isLikePending || isUnlikePending}
                   onPress={onToggleLiked}>
                   {likeUri ? (
@@ -165,12 +163,10 @@ let ProfileHeaderLabeler = ({
                       },
                     }}
                     size="tiny"
-                    label={_(
-                      msg`Liked by ${plural(likeCount, {
-                        one: '# user',
-                        other: '# users',
-                      })}`,
-                    )}>
+                    label={l`Liked by ${plural(likeCount, {
+                      one: '# user',
+                      other: '# users',
+                    })}`}>
                     {({hovered, focused, pressed}) => (
                       <Text
                         style={[
@@ -211,7 +207,7 @@ function CantSubscribePrompt({
 }: {
   control: DialogOuterProps['control']
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   return (
     <Prompt.Outer control={control}>
       <Prompt.Content>
@@ -224,7 +220,7 @@ function CantSubscribePrompt({
         </Prompt.DescriptionText>
       </Prompt.Content>
       <Prompt.Actions>
-        <Prompt.Action onPress={() => control.close()} cta={_(msg`OK`)} />
+        <Prompt.Action onPress={() => control.close()} cta={l`OK`} />
       </Prompt.Actions>
     </Prompt.Outer>
   )
@@ -240,7 +236,7 @@ export function HeaderLabelerButtons({
 }) {
   const t = useTheme()
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount, hasSession} = useSession()
   const requireAuth = useRequireAuth()
   const playHaptic = useHaptics()
@@ -291,7 +287,6 @@ export function HeaderLabelerButtons({
         !isMe &&
         !profile.viewer?.blockedBy &&
         !profile.viewer?.blocking && <MessageProfileButton profile={profile} />}
-
       {isMe ? (
         <>
           <Button
@@ -302,7 +297,7 @@ export function HeaderLabelerButtons({
               playHaptic('Light')
               editProfileControl.open()
             }}
-            label={_(msg`Edit profile`)}
+            label={l`Edit profile`}
             style={a.rounded_full}>
             <ButtonText>
               <Trans>Edit Profile</Trans>
@@ -318,8 +313,8 @@ export function HeaderLabelerButtons({
           testID="toggleSubscribeBtn"
           label={
             isSubscribed
-              ? _(msg`Unsubscribe from this labeler`)
-              : _(msg`Subscribe to this labeler`)
+              ? l`Unsubscribe from this labeler`
+              : l`Subscribe to this labeler`
           }
           onPress={onPressSubscribe}>
           {state => (
diff --git a/src/screens/Profile/Header/ProfileHeaderStandard.tsx b/src/screens/Profile/Header/ProfileHeaderStandard.tsx
index da01ded772..02ad2445f6 100644
--- a/src/screens/Profile/Header/ProfileHeaderStandard.tsx
+++ b/src/screens/Profile/Header/ProfileHeaderStandard.tsx
@@ -7,8 +7,7 @@ import {
   type ModerationOpts,
   type RichText as RichTextAPI,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useHaptics} from '#/lib/haptics'
@@ -66,7 +65,7 @@ let ProfileHeaderStandard = ({
   const profile =
     useProfileShadow<AppBskyActorDefs.ProfileViewDetailed>(profileUnshadowed)
   const {currentAccount} = useSession()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const moderation = useMemo(
     () => moderateProfile(profile, moderationOpts),
     [profile, moderationOpts],
@@ -84,12 +83,12 @@ let ProfileHeaderStandard = ({
   const unblockAccount = async () => {
     try {
       await queueUnblock()
-      Toast.show(_(msg({message: 'Account unblocked', context: 'toast'})))
+      Toast.show(l({message: 'Account unblocked', context: 'toast'}))
     } catch (err) {
       const e = err as Error
       if (e?.name !== 'AbortError') {
         logger.error('Failed to unblock account', {message: e})
-        Toast.show(_(msg`There was an issue! ${e.toString()}`), {type: 'error'})
+        Toast.show(l`There was an issue! ${e.toString()}`, {type: 'error'})
       }
     }
   }
@@ -179,20 +178,15 @@ let ProfileHeaderStandard = ({
 
         <Prompt.Basic
           control={unblockPromptControl}
-          title={_(msg`Unblock Account?`)}
-          description={_(
-            msg`The account will be able to interact with you after unblocking.`,
-          )}
+          title={l`Unblock Account?`}
+          description={l`The account will be able to interact with you after unblocking.`}
           onConfirm={() => {
             void unblockAccount()
           }}
-          confirmButtonCta={
-            profile.viewer?.blocking ? _(msg`Unblock`) : _(msg`Block`)
-          }
+          confirmButtonCta={profile.viewer?.blocking ? l`Unblock` : l`Block`}
           confirmButtonColor="negative"
         />
       </ProfileHeaderShell>
-
       <ProfileHeaderSuggestedFollows
         isExpanded={!hasSeenAllSuggestedFollows && showSuggestedFollows}
         actorDid={profile.did}
@@ -220,7 +214,7 @@ export function HeaderStandardButtons({
   onUnfollow?: () => void
   minimal?: boolean
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const {hasSession, currentAccount} = useSession()
   const playHaptic = useHaptics()
@@ -243,18 +237,16 @@ export function HeaderStandardButtons({
         await queueFollow()
         onFollow?.()
         Toast.show(
-          _(
-            msg`Following ${sanitizeDisplayName(
-              profile.displayName || profile.handle,
-              moderation.ui('displayName'),
-            )}`,
-          ),
+          l`Following ${sanitizeDisplayName(
+            profile.displayName || profile.handle,
+            moderation.ui('displayName'),
+          )}`,
         )
       } catch (err) {
         const e = err as Error
         if (e?.name !== 'AbortError') {
           logger.error('Failed to follow', {message: String(e)})
-          Toast.show(_(msg`There was an issue! ${e.toString()}`), {
+          Toast.show(l`There was an issue! ${e.toString()}`, {
             type: 'error',
           })
         }
@@ -269,19 +261,17 @@ export function HeaderStandardButtons({
         await queueUnfollow()
         onUnfollow?.()
         Toast.show(
-          _(
-            msg`No longer following ${sanitizeDisplayName(
-              profile.displayName || profile.handle,
-              moderation.ui('displayName'),
-            )}`,
-          ),
+          l`No longer following ${sanitizeDisplayName(
+            profile.displayName || profile.handle,
+            moderation.ui('displayName'),
+          )}`,
           {type: 'default'},
         )
       } catch (err) {
         const e = err as Error
         if (e?.name !== 'AbortError') {
           logger.error('Failed to unfollow', {message: String(e)})
-          Toast.show(_(msg`There was an issue! ${e.toString()}`), {
+          Toast.show(l`There was an issue! ${e.toString()}`, {
             type: 'error',
           })
         }
@@ -292,12 +282,12 @@ export function HeaderStandardButtons({
   const unblockAccount = async () => {
     try {
       await queueUnblock()
-      Toast.show(_(msg({message: 'Account unblocked', context: 'toast'})))
+      Toast.show(l({message: 'Account unblocked', context: 'toast'}))
     } catch (err) {
       const e = err as Error
       if (e?.name !== 'AbortError') {
         logger.error('Failed to unblock account', {message: e})
-        Toast.show(_(msg`There was an issue! ${e.toString()}`), {type: 'error'})
+        Toast.show(l`There was an issue! ${e.toString()}`, {type: 'error'})
       }
     }
   }
@@ -327,7 +317,7 @@ export function HeaderStandardButtons({
               playHaptic('Light')
               editProfileControl.open()
             }}
-            label={_(msg`Edit profile`)}>
+            label={l`Edit profile`}>
             <ButtonText>
               <Trans>Edit Profile</Trans>
             </ButtonText>
@@ -349,7 +339,7 @@ export function HeaderStandardButtons({
                 ax.metric('invite:dialog:open', {logContext: 'ProfileHeader'})
                 inviteFriendsControl.open()
               }}
-              label={_(msg`Invite friends`)}>
+              label={l`Invite friends`}>
               <ButtonIcon icon={ArrowShareRight} />
             </Button>
           )}
@@ -362,7 +352,7 @@ export function HeaderStandardButtons({
             testID="unblockBtn"
             size="small"
             color="secondary"
-            label={_(msg`Unblock`)}
+            label={l`Unblock`}
             disabled={!hasSession}
             onPress={() => unblockPromptControl.open()}>
             <ButtonText>
@@ -393,8 +383,8 @@ export function HeaderStandardButtons({
               color={profile.viewer?.following ? 'secondary' : 'primary'}
               label={
                 profile.viewer?.following
-                  ? _(msg`Unfollow ${profile.handle}`)
-                  : _(msg`Follow ${profile.handle}`)
+                  ? l`Unfollow ${profile.handle}`
+                  : l`Follow ${profile.handle}`
               }
               onPress={
                 profile.viewer?.following ? onPressUnfollow : onPressFollow
@@ -414,17 +404,14 @@ export function HeaderStandardButtons({
         </>
       ) : null}
       <ProfileMenu profile={profile} />
-
       <Prompt.Basic
         control={unblockPromptControl}
-        title={_(msg`Unblock Account?`)}
-        description={_(
-          msg`The account will be able to interact with you after unblocking.`,
-        )}
+        title={l`Unblock Account?`}
+        description={l`The account will be able to interact with you after unblocking.`}
         onConfirm={() => {
           void unblockAccount()
         }}
-        confirmButtonCta={_(msg`Unblock`)}
+        confirmButtonCta={l`Unblock`}
         confirmButtonColor="negative"
       />
     </>
diff --git a/src/screens/Profile/KnownFollowers.tsx b/src/screens/Profile/KnownFollowers.tsx
index 09c1034b07..679a1e4e2d 100644
--- a/src/screens/Profile/KnownFollowers.tsx
+++ b/src/screens/Profile/KnownFollowers.tsx
@@ -1,7 +1,6 @@
 import {useMemo, useState} from 'react'
 import {type AppBskyActorDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender'
 import {
@@ -43,7 +42,7 @@ type Props = NativeStackScreenProps<
   'ProfileKnownFollowers'
 >
 export const ProfileKnownFollowersScreen = ({route}: Props) => {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const initialNumToRender = useInitialNumToRender()
 
   const {name} = route.params
@@ -95,12 +94,12 @@ export const ProfileKnownFollowersScreen = ({route}: Props) => {
   if (followers.length < 1) {
     return (
       <Layout.Screen>
-        <ViewHeader title={_(msg`Followers you know`)} />
+        <ViewHeader title={l`Followers you know`} />
         <ListMaybePlaceholder
           isLoading={isDidLoading || isFollowersLoading}
           isError={isError}
           emptyType="results"
-          emptyMessage={_(msg`You don't follow any users who follow @${name}.`)}
+          emptyMessage={l`You don't follow any users who follow @${name}.`}
           errorMessage={cleanError(resolveError || error)}
           onRetry={isError ? refetch : undefined}
           topBorder={false}
@@ -112,7 +111,7 @@ export const ProfileKnownFollowersScreen = ({route}: Props) => {
 
   return (
     <Layout.Screen>
-      <ViewHeader title={_(msg`Followers you know`)} />
+      <ViewHeader title={l`Followers you know`} />
       <List
         data={followers}
         renderItem={renderItem}
diff --git a/src/screens/Profile/ProfileLabelerLikedBy.tsx b/src/screens/Profile/ProfileLabelerLikedBy.tsx
index 6203e5b80a..ab98716819 100644
--- a/src/screens/Profile/ProfileLabelerLikedBy.tsx
+++ b/src/screens/Profile/ProfileLabelerLikedBy.tsx
@@ -1,5 +1,4 @@
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {
   type CommonNavigatorParams,
@@ -15,11 +14,11 @@ export function ProfileLabelerLikedByScreen({
 }: NativeStackScreenProps<CommonNavigatorParams, 'ProfileLabelerLikedBy'>) {
   const {name: handleOrDid} = route.params
   const uri = makeRecordUri(handleOrDid, 'app.bsky.labeler.service', 'self')
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <Layout.Screen>
-      <ViewHeader title={_(msg`Liked By`)} />
+      <ViewHeader title={l`Liked By`} />
       <LikedByList uri={uri} />
     </Layout.Screen>
   )
diff --git a/src/screens/Profile/ProfileSearch.tsx b/src/screens/Profile/ProfileSearch.tsx
index 6e65f9b971..5f727dd19e 100644
--- a/src/screens/Profile/ProfileSearch.tsx
+++ b/src/screens/Profile/ProfileSearch.tsx
@@ -1,6 +1,5 @@
 import {useMemo} from 'react'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {
   type CommonNavigatorParams,
@@ -14,7 +13,7 @@ import {SearchScreenShell} from '#/screens/Search/Shell'
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'ProfileSearch'>
 export const ProfileSearchScreen = ({route}: Props) => {
   const {name, q: queryParam = ''} = route.params
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount} = useSession()
 
   const {data: resolvedDid} = useResolveDidQuery(name)
@@ -33,9 +32,9 @@ export const ProfileSearchScreen = ({route}: Props) => {
       inputPlaceholder={
         profile
           ? currentAccount?.did === profile.did
-            ? _(msg`Search my posts`)
-            : _(msg`Search @${profile.handle}'s posts`)
-          : _(msg`Search...`)
+            ? l`Search my posts`
+            : l`Search @${profile.handle}'s posts`
+          : l`Search...`
       }
       fixedParams={fixedParams}
       queryParam={queryParam}
diff --git a/src/screens/Profile/Sections/Feed.tsx b/src/screens/Profile/Sections/Feed.tsx
index c830963922..c7ee5ac11b 100644
--- a/src/screens/Profile/Sections/Feed.tsx
+++ b/src/screens/Profile/Sections/Feed.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useEffect, useImperativeHandle, useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -52,7 +51,7 @@ export function ProfileFeedSection({
   emptyStateIcon,
   postFeedRef,
 }: FeedSectionProps) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const queryClient = useQueryClient()
   const [hasNew, setHasNew] = useState(false)
   const [isScrolledDown, setIsScrolledDown] = useState(false)
@@ -81,12 +80,12 @@ export function ProfileFeedSection({
           style={{width: '100%'}}
           icon={emptyStateIcon || EditIcon}
           iconSize="3xl"
-          message={emptyStateMessage || _(msg`No posts yet`)}
+          message={emptyStateMessage || l`No posts yet`}
           button={emptyStateButton}
         />
       </View>
     )
-  }, [_, emptyStateButton, emptyStateIcon, emptyStateMessage])
+  }, [l, emptyStateButton, emptyStateIcon, emptyStateMessage])
 
   useEffect(() => {
     if (IS_IOS && isFocused && scrollElRef.current) {
@@ -118,7 +117,7 @@ export function ProfileFeedSection({
       {(isScrolledDown || hasNew) && (
         <LoadLatestBtn
           onPress={onScrollToTop}
-          label={_(msg`Load new posts`)}
+          label={l`Load new posts`}
           showIndicator={hasNew}
         />
       )}
diff --git a/src/screens/Profile/Sections/Labels.tsx b/src/screens/Profile/Sections/Labels.tsx
index 8c70d40392..62578466f3 100644
--- a/src/screens/Profile/Sections/Labels.tsx
+++ b/src/screens/Profile/Sections/Labels.tsx
@@ -6,8 +6,7 @@ import {
   interpretLabelValueDefinitions,
   type ModerationOpts,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {isLabelerSubscribed, lookupLabelValueDefinition} from '#/lib/moderation'
@@ -166,7 +165,7 @@ export function LabelerListHeader({
   isSubscribed: boolean
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   if (isLabelerLoading) {
     return (
@@ -182,7 +181,7 @@ export function LabelerListHeader({
         <ErrorState
           error={
             labelerError?.toString() ||
-            _(msg`Something went wrong, please try again.`)
+            l`Something went wrong, please try again.`
           }
         />
       </View>
diff --git a/src/screens/Profile/components/GermButton.tsx b/src/screens/Profile/components/GermButton.tsx
index e37e57edbf..052e3159bf 100644
--- a/src/screens/Profile/components/GermButton.tsx
+++ b/src/screens/Profile/components/GermButton.tsx
@@ -5,8 +5,7 @@ import {
   type AppBskyActorGetProfile,
   type AtpAgent,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
@@ -35,7 +34,7 @@ export function GermButton({
 }) {
   const t = useTheme()
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount} = useSession()
   const linkWarningControl = Dialog.useDialogControl()
 
@@ -72,7 +71,7 @@ export function GermButton({
             return false
           }
         }}
-        label={_(msg`Open Germ DM`)}
+        label={l`Open Germ DM`}
         overridePresentation={false}
         shouldProxy={false}
         style={[
@@ -117,7 +116,7 @@ function GermLogo({size}: {size: 'small' | 'large'}) {
 function GermSelfButton({did}: {did: string}) {
   const t = useTheme()
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const selfExplanationDialogControl = Dialog.useDialogControl()
   const agent = useAgent()
   const queryClient = useQueryClient()
@@ -157,15 +156,12 @@ function GermSelfButton({did}: {did: string}) {
           await whenAppViewReady(agent, did, res => !!res.data.associated?.germ)
           await queryClient.refetchQueries({queryKey: RQKEY(did)})
 
-          Toast.show(_(msg`Germ DM reconnected`))
+          Toast.show(l`Germ DM reconnected`)
           ax.metric('profile:associated:germ:self-reconnect', {})
         } catch (e: any) {
-          Toast.show(
-            _(msg`Failed to reconnect Germ DM. Error: ${e?.message}`),
-            {
-              type: 'error',
-            },
-          )
+          Toast.show(l`Failed to reconnect Germ DM. Error: ${e?.message}`, {
+            type: 'error',
+          })
           if (!isNetworkError(e)) {
             ax.logger.error('Failed to reconnect Germ DM link', {
               safeMessage: e,
@@ -183,7 +179,7 @@ function GermSelfButton({did}: {did: string}) {
               <Trans>Germ DM disconnected</Trans>
             </Toast.Text>
             {previousRecord && (
-              <Toast.Action label={_(msg`Undo`)} onPress={() => void undo()}>
+              <Toast.Action label={l`Undo`} onPress={() => void undo()}>
                 <Trans>Undo</Trans>
               </Toast.Action>
             )}
@@ -192,12 +188,9 @@ function GermSelfButton({did}: {did: string}) {
       })
     },
     onError: error => {
-      Toast.show(
-        _(msg`Failed to disconnect Germ DM. Error: ${error?.message}`),
-        {
-          type: 'error',
-        },
-      )
+      Toast.show(l`Failed to disconnect Germ DM. Error: ${error?.message}`, {
+        type: 'error',
+      })
       if (!isNetworkError(error)) {
         ax.logger.error('Failed to disconnect Germ DM link', {
           safeMessage: error,
@@ -209,7 +202,7 @@ function GermSelfButton({did}: {did: string}) {
   return (
     <>
       <Button
-        label={_(msg`Learn more about your Germ DM link`)}
+        label={l`Learn more about your Germ DM link`}
         onPress={() => {
           ax.metric('profile:associated:germ:click-self-info', {})
           selfExplanationDialogControl.open()
@@ -225,13 +218,12 @@ function GermSelfButton({did}: {did: string}) {
           <Trans>Germ DM</Trans>
         </Text>
       </Button>
-
       <Dialog.Outer
         control={selfExplanationDialogControl}
         nativeOptions={{preventExpansion: true}}>
         <Dialog.Handle />
         <Dialog.ScrollableInner
-          label={_(msg`Germ DM Link`)}
+          label={l`Germ DM Link`}
           style={web([{maxWidth: 400, borderRadius: 36}])}>
           <View style={[a.flex_row, a.align_center, {gap: 6}]}>
             <GermLogo size="large" />
@@ -250,7 +242,7 @@ function GermSelfButton({did}: {did: string}) {
           </Text>
           <View style={[a.mt_2xl, a.gap_md]}>
             <Button
-              label={_(msg`Got it`)}
+              label={l`Got it`}
               size="large"
               color="primary"
               onPress={() => selfExplanationDialogControl.close()}>
@@ -259,7 +251,7 @@ function GermSelfButton({did}: {did: string}) {
               </ButtonText>
             </Button>
             <Button
-              label={_(msg`Disconnect Germ DM`)}
+              label={l`Disconnect Germ DM`}
               size="large"
               color="secondary"
               onPress={() => deleteDeclaration()}
diff --git a/src/screens/ProfileList/AboutSection.tsx b/src/screens/ProfileList/AboutSection.tsx
index d7f6be5c33..0337d0f7b6 100644
--- a/src/screens/ProfileList/AboutSection.tsx
+++ b/src/screens/ProfileList/AboutSection.tsx
@@ -1,8 +1,7 @@
 import {useCallback, useImperativeHandle, useState} from 'react'
 import {View} from 'react-native'
 import {type AppBskyGraphDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useSession} from '#/state/session'
@@ -35,7 +34,7 @@ export function AboutSection({
   headerHeight,
   scrollElRef,
 }: AboutSectionProps) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount} = useSession()
   const {gtMobile} = useBreakpoints()
   const [isScrolledDown, setIsScrolledDown] = useState(false)
@@ -61,7 +60,7 @@ export function AboutSection({
         <View style={[a.px_sm, a.py_sm]}>
           <Button
             testID="addUserBtn"
-            label={_(msg`Add a user to this list`)}
+            label={l`Add a user to this list`}
             onPress={onPressAddUser}
             color="primary"
             size="small"
@@ -79,7 +78,7 @@ export function AboutSection({
       <View style={[a.px_lg, a.py_md, a.flex_row_reverse]}>
         <Button
           testID="addUserBtn"
-          label={_(msg`Add a user to this list`)}
+          label={l`Add a user to this list`}
           onPress={onPressAddUser}
           color="primary"
           size="small"
@@ -92,16 +91,16 @@ export function AboutSection({
         </Button>
       </View>
     )
-  }, [isOwner, _, onPressAddUser, gtMobile])
+  }, [isOwner, l, onPressAddUser, gtMobile])
 
   const renderEmptyState = useCallback(() => {
     return (
       <View style={[a.gap_xl, a.align_center]}>
-        <EmptyState icon={ListIcon} message={_(msg`This list is empty.`)} />
+        <EmptyState icon={ListIcon} message={l`This list is empty.`} />
         {isOwner && (
           <Button
             testID="emptyStateAddUserBtn"
-            label={_(msg`Start adding people`)}
+            label={l`Start adding people`}
             onPress={onPressAddUser}
             color="primary"
             size="small">
@@ -113,7 +112,7 @@ export function AboutSection({
         )}
       </View>
     )
-  }, [_, isOwner, onPressAddUser])
+  }, [l, isOwner, onPressAddUser])
 
   return (
     <View>
@@ -129,7 +128,7 @@ export function AboutSection({
       {isScrolledDown && (
         <LoadLatestBtn
           onPress={onScrollToTop}
-          label={_(msg`Scroll to top`)}
+          label={l`Scroll to top`}
           showIndicator={false}
         />
       )}
diff --git a/src/screens/ProfileList/FeedSection.tsx b/src/screens/ProfileList/FeedSection.tsx
index beb68e1bea..d933d1ec6e 100644
--- a/src/screens/ProfileList/FeedSection.tsx
+++ b/src/screens/ProfileList/FeedSection.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useEffect, useImperativeHandle, useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useIsFocused} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
@@ -48,7 +47,7 @@ export function FeedSection({
   const [hasNew, setHasNew] = useState(false)
   const [isScrolledDown, setIsScrolledDown] = useState(false)
   const isScreenFocused = useIsFocused()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const onScrollToTop = useCallback(() => {
     scrollElRef.current?.scrollToOffset({
@@ -75,11 +74,11 @@ export function FeedSection({
         <EmptyState
           icon={HashtagWideIcon}
           iconSize="2xl"
-          message={_(msg`This feed is empty.`)}
+          message={l`This feed is empty.`}
         />
         {isOwner && (
           <Button
-            label={_(msg`Start adding people`)}
+            label={l`Start adding people`}
             onPress={onPressAddUser}
             color="primary"
             size="small">
@@ -91,7 +90,7 @@ export function FeedSection({
         )}
       </View>
     )
-  }, [_, onPressAddUser, isOwner])
+  }, [l, onPressAddUser, isOwner])
 
   return (
     <View>
@@ -110,7 +109,7 @@ export function FeedSection({
       {(isScrolledDown || hasNew) && (
         <LoadLatestBtn
           onPress={onScrollToTop}
-          label={_(msg`Load new posts`)}
+          label={l`Load new posts`}
           showIndicator={hasNew}
         />
       )}
diff --git a/src/screens/ProfileList/components/ErrorScreen.tsx b/src/screens/ProfileList/components/ErrorScreen.tsx
index 0ccecc4895..7bb7a92036 100644
--- a/src/screens/ProfileList/components/ErrorScreen.tsx
+++ b/src/screens/ProfileList/components/ErrorScreen.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
@@ -12,7 +11,7 @@ import {Text} from '#/components/Typography'
 export function ErrorScreen({error}: {error: React.ReactNode}) {
   const t = useTheme()
   const navigation = useNavigation<NavigationProp>()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const onPressBack = () => {
     if (navigation.canGoBack()) {
       navigation.goBack()
@@ -29,11 +28,10 @@ export function ErrorScreen({error}: {error: React.ReactNode}) {
       <Text style={[a.text_md, t.atoms.text_contrast_high, a.leading_snug]}>
         {error}
       </Text>
-
       <View style={[a.flex_row, a.mt_lg]}>
         <Button
-          label={_(msg`Go back`)}
-          accessibilityHint={_(msg`Returns to previous page`)}
+          label={l`Go back`}
+          accessibilityHint={l`Returns to previous page`}
           onPress={onPressBack}
           size="small"
           color="secondary">
diff --git a/src/screens/ProfileList/components/Header.tsx b/src/screens/ProfileList/components/Header.tsx
index 9d6c4f3ff7..8918eb5a2b 100644
--- a/src/screens/ProfileList/components/Header.tsx
+++ b/src/screens/ProfileList/components/Header.tsx
@@ -1,8 +1,7 @@
 import {useMemo} from 'react'
 import {View} from 'react-native'
 import {AppBskyGraphDefs, RichText as RichTextAPI} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useHaptics} from '#/lib/haptics'
@@ -35,7 +34,7 @@ export function Header({
   list: AppBskyGraphDefs.ListView
   preferences: UsePreferencesQueryResponse
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const {currentAccount} = useSession()
   const isCurateList = list.purpose === AppBskyGraphDefs.CURATELIST
@@ -73,9 +72,7 @@ export function Header({
           },
         ])
         Toast.show(
-          pinned
-            ? _(msg`Pinned to your feeds`)
-            : _(msg`Unpinned from your feeds`),
+          pinned ? l`Pinned to your feeds` : l`Unpinned from your feeds`,
         )
       } else {
         await addSavedFeeds([
@@ -85,10 +82,10 @@ export function Header({
             pinned: true,
           },
         ])
-        Toast.show(_(msg`Saved to your feeds`))
+        Toast.show(l`Saved to your feeds`)
       }
     } catch (e) {
-      Toast.show(_(msg`There was an issue contacting the server`), {
+      Toast.show(l`There was an issue contacting the server`, {
         type: 'error',
       })
       logger.error('Failed to toggle pinned feed', {message: e})
@@ -98,13 +95,11 @@ export function Header({
   const onUnsubscribeMute = async () => {
     try {
       await muteList({uri: list.uri, mute: false})
-      Toast.show(_(msg({message: 'List unmuted', context: 'toast'})))
+      Toast.show(l({message: 'List unmuted', context: 'toast'}))
       ax.metric('moderation:unsubscribedFromList', {listType: 'mute'})
     } catch {
       Toast.show(
-        _(
-          msg`There was an issue. Please check your internet connection and try again.`,
-        ),
+        l`There was an issue. Please check your internet connection and try again.`,
       )
     }
   }
@@ -112,13 +107,11 @@ export function Header({
   const onUnsubscribeBlock = async () => {
     try {
       await blockList({uri: list.uri, block: false})
-      Toast.show(_(msg({message: 'List unblocked', context: 'toast'})))
+      Toast.show(l({message: 'List unblocked', context: 'toast'}))
       ax.metric('moderation:unsubscribedFromList', {listType: 'block'})
     } catch {
       Toast.show(
-        _(
-          msg`There was an issue. Please check your internet connection and try again.`,
-        ),
+        l`There was an issue. Please check your internet connection and try again.`,
       )
     }
   }
@@ -148,7 +141,7 @@ export function Header({
           <Button
             testID={isPinned ? 'unpinBtn' : 'pinBtn'}
             color={isPinned ? 'secondary' : 'primary_subtle'}
-            label={isPinned ? _(msg`Unpin`) : _(msg`Pin to home`)}
+            label={isPinned ? l`Unpin` : l`Pin to home`}
             onPress={onTogglePinned}
             disabled={isPending}
             size="small"
@@ -163,7 +156,7 @@ export function Header({
             <Button
               testID="unblockBtn"
               color="secondary"
-              label={_(msg`Unblock`)}
+              label={l`Unblock`}
               onPress={onUnsubscribeBlock}
               size="small"
               style={[a.rounded_full]}
@@ -177,7 +170,7 @@ export function Header({
             <Button
               testID="unmuteBtn"
               color="secondary"
-              label={_(msg`Unmute`)}
+              label={l`Unmute`}
               onPress={onUnsubscribeMute}
               size="small"
               style={[a.rounded_full]}
diff --git a/src/screens/ProfileList/components/MoreOptionsMenu.tsx b/src/screens/ProfileList/components/MoreOptionsMenu.tsx
index 8bc40682d1..982098998d 100644
--- a/src/screens/ProfileList/components/MoreOptionsMenu.tsx
+++ b/src/screens/ProfileList/components/MoreOptionsMenu.tsx
@@ -1,6 +1,5 @@
 import {type AppBskyActorDefs, AppBskyGraphDefs, AtUri} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
@@ -44,7 +43,7 @@ export function MoreOptionsMenu({
   list: AppBskyGraphDefs.ListView
   savedFeedConfig?: AppBskyActorDefs.SavedFeed
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const {currentAccount} = useSession()
   const editListDialogControl = useDialogControl()
@@ -74,9 +73,9 @@ export function MoreOptionsMenu({
     if (!savedFeedConfig) return
     try {
       await removeSavedFeed(savedFeedConfig)
-      Toast.show(_(msg`Removed from your feeds`))
+      Toast.show(l`Removed from your feeds`)
     } catch (e) {
-      Toast.show(_(msg`There was an issue contacting the server`), {
+      Toast.show(l`There was an issue contacting the server`, {
         type: 'error',
       })
       logger.error('Failed to remove pinned list', {message: e})
@@ -90,7 +89,7 @@ export function MoreOptionsMenu({
       await removeSavedFeed(savedFeedConfig)
     }
 
-    Toast.show(_(msg({message: 'List deleted', context: 'toast'})))
+    Toast.show(l({message: 'List deleted', context: 'toast'}))
     if (navigation.canGoBack()) {
       navigation.goBack()
     } else {
@@ -102,9 +101,9 @@ export function MoreOptionsMenu({
     try {
       if (!savedFeedConfig) return
       await removeSavedFeed(savedFeedConfig)
-      Toast.show(_(msg`Unpinned list`))
+      Toast.show(l`Unpinned list`)
     } catch {
-      Toast.show(_(msg`Failed to unpin list`), {
+      Toast.show(l`Failed to unpin list`, {
         type: 'error',
       })
     }
@@ -113,13 +112,11 @@ export function MoreOptionsMenu({
   const onUnsubscribeMute = async () => {
     try {
       await muteList({uri: list.uri, mute: false})
-      Toast.show(_(msg({message: 'List unmuted', context: 'toast'})))
+      Toast.show(l({message: 'List unmuted', context: 'toast'}))
       ax.metric('moderation:unsubscribedFromList', {listType: 'mute'})
     } catch {
       Toast.show(
-        _(
-          msg`There was an issue. Please check your internet connection and try again.`,
-        ),
+        l`There was an issue. Please check your internet connection and try again.`,
       )
     }
   }
@@ -127,13 +124,11 @@ export function MoreOptionsMenu({
   const onUnsubscribeBlock = async () => {
     try {
       await blockList({uri: list.uri, block: false})
-      Toast.show(_(msg({message: 'List unblocked', context: 'toast'})))
+      Toast.show(l({message: 'List unblocked', context: 'toast'}))
       ax.metric('moderation:unsubscribedFromList', {listType: 'block'})
     } catch {
       Toast.show(
-        _(
-          msg`There was an issue. Please check your internet connection and try again.`,
-        ),
+        l`There was an issue. Please check your internet connection and try again.`,
       )
     }
   }
@@ -141,7 +136,7 @@ export function MoreOptionsMenu({
   return (
     <>
       <Menu.Root>
-        <Menu.Trigger label={_(msg`More options`)}>
+        <Menu.Trigger label={l`More options`}>
           {({props}) => (
             <Button
               label={props.accessibilityLabel}
@@ -157,7 +152,7 @@ export function MoreOptionsMenu({
         <Menu.Outer showCancel>
           <Menu.Group>
             <Menu.Item
-              label={IS_WEB ? _(msg`Copy link to list`) : _(msg`Share via...`)}
+              label={IS_WEB ? l`Copy link to list` : l`Share via...`}
               onPress={onPressShare}>
               <Menu.ItemText>
                 {IS_WEB ? (
@@ -173,7 +168,7 @@ export function MoreOptionsMenu({
             </Menu.Item>
             {savedFeedConfig && (
               <Menu.Item
-                label={_(msg`Remove from my feeds`)}
+                label={l`Remove from my feeds`}
                 onPress={onRemoveFromSavedFeeds}>
                 <Menu.ItemText>
                   <Trans>Remove from my feeds</Trans>
@@ -188,7 +183,7 @@ export function MoreOptionsMenu({
           {isOwner ? (
             <Menu.Group>
               <Menu.Item
-                label={_(msg`Edit list details`)}
+                label={l`Edit list details`}
                 onPress={editListDialogControl.open}>
                 <Menu.ItemText>
                   <Trans>Edit list details</Trans>
@@ -196,7 +191,7 @@ export function MoreOptionsMenu({
                 <Menu.ItemIcon position="right" icon={PencilLineIcon} />
               </Menu.Item>
               <Menu.Item
-                label={_(msg`Delete list`)}
+                label={l`Delete list`}
                 onPress={deleteListPromptControl.open}>
                 <Menu.ItemText>
                   <Trans>Delete list</Trans>
@@ -207,7 +202,7 @@ export function MoreOptionsMenu({
           ) : (
             <Menu.Group>
               <Menu.Item
-                label={_(msg`Report list`)}
+                label={l`Report list`}
                 onPress={reportDialogControl.open}>
                 <Menu.ItemText>
                   <Trans>Report list</Trans>
@@ -222,7 +217,7 @@ export function MoreOptionsMenu({
               <Menu.Divider />
               <Menu.Group>
                 <Menu.Item
-                  label={_(msg`Unpin moderation list`)}
+                  label={l`Unpin moderation list`}
                   onPress={onUnpinModList}>
                   <Menu.ItemText>
                     <Trans>Unpin moderation list</Trans>
@@ -239,7 +234,7 @@ export function MoreOptionsMenu({
               <Menu.Group>
                 {isBlocking && (
                   <Menu.Item
-                    label={_(msg`Unblock list`)}
+                    label={l`Unblock list`}
                     onPress={onUnsubscribeBlock}>
                     <Menu.ItemText>
                       <Trans>Unblock list</Trans>
@@ -248,9 +243,7 @@ export function MoreOptionsMenu({
                   </Menu.Item>
                 )}
                 {isMuting && (
-                  <Menu.Item
-                    label={_(msg`Unmute list`)}
-                    onPress={onUnsubscribeMute}>
+                  <Menu.Item label={l`Unmute list`} onPress={onUnsubscribeMute}>
                     <Menu.ItemText>
                       <Trans>Unmute list</Trans>
                     </Menu.ItemText>
@@ -262,20 +255,15 @@ export function MoreOptionsMenu({
           )}
         </Menu.Outer>
       </Menu.Root>
-
       <CreateOrEditListDialog control={editListDialogControl} list={list} />
-
       <Prompt.Basic
         control={deleteListPromptControl}
-        title={_(msg`Delete this list?`)}
-        description={_(
-          msg`If you delete this list, you won't be able to recover it.`,
-        )}
+        title={l`Delete this list?`}
+        description={l`If you delete this list, you won't be able to recover it.`}
         onConfirm={onPressDelete}
-        confirmButtonCta={_(msg`Delete`)}
+        confirmButtonCta={l`Delete`}
         confirmButtonColor="negative"
       />
-
       <ReportDialog
         control={reportDialogControl}
         subject={{
diff --git a/src/screens/ProfileList/components/SubscribeMenu.tsx b/src/screens/ProfileList/components/SubscribeMenu.tsx
index af16e0de0b..fe9843d502 100644
--- a/src/screens/ProfileList/components/SubscribeMenu.tsx
+++ b/src/screens/ProfileList/components/SubscribeMenu.tsx
@@ -1,6 +1,5 @@
 import {type AppBskyGraphDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useListBlockMutation, useListMuteMutation} from '#/state/queries/list'
@@ -15,7 +14,7 @@ import * as Toast from '#/components/Toast'
 import {useAnalytics} from '#/analytics'
 
 export function SubscribeMenu({list}: {list: AppBskyGraphDefs.ListView}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const subscribeMutePromptControl = Prompt.usePromptControl()
   const subscribeBlockPromptControl = Prompt.usePromptControl()
@@ -30,13 +29,11 @@ export function SubscribeMenu({list}: {list: AppBskyGraphDefs.ListView}) {
   const onSubscribeMute = async () => {
     try {
       await muteList({uri: list.uri, mute: true})
-      Toast.show(_(msg({message: 'List muted', context: 'toast'})))
+      Toast.show(l({message: 'List muted', context: 'toast'}))
       ax.metric('moderation:subscribedToList', {listType: 'mute'})
     } catch {
       Toast.show(
-        _(
-          msg`There was an issue. Please check your internet connection and try again.`,
-        ),
+        l`There was an issue. Please check your internet connection and try again.`,
         {type: 'error'},
       )
     }
@@ -45,13 +42,11 @@ export function SubscribeMenu({list}: {list: AppBskyGraphDefs.ListView}) {
   const onSubscribeBlock = async () => {
     try {
       await blockList({uri: list.uri, block: true})
-      Toast.show(_(msg({message: 'List blocked', context: 'toast'})))
+      Toast.show(l({message: 'List blocked', context: 'toast'}))
       ax.metric('moderation:subscribedToList', {listType: 'block'})
     } catch {
       Toast.show(
-        _(
-          msg`There was an issue. Please check your internet connection and try again.`,
-        ),
+        l`There was an issue. Please check your internet connection and try again.`,
         {type: 'error'},
       )
     }
@@ -60,7 +55,7 @@ export function SubscribeMenu({list}: {list: AppBskyGraphDefs.ListView}) {
   return (
     <>
       <Menu.Root>
-        <Menu.Trigger label={_(msg`Subscribe to this list`)}>
+        <Menu.Trigger label={l`Subscribe to this list`}>
           {({props}) => (
             <Button
               label={props.accessibilityLabel}
@@ -80,7 +75,7 @@ export function SubscribeMenu({list}: {list: AppBskyGraphDefs.ListView}) {
         <Menu.Outer showCancel>
           <Menu.Group>
             <Menu.Item
-              label={_(msg`Mute accounts`)}
+              label={l`Mute accounts`}
               onPress={subscribeMutePromptControl.open}>
               <Menu.ItemText>
                 <Trans>Mute accounts</Trans>
@@ -88,7 +83,7 @@ export function SubscribeMenu({list}: {list: AppBskyGraphDefs.ListView}) {
               <Menu.ItemIcon position="right" icon={MuteIcon} />
             </Menu.Item>
             <Menu.Item
-              label={_(msg`Block accounts`)}
+              label={l`Block accounts`}
               onPress={subscribeBlockPromptControl.open}>
               <Menu.ItemText>
                 <Trans>Block accounts</Trans>
@@ -98,25 +93,19 @@ export function SubscribeMenu({list}: {list: AppBskyGraphDefs.ListView}) {
           </Menu.Group>
         </Menu.Outer>
       </Menu.Root>
-
       <Prompt.Basic
         control={subscribeMutePromptControl}
-        title={_(msg`Mute these accounts?`)}
-        description={_(
-          msg`Muting is private. Muted accounts can interact with you, but you will not see their posts or receive notifications from them.`,
-        )}
+        title={l`Mute these accounts?`}
+        description={l`Muting is private. Muted accounts can interact with you, but you will not see their posts or receive notifications from them.`}
         onConfirm={onSubscribeMute}
-        confirmButtonCta={_(msg`Mute list`)}
+        confirmButtonCta={l`Mute list`}
       />
-
       <Prompt.Basic
         control={subscribeBlockPromptControl}
-        title={_(msg`Block these accounts?`)}
-        description={_(
-          msg`Blocking is public. Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you.`,
-        )}
+        title={l`Block these accounts?`}
+        description={l`Blocking is public. Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you.`}
         onConfirm={onSubscribeBlock}
-        confirmButtonCta={_(msg`Block list`)}
+        confirmButtonCta={l`Block list`}
         confirmButtonColor="negative"
       />
     </>
diff --git a/src/screens/ProfileList/index.tsx b/src/screens/ProfileList/index.tsx
index 77af470cd5..e981848b5d 100644
--- a/src/screens/ProfileList/index.tsx
+++ b/src/screens/ProfileList/index.tsx
@@ -7,8 +7,7 @@ import {
   moderateUserList,
   type ModerationOpts,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useIsFocused} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
@@ -61,7 +60,7 @@ export function ProfileListScreen(props: Props) {
 }
 
 function ProfileListScreenInner(props: Props) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {name: handleOrDid, rkey} = props.route.params
   const {data: resolvedUri, error: resolveError} = useResolveUriQuery(
     AtUri.make(handleOrDid, 'app.bsky.graph.list', rkey).toString(),
@@ -84,9 +83,7 @@ function ProfileListScreenInner(props: Props) {
         </Layout.Header.Outer>
         <Layout.Content centerContent>
           <ErrorScreen
-            error={_(
-              msg`We're sorry, but we were unable to resolve this list. If this persists, please contact the list creator, @${handleOrDid}.`,
-            )}
+            error={l`We're sorry, but we were unable to resolve this list. If this persists, please contact the list creator, @${handleOrDid}.`}
           />
         </Layout.Content>
       </>
@@ -151,7 +148,7 @@ function ProfileListScreenLoaded({
   preferences: UsePreferencesQueryResponse
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const queryClient = useQueryClient()
   const {openComposer} = useOpenComposer()
   const {currentAccount} = useSession()
@@ -164,7 +161,7 @@ function ProfileListScreenLoaded({
   const isOwner = currentAccount?.did === list.creator.did
   const scrollElRef = useAnimatedRef()
   const addUserDialogControl = useDialogControl()
-  const sectionTitlesCurate = [_(msg`Posts`), _(msg`People`)]
+  const sectionTitlesCurate = [l`Posts`, l`People`]
   // modlist only
   const [headerHeight, setHeaderHeight] = useState<number | null>(null)
 
@@ -172,7 +169,7 @@ function ProfileListScreenLoaded({
     return moderateUserList(list, moderationOpts)
   }, [list, moderationOpts])
 
-  useSetTitle(isHidden ? _(msg`List Hidden`) : list.name)
+  useSetTitle(isHidden ? l`List Hidden` : list.name)
 
   const onChangeMembers = () => {
     if (isCurateList) {
@@ -234,7 +231,7 @@ function ProfileListScreenLoaded({
               onPress={() => openComposer({logContext: 'Fab'})}
               icon={<EditBigIcon size="lg" fill={t.palette.white} />}
               accessibilityRole="button"
-              accessibilityLabel={_(msg`New post`)}
+              accessibilityLabel={l`New post`}
               accessibilityHint=""
             />
           </View>
@@ -277,7 +274,7 @@ function ProfileListScreenLoaded({
             onPress={() => openComposer({logContext: 'Fab'})}
             icon={<EditBigIcon size="lg" fill={t.palette.white} />}
             accessibilityRole="button"
-            accessibilityLabel={_(msg`New post`)}
+            accessibilityLabel={l`New post`}
             accessibilityHint=""
           />
         </View>
diff --git a/src/screens/SavedFeeds.tsx b/src/screens/SavedFeeds.tsx
index db574318f3..4a3708f7d0 100644
--- a/src/screens/SavedFeeds.tsx
+++ b/src/screens/SavedFeeds.tsx
@@ -4,8 +4,7 @@ import type Animated from 'react-native-reanimated'
 import {useAnimatedRef, useScrollOffset} from 'react-native-reanimated'
 import {type AppBskyActorDefs} from '@atproto/api'
 import {TID} from '@atproto/common-web'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
@@ -63,7 +62,7 @@ function SavedFeedsInner({
   preferences: UsePreferencesQueryResponse
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {gtMobile} = useBreakpoints()
   const {mutateAsync: overwriteSavedFeeds, isPending: isOverwritePending} =
     useOverwriteSavedFeedsMutation()
@@ -89,14 +88,14 @@ function SavedFeedsInner({
   const onSaveChanges = async () => {
     try {
       await overwriteSavedFeeds(currentFeeds)
-      Toast.show(_(msg({message: 'Feeds updated!', context: 'toast'})))
+      Toast.show(l({message: 'Feeds updated!', context: 'toast'}))
       if (navigation.canGoBack()) {
         navigation.goBack()
       } else {
         navigation.navigate('Feeds')
       }
     } catch (e) {
-      Toast.show(_(msg`There was an issue contacting the server`), {
+      Toast.show(l`There was an issue contacting the server`, {
         type: 'error',
       })
       logger.error('Failed to toggle pinned feed', {message: e})
@@ -117,7 +116,7 @@ function SavedFeedsInner({
           size="small"
           color={hasUnsavedChanges ? 'primary' : 'secondary'}
           onPress={onSaveChanges}
-          label={_(msg`Save changes`)}
+          label={l`Save changes`}
           disabled={isOverwritePending || !hasUnsavedChanges}>
           <ButtonIcon icon={isOverwritePending ? Loader : SaveIcon} />
           <ButtonText>
@@ -125,7 +124,6 @@ function SavedFeedsInner({
           </ButtonText>
         </Button>
       </Layout.Header.Outer>
-
       <Layout.Content ref={scrollRef} scrollEnabled={!isDragging}>
         {noSavedFeedsOfAnyType && (
           <View style={[t.atoms.border_contrast_low, a.border_b]}>
@@ -229,7 +227,7 @@ function SavedFeedsInner({
               expertise.{' '}
               <InlineLinkText
                 to="https://github.com/bluesky-social/feed-generator"
-                label={_(msg`See this guide`)}
+                label={l`See this guide`}
                 disableMismatchWarning
                 style={[a.leading_snug]}>
                 See this guide
@@ -249,7 +247,7 @@ function SavedFeedsA11y({
   preferences: UsePreferencesQueryResponse
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {gtMobile} = useBreakpoints()
   const {mutateAsync: overwriteSavedFeeds, isPending: isOverwritePending} =
     useOverwriteSavedFeedsMutation()
@@ -268,14 +266,14 @@ function SavedFeedsA11y({
   const onSaveChanges = async () => {
     try {
       await overwriteSavedFeeds(currentFeeds)
-      Toast.show(_(msg({message: 'Feeds updated!', context: 'toast'})))
+      Toast.show(l({message: 'Feeds updated!', context: 'toast'}))
       if (navigation.canGoBack()) {
         navigation.goBack()
       } else {
         navigation.navigate('Feeds')
       }
     } catch (e) {
-      Toast.show(_(msg`There was an issue contacting the server`), {
+      Toast.show(l`There was an issue contacting the server`, {
         type: 'error',
       })
       logger.error('Failed to toggle pinned feed', {message: e})
@@ -308,7 +306,7 @@ function SavedFeedsA11y({
           size="small"
           color={hasUnsavedChanges ? 'primary' : 'secondary'}
           onPress={onSaveChanges}
-          label={_(msg`Save changes`)}
+          label={l`Save changes`}
           disabled={isOverwritePending || !hasUnsavedChanges}>
           <ButtonIcon icon={isOverwritePending ? Loader : SaveIcon} />
           <ButtonText>
@@ -316,7 +314,6 @@ function SavedFeedsA11y({
           </ButtonText>
         </Button>
       </Layout.Header.Outer>
-
       <Layout.Content>
         {noSavedFeedsOfAnyType && (
           <View style={[t.atoms.border_contrast_low, a.border_b]}>
@@ -400,7 +397,7 @@ function SavedFeedsA11y({
               expertise.{' '}
               <InlineLinkText
                 to="https://github.com/bluesky-social/feed-generator"
-                label={_(msg`See this guide`)}
+                label={l`See this guide`}
                 disableMismatchWarning
                 style={[a.leading_snug]}>
                 See this guide
@@ -435,7 +432,7 @@ function PinnedFeedItem({
   onMoveUp?: () => void
   onMoveDown?: () => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const playHaptic = useHaptics()
   const feedUri = feed.value
@@ -464,7 +461,7 @@ function PinnedFeedItem({
       <View style={[a.pr_sm, a.flex_row, a.align_center, a.gap_sm]}>
         <Button
           testID={`feed-${feed.type}-togglePin`}
-          label={_(msg`Unpin feed`)}
+          label={l`Unpin feed`}
           onPress={onTogglePinned}
           size="small"
           color="primary_subtle"
@@ -475,7 +472,7 @@ function PinnedFeedItem({
           <>
             <Button
               testID={`feed-${feed.type}-moveUp`}
-              label={_(msg`Move feed up`)}
+              label={l`Move feed up`}
               onPress={onMoveUp}
               disabled={index === 0}
               size="small"
@@ -485,7 +482,7 @@ function PinnedFeedItem({
             </Button>
             <Button
               testID={`feed-${feed.type}-moveDown`}
-              label={_(msg`Move feed down`)}
+              label={l`Move feed down`}
               onPress={onMoveDown}
               disabled={index === total! - 1}
               size="small"
@@ -513,7 +510,7 @@ function UnpinnedFeedItem({
     React.SetStateAction<AppBskyActorDefs.SavedFeed[]>
   >
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const playHaptic = useHaptics()
   const feedUri = feed.value
@@ -546,7 +543,7 @@ function UnpinnedFeedItem({
       <View style={[a.pr_lg, a.flex_row, a.align_center, a.gap_sm]}>
         <Button
           testID={`feed-${feedUri}-toggleSave`}
-          label={_(msg`Remove from my feeds`)}
+          label={l`Remove from my feeds`}
           onPress={onPressRemove}
           size="small"
           color="secondary"
@@ -556,7 +553,7 @@ function UnpinnedFeedItem({
         </Button>
         <Button
           testID={`feed-${feed.type}-togglePin`}
-          label={_(msg`Pin feed`)}
+          label={l`Pin feed`}
           onPress={onTogglePinned}
           size="small"
           color="secondary"
diff --git a/src/screens/Search/components/AdvancedSearchDialog/ClearableDateField.tsx b/src/screens/Search/components/AdvancedSearchDialog/ClearableDateField.tsx
index b4d07497e2..bb64f1555e 100644
--- a/src/screens/Search/components/AdvancedSearchDialog/ClearableDateField.tsx
+++ b/src/screens/Search/components/AdvancedSearchDialog/ClearableDateField.tsx
@@ -54,7 +54,6 @@ export function ClearableDateField({
         onChangeDate={() => {}}
         onConfirm={onConfirm}
       />
-
       {active && (
         /*
          * Nudged left of the browser's native date-picker icon, which (in
diff --git a/src/screens/Search/components/SearchProfileCard.tsx b/src/screens/Search/components/SearchProfileCard.tsx
index a5ca18ee13..e0834dad92 100644
--- a/src/screens/Search/components/SearchProfileCard.tsx
+++ b/src/screens/Search/components/SearchProfileCard.tsx
@@ -1,8 +1,7 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
 import {type ModerationOpts} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {makeProfileLink} from '#/lib/routes/links'
@@ -22,7 +21,7 @@ export function SearchProfileCard({
   onPress?: () => void
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const qc = useQueryClient()
 
   const onPress = useCallback(() => {
@@ -34,7 +33,7 @@ export function SearchProfileCard({
     <Link
       testID={`searchAutoCompleteResult-${profile.handle}`}
       to={makeProfileLink(profile)}
-      label={_(msg`View ${profile.handle}'s profile`)}
+      label={l`View ${profile.handle}'s profile`}
       onPress={onPress}>
       {({hovered, pressed}) => (
         <View
diff --git a/src/screens/Search/components/StarterPackCard.tsx b/src/screens/Search/components/StarterPackCard.tsx
index 9831746b42..23537d3761 100644
--- a/src/screens/Search/components/StarterPackCard.tsx
+++ b/src/screens/Search/components/StarterPackCard.tsx
@@ -5,8 +5,7 @@ import {
   AppBskyGraphStarterpack,
   moderateProfile,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {sanitizeHandle} from '#/lib/strings/handles'
@@ -32,7 +31,7 @@ export function StarterPackCard({
   onPress?: () => void
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount} = useSession()
   const {gtPhone} = useBreakpoints()
   const link = useStarterPackLink({view})
@@ -108,8 +107,8 @@ export function StarterPackCard({
                   ]}
                   numberOfLines={1}>
                   {view.creator?.did === currentAccount?.did
-                    ? _(msg`By you`)
-                    : _(msg`By ${sanitizeHandle(view.creator.handle, '@')}`)}
+                    ? l`By you`
+                    : l`By ${sanitizeHandle(view.creator.handle, '@')}`}
                 </Text>
               </View>
               <Link
diff --git a/src/screens/Search/modules/ExploreSuggestedAccounts.tsx b/src/screens/Search/modules/ExploreSuggestedAccounts.tsx
index c32d4eefd3..2ea491056b 100644
--- a/src/screens/Search/modules/ExploreSuggestedAccounts.tsx
+++ b/src/screens/Search/modules/ExploreSuggestedAccounts.tsx
@@ -1,8 +1,7 @@
 import {memo, useEffect} from 'react'
 import {View} from 'react-native'
 import {type AppBskyActorSearchActors, type ModerationOpts} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {type InfiniteData} from '@tanstack/react-query'
 
 import {popularInterests, useInterestsDisplayNames} from '#/lib/interests'
@@ -60,7 +59,7 @@ export function SuggestedAccountsTabBar({
   hideDefaultTab?: boolean
   defaultTabLabel?: string
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const interestsDisplayNames = useInterestsDisplayNames()
   const {data: preferences} = usePreferencesQuery()
@@ -83,7 +82,7 @@ export function SuggestedAccountsTabBar({
         hideDefaultTab
           ? interestsDisplayNames
           : {
-              all: defaultTabLabel || _(msg`For You`),
+              all: defaultTabLabel || l`For You`,
               ...interestsDisplayNames,
             }
       }
diff --git a/src/screens/Search/modules/ExploreTrendingVideos.tsx b/src/screens/Search/modules/ExploreTrendingVideos.tsx
index 6f173a7825..40cfd454db 100644
--- a/src/screens/Search/modules/ExploreTrendingVideos.tsx
+++ b/src/screens/Search/modules/ExploreTrendingVideos.tsx
@@ -1,8 +1,7 @@
 import {useMemo} from 'react'
 import {ScrollView, View} from 'react-native'
 import {AppBskyEmbedVideo, AtUri} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useFocusEffect} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
@@ -151,7 +150,7 @@ function VideoCards({
   data: Exclude<ReturnType<typeof usePostFeedQuery>['data'], undefined>
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const items = useMemo(() => {
     return data.pages
@@ -184,11 +183,10 @@ function VideoCards({
           />
         </View>
       ))}
-
       <View style={[{width: CARD_WIDTH * 2}]}>
         <Link
           to={href}
-          label={_(msg`View more`)}
+          label={l`View more`}
           style={[
             a.justify_center,
             a.align_center,
diff --git a/src/screens/Settings/AboutSettings.tsx b/src/screens/Settings/AboutSettings.tsx
index 0c227c7b44..07efca73fe 100644
--- a/src/screens/Settings/AboutSettings.tsx
+++ b/src/screens/Settings/AboutSettings.tsx
@@ -2,8 +2,7 @@ import {Platform} from 'react-native'
 import {setStringAsync} from 'expo-clipboard'
 import * as FileSystem from 'expo-file-system/legacy'
 import {Image} from 'expo-image'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
 import {useMutation} from '@tanstack/react-query'
@@ -33,7 +32,7 @@ import {OTAInfo} from './components/OTAInfo'
 
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'AboutSettings'>
 export function AboutSettingsScreen({}: Props) {
-  const {_, i18n} = useLingui()
+  const {t: l, i18n} = useLingui()
   const [devModeEnabled, setDevModeEnabled] = useDevMode()
   const [demoModeEnabled, setDemoModeEnabled] = useDemoMode()
   const sendErrorReportControl = Prompt.usePromptControl()
@@ -56,22 +55,20 @@ export function AboutSettingsScreen({}: Props) {
       onSuccess: sizeDiffBytes => {
         if (IS_ANDROID) {
           Toast.show(
-            _(
-              msg({
-                message: `Image cache cleared, freed ${i18n.number(
-                  Math.abs(sizeDiffBytes / 1024 / 1024),
-                  {
-                    notation: 'compact',
-                    style: 'unit',
-                    unit: 'megabyte',
-                  },
-                )}`,
-                comment: `Android-only toast message which includes amount of space freed using localized number formatting`,
-              }),
-            ),
+            l({
+              message: `Image cache cleared, freed ${i18n.number(
+                Math.abs(sizeDiffBytes / 1024 / 1024),
+                {
+                  notation: 'compact',
+                  style: 'unit',
+                  unit: 'megabyte',
+                },
+              )}`,
+              comment: `Android-only toast message which includes amount of space freed using localized number formatting`,
+            }),
           )
         } else {
-          Toast.show(_(msg`Image cache cleared`))
+          Toast.show(l`Image cache cleared`)
         }
       },
     })
@@ -91,7 +88,7 @@ export function AboutSettingsScreen({}: Props) {
         <SettingsList.Container>
           <SettingsList.LinkItem
             to="https://bsky.social/about/support/tos"
-            label={_(msg`Terms of Service`)}>
+            label={l`Terms of Service`}>
             <SettingsList.ItemIcon icon={NewspaperIcon} />
             <SettingsList.ItemText>
               <Trans>Terms of Service</Trans>
@@ -99,22 +96,20 @@ export function AboutSettingsScreen({}: Props) {
           </SettingsList.LinkItem>
           <SettingsList.LinkItem
             to="https://bsky.social/about/support/privacy-policy"
-            label={_(msg`Privacy Policy`)}>
+            label={l`Privacy Policy`}>
             <SettingsList.ItemIcon icon={NewspaperIcon} />
             <SettingsList.ItemText>
               <Trans>Privacy Policy</Trans>
             </SettingsList.ItemText>
           </SettingsList.LinkItem>
-          <SettingsList.LinkItem
-            to={STATUS_PAGE_URL}
-            label={_(msg`Status Page`)}>
+          <SettingsList.LinkItem to={STATUS_PAGE_URL} label={l`Status Page`}>
             <SettingsList.ItemIcon icon={GlobeIcon} />
             <SettingsList.ItemText>
               <Trans>Status Page</Trans>
             </SettingsList.ItemText>
           </SettingsList.LinkItem>
           <SettingsList.Divider />
-          <SettingsList.LinkItem to="/sys/log" label={_(msg`System log`)}>
+          <SettingsList.LinkItem to="/sys/log" label={l`System log`}>
             <SettingsList.ItemIcon icon={CodeLinesIcon} />
             <SettingsList.ItemText>
               <Trans>System log</Trans>
@@ -122,7 +117,7 @@ export function AboutSettingsScreen({}: Props) {
           </SettingsList.LinkItem>
           <SettingsList.PressableItem
             onPress={() => sendErrorReportControl.open()}
-            label={_(msg`Send error report`)}>
+            label={l`Send error report`}>
             <SettingsList.ItemIcon icon={BubblesIcon} />
             <SettingsList.ItemText>
               <Trans>Send error report</Trans>
@@ -131,7 +126,7 @@ export function AboutSettingsScreen({}: Props) {
           {IS_NATIVE && (
             <SettingsList.PressableItem
               onPress={() => onClearImageCache()}
-              label={_(msg`Clear image cache`)}
+              label={l`Clear image cache`}
               disabled={isClearingImageCache}>
               <SettingsList.ItemIcon icon={BroomSparkleIcon} />
               <SettingsList.ItemText>
@@ -141,32 +136,28 @@ export function AboutSettingsScreen({}: Props) {
             </SettingsList.PressableItem>
           )}
           <SettingsList.PressableItem
-            label={_(msg`Version ${env.APP_VERSION}`)}
-            accessibilityHint={_(msg`Copies build version to clipboard`)}
+            label={l`Version ${env.APP_VERSION}`}
+            accessibilityHint={l`Copies build version to clipboard`}
             onLongPress={() => {
               const newDevModeEnabled = !devModeEnabled
               setDevModeEnabled(newDevModeEnabled)
               Toast.show(
                 newDevModeEnabled
-                  ? _(
-                      msg({
-                        message: 'Developer mode enabled',
-                        context: 'toast',
-                      }),
-                    )
-                  : _(
-                      msg({
-                        message: 'Developer mode disabled',
-                        context: 'toast',
-                      }),
-                    ),
+                  ? l({
+                      message: 'Developer mode enabled',
+                      context: 'toast',
+                    })
+                  : l({
+                      message: 'Developer mode disabled',
+                      context: 'toast',
+                    }),
               )
             }}
             onPress={() => {
               setStringAsync(
                 `Build version: ${env.APP_VERSION}; Bundle info: ${env.APP_METADATA}; Bundle date: ${env.BUNDLE_DATE}; Platform: ${Platform.OS}; Platform version: ${Platform.Version}; Device ID: ${getDeviceId() ?? 'N/A'}`,
               )
-              Toast.show(_(msg`Copied build version to clipboard`))
+              Toast.show(l`Copied build version to clipboard`)
             }}>
             <SettingsList.ItemIcon icon={WrenchIcon} />
             <SettingsList.ItemText>
diff --git a/src/screens/Settings/AccessibilitySettings.tsx b/src/screens/Settings/AccessibilitySettings.tsx
index d5819fa4d7..ce37d555f7 100644
--- a/src/screens/Settings/AccessibilitySettings.tsx
+++ b/src/screens/Settings/AccessibilitySettings.tsx
@@ -1,5 +1,4 @@
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
 
@@ -27,7 +26,7 @@ type Props = NativeStackScreenProps<
   'AccessibilitySettings'
 >
 export function AccessibilitySettingsScreen({}: Props) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const requireAltTextEnabled = useRequireAltTextEnabled()
   const setRequireAltTextEnabled = useSetRequireAltTextEnabled()
@@ -56,7 +55,7 @@ export function AccessibilitySettingsScreen({}: Props) {
             </SettingsList.ItemText>
             <Toggle.Item
               name="require_alt_text"
-              label={_(msg`Require alt text before posting`)}
+              label={l`Require alt text before posting`}
               value={requireAltTextEnabled ?? false}
               onChange={value => setRequireAltTextEnabled(value)}
               style={[a.w_full]}>
@@ -67,7 +66,7 @@ export function AccessibilitySettingsScreen({}: Props) {
             </Toggle.Item>
             <Toggle.Item
               name="large_alt_badge"
-              label={_(msg`Display larger alt text badges`)}
+              label={l`Display larger alt text badges`}
               value={!!largeAltBadgeEnabled}
               onChange={value => setLargeAltBadgeEnabled(value)}
               style={[a.w_full]}>
@@ -87,7 +86,7 @@ export function AccessibilitySettingsScreen({}: Props) {
                 </SettingsList.ItemText>
                 <Toggle.Item
                   name="haptics"
-                  label={_(msg`Disable haptic feedback`)}
+                  label={l`Disable haptic feedback`}
                   value={hapticsDisabled ?? false}
                   onChange={value => setHapticsDisabled(value)}
                   style={[a.w_full]}>
diff --git a/src/screens/Settings/ActivityPrivacySettings.tsx b/src/screens/Settings/ActivityPrivacySettings.tsx
index b1d90cf9c1..3ddc05c067 100644
--- a/src/screens/Settings/ActivityPrivacySettings.tsx
+++ b/src/screens/Settings/ActivityPrivacySettings.tsx
@@ -1,7 +1,6 @@
 import {View} from 'react-native'
 import {type AppBskyNotificationDeclaration} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {
@@ -89,7 +88,7 @@ export function Inner({
   }
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {mutate} = useNotificationDeclarationMutation()
 
   const onChangeFilter = ([declaration]: string[]) => {
@@ -102,14 +101,12 @@ export function Inner({
   return (
     <Toggle.Group
       type="radio"
-      label={_(
-        msg`Filter who can opt to receive notifications for your activity`,
-      )}
+      label={l`Filter who can opt to receive notifications for your activity`}
       values={[notificationDeclaration.value.allowSubscriptions]}
       onChange={onChangeFilter}>
       <View style={[a.gap_sm]}>
         <Toggle.Item
-          label={_(msg`Anyone who follows me`)}
+          label={l`Anyone who follows me`}
           name="followers"
           style={[a.flex_row, a.py_xs, a.gap_sm]}>
           <Toggle.Radio />
@@ -118,7 +115,7 @@ export function Inner({
           </Toggle.LabelText>
         </Toggle.Item>
         <Toggle.Item
-          label={_(msg`Only followers who I follow`)}
+          label={l`Only followers who I follow`}
           name="mutuals"
           style={[a.flex_row, a.py_xs, a.gap_sm]}>
           <Toggle.Radio />
@@ -127,7 +124,7 @@ export function Inner({
           </Toggle.LabelText>
         </Toggle.Item>
         <Toggle.Item
-          label={_(msg({context: 'enable for', message: `No one`}))}
+          label={l({context: 'enable for', message: `No one`})}
           name="none"
           style={[a.flex_row, a.py_xs, a.gap_sm]}>
           <Toggle.Radio />
diff --git a/src/screens/Settings/AppIconSettings/SettingsListItem.tsx b/src/screens/Settings/AppIconSettings/SettingsListItem.tsx
index 9809537a88..4f585f7d90 100644
--- a/src/screens/Settings/AppIconSettings/SettingsListItem.tsx
+++ b/src/screens/Settings/AppIconSettings/SettingsListItem.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {AppIconImage} from '#/screens/Settings/AppIconSettings/AppIconImage'
@@ -10,13 +9,13 @@ import {atoms as a} from '#/alf'
 import {Shapes_Stroke2_Corner0_Rounded as Shapes} from '#/components/icons/Shapes'
 
 export function SettingsListItem() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const icon = useCurrentAppIcon()
 
   return (
     <SettingsList.LinkItem
       to="/settings/app-icon"
-      label={_(msg`App Icon`)}
+      label={l`App Icon`}
       contentContainerStyle={[a.align_start]}>
       <SettingsList.ItemIcon icon={Shapes} />
       <View style={[a.flex_1]}>
diff --git a/src/screens/Settings/AppIconSettings/index.tsx b/src/screens/Settings/AppIconSettings/index.tsx
index 3388515fd0..057ba9987c 100644
--- a/src/screens/Settings/AppIconSettings/index.tsx
+++ b/src/screens/Settings/AppIconSettings/index.tsx
@@ -1,8 +1,7 @@
 import {useState} from 'react'
 import {Alert, View} from 'react-native'
 import * as DynamicAppIcon from '@bsky.app/expo-dynamic-app-icon'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
 
@@ -20,7 +19,7 @@ import {IS_ANDROID, IS_INTERNAL} from '#/env'
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'AppIconSettings'>
 export function AppIconSettingsScreen({}: Props) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const sets = useAppIconSets()
   const [currentAppIcon, setCurrentAppIcon] = useState(() =>
     getAppIconName(DynamicAppIcon.getAppIcon()),
@@ -32,18 +31,15 @@ export function AppIconSettingsScreen({}: Props) {
         sets.defaults.find(i => i.id === icon) ??
         sets.core.find(i => i.id === icon)
       Alert.alert(
-        next
-          ? _(msg`Change app icon to "${next.name}"`)
-          : _(msg`Change app icon`),
-        // unfortunately necessary -sfn
-        _(msg`The app will be restarted`),
+        next ? l`Change app icon to "${next.name}"` : l`Change app icon`,
+        l`The app will be restarted`,
         [
           {
-            text: _(msg`Cancel`),
+            text: l`Cancel`,
             style: 'cancel',
           },
           {
-            text: _(msg`OK`),
+            text: l`OK`,
             onPress: () => {
               setCurrentAppIcon(setAppIcon(icon))
             },
@@ -67,10 +63,9 @@ export function AppIconSettingsScreen({}: Props) {
         </Layout.Header.Content>
         <Layout.Header.Slot />
       </Layout.Header.Outer>
-
       <Layout.Content contentContainerStyle={[a.p_lg]}>
         <Group
-          label={_(msg`Default icons`)}
+          label={l`Default icons`}
           value={currentAppIcon}
           onChange={onSetAppIcon}>
           {sets.defaults.map((icon, i) => (
@@ -97,7 +92,7 @@ export function AppIconSettingsScreen({}: Props) {
               <Trans>Bluesky+</Trans>
             </Text>
             <Group
-              label={_(msg`Bluesky+ icons`)}
+              label={l`Bluesky+ icons`}
               value={currentAppIcon}
               onChange={onSetAppIcon}>
               {sets.core.map((icon, i) => (
@@ -170,10 +165,10 @@ function Row({
   isEnd: boolean
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
-    <Toggle.Item label={_(msg`Set app icon to ${icon.name}`)} name={icon.id}>
+    <Toggle.Item label={l`Set app icon to ${icon.name}`} name={icon.id}>
       {({hovered, pressed}) => (
         <View
           style={[
@@ -212,24 +207,24 @@ function RowText({children}: {children: React.ReactNode}) {
 }
 
 function AppIcon({icon, size = 50}: {icon: AppIconSet; size: number}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   return (
     <PressableScale
       accessibilityLabel={icon.name}
-      accessibilityHint={_(msg`Changes app icon`)}
+      accessibilityHint={l`Changes app icon`}
       targetScale={0.95}
       onPress={() => {
         if (IS_ANDROID) {
           Alert.alert(
-            _(msg`Change app icon to "${icon.name}"`),
-            _(msg`The app will be restarted`),
+            l`Change app icon to "${icon.name}"`,
+            l`The app will be restarted`,
             [
               {
-                text: _(msg`Cancel`),
+                text: l`Cancel`,
                 style: 'cancel',
               },
               {
-                text: _(msg`OK`),
+                text: l`OK`,
                 onPress: () => {
                   DynamicAppIcon.setAppIcon(icon.id)
                 },
diff --git a/src/screens/Settings/AppIconSettings/useAppIconSets.ts b/src/screens/Settings/AppIconSettings/useAppIconSets.ts
index 584426fb83..7cc9aa5430 100644
--- a/src/screens/Settings/AppIconSettings/useAppIconSets.ts
+++ b/src/screens/Settings/AppIconSettings/useAppIconSets.ts
@@ -1,17 +1,16 @@
 import {useMemo} from 'react'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {type AppIconSet} from '#/screens/Settings/AppIconSettings/types'
 
 export function useAppIconSets() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return useMemo(() => {
     const defaults = [
       {
         id: 'default_light',
-        name: _(msg({context: 'Name of app icon variant', message: 'Light'})),
+        name: l({context: 'Name of app icon variant', message: 'Light'}),
         iosImage: () => {
           return require(
             `../../../../assets/app-icons/ios_icon_legacy_light.png`,
@@ -25,7 +24,7 @@ export function useAppIconSets() {
       },
       {
         id: 'default_dark',
-        name: _(msg({context: 'Name of app icon variant', message: 'Dark'})),
+        name: l({context: 'Name of app icon variant', message: 'Dark'}),
         iosImage: () => {
           return require(
             `../../../../assets/app-icons/ios_icon_legacy_dark.png`,
@@ -45,7 +44,7 @@ export function useAppIconSets() {
     const core = [
       {
         id: 'core_aurora',
-        name: _(msg({context: 'Name of app icon variant', message: 'Aurora'})),
+        name: l({context: 'Name of app icon variant', message: 'Aurora'}),
         iosImage: () => {
           return require(
             `../../../../assets/app-icons/ios_icon_core_aurora.png`,
@@ -69,7 +68,7 @@ export function useAppIconSets() {
       // },
       {
         id: 'core_sunrise',
-        name: _(msg({context: 'Name of app icon variant', message: 'Sunrise'})),
+        name: l({context: 'Name of app icon variant', message: 'Sunrise'}),
         iosImage: () => {
           return require(
             `../../../../assets/app-icons/ios_icon_core_sunrise.png`,
@@ -83,7 +82,7 @@ export function useAppIconSets() {
       },
       {
         id: 'core_sunset',
-        name: _(msg({context: 'Name of app icon variant', message: 'Sunset'})),
+        name: l({context: 'Name of app icon variant', message: 'Sunset'}),
         iosImage: () => {
           return require(
             `../../../../assets/app-icons/ios_icon_core_sunset.png`,
@@ -97,9 +96,7 @@ export function useAppIconSets() {
       },
       {
         id: 'core_midnight',
-        name: _(
-          msg({context: 'Name of app icon variant', message: 'Midnight'}),
-        ),
+        name: l({context: 'Name of app icon variant', message: 'Midnight'}),
         iosImage: () => {
           return require(
             `../../../../assets/app-icons/ios_icon_core_midnight.png`,
@@ -113,9 +110,7 @@ export function useAppIconSets() {
       },
       {
         id: 'core_flat_blue',
-        name: _(
-          msg({context: 'Name of app icon variant', message: 'Flat Blue'}),
-        ),
+        name: l({context: 'Name of app icon variant', message: 'Flat Blue'}),
         iosImage: () => {
           return require(
             `../../../../assets/app-icons/ios_icon_core_flat_blue.png`,
@@ -129,9 +124,7 @@ export function useAppIconSets() {
       },
       {
         id: 'core_flat_white',
-        name: _(
-          msg({context: 'Name of app icon variant', message: 'Flat White'}),
-        ),
+        name: l({context: 'Name of app icon variant', message: 'Flat White'}),
         iosImage: () => {
           return require(
             `../../../../assets/app-icons/ios_icon_core_flat_white.png`,
@@ -145,9 +138,7 @@ export function useAppIconSets() {
       },
       {
         id: 'core_flat_black',
-        name: _(
-          msg({context: 'Name of app icon variant', message: 'Flat Black'}),
-        ),
+        name: l({context: 'Name of app icon variant', message: 'Flat Black'}),
         iosImage: () => {
           return require(
             `../../../../assets/app-icons/ios_icon_core_flat_black.png`,
@@ -161,12 +152,10 @@ export function useAppIconSets() {
       },
       {
         id: 'core_classic',
-        name: _(
-          msg({
-            context: 'Name of app icon variant',
-            message: 'Bluesky Classic™',
-          }),
-        ),
+        name: l({
+          context: 'Name of app icon variant',
+          message: 'Bluesky Classic™',
+        }),
         iosImage: () => {
           return require(
             `../../../../assets/app-icons/ios_icon_core_classic.png`,
@@ -184,5 +173,5 @@ export function useAppIconSets() {
       defaults,
       core,
     }
-  }, [_])
+  }, [l])
 }
diff --git a/src/screens/Settings/AppPasswords.tsx b/src/screens/Settings/AppPasswords.tsx
index 65ebdf3d4f..5bab415fc3 100644
--- a/src/screens/Settings/AppPasswords.tsx
+++ b/src/screens/Settings/AppPasswords.tsx
@@ -7,8 +7,7 @@ import Animated, {
   LinearTransition,
 } from 'react-native-reanimated'
 import {type ComAtprotoServerListAppPasswords} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
 
@@ -38,7 +37,7 @@ import * as SettingsList from './components/SettingsList'
 
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'AppPasswords'>
 export function AppPasswordsScreen({}: Props) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {data: appPasswords, error} = useAppPasswordsQuery()
   const createAppPasswordControl = useDialogControl()
 
@@ -56,8 +55,8 @@ export function AppPasswordsScreen({}: Props) {
       <Layout.Content>
         {error ? (
           <ErrorScreen
-            title={_(msg`Oops!`)}
-            message={_(msg`There was an issue fetching your app passwords`)}
+            title={l`Oops!`}
+            message={l`There was an issue fetching your app passwords`}
             details={cleanError(error)}
           />
         ) : (
@@ -72,7 +71,7 @@ export function AppPasswordsScreen({}: Props) {
             </SettingsList.Item>
             <SettingsList.Item>
               <Button
-                label={_(msg`Add App Password`)}
+                label={l`Add App Password`}
                 size="large"
                 color="primary"
                 variant="solid"
@@ -103,10 +102,7 @@ export function AppPasswordsScreen({}: Props) {
                     ))}
                   </View>
                 ) : (
-                  <EmptyState
-                    icon={Growth}
-                    message={_(msg`No app passwords yet`)}
-                  />
+                  <EmptyState icon={Growth} message={l`No app passwords yet`} />
                 )
               ) : (
                 <View
@@ -123,7 +119,6 @@ export function AppPasswordsScreen({}: Props) {
           </SettingsList.Container>
         )}
       </Layout.Content>
-
       <AddAppPasswordDialog
         control={createAppPasswordControl}
         passwords={appPasswords?.map(p => p.name) || []}
@@ -138,14 +133,14 @@ function AppPasswordCard({
   appPassword: ComAtprotoServerListAppPasswords.AppPassword
 }) {
   const t = useTheme()
-  const {i18n, _} = useLingui()
+  const {i18n, t: l} = useLingui()
   const deleteControl = Prompt.usePromptControl()
   const {mutateAsync: deleteMutation} = useAppPasswordDeleteMutation()
 
   const onDelete = useCallback(async () => {
     await deleteMutation({name: appPassword.name})
-    Toast.show(_(msg({message: 'App password deleted', context: 'toast'})))
-  }, [deleteMutation, appPassword.name, _])
+    Toast.show(l({message: 'App password deleted', context: 'toast'}))
+  }, [deleteMutation, appPassword.name, l])
 
   return (
     <View
@@ -184,7 +179,7 @@ function AppPasswordCard({
           </Text>
         </View>
         <Button
-          label={_(msg`Delete app password`)}
+          label={l`Delete app password`}
           variant="ghost"
           color="negative"
           size="small"
@@ -202,15 +197,12 @@ function AppPasswordCard({
           </Text>
         </View>
       )}
-
       <Prompt.Basic
         control={deleteControl}
-        title={_(msg`Delete app password?`)}
-        description={_(
-          msg`Are you sure you want to delete the app password "${appPassword.name}"?`,
-        )}
+        title={l`Delete app password?`}
+        description={l`Are you sure you want to delete the app password "${appPassword.name}"?`}
         onConfirm={onDelete}
-        confirmButtonCta={_(msg`Delete`)}
+        confirmButtonCta={l`Delete`}
         confirmButtonColor="negative"
       />
     </View>
diff --git a/src/screens/Settings/AppearanceSettings.tsx b/src/screens/Settings/AppearanceSettings.tsx
index d9fe0f863b..4d198e1dba 100644
--- a/src/screens/Settings/AppearanceSettings.tsx
+++ b/src/screens/Settings/AppearanceSettings.tsx
@@ -5,8 +5,7 @@ import Animated, {
   LayoutAnimationConfig,
   LinearTransition,
 } from 'react-native-reanimated'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {
@@ -27,7 +26,7 @@ import * as SettingsList from './components/SettingsList'
 
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'AppearanceSettings'>
 export function AppearanceSettingsScreen({}: Props) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {fonts} = useAlf()
 
   const {colorMode, darkTheme} = useThemePrefs()
@@ -76,19 +75,19 @@ export function AppearanceSettingsScreen({}: Props) {
         <Layout.Content>
           <SettingsList.Container>
             <AppearanceToggleButtonGroup
-              title={_(msg`Color mode`)}
+              title={l`Color mode`}
               icon={PhoneIcon}
               items={[
                 {
-                  label: _(msg`System`),
+                  label: l`System`,
                   name: 'system',
                 },
                 {
-                  label: _(msg`Light`),
+                  label: l`Light`,
                   name: 'light',
                 },
                 {
-                  label: _(msg`Dark`),
+                  label: l`Dark`,
                   name: 'dark',
                 },
               ]}
@@ -101,15 +100,15 @@ export function AppearanceSettingsScreen({}: Props) {
                 entering={native(FadeInUp)}
                 exiting={native(FadeOutUp)}>
                 <AppearanceToggleButtonGroup
-                  title={_(msg`Dark theme`)}
+                  title={l`Dark theme`}
                   icon={MoonIcon}
                   items={[
                     {
-                      label: _(msg`Dim`),
+                      label: l`Dim`,
                       name: 'dim',
                     },
                     {
-                      label: _(msg`Dark`),
+                      label: l`Dark`,
                       name: 'dark',
                     },
                   ]}
@@ -123,18 +122,16 @@ export function AppearanceSettingsScreen({}: Props) {
               <SettingsList.Divider />
 
               <AppearanceToggleButtonGroup
-                title={_(msg`Font`)}
-                description={_(
-                  msg`For the best experience, we recommend using the theme font.`,
-                )}
+                title={l`Font`}
+                description={l`For the best experience, we recommend using the theme font.`}
                 icon={Aa}
                 items={[
                   {
-                    label: _(msg`System`),
+                    label: l`System`,
                     name: 'system',
                   },
                   {
-                    label: _(msg`Theme`),
+                    label: l`Theme`,
                     name: 'theme',
                   },
                 ]}
@@ -143,19 +140,19 @@ export function AppearanceSettingsScreen({}: Props) {
               />
 
               <AppearanceToggleButtonGroup
-                title={_(msg`Font size`)}
+                title={l`Font size`}
                 icon={TextSize}
                 items={[
                   {
-                    label: _(msg`Smaller`),
+                    label: l`Smaller`,
                     name: '-1',
                   },
                   {
-                    label: _(msg`Default`),
+                    label: l`Default`,
                     name: '0',
                   },
                   {
-                    label: _(msg`Larger`),
+                    label: l`Larger`,
                     name: '1',
                   },
                 ]}
diff --git a/src/screens/Settings/ContentAndMediaSettings.tsx b/src/screens/Settings/ContentAndMediaSettings.tsx
index 3aae0b4917..1239505325 100644
--- a/src/screens/Settings/ContentAndMediaSettings.tsx
+++ b/src/screens/Settings/ContentAndMediaSettings.tsx
@@ -1,5 +1,4 @@
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
 
@@ -33,7 +32,7 @@ type Props = NativeStackScreenProps<
   'ContentAndMediaSettings'
 >
 export function ContentAndMediaSettingsScreen({}: Props) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const autoplayDisabledPref = useAutoplayDisabled()
   const setAutoplayDisabledPref = useSetAutoplayDisabled()
@@ -59,7 +58,7 @@ export function ContentAndMediaSettingsScreen({}: Props) {
         <SettingsList.Container>
           <SettingsList.LinkItem
             to="/settings/saved-feeds"
-            label={_(msg`Manage saved feeds`)}>
+            label={l`Manage saved feeds`}>
             <SettingsList.ItemIcon icon={HashtagIcon} />
             <SettingsList.ItemText>
               <Trans>Manage saved feeds</Trans>
@@ -67,7 +66,7 @@ export function ContentAndMediaSettingsScreen({}: Props) {
           </SettingsList.LinkItem>
           <SettingsList.LinkItem
             to="/settings/threads"
-            label={_(msg`Thread preferences`)}>
+            label={l`Thread preferences`}>
             <SettingsList.ItemIcon icon={BubblesIcon} />
             <SettingsList.ItemText>
               <Trans>Thread preferences</Trans>
@@ -75,7 +74,7 @@ export function ContentAndMediaSettingsScreen({}: Props) {
           </SettingsList.LinkItem>
           <SettingsList.LinkItem
             to="/settings/following-feed"
-            label={_(msg`Following feed preferences`)}>
+            label={l`Following feed preferences`}>
             <SettingsList.ItemIcon icon={HomeIcon} />
             <SettingsList.ItemText>
               <Trans>Following feed preferences</Trans>
@@ -83,7 +82,7 @@ export function ContentAndMediaSettingsScreen({}: Props) {
           </SettingsList.LinkItem>
           <SettingsList.LinkItem
             to="/settings/external-embeds"
-            label={_(msg`External media`)}>
+            label={l`External media`}>
             <SettingsList.ItemIcon icon={MacintoshIcon} />
             <SettingsList.ItemText>
               <Trans>External media</Trans>
@@ -91,7 +90,7 @@ export function ContentAndMediaSettingsScreen({}: Props) {
           </SettingsList.LinkItem>
           <SettingsList.LinkItem
             to="/settings/interests"
-            label={_(msg`Your interests`)}>
+            label={l`Your interests`}>
             <SettingsList.ItemIcon icon={CircleInfo} />
             <SettingsList.ItemText>
               <Trans>Your interests</Trans>
@@ -101,7 +100,7 @@ export function ContentAndMediaSettingsScreen({}: Props) {
           {IS_NATIVE && (
             <Toggle.Item
               name="use_in_app_browser"
-              label={_(msg`Use in-app browser to open links`)}
+              label={l`Use in-app browser to open links`}
               value={inAppBrowserPref ?? false}
               onChange={value => setUseInAppBrowser(value)}>
               <SettingsList.Item>
@@ -115,7 +114,7 @@ export function ContentAndMediaSettingsScreen({}: Props) {
           )}
           <Toggle.Item
             name="disable_autoplay"
-            label={_(msg`Autoplay videos and GIFs`)}
+            label={l`Autoplay videos and GIFs`}
             value={!autoplayDisabledPref}
             onChange={value => setAutoplayDisabledPref(!value)}>
             <SettingsList.Item>
@@ -131,7 +130,7 @@ export function ContentAndMediaSettingsScreen({}: Props) {
               <SettingsList.Divider />
               <Toggle.Item
                 name="show_trending_topics"
-                label={_(msg`Enable trending topics`)}
+                label={l`Enable trending topics`}
                 value={!trendingDisabled}
                 onChange={value => {
                   const hide = Boolean(!value)
@@ -152,7 +151,7 @@ export function ContentAndMediaSettingsScreen({}: Props) {
               </Toggle.Item>
               <Toggle.Item
                 name="show_trending_videos"
-                label={_(msg`Enable trending videos in your Discover feed`)}
+                label={l`Enable trending videos in your Discover feed`}
                 value={!trendingVideoDisabled}
                 onChange={value => {
                   const hide = Boolean(!value)
diff --git a/src/screens/Settings/FindContactsSettings.tsx b/src/screens/Settings/FindContactsSettings.tsx
index 57f1edde90..df027eb010 100644
--- a/src/screens/Settings/FindContactsSettings.tsx
+++ b/src/screens/Settings/FindContactsSettings.tsx
@@ -6,8 +6,7 @@ import {
   type AppBskyContactGetSyncStatus,
   type ModerationOpts,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 import {useIsFocused} from '@react-navigation/native'
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'
@@ -57,7 +56,7 @@ import {bulkWriteFollows} from '../Onboarding/util'
 
 type Props = NativeStackScreenProps<AllNavigatorParams, 'FindContactsSettings'>
 export function FindContactsSettingsScreen({}: Props) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
 
   const {data, error, refetch} = useContactsSyncStatusQuery()
@@ -92,7 +91,7 @@ export function FindContactsSettingsScreen({}: Props) {
           )
         ) : error ? (
           <ErrorScreen
-            title={_(msg`Error getting the latest data.`)}
+            title={l`Error getting the latest data.`}
             message={cleanError(error)}
             onPressTryAgain={refetch}
           />
@@ -103,8 +102,8 @@ export function FindContactsSettingsScreen({}: Props) {
         )
       ) : (
         <ErrorScreen
-          title={_(msg`Not available on this platform.`)}
-          message={_(msg`Please use the native app to import your contacts.`)}
+          title={l`Not available on this platform.`}
+          message={l`Please use the native app to import your contacts.`}
         />
       )}
     </Layout.Screen>
@@ -114,7 +113,7 @@ export function FindContactsSettingsScreen({}: Props) {
 function Intro() {
   const gutter = useGutters(['base'])
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const inviteFriendsControl = useDialogControl()
 
@@ -136,12 +135,10 @@ function Intro() {
           control what happens next.{' '}
           <InlineLinkText
             to={urls.website.blog.findFriendsAnnouncement}
-            label={_(
-              msg({
-                message: `Learn more about importing contacts`,
-                context: `english-only-resource`,
-              }),
-            )}
+            label={l({
+              message: `Learn more about importing contacts`,
+              context: `english-only-resource`,
+            })}
             style={[a.text_md, a.leading_snug]}>
             <Trans context="english-only-resource">Learn more</Trans>
           </InlineLinkText>
@@ -150,7 +147,7 @@ function Intro() {
       {isAvailable ? (
         <Link
           to={{screen: 'FindContactsFlow'}}
-          label={_(msg`Import contacts`)}
+          label={l`Import contacts`}
           size="large"
           color="primary"
           style={[a.flex_1, a.justify_center]}>
@@ -169,7 +166,7 @@ function Intro() {
         )
       )}
       <Button
-        label={_(msg`Share my profile`)}
+        label={l`Share my profile`}
         size="large"
         color="secondary"
         onPress={() => {
@@ -196,7 +193,7 @@ function SyncStatus({
   const ax = useAnalytics()
   const agent = useAgent()
   const queryClient = useQueryClient()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const moderationOpts = useModerationOpts()
 
   const {
@@ -229,14 +226,12 @@ function SyncStatus({
       refetchMatches()
       if (isNetworkError(err)) {
         Toast.show(
-          _(
-            msg`Could not follow all matches - please check your network connection.`,
-          ),
+          l`Could not follow all matches - please check your network connection.`,
           {type: 'error'},
         )
       } else {
         logger.error('Failed to follow all matches', {safeMessage: err})
-        Toast.show(_(msg`Could not follow all matches. ${cleanError(err)}`), {
+        Toast.show(l`Could not follow all matches. ${cleanError(err)}`, {
           type: 'error',
         })
       }
@@ -302,7 +297,7 @@ function MatchItem({
   dismissMatch: (did: string) => void
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const shadow = useProfileShadow(profile)
 
@@ -346,7 +341,7 @@ function MatchItem({
             <Button
               color="secondary"
               variant="ghost"
-              label={_(msg`Remove suggestion`)}
+              label={l`Remove suggestion`}
               onPress={() => dismissMatch(profile.did)}
               hoverStyle={[a.bg_transparent, {opacity: 0.5}]}
               hitSlop={8}>
@@ -368,7 +363,7 @@ function StatusHeader({
   isPending: boolean
   isAnyUnfollowed: boolean
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const agent = useAgent()
   const queryClient = useQueryClient()
@@ -415,19 +410,17 @@ function StatusHeader({
       }
     },
     onSuccess: () => {
-      Toast.show(_(msg`Followed all matches`), {type: 'success'})
+      Toast.show(l`Followed all matches`, {type: 'success'})
     },
     onError: err => {
       if (isNetworkError(err)) {
         Toast.show(
-          _(
-            msg`Could not follow all matches - please check your network connection.`,
-          ),
+          l`Could not follow all matches - please check your network connection.`,
           {type: 'error'},
         )
       } else {
         logger.error('Failed to follow all matches', {safeMessage: err})
-        Toast.show(_(msg`Could not follow all matches. ${cleanError(err)}`), {
+        Toast.show(l`Could not follow all matches. ${cleanError(err)}`, {
           type: 'error',
         })
       }
@@ -462,7 +455,7 @@ function StatusHeader({
         </Text>
         {isAnyUnfollowed && (
           <Button
-            label={_(msg`Follow all`)}
+            label={l`Follow all`}
             color="primary"
             size="small"
             variant="ghost"
@@ -484,7 +477,7 @@ function StatusHeader({
 }
 
 function StatusFooter({syncedAt}: {syncedAt: string}) {
-  const {_, i18n} = useLingui()
+  const {t: l, i18n} = useLingui()
   const t = useTheme()
   const ax = useAnalytics()
   const agent = useAgent()
@@ -496,7 +489,7 @@ function StatusFooter({syncedAt}: {syncedAt: string}) {
     },
     onMutate: () => ax.metric('contacts:settings:removeData', {}),
     onSuccess: () => {
-      Toast.show(_(msg`Contacts removed`))
+      Toast.show(l`Contacts removed`)
       queryClient.setQueryData<AppBskyContactGetSyncStatus.OutputSchema>(
         findContactsStatusQueryKey,
         {syncStatus: undefined},
@@ -505,14 +498,12 @@ function StatusFooter({syncedAt}: {syncedAt: string}) {
     onError: err => {
       if (isNetworkError(err)) {
         Toast.show(
-          _(
-            msg`Failed to remove data due to a network error, please check your internet connection.`,
-          ),
+          l`Failed to remove data due to a network error, please check your internet connection.`,
           {type: 'error'},
         )
       } else {
         logger.error('Remove data failed', {safeMessage: err})
-        Toast.show(_(msg`Failed to remove data. ${cleanError(err)}`), {
+        Toast.show(l`Failed to remove data. ${cleanError(err)}`, {
           type: 'error',
         })
       }
@@ -541,7 +532,7 @@ function StatusFooter({syncedAt}: {syncedAt: string}) {
           </Text>
         </View>
         <Link
-          label={_(msg`Resync contacts`)}
+          label={l`Resync contacts`}
           to={{screen: 'FindContactsFlow'}}
           onPress={() => {
             const daysSinceLastSync = Math.floor(
@@ -561,7 +552,6 @@ function StatusFooter({syncedAt}: {syncedAt: string}) {
           </ButtonText>
         </Link>
       </View>
-
       <View style={[a.gap_xs, a.align_start]}>
         <Text style={[a.text_md, a.font_semi_bold]}>
           <Trans>Delete contacts</Trans>
@@ -573,7 +563,7 @@ function StatusFooter({syncedAt}: {syncedAt: string}) {
           </Trans>
         </Text>
         <Button
-          label={_(msg`Remove all contacts`)}
+          label={l`Remove all contacts`}
           onPress={() => removeData()}
           size="small"
           color="negative_subtle"
diff --git a/src/screens/Settings/FollowingFeedPreferences.tsx b/src/screens/Settings/FollowingFeedPreferences.tsx
index 265019d563..a3992d3809 100644
--- a/src/screens/Settings/FollowingFeedPreferences.tsx
+++ b/src/screens/Settings/FollowingFeedPreferences.tsx
@@ -1,5 +1,4 @@
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {
@@ -25,7 +24,7 @@ type Props = NativeStackScreenProps<
   'PreferencesFollowingFeed'
 >
 export function FollowingFeedPreferencesScreen({}: Props) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const {data: preferences} = usePreferencesQuery()
   const {mutate: setFeedViewPref, variables} =
@@ -69,7 +68,7 @@ export function FollowingFeedPreferencesScreen({}: Props) {
           <Toggle.Item
             type="checkbox"
             name="show-replies"
-            label={_(msg`Show replies`)}
+            label={l`Show replies`}
             value={showReplies}
             onChange={value =>
               setFeedViewPref({
@@ -87,7 +86,7 @@ export function FollowingFeedPreferencesScreen({}: Props) {
           <Toggle.Item
             type="checkbox"
             name="show-reposts"
-            label={_(msg`Show reposts`)}
+            label={l`Show reposts`}
             value={showReposts}
             onChange={value =>
               setFeedViewPref({
@@ -105,7 +104,7 @@ export function FollowingFeedPreferencesScreen({}: Props) {
           <Toggle.Item
             type="checkbox"
             name="show-quotes"
-            label={_(msg`Show quote posts`)}
+            label={l`Show quote posts`}
             value={showQuotePosts}
             onChange={value =>
               setFeedViewPref({
@@ -129,9 +128,7 @@ export function FollowingFeedPreferencesScreen({}: Props) {
             <Toggle.Item
               type="checkbox"
               name="merge-feed"
-              label={_(
-                msg`Show samples of your saved feeds in your Following feed`,
-              )}
+              label={l`Show samples of your saved feeds in your Following feed`}
               value={mergeFeedEnabled}
               onChange={value =>
                 setFeedViewPref({
diff --git a/src/screens/Settings/InterestsSettings.tsx b/src/screens/Settings/InterestsSettings.tsx
index ced7148669..1cadce573b 100644
--- a/src/screens/Settings/InterestsSettings.tsx
+++ b/src/screens/Settings/InterestsSettings.tsx
@@ -1,7 +1,6 @@
 import {useMemo, useState} from 'react'
 import {type TextStyle, View, type ViewStyle} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
 import {useQueryClient} from '@tanstack/react-query'
@@ -87,7 +86,7 @@ function Inner({
   preferences: UsePreferencesQueryResponse
   setIsSaving: (isSaving: boolean) => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const agent = useAgent()
   const qc = useQueryClient()
   const interestsDisplayNames = useInterestsDisplayNames()
@@ -134,21 +133,17 @@ function Inner({
         ])
 
         Toast.show(
-          _(
-            msg({
-              message: 'Your interests have been updated!',
-              context: 'toast',
-            }),
-          ),
+          l({
+            message: 'Your interests have been updated!',
+            context: 'toast',
+          }),
         )
       } catch (error) {
         Toast.show(
-          _(
-            msg({
-              message: 'Failed to save your interests.',
-              context: 'toast',
-            }),
-          ),
+          l({
+            message: 'Failed to save your interests.',
+            context: 'toast',
+          }),
           {
             type: 'error',
           },
@@ -157,7 +152,7 @@ function Inner({
         setIsSaving(false)
       }
     }, 1500)
-  }, [_, agent, setIsSaving, qc, preselectedInterests])
+  }, [l, agent, setIsSaving, qc, preselectedInterests])
 
   const onChangeInterests = async (interests: string[]) => {
     setInterests(interests)
@@ -171,11 +166,10 @@ function Inner({
           <Trans>We recommend selecting at least two interests.</Trans>
         </Admonition>
       )}
-
       <Toggle.Group
         values={interests}
         onChange={onChangeInterests}
-        label={_(msg`Select your interests from the options below`)}>
+        label={l`Select your interests from the options below`}>
         <View style={[a.flex_row, a.flex_wrap, a.gap_sm]}>
           {allInterests.map(interest => {
             const name = interestsDisplayNames[interest]
diff --git a/src/screens/Settings/LanguageSettings.tsx b/src/screens/Settings/LanguageSettings.tsx
index 3421ef805b..ed805bd5e2 100644
--- a/src/screens/Settings/LanguageSettings.tsx
+++ b/src/screens/Settings/LanguageSettings.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useMemo, useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {
@@ -30,7 +29,7 @@ const DEDUPED_LANGUAGES = LANGUAGES.filter(
 
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'LanguageSettings'>
 export function LanguageSettingsScreen({}: Props) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const langPrefs = useLanguagePrefs()
   const setLangPrefs = useLanguagePrefsApi()
 
@@ -115,12 +114,12 @@ export function LanguageSettingsScreen({}: Props) {
               <Select.Root
                 value={sanitizeAppLanguageSetting(langPrefs.appLanguage)}
                 onValueChange={onChangeAppLanguage}>
-                <Select.Trigger label={_(msg`Select app language`)}>
+                <Select.Trigger label={l`Select app language`}>
                   <Select.ValueText />
                   <Select.Icon />
                 </Select.Trigger>
                 <Select.Content
-                  label={_(msg`App language`)}
+                  label={l`App language`}
                   renderItem={({label, value}) => (
                     <Select.Item value={value} label={label}>
                       <Select.ItemIndicator />
@@ -149,12 +148,12 @@ export function LanguageSettingsScreen({}: Props) {
               <Select.Root
                 value={langPrefs.primaryLanguage}
                 onValueChange={onChangePrimaryLanguage}>
-                <Select.Trigger label={_(msg`Select primary language`)}>
+                <Select.Trigger label={l`Select primary language`}>
                   <Select.ValueText />
                   <Select.Icon />
                 </Select.Trigger>
                 <Select.Content
-                  label={_(msg`Primary language`)}
+                  label={l`Primary language`}
                   renderItem={({label, value}) => (
                     <Select.Item value={value} label={label}>
                       <Select.ItemIndicator />
@@ -192,7 +191,7 @@ export function LanguageSettingsScreen({}: Props) {
 
               <View style={[a.w_full, web({maxWidth: 400})]}>
                 <Toggle.Group
-                  label={_(msg`Select content languages`)}
+                  label={l`Select content languages`}
                   values={contentLanguages}
                   onChange={setContentLanguages}>
                   <Toggle.PanelGroup>
@@ -215,7 +214,7 @@ export function LanguageSettingsScreen({}: Props) {
                       )
                     })}
                     <Button
-                      label={_(msg`Add more languages…`)}
+                      label={l`Add more languages…`}
                       onPress={contentLanguagePrefsControl.open}>
                       <Toggle.Panel adjacent="leading">
                         <Toggle.PanelIcon icon={PlusIcon} />
diff --git a/src/screens/Settings/PrivacyAndSecuritySettings.tsx b/src/screens/Settings/PrivacyAndSecuritySettings.tsx
index 2979ace213..9e65ff2c97 100644
--- a/src/screens/Settings/PrivacyAndSecuritySettings.tsx
+++ b/src/screens/Settings/PrivacyAndSecuritySettings.tsx
@@ -1,6 +1,5 @@
 import {type AppBskyNotificationDeclaration} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
 
@@ -26,7 +25,7 @@ type Props = NativeStackScreenProps<
   'PrivacyAndSecuritySettings'
 >
 export function PrivacyAndSecuritySettingsScreen({}: Props) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const {data: appPasswords} = useAppPasswordsQuery()
   const {currentAccount} = useSession()
@@ -69,7 +68,7 @@ export function PrivacyAndSecuritySettingsScreen({}: Props) {
           </SettingsList.Item>
           <SettingsList.LinkItem
             to="/settings/app-passwords"
-            label={_(msg`App passwords`)}>
+            label={l`App passwords`}>
             <SettingsList.ItemIcon icon={KeyIcon} />
             <SettingsList.ItemText>
               <Trans>App passwords</Trans>
@@ -81,9 +80,7 @@ export function PrivacyAndSecuritySettingsScreen({}: Props) {
             )}
           </SettingsList.LinkItem>
           <SettingsList.LinkItem
-            label={_(
-              msg`Settings for allowing others to be notified of your posts`,
-            )}
+            label={l`Settings for allowing others to be notified of your posts`}
             to={{screen: 'ActivityPrivacySettings'}}
             contentContainerStyle={[a.align_start]}>
             <SettingsList.ItemIcon icon={BellRingingIcon} />
@@ -124,9 +121,7 @@ export function PrivacyAndSecuritySettingsScreen({}: Props) {
                   </Admonition.Text>
                   <Admonition.Text>
                     <InlineLinkText
-                      label={_(
-                        msg`Learn more about what is public on Bluesky.`,
-                      )}
+                      label={l`Learn more about what is public on Bluesky.`}
                       to="https://blueskyweb.zendesk.com/hc/en-us/articles/15835264007693-Data-Privacy">
                       <Trans>Learn more about what is public on Bluesky.</Trans>
                     </InlineLinkText>
diff --git a/src/screens/Settings/ThreadPreferences.tsx b/src/screens/Settings/ThreadPreferences.tsx
index 06f3b4382d..4fd1260446 100644
--- a/src/screens/Settings/ThreadPreferences.tsx
+++ b/src/screens/Settings/ThreadPreferences.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {
@@ -23,7 +22,7 @@ import * as SettingsList from './components/SettingsList'
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'PreferencesThreads'>
 export function ThreadPreferencesScreen({}: Props) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {sort, setSort, view, setView} = useThreadPreferences({save: true})
 
   return (
@@ -49,28 +48,24 @@ export function ThreadPreferencesScreen({}: Props) {
                 <Trans>Sort replies to the same post by:</Trans>
               </Text>
               <Toggle.Group
-                label={_(msg`Sort replies by`)}
+                label={l`Sort replies by`}
                 type="radio"
                 values={sort ? [sort] : []}
                 onChange={values => setSort(normalizeSort(values[0]))}>
                 <View style={[a.gap_sm, a.flex_1]}>
-                  <Toggle.Item name="top" label={_(msg`Top replies first`)}>
+                  <Toggle.Item name="top" label={l`Top replies first`}>
                     <Toggle.Radio />
                     <Toggle.LabelText>
                       <Trans>Top replies first</Trans>
                     </Toggle.LabelText>
                   </Toggle.Item>
-                  <Toggle.Item
-                    name="oldest"
-                    label={_(msg`Oldest replies first`)}>
+                  <Toggle.Item name="oldest" label={l`Oldest replies first`}>
                     <Toggle.Radio />
                     <Toggle.LabelText>
                       <Trans>Oldest replies first</Trans>
                     </Toggle.LabelText>
                   </Toggle.Item>
-                  <Toggle.Item
-                    name="newest"
-                    label={_(msg`Newest replies first`)}>
+                  <Toggle.Item name="newest" label={l`Newest replies first`}>
                     <Toggle.Radio />
                     <Toggle.LabelText>
                       <Trans>Newest replies first</Trans>
@@ -89,7 +84,7 @@ export function ThreadPreferencesScreen({}: Props) {
             <Toggle.Item
               type="checkbox"
               name="threaded-mode"
-              label={_(msg`Tree view`)}
+              label={l`Tree view`}
               value={view === 'tree'}
               onChange={value =>
                 setView(normalizeView({treeViewEnabled: value}))
diff --git a/src/screens/Settings/components/AddAppPasswordDialog.tsx b/src/screens/Settings/components/AddAppPasswordDialog.tsx
index 5029ad9f16..8eea653adb 100644
--- a/src/screens/Settings/components/AddAppPasswordDialog.tsx
+++ b/src/screens/Settings/components/AddAppPasswordDialog.tsx
@@ -9,8 +9,7 @@ import Animated, {
   SlideOutLeft,
 } from 'react-native-reanimated'
 import {type ComAtprotoServerCreateAppPassword} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useMutation} from '@tanstack/react-query'
 
@@ -45,7 +44,7 @@ export function AddAppPasswordDialog({
 function CreateDialogInner({passwords}: {passwords: string[]}) {
   const control = Dialog.useDialogContext()
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const autogeneratedName = useRandomName()
   const [name, setName] = useState('')
   const [privileged, setPrivileged] = useState(false)
@@ -58,11 +57,9 @@ function CreateDialogInner({passwords}: {passwords: string[]}) {
   const regexFailError = useMemo(
     () =>
       new DisplayableError(
-        _(
-          msg`App password names can only contain letters, numbers, spaces, hyphens, and underscores`,
-        ),
+        l`App password names can only contain letters, numbers, spaces, hyphens, and underscores`,
       ),
-    [_],
+    [l],
   )
 
   const {
@@ -77,11 +74,11 @@ function CreateDialogInner({passwords}: {passwords: string[]}) {
       const chosenName = name.trim() || autogeneratedName
       if (chosenName.length < 4) {
         throw new DisplayableError(
-          _(msg`App password names must be at least 4 characters long`),
+          l`App password names must be at least 4 characters long`,
         )
       }
       if (passwords.find(p => p === chosenName)) {
-        throw new DisplayableError(_(msg`App password name must be unique`))
+        throw new DisplayableError(l`App password name must be unique`)
       }
       return await actuallyCreateAppPassword({name: chosenName, privileged})
     },
@@ -99,7 +96,7 @@ function CreateDialogInner({passwords}: {passwords: string[]}) {
     validationError || (!name.match(/^[a-zA-Z0-9-_ ]*$/) && regexFailError)
 
   return (
-    <Dialog.ScrollableInner label={_(msg`Add app password`)}>
+    <Dialog.ScrollableInner label={l`Add app password`}>
       <View style={[native(a.pt_md)]}>
         <LayoutAnimationConfig skipEntering skipExiting>
           {!data ? (
@@ -119,7 +116,7 @@ function CreateDialogInner({passwords}: {passwords: string[]}) {
               <View>
                 <TextInput.Root isInvalid={!!error}>
                   <Dialog.Input
-                    label={_(msg`App Password`)}
+                    label={l`App Password`}
                     placeholder={autogeneratedName}
                     onChangeText={setName}
                     returnKeyType="done"
@@ -143,7 +140,7 @@ function CreateDialogInner({passwords}: {passwords: string[]}) {
                 <Toggle.Item
                   name="privileged"
                   type="checkbox"
-                  label={_(msg`Allow access to your direct messages`)}
+                  label={l`Allow access to your direct messages`}
                   value={privileged}
                   onChange={setPrivileged}
                   style={[a.flex_1]}>
@@ -154,7 +151,7 @@ function CreateDialogInner({passwords}: {passwords: string[]}) {
                   </Toggle.LabelText>
                 </Toggle.Item>
                 <Button
-                  label={_(msg`Next`)}
+                  label={l`Next`}
                   size="large"
                   variant="solid"
                   color="primary"
@@ -193,7 +190,7 @@ function CreateDialogInner({passwords}: {passwords: string[]}) {
               </Text>
               <CopyButton
                 value={data.password}
-                label={_(msg`Copy App Password`)}
+                label={l`Copy App Password`}
                 size="large"
                 color="secondary">
                 <ButtonText>{data.password}</ButtonText>
@@ -211,7 +208,7 @@ function CreateDialogInner({passwords}: {passwords: string[]}) {
                 </Trans>
               </Text>
               <Button
-                label={_(msg`Done`)}
+                label={l`Done`}
                 size="large"
                 variant="outline"
                 color="primary"
diff --git a/src/screens/Settings/components/ChangeHandleDialog.tsx b/src/screens/Settings/components/ChangeHandleDialog.tsx
index 1b31a7de2a..a220b86700 100644
--- a/src/screens/Settings/components/ChangeHandleDialog.tsx
+++ b/src/screens/Settings/components/ChangeHandleDialog.tsx
@@ -11,8 +11,7 @@ import Animated, {
   SlideOutRight,
 } from 'react-native-reanimated'
 import {type ComAtprotoServerDescribeServer} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
@@ -62,7 +61,7 @@ export function ChangeHandleDialog({
 
 function ChangeHandleDialogInner() {
   const control = Dialog.useDialogContext()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const agent = useAgent()
   const {
     data: serviceInfo,
@@ -77,7 +76,7 @@ function ChangeHandleDialogInner() {
   const cancelButton = useCallback(
     () => (
       <Button
-        label={_(msg`Cancel`)}
+        label={l`Cancel`}
         onPress={() => control.close()}
         size="small"
         color="primary"
@@ -88,12 +87,12 @@ function ChangeHandleDialogInner() {
         </ButtonText>
       </Button>
     ),
-    [control, _],
+    [control, l],
   )
 
   return (
     <Dialog.ScrollableInner
-      label={_(msg`Change Handle`)}
+      label={l`Change Handle`}
       header={
         <Dialog.Header renderLeft={cancelButton}>
           <Dialog.HeaderText>
@@ -105,8 +104,8 @@ function ChangeHandleDialogInner() {
       <View style={[a.flex_1, a.pt_lg, a.px_xl]}>
         {serviceInfoError ? (
           <ErrorScreen
-            title={_(msg`Oops!`)}
-            message={_(msg`There was an issue fetching your service info`)}
+            title={l`Oops!`}
+            message={l`There was an issue fetching your service info`}
             details={cleanError(serviceInfoError)}
             onPressTryAgain={refetch}
           />
@@ -150,7 +149,7 @@ function ProvidedHandlePage({
   serviceInfo: ComAtprotoServerDescribeServer.OutputSchema
   goToOwnHandle: () => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const [subdomain, setSubdomain] = useState('')
   const agent = useAgent()
   const control = Dialog.useDialogContext()
@@ -194,7 +193,7 @@ function ProvidedHandlePage({
       <View style={[a.flex_1, a.gap_md]}>
         {isSuccess && (
           <Animated.View entering={FadeIn} exiting={FadeOut}>
-            <SuccessMessage text={_(msg`Handle changed!`)} />
+            <SuccessMessage text={l`Handle changed!`} />
           </Animated.View>
         )}
         {error && (
@@ -211,12 +210,10 @@ function ProvidedHandlePage({
                 You are verified. You will lose your verification status if you
                 change your handle.{' '}
                 <InlineLinkText
-                  label={_(
-                    msg({
-                      message: `Learn more`,
-                      context: `english-only-resource`,
-                    }),
-                  )}
+                  label={l({
+                    message: `Learn more`,
+                    context: `english-only-resource`,
+                  })}
                   to={urls.website.blog.initialVerificationAnnouncement}>
                   <Trans context="english-only-resource">Learn more.</Trans>
                 </InlineLinkText>
@@ -233,8 +230,8 @@ function ProvidedHandlePage({
                 editable={!isPending}
                 defaultValue={subdomain}
                 onChangeText={text => setSubdomain(text)}
-                label={_(msg`New handle`)}
-                placeholder={_(msg`e.g. alice`)}
+                label={l`New handle`}
+                placeholder={l`e.g. alice`}
                 autoCapitalize="none"
                 autoCorrect={false}
               />
@@ -252,7 +249,7 @@ function ProvidedHandlePage({
             </Trans>
           </Text>
           <Button
-            label={_(msg`Save new handle`)}
+            label={l`Save new handle`}
             variant="solid"
             size="large"
             color={validation.overall ? 'primary' : 'secondary'}
@@ -275,12 +272,10 @@ function ProvidedHandlePage({
               If you have your own domain, you can use that as your handle. This
               lets you self-verify your identity.{' '}
               <InlineLinkText
-                label={_(
-                  msg({
-                    message: `Learn more`,
-                    context: `english-only-resource`,
-                  }),
-                )}
+                label={l({
+                  message: `Learn more`,
+                  context: `english-only-resource`,
+                })}
                 to="https://bsky.social/about/blog/4-28-2023-domain-handle-tutorial"
                 style={[a.font_semi_bold]}
                 disableMismatchWarning>
@@ -289,7 +284,7 @@ function ProvidedHandlePage({
             </Trans>
           </Text>
           <Button
-            label={_(msg`I have my own domain`)}
+            label={l`I have my own domain`}
             variant="outline"
             color="primary"
             size="large"
@@ -306,7 +301,7 @@ function ProvidedHandlePage({
 }
 
 function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const {currentAccount} = useSession()
   const [dnsPanel, setDNSPanel] = useState(true)
@@ -353,7 +348,7 @@ function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
     <View style={[a.flex_1, a.gap_lg]}>
       {isSuccess && (
         <Animated.View entering={FadeIn} exiting={FadeOut}>
-          <SuccessMessage text={_(msg`Handle changed!`)} />
+          <SuccessMessage text={l`Handle changed!`} />
         </Animated.View>
       )}
       {error && (
@@ -384,8 +379,8 @@ function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
           <TextField.Root>
             <TextField.Icon icon={AtIcon} />
             <Dialog.Input
-              label={_(msg`New handle`)}
-              placeholder={_(msg`e.g. alice.com`)}
+              label={l`New handle`}
+              placeholder={l`e.g. alice.com`}
               editable={!isPending}
               defaultValue={domain}
               onChangeText={text => {
@@ -398,16 +393,16 @@ function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
           </TextField.Root>
         </View>
         <SegmentedControl.Root
-          label={_(msg`Choose domain verification method`)}
+          label={l`Choose domain verification method`}
           type="tabs"
           value={dnsPanel ? 'dns' : 'file'}
           onChange={values => setDNSPanel(values === 'dns')}>
-          <SegmentedControl.Item value="dns" label={_(msg`DNS Panel`)}>
+          <SegmentedControl.Item value="dns" label={l`DNS Panel`}>
             <SegmentedControl.ItemText>
               <Trans>DNS Panel</Trans>
             </SegmentedControl.ItemText>
           </SegmentedControl.Item>
-          <SegmentedControl.Item value="file" label={_(msg`No DNS Panel`)}>
+          <SegmentedControl.Item value="file" label={l`No DNS Panel`}>
             <SegmentedControl.ItemText>
               <Trans>No DNS Panel</Trans>
             </SegmentedControl.ItemText>
@@ -433,7 +428,7 @@ function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
                 <CopyButton
                   color="secondary"
                   value="_atproto"
-                  label={_(msg`Copy host`)}
+                  label={l`Copy host`}
                   style={[a.bg_transparent]}
                   hoverStyle={[a.bg_transparent]}
                   hitSlop={HITSLOP_10}>
@@ -454,7 +449,7 @@ function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
                 <CopyButton
                   color="secondary"
                   value={'did=' + currentAccount?.did}
-                  label={_(msg`Copy TXT record value`)}
+                  label={l`Copy TXT record value`}
                   style={[a.bg_transparent]}
                   hoverStyle={[a.bg_transparent]}
                   hitSlop={HITSLOP_10}>
@@ -501,7 +496,7 @@ function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
             </Text>
             <CopyButton
               value={currentAccount?.did ?? ''}
-              label={_(msg`Copy DID`)}
+              label={l`Copy DID`}
               size="large"
               shape="rectangular"
               color="secondary"
@@ -522,7 +517,7 @@ function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
           entering={FadeIn}
           exiting={FadeOut}
           layout={native(LinearTransition)}>
-          <SuccessMessage text={_(msg`Domain verified!`)} />
+          <SuccessMessage text={l`Domain verified!`} />
         </Animated.View>
       )}
       <Animated.View layout={native(LinearTransition)}>
@@ -541,10 +536,10 @@ function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
         <Button
           label={
             isVerified
-              ? _(msg`Update to ${domain}`)
+              ? l`Update to ${domain}`
               : dnsPanel
-                ? _(msg`Verify DNS Record`)
-                : _(msg`Verify Text File`)
+                ? l`Verify DNS Record`
+                : l`Verify Text File`
           }
           variant="solid"
           size="large"
@@ -573,8 +568,8 @@ function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
         </Button>
 
         <Button
-          label={_(msg`Use default provider`)}
-          accessibilityHint={_(msg`Returns to previous page`)}
+          label={l`Use default provider`}
+          accessibilityHint={l`Returns to previous page`}
           onPress={goToServiceHandle}
           variant="outline"
           color="secondary"
@@ -600,23 +595,21 @@ class DidMismatchError extends Error {
 }
 
 function ChangeHandleError({error}: {error: unknown}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
-  let message = _(msg`Failed to change handle. Please try again.`)
+  let message = l`Failed to change handle. Please try again.`
 
   if (error instanceof Error) {
     if (error.message.startsWith('Handle already taken')) {
-      message = _(msg`Handle already taken. Please try a different one.`)
+      message = l`Handle already taken. Please try a different one.`
     } else if (error.message === 'Reserved handle') {
-      message = _(msg`This handle is reserved. Please try a different one.`)
+      message = l`This handle is reserved. Please try a different one.`
     } else if (error.message === 'Handle too long') {
-      message = _(msg`Handle too long. Please try a shorter one.`)
+      message = l`Handle too long. Please try a shorter one.`
     } else if (error.message === 'Input/handle must be a valid handle') {
-      message = _(msg`Invalid handle. Please try a different one.`)
+      message = l`Invalid handle. Please try a different one.`
     } else if (error.message === 'Rate Limit Exceeded') {
-      message = _(
-        msg`Rate limit exceeded – you've tried to change your handle too many times in a short period. Please wait a minute before trying again.`,
-      )
+      message = l`Rate limit exceeded – you've tried to change your handle too many times in a short period. Please wait a minute before trying again.`
     }
   }
 
diff --git a/src/screens/Settings/components/ChangePasswordDialog.tsx b/src/screens/Settings/components/ChangePasswordDialog.tsx
index 91cb671792..d4e11bcdf1 100644
--- a/src/screens/Settings/components/ChangePasswordDialog.tsx
+++ b/src/screens/Settings/components/ChangePasswordDialog.tsx
@@ -1,7 +1,6 @@
 import {useState} from 'react'
 import {useWindowDimensions, View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import * as EmailValidator from 'email-validator'
 
@@ -42,7 +41,7 @@ export function ChangePasswordDialog({
 }
 
 function Inner() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount} = useSession()
   const agent = useAgent()
   const control = Dialog.useDialogContext()
@@ -55,22 +54,16 @@ function Inner() {
 
   const uiStrings = {
     RequestCode: {
-      title: _(msg`Change your password`),
-      message: _(
-        msg`If you want to change your password, we will send you a code to verify that this is your account.`,
-      ),
+      title: l`Change your password`,
+      message: l`If you want to change your password, we will send you a code to verify that this is your account.`,
     },
     ChangePassword: {
-      title: _(msg`Enter code`),
-      message: _(
-        msg`Please enter the code you received and the new password you would like to use.`,
-      ),
+      title: l`Enter code`,
+      message: l`Please enter the code you received and the new password you would like to use.`,
     },
     Done: {
-      title: _(msg`Password changed`),
-      message: _(
-        msg`Your password has been changed successfully! Please use your new password when you sign in to Bluesky from now on.`,
-      ),
+      title: l`Password changed`,
+      message: l`Your password has been changed successfully! Please use your new password when you sign in to Bluesky from now on.`,
     },
   }
 
@@ -79,7 +72,7 @@ function Inner() {
       !currentAccount?.email ||
       !EmailValidator.validate(currentAccount.email)
     ) {
-      return setError(_(msg`Your email appears to be invalid.`))
+      return setError(l`Your email appears to be invalid.`)
     }
 
     setError('')
@@ -92,9 +85,7 @@ function Inner() {
     } catch (e: any) {
       if (isNetworkError(e)) {
         setError(
-          _(
-            msg`Unable to contact your service. Please check your internet connection and try again.`,
-          ),
+          l`Unable to contact your service. Please check your internet connection and try again.`,
         )
       } else {
         logger.error('Failed to request password reset', {safeMessage: e})
@@ -109,20 +100,18 @@ function Inner() {
     const formattedCode = checkAndFormatResetCode(resetCode)
     if (!formattedCode) {
       setError(
-        _(
-          msg`You have entered an invalid code. It should look like XXXXX-XXXXX.`,
-        ),
+        l`You have entered an invalid code. It should look like XXXXX-XXXXX.`,
       )
       return
     }
     if (!newPassword) {
       setError(
-        _(msg`Please enter a password. It must be at least 8 characters long.`),
+        l`Please enter a password. It must be at least 8 characters long.`,
       )
       return
     }
     if (newPassword.length < 8) {
-      setError(_(msg`Password must be at least 8 characters long.`))
+      setError(l`Password must be at least 8 characters long.`)
       return
     }
 
@@ -137,12 +126,10 @@ function Inner() {
     } catch (e: any) {
       if (isNetworkError(e)) {
         setError(
-          _(
-            msg`Unable to contact your service. Please check your internet connection and try again.`,
-          ),
+          l`Unable to contact your service. Please check your internet connection and try again.`,
         )
       } else if (e?.toString().includes('Token is invalid')) {
-        setError(_(msg`This confirmation code is not valid. Please try again.`))
+        setError(l`This confirmation code is not valid. Please try again.`)
       } else {
         logger.error('Failed to set new password', {safeMessage: e})
         setError(cleanError(e))
@@ -162,7 +149,7 @@ function Inner() {
 
   return (
     <Dialog.ScrollableInner
-      label={_(msg`Change password dialog`)}
+      label={l`Change password dialog`}
       style={web({maxWidth: 400})}>
       <View style={[a.gap_xl]}>
         <View style={[a.gap_sm]}>
@@ -188,7 +175,7 @@ function Inner() {
               </TextField.LabelText>
               <TextField.Root>
                 <TextField.Input
-                  label={_(msg`Confirmation code`)}
+                  label={l`Confirmation code`}
                   placeholder="XXXXX-XXXXX"
                   value={resetCode}
                   onChangeText={setResetCode}
@@ -205,8 +192,8 @@ function Inner() {
               </TextField.LabelText>
               <TextField.Root>
                 <TextField.Input
-                  label={_(msg`New password`)}
-                  placeholder={_(msg`At least 8 characters`)}
+                  label={l`New password`}
+                  placeholder={l`At least 8 characters`}
                   value={newPassword}
                   onChangeText={setNewPassword}
                   secureTextEntry
@@ -223,7 +210,7 @@ function Inner() {
           {stage === Stages.RequestCode ? (
             <>
               <Button
-                label={_(msg`Request code`)}
+                label={l`Request code`}
                 color="primary"
                 size="large"
                 disabled={isProcessing}
@@ -234,7 +221,7 @@ function Inner() {
                 {isProcessing && <ButtonIcon icon={Loader} />}
               </Button>
               <Button
-                label={_(msg`Already have a code?`)}
+                label={l`Already have a code?`}
                 onPress={() => setStage(Stages.ChangePassword)}
                 size="large"
                 color="primary_subtle"
@@ -245,7 +232,7 @@ function Inner() {
               </Button>
               {IS_NATIVE && (
                 <Button
-                  label={_(msg`Cancel`)}
+                  label={l`Cancel`}
                   color="secondary"
                   size="large"
                   disabled={isProcessing}
@@ -259,7 +246,7 @@ function Inner() {
           ) : stage === Stages.ChangePassword ? (
             <>
               <Button
-                label={_(msg`Change password`)}
+                label={l`Change password`}
                 color="primary"
                 size="large"
                 disabled={isProcessing}
@@ -270,7 +257,7 @@ function Inner() {
                 {isProcessing && <ButtonIcon icon={Loader} />}
               </Button>
               <Button
-                label={_(msg`Back`)}
+                label={l`Back`}
                 color="secondary"
                 size="large"
                 disabled={isProcessing}
@@ -285,7 +272,7 @@ function Inner() {
             </>
           ) : stage === Stages.Done ? (
             <Button
-              label={_(msg`Close`)}
+              label={l`Close`}
               color="primary"
               size="large"
               onPress={() => control.close()}>
diff --git a/src/screens/Settings/components/DeactivateAccountDialog.tsx b/src/screens/Settings/components/DeactivateAccountDialog.tsx
index 036ad38035..39684d141b 100644
--- a/src/screens/Settings/components/DeactivateAccountDialog.tsx
+++ b/src/screens/Settings/components/DeactivateAccountDialog.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {logger} from '#/logger'
@@ -33,7 +32,7 @@ function DeactivateAccountDialogInner({
   control: DialogOuterProps['control']
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const agent = useAgent()
   const {logoutCurrentAccount} = useSessionApi()
   const [pending, setPending] = useState(false)
@@ -50,13 +49,11 @@ function DeactivateAccountDialogInner({
       switch (e.message) {
         case 'Bad token scope':
           setError(
-            _(
-              msg`You're signed in with an App Password. Please sign in with your main password to continue deactivating your account.`,
-            ),
+            l`You're signed in with an App Password. Please sign in with your main password to continue deactivating your account.`,
           )
           break
         default:
-          setError(_(msg`Something went wrong, please try again`))
+          setError(l`Something went wrong, please try again`)
           break
       }
 
@@ -66,11 +63,11 @@ function DeactivateAccountDialogInner({
     } finally {
       setPending(false)
     }
-  }, [agent, control, logoutCurrentAccount, _, setPending])
+  }, [agent, control, logoutCurrentAccount, l, setPending])
 
   return (
     <>
-      <Prompt.TitleText>{_(msg`Deactivate account`)}</Prompt.TitleText>
+      <Prompt.TitleText>{l`Deactivate account`}</Prompt.TitleText>
       <Prompt.DescriptionText>
         <Trans>
           Your profile, posts, feeds, and lists will no longer be visible to
@@ -78,7 +75,6 @@ function DeactivateAccountDialogInner({
           logging in.
         </Trans>
       </Prompt.DescriptionText>
-
       <View style={[a.pb_xl]}>
         <Divider />
         <View style={[a.gap_sm, a.pt_lg, a.pb_xl]}>
@@ -102,14 +98,13 @@ function DeactivateAccountDialogInner({
         <Button
           color="negative"
           size="large"
-          label={_(msg`Yes, deactivate`)}
+          label={l`Yes, deactivate`}
           onPress={handleDeactivate}>
-          <ButtonText>{_(msg`Yes, deactivate`)}</ButtonText>
+          <ButtonText>{l`Yes, deactivate`}</ButtonText>
           {pending && <ButtonIcon icon={Loader} position="right" />}
         </Button>
         <Prompt.Cancel />
       </Prompt.Actions>
-
       {error && (
         <View
           style={[
diff --git a/src/screens/Settings/components/DeleteAccountDialog.tsx b/src/screens/Settings/components/DeleteAccountDialog.tsx
index 9903fce3ba..83101af30d 100644
--- a/src/screens/Settings/components/DeleteAccountDialog.tsx
+++ b/src/screens/Settings/components/DeleteAccountDialog.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useRef, useState} from 'react'
 import {type TextInput, View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {DM_SERVICE_HEADERS} from '#/lib/constants'
@@ -70,7 +69,7 @@ function DeleteAccountDialogInner({
 }) {
   const passwordRef = useRef<TextInput | null>(null)
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const cleanError = useCleanError()
   const agent = useAgent()
   const {currentAccount} = useSession()
@@ -125,7 +124,7 @@ function DeleteAccountDialogInner({
         token,
       })
       control.close(() => {
-        toast.show(_(msg`Your account has been deleted, see ya! ✌️`))
+        toast.show(l`Your account has been deleted, see ya! ✌️`)
         resetToTab('HomeTab')
         removeAccount(currentAccount)
       })
@@ -141,7 +140,7 @@ function DeleteAccountDialogInner({
       setStep(Step.VERIFY_CODE)
     }
   }, [
-    _,
+    l,
     agent,
     cleanError,
     confirmCode,
@@ -180,7 +179,7 @@ function DeleteAccountDialogInner({
         <>
           <Prompt.Content>
             <Prompt.TitleText>
-              {_(msg`Delete account “${currentHandle}”`)}
+              {l`Delete account “${currentHandle}”`}
             </Prompt.TitleText>
             <Prompt.DescriptionText>
               <Trans>
@@ -196,7 +195,7 @@ function DeleteAccountDialogInner({
           <Prompt.Actions>
             <Prompt.Action
               icon={emailState === EmailState.PENDING ? Loader : Envelope}
-              cta={_(msg`Send email`)}
+              cta={l`Send email`}
               shouldCloseOnPress={false}
               onPress={handleSendEmail}
             />
@@ -211,7 +210,7 @@ function DeleteAccountDialogInner({
             <Trans>
               You can also{' '}
               <SimpleInlineLinkText
-                label={_(msg`Temporarily deactivate your account`)}
+                label={l`Temporarily deactivate your account`}
                 {...createStaticClick(handleDeactivate)}>
                 temporarily deactivate
               </SimpleInlineLinkText>{' '}
@@ -227,7 +226,7 @@ function DeleteAccountDialogInner({
         <>
           <Prompt.Content>
             <Prompt.TitleText>
-              {_(msg`Delete account “${currentHandle}”`)}
+              {l`Delete account “${currentHandle}”`}
             </Prompt.TitleText>
             <Prompt.DescriptionText>
               <Trans>
@@ -260,7 +259,7 @@ function DeleteAccountDialogInner({
               <Trans>
                 Email sent!{' '}
                 <SimpleInlineLinkText
-                  label={_(msg`Click here to resend the email`)}
+                  label={l`Click here to resend the email`}
                   {...createStaticClick(handleSendEmail)}>
                   Click here to resend.
                 </SimpleInlineLinkText>
@@ -269,7 +268,7 @@ function DeleteAccountDialogInner({
               <Trans>
                 Don’t see a code?{' '}
                 <SimpleInlineLinkText
-                  label={_(msg`Click here to resend the email`)}
+                  label={l`Click here to resend the email`}
                   {...createStaticClick(handleSendEmail)}>
                   Click here to resend.
                 </SimpleInlineLinkText>
@@ -288,7 +287,7 @@ function DeleteAccountDialogInner({
               <TextField.Input
                 inputRef={passwordRef}
                 testID="newPasswordInput"
-                label={_(msg`Enter your password`)}
+                label={l`Enter your password`}
                 autoCapitalize="none"
                 autoCorrect={false}
                 returnKeyType="done"
@@ -306,7 +305,7 @@ function DeleteAccountDialogInner({
             <Prompt.Action
               color="negative"
               disabled={!isValidCode(confirmCode) || !isPasswordValid(password)}
-              cta={_(msg`Delete my account`)}
+              cta={l`Delete my account`}
               shouldCloseOnPress={false}
               onPress={handleDeleteAccount}
             />
@@ -324,7 +323,7 @@ function DeleteAccountDialogInner({
         <>
           <Prompt.Content>
             <Prompt.TitleText>
-              {_(msg`Are you really, really sure?`)}
+              {l`Are you really, really sure?`}
             </Prompt.TitleText>
             <Prompt.DescriptionText>
               <Trans>
@@ -335,7 +334,7 @@ function DeleteAccountDialogInner({
                 and all associated data. Note that this will affect any other{' '}
                 <SimpleInlineLinkText
                   to="https://bsky.social/about/faq"
-                  label={_(msg`AT Protocol FAQ`)}>
+                  label={l`AT Protocol FAQ`}>
                   AT Protocol
                 </SimpleInlineLinkText>{' '}
                 services you use with this account.
@@ -345,7 +344,7 @@ function DeleteAccountDialogInner({
           <Prompt.Actions>
             <Prompt.Action
               color="negative"
-              cta={_(msg`Yes, delete my account`)}
+              cta={l`Yes, delete my account`}
               shouldCloseOnPress={false}
               onPress={handleConfirmDeletion}
             />
diff --git a/src/screens/Settings/components/DisableEmail2FADialog.tsx b/src/screens/Settings/components/DisableEmail2FADialog.tsx
index 8b774b54f7..caba45f7d1 100644
--- a/src/screens/Settings/components/DisableEmail2FADialog.tsx
+++ b/src/screens/Settings/components/DisableEmail2FADialog.tsx
@@ -1,7 +1,6 @@
 import {useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {cleanError} from '#/lib/strings/errors'
@@ -27,7 +26,7 @@ export function DisableEmail2FADialog({
 }: {
   control: Dialog.DialogOuterProps['control']
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const {gtMobile} = useBreakpoints()
   const {currentAccount} = useSession()
@@ -62,13 +61,13 @@ export function DisableEmail2FADialog({
           emailAuthFactor: false,
         })
         await agent.resumeSession(agent.session!)
-        Toast.show(_(msg({message: 'Email 2FA disabled', context: 'toast'})))
+        Toast.show(l({message: 'Email 2FA disabled', context: 'toast'}))
       }
       control.close()
     } catch (e) {
       const errMsg = String(e)
       if (errMsg.includes('Token is invalid')) {
-        setError(_(msg`Invalid 2FA confirmation code.`))
+        setError(l`Invalid 2FA confirmation code.`)
       } else {
         setError(cleanError(errMsg))
       }
@@ -118,7 +117,7 @@ export function DisableEmail2FADialog({
                 color="primary"
                 size={gtMobile ? 'small' : 'large'}
                 onPress={onSendEmail}
-                label={_(msg`Send verification email`)}
+                label={l`Send verification email`}
                 disabled={isProcessing}>
                 <ButtonText>
                   <Trans>Send verification email</Trans>
@@ -131,7 +130,7 @@ export function DisableEmail2FADialog({
                 color="primary"
                 size={gtMobile ? 'small' : 'large'}
                 onPress={() => setStage(Stages.ConfirmCode)}
-                label={_(msg`I have a code`)}
+                label={l`I have a code`}
                 disabled={isProcessing}>
                 <ButtonText>
                   <Trans>I have a code</Trans>
@@ -148,7 +147,7 @@ export function DisableEmail2FADialog({
                   <TextField.Icon icon={Lock} />
                   <Dialog.Input
                     testID="confirmationCode"
-                    label={_(msg`Confirmation code`)}
+                    label={l`Confirmation code`}
                     autoCapitalize="none"
                     autoFocus
                     autoCorrect={false}
@@ -171,7 +170,7 @@ export function DisableEmail2FADialog({
                   color="primary"
                   size={gtMobile ? 'small' : 'large'}
                   onPress={onSendEmail}
-                  label={_(msg`Resend email`)}
+                  label={l`Resend email`}
                   disabled={isProcessing}>
                   <ButtonText>
                     <Trans>Resend email</Trans>
@@ -183,7 +182,7 @@ export function DisableEmail2FADialog({
                   color="primary"
                   size={gtMobile ? 'small' : 'large'}
                   onPress={onConfirmDisable}
-                  label={_(msg`Confirm`)}
+                  label={l`Confirm`}
                   disabled={isProcessing}>
                   <ButtonText>
                     <Trans>Confirm</Trans>
diff --git a/src/screens/Settings/components/Email2FAToggle.tsx b/src/screens/Settings/components/Email2FAToggle.tsx
index 32c886278e..f336f93ea6 100644
--- a/src/screens/Settings/components/Email2FAToggle.tsx
+++ b/src/screens/Settings/components/Email2FAToggle.tsx
@@ -1,6 +1,5 @@
 import {useCallback} from 'react'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {useSession} from '#/state/session'
 import {useDialogControl} from '#/components/Dialog'
@@ -12,7 +11,7 @@ import {DisableEmail2FADialog} from './DisableEmail2FADialog'
 import * as SettingsList from './SettingsList'
 
 export function Email2FAToggle() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount} = useSession()
   const disableDialogControl = useDialogControl()
   const emailDialogControl = useEmailDialogControl()
@@ -27,9 +26,7 @@ export function Email2FAToggle() {
     <>
       <DisableEmail2FADialog control={disableDialogControl} />
       <SettingsList.BadgeButton
-        label={
-          currentAccount?.emailAuthFactor ? _(msg`Change`) : _(msg`Enable`)
-        }
+        label={currentAccount?.emailAuthFactor ? l`Change` : l`Enable`}
         onPress={onToggle}
       />
     </>
diff --git a/src/screens/Settings/components/OTAInfo.tsx b/src/screens/Settings/components/OTAInfo.tsx
index 9ab1962b97..0cadbf449f 100644
--- a/src/screens/Settings/components/OTAInfo.tsx
+++ b/src/screens/Settings/components/OTAInfo.tsx
@@ -1,6 +1,5 @@
 import * as Updates from 'expo-updates'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useMutation, useQuery} from '@tanstack/react-query'
 
@@ -12,7 +11,7 @@ import * as Toast from '#/components/Toast'
 import * as SettingsList from '../components/SettingsList'
 
 export function OTAInfo() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {
     data: isAvailable,
     isPending: isPendingInfo,
@@ -58,7 +57,7 @@ export function OTAInfo() {
         )}
       </SettingsList.ItemText>
       <Button
-        label={isAvailable ? _(msg`Update`) : _(msg`Fetch update`)}
+        label={isAvailable ? l`Update` : l`Fetch update`}
         disabled={isFetchingInfo || isPendingUpdate}
         variant="solid"
         size="small"
diff --git a/src/screens/Settings/components/PwiOptOut.tsx b/src/screens/Settings/components/PwiOptOut.tsx
index 193f26994e..1c000b4513 100644
--- a/src/screens/Settings/components/PwiOptOut.tsx
+++ b/src/screens/Settings/components/PwiOptOut.tsx
@@ -1,8 +1,7 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
 import {type $Typed, ComAtprotoLabelDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {
@@ -17,7 +16,7 @@ import * as bsky from '#/types/bsky'
 
 export function PwiOptOut() {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount} = useSession()
   const {data: profile} = useProfileQuery({did: currentAccount?.did})
   const updateProfile = useProfileUpdateMutation()
@@ -84,9 +83,7 @@ export function PwiOptOut() {
         disabled={!canToggle || updateProfile.isPending}
         value={isOptedOut}
         onChange={onToggleOptOut}
-        label={_(
-          msg`Discourage apps from showing my account to logged-out users`,
-        )}
+        label={l`Discourage apps from showing my account to logged-out users`}
         style={[a.w_full]}>
         <Toggle.LabelText style={[a.flex_1]}>
           <Trans>
@@ -95,7 +92,6 @@ export function PwiOptOut() {
         </Toggle.LabelText>
         <Toggle.Platform />
       </Toggle.Item>
-
       <Text style={[a.leading_snug, t.atoms.text_contrast_high]}>
         <Trans>
           Bluesky will not show your profile and posts to logged-out users.
diff --git a/src/screens/Signup/BackNextButtons.tsx b/src/screens/Signup/BackNextButtons.tsx
index 4466e836f7..63502ae284 100644
--- a/src/screens/Signup/BackNextButtons.tsx
+++ b/src/screens/Signup/BackNextButtons.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {atoms as a} from '#/alf'
@@ -28,12 +27,12 @@ export function BackNextButtons({
   onRetryPress,
   overrideNextText,
 }: BackNextButtonsProps) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <View style={[a.flex_row, a.justify_between, a.pb_lg, a.pt_3xl]}>
       <Button
-        label={_(msg`Go back to previous step`)}
+        label={l`Go back to previous step`}
         variant="solid"
         color="secondary"
         size="large"
@@ -45,7 +44,7 @@ export function BackNextButtons({
       {!hideNext &&
         (showRetry ? (
           <Button
-            label={_(msg`Press to retry`)}
+            label={l`Press to retry`}
             variant="solid"
             color="primary"
             size="large"
@@ -58,7 +57,7 @@ export function BackNextButtons({
         ) : (
           <Button
             testID="nextBtn"
-            label={_(msg`Continue to next step`)}
+            label={l`Continue to next step`}
             variant="solid"
             color="primary"
             size="large"
diff --git a/src/screens/Signup/StepCaptcha/index.tsx b/src/screens/Signup/StepCaptcha/index.tsx
index 43e536c7ae..19c95e8811 100644
--- a/src/screens/Signup/StepCaptcha/index.tsx
+++ b/src/screens/Signup/StepCaptcha/index.tsx
@@ -1,8 +1,7 @@
 import {useCallback, useEffect, useMemo, useState} from 'react'
 import {ActivityIndicator, Platform, View} from 'react-native'
 import ReactNativeDeviceAttest from 'react-native-device-attest'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {nanoid} from 'nanoid/non-secure'
 
 import {createFullHandle} from '#/lib/strings/handles'
@@ -71,7 +70,7 @@ function StepCaptchaInner({
   token?: string
   payload?: string
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const theme = useTheme()
   const {state, dispatch} = useSignupContext()
@@ -124,14 +123,14 @@ function StepCaptchaInner({
     (error?: unknown) => {
       dispatch({
         type: 'setError',
-        value: _(msg`Error receiving captcha response.`),
+        value: l`Error receiving captcha response.`,
       })
       ax.metric('signup:captchaFailure', {})
       logger.error('Signup: captcha response error', {
         safeMessage: error,
       })
     },
-    [_, ax, dispatch],
+    [l, ax, dispatch],
   )
 
   const onBackPress = useCallback(() => {
diff --git a/src/screens/Signup/StepHandle/index.tsx b/src/screens/Signup/StepHandle/index.tsx
index 06927a0552..3382a203bc 100644
--- a/src/screens/Signup/StepHandle/index.tsx
+++ b/src/screens/Signup/StepHandle/index.tsx
@@ -7,8 +7,7 @@ import Animated, {
   LinearTransition,
 } from 'react-native-reanimated'
 import {useSift} from '@bsky.app/sift'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 
 import {
@@ -34,7 +33,7 @@ import {BackNextButtons} from '../BackNextButtons'
 import {HandleSuggestions} from './HandleSuggestions'
 
 export function StepHandle() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const t = useTheme()
   const {state, dispatch} = useSignupContext()
@@ -87,7 +86,7 @@ export function StepHandle() {
         ax.metric('signup:handleTaken', {typeahead: false})
         dispatch({
           type: 'setError',
-          value: _(msg`That username is already taken`),
+          value: l`That username is already taken`,
           field: 'handle',
         })
         return
diff --git a/src/screens/Signup/StepInfo/Policies.tsx b/src/screens/Signup/StepInfo/Policies.tsx
index 9d7b7e9ff1..46ad93a82e 100644
--- a/src/screens/Signup/StepInfo/Policies.tsx
+++ b/src/screens/Signup/StepInfo/Policies.tsx
@@ -1,8 +1,7 @@
 import {type ReactElement} from 'react'
 import {View} from 'react-native'
 import {type ComAtprotoServerDescribeServer} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {atoms as a, useTheme} from '#/alf'
@@ -16,7 +15,7 @@ export const Policies = ({
   serviceDescription: ComAtprotoServerDescribeServer.OutputSchema
 }) => {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   if (!serviceDescription) {
     return <View />
@@ -43,14 +42,14 @@ export const Policies = ({
       <Trans>
         By creating an account you agree to the{' '}
         <InlineLinkText
-          label={_(msg`Read the Bluesky Terms of Service`)}
+          label={l`Read the Bluesky Terms of Service`}
           key="tos"
           to={tos}>
           Terms of Service
         </InlineLinkText>{' '}
         and{' '}
         <InlineLinkText
-          label={_(msg`Read the Bluesky Privacy Policy`)}
+          label={l`Read the Bluesky Privacy Policy`}
           key="pp"
           to={pp}>
           Privacy Policy
@@ -63,7 +62,7 @@ export const Policies = ({
       <Trans>
         By creating an account you agree to the{' '}
         <InlineLinkText
-          label={_(msg`Read the Bluesky Terms of Service`)}
+          label={l`Read the Bluesky Terms of Service`}
           key="tos"
           to={tos}>
           Terms of Service
@@ -76,7 +75,7 @@ export const Policies = ({
       <Trans>
         By creating an account you agree to the{' '}
         <InlineLinkText
-          label={_(msg`Read the Bluesky Privacy Policy`)}
+          label={l`Read the Bluesky Privacy Policy`}
           key="pp"
           to={pp}>
           Privacy Policy
diff --git a/src/screens/SignupQueued.tsx b/src/screens/SignupQueued.tsx
index b83e627404..856b107c47 100644
--- a/src/screens/SignupQueued.tsx
+++ b/src/screens/SignupQueued.tsx
@@ -2,8 +2,8 @@ import {useCallback, useEffect, useState} from 'react'
 import {Modal, ScrollView, View} from 'react-native'
 import {SystemBars} from 'react-native-edge-to-edge'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {msg, plural} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {plural} from '@lingui/core/macro'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {logger} from '#/logger'
@@ -19,7 +19,7 @@ import {IS_IOS, IS_LIQUID_GLASS, IS_WEB} from '#/env'
 const COL_WIDTH = 400
 
 export function SignupQueued() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const insets = useSafeAreaInsets()
   const {gtMobile} = useBreakpoints()
@@ -76,7 +76,7 @@ export function SignupQueued() {
       variant="solid"
       color="primary"
       size="large"
-      label={_(msg`Check my status`)}
+      label={l`Check my status`}
       onPress={checkStatus}
       disabled={isProcessing}>
       <ButtonText>
@@ -91,7 +91,7 @@ export function SignupQueued() {
       variant="ghost"
       size="large"
       color="primary"
-      label={_(msg`Sign out`)}
+      label={l`Sign out`}
       onPress={() => logoutCurrentAccount('SignupQueued')}>
       <ButtonText>
         <Trans>Sign out</Trans>
diff --git a/src/screens/StarterPack/StarterPackLandingScreen.tsx b/src/screens/StarterPack/StarterPackLandingScreen.tsx
index 6184514412..a7801bed41 100644
--- a/src/screens/StarterPack/StarterPackLandingScreen.tsx
+++ b/src/screens/StarterPack/StarterPackLandingScreen.tsx
@@ -7,8 +7,7 @@ import {
   AtUri,
   type ModerationOpts,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {JOINED_THIS_WEEK} from '#/lib/constants'
@@ -119,7 +118,7 @@ function LandingScreenLoaded({
   moderationOpts: ModerationOpts
 }) {
   const {creator, listItemsSample, feeds} = starterPack
-  const {_, i18n} = useLingui()
+  const {t: l, i18n} = useLingui()
   const ax = useAnalytics()
   const t = useTheme()
   const activeStarterPack = useActiveStarterPack()
@@ -207,7 +206,7 @@ function LandingScreenLoaded({
           ) : null}
           <View style={[a.gap_sm]}>
             <Button
-              label={_(msg`Join Bluesky`)}
+              label={l`Join Bluesky`}
               onPress={onJoinPress}
               color="primary"
               size="large">
@@ -307,7 +306,7 @@ function LandingScreenLoaded({
             ) : null}
           </View>
           <Button
-            label={_(msg`Create an account without using this starter pack`)}
+            label={l`Create an account without using this starter pack`}
             variant="solid"
             color="secondary"
             size="large"
diff --git a/src/screens/StarterPack/StarterPackScreen.tsx b/src/screens/StarterPack/StarterPackScreen.tsx
index ddbd5cd840..23dde0c6d8 100644
--- a/src/screens/StarterPack/StarterPackScreen.tsx
+++ b/src/screens/StarterPack/StarterPackScreen.tsx
@@ -8,8 +8,7 @@ import {
   type ModerationOpts,
   RichText as RichTextAPI,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
@@ -97,7 +96,7 @@ export function StarterPackScreen({route}: StarterPackScreeProps) {
 }
 
 export function StarterPackScreenShort({route}: StarterPackScreenShortProps) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {
     data: resolvedStarterPack,
     isLoading,
@@ -112,8 +111,8 @@ export function StarterPackScreenShort({route}: StarterPackScreenShortProps) {
         <ListMaybePlaceholder
           isLoading={isLoading}
           isError={isError}
-          errorMessage={_(msg`That starter pack could not be found.`)}
-          emptyMessage={_(msg`That starter pack could not be found.`)}
+          errorMessage={l`That starter pack could not be found.`}
+          emptyMessage={l`That starter pack could not be found.`}
         />
       </Layout.Screen>
     )
@@ -131,7 +130,7 @@ export function StarterPackScreenInner({
   routeParams: StarterPackScreeProps['route']['params']
 }) {
   const {name, rkey} = routeParams
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount} = useSession()
 
   const moderationOpts = useModerationOpts()
@@ -157,8 +156,8 @@ export function StarterPackScreenInner({
       <ListMaybePlaceholder
         isLoading={isLoadingDid || isLoadingStarterPack || !moderationOpts}
         isError={isErrorDid || isErrorStarterPack || !isValid}
-        errorMessage={_(msg`That starter pack could not be found.`)}
-        emptyMessage={_(msg`That starter pack could not be found.`)}
+        errorMessage={l`That starter pack could not be found.`}
+        emptyMessage={l`That starter pack could not be found.`}
       />
     )
   }
@@ -188,13 +187,13 @@ function StarterPackScreenLoaded({
   const showPeopleTab = Boolean(starterPack.list)
   const showFeedsTab = Boolean(starterPack.feeds?.length)
   const showPostsTab = Boolean(starterPack.list)
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
 
   const tabs = [
-    ...(showPeopleTab ? [_(msg`People`)] : []),
-    ...(showFeedsTab ? [_(msg`Feeds`)] : []),
-    ...(showPostsTab ? [_(msg`Posts`)] : []),
+    ...(showPeopleTab ? [l`People`] : []),
+    ...(showFeedsTab ? [l`Feeds`] : []),
+    ...(showPostsTab ? [l`Posts`] : []),
   ]
 
   const qrCodeDialogControl = useDialogControl()
@@ -307,7 +306,7 @@ function Header({
   routeParams: StarterPackScreeProps['route']['params']
   onOpenShareDialog: () => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const {currentAccount, hasSession} = useSession()
   const agent = useAgent()
@@ -356,7 +355,7 @@ function Header({
       listItems = await getAllListMembers(agent, starterPack.list.uri)
     } catch (e) {
       setIsProcessing(false)
-      Toast.show(_(msg`An error occurred while trying to follow all`), {
+      Toast.show(l`An error occurred while trying to follow all`, {
         type: 'error',
       })
       logger.error('Failed to get list members for starter pack', {
@@ -383,7 +382,7 @@ function Header({
       })
     } catch (e) {
       setIsProcessing(false)
-      Toast.show(_(msg`An error occurred while trying to follow all`), {
+      Toast.show(l`An error occurred while trying to follow all`, {
         type: 'error',
       })
       logger.error('Failed to follow all accounts', {safeMessage: e})
@@ -397,7 +396,7 @@ function Header({
         })
       }
     })
-    Toast.show(_(msg`All accounts have been followed!`))
+    Toast.show(l`All accounts have been followed!`)
     captureAction(ProgressGuideAction.Follow, dids.length)
     ax.metric('starterPack:followAll', {
       logContext: 'StarterPackProfilesList',
@@ -437,7 +436,7 @@ function Header({
           <View style={[a.flex_row, a.gap_sm, a.align_center]}>
             {isOwn ? (
               <Button
-                label={_(msg`Share this starter pack`)}
+                label={l`Share this starter pack`}
                 hitSlop={HITSLOP_20}
                 variant="solid"
                 color="primary"
@@ -449,7 +448,7 @@ function Header({
               </Button>
             ) : (
               <Button
-                label={_(msg`Follow all`)}
+                label={l`Follow all`}
                 variant="solid"
                 color="primary"
                 size="small"
@@ -475,7 +474,7 @@ function Header({
           {richText ? <RichText value={richText} style={[a.text_md]} /> : null}
           {!hasSession ? (
             <Button
-              label={_(msg`Join Bluesky`)}
+              label={l`Join Bluesky`}
               onPress={() => {
                 setActiveStarterPack({
                   uri: starterPack.uri,
@@ -527,7 +526,7 @@ function OverflowMenu({
   onOpenShareDialog: () => void
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const {gtMobile} = useBreakpoints()
   const {currentAccount} = useSession()
@@ -574,12 +573,12 @@ function OverflowMenu({
   return (
     <>
       <Menu.Root>
-        <Menu.Trigger label={_(msg`Repost or quote post`)}>
+        <Menu.Trigger label={l`Repost or quote post`}>
           {({props}) => (
             <Button
               {...props}
               testID="headerDropdownBtn"
-              label={_(msg`Open starter pack menu`)}
+              label={l`Open starter pack menu`}
               hitSlop={HITSLOP_20}
               variant="solid"
               color="secondary"
@@ -593,7 +592,7 @@ function OverflowMenu({
           {isOwn ? (
             <>
               <Menu.Item
-                label={_(msg`Edit starter pack`)}
+                label={l`Edit starter pack`}
                 testID="editStarterPackLinkBtn"
                 onPress={() => {
                   navigation.navigate('StarterPackEdit', {
@@ -606,7 +605,7 @@ function OverflowMenu({
                 <Menu.ItemIcon icon={Pencil} position="right" />
               </Menu.Item>
               <Menu.Item
-                label={_(msg`Delete starter pack`)}
+                label={l`Delete starter pack`}
                 testID="deleteStarterPackBtn"
                 onPress={() => {
                   deleteDialogControl.open()
@@ -617,7 +616,7 @@ function OverflowMenu({
                 <Menu.ItemIcon icon={Trash} position="right" />
               </Menu.Item>
               <Menu.Item
-                label={_(msg`Create a list from this starter pack`)}
+                label={l`Create a list from this starter pack`}
                 testID="convertToListBtn"
                 onPress={() => {
                   convertToListDialogControl.open()
@@ -633,9 +632,7 @@ function OverflowMenu({
               <Menu.Group>
                 <Menu.Item
                   label={
-                    IS_WEB
-                      ? _(msg`Copy link to starter pack`)
-                      : _(msg`Share via...`)
+                    IS_WEB ? l`Copy link to starter pack` : l`Share via...`
                   }
                   testID="shareStarterPackLinkBtn"
                   onPress={onOpenShareDialog}>
@@ -654,7 +651,7 @@ function OverflowMenu({
               </Menu.Group>
 
               <Menu.Item
-                label={_(msg`Report starter pack`)}
+                label={l`Report starter pack`}
                 onPress={() => reportDialogControl.open()}>
                 <Menu.ItemText>
                   <Trans>Report starter pack</Trans>
@@ -665,7 +662,6 @@ function OverflowMenu({
           )}
         </Menu.Outer>
       </Menu.Root>
-
       {starterPack.list && (
         <ReportDialog
           control={reportDialogControl}
@@ -675,7 +671,6 @@ function OverflowMenu({
           }}
         />
       )}
-
       <Prompt.Outer control={deleteDialogControl}>
         <Prompt.TitleText>
           <Trans>Delete starter pack?</Trans>
@@ -709,7 +704,7 @@ function OverflowMenu({
             variant="solid"
             color="negative"
             size={gtMobile ? 'small' : 'large'}
-            label={_(msg`Yes, delete this starter pack`)}
+            label={l`Yes, delete this starter pack`}
             onPress={onDeleteStarterPack}>
             <ButtonText>
               <Trans>Delete</Trans>
@@ -719,7 +714,6 @@ function OverflowMenu({
           <Prompt.Cancel />
         </Prompt.Actions>
       </Prompt.Outer>
-
       <CreateListFromStarterPackDialog
         control={convertToListDialogControl}
         starterPack={starterPack}
@@ -729,7 +723,7 @@ function OverflowMenu({
 }
 
 function InvalidStarterPack({rkey}: {rkey: string}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const navigation = useNavigation<NavigationProp>()
   const {gtMobile} = useBreakpoints()
@@ -751,7 +745,7 @@ function InvalidStarterPack({rkey}: {rkey: string}) {
     onError: e => {
       setIsProcessing(false)
       logger.error('Failed to delete invalid starter pack', {safeMessage: e})
-      Toast.show(_(msg`Failed to delete starter pack`), {
+      Toast.show(l`Failed to delete starter pack`, {
         type: 'error',
       })
     },
@@ -782,7 +776,7 @@ function InvalidStarterPack({rkey}: {rkey: string}) {
           <Button
             variant="solid"
             color="primary"
-            label={_(msg`Delete starter pack`)}
+            label={l`Delete starter pack`}
             size="large"
             style={[a.rounded_sm, a.overflow_hidden, {paddingVertical: 10}]}
             disabled={isProcessing}
@@ -798,7 +792,7 @@ function InvalidStarterPack({rkey}: {rkey: string}) {
           <Button
             variant="solid"
             color="secondary"
-            label={_(msg`Return to previous page`)}
+            label={l`Return to previous page`}
             size="large"
             style={[a.rounded_sm, a.overflow_hidden, {paddingVertical: 10}]}
             disabled={isProcessing}
diff --git a/src/screens/StarterPack/Wizard/State.tsx b/src/screens/StarterPack/Wizard/State.tsx
index 0ec8700057..86df318c30 100644
--- a/src/screens/StarterPack/Wizard/State.tsx
+++ b/src/screens/StarterPack/Wizard/State.tsx
@@ -4,7 +4,7 @@ import {
   type AppBskyGraphDefs,
   AppBskyGraphStarterpack,
 } from '@atproto/api'
-import {msg, plural} from '@lingui/core/macro'
+import {plural, t} from '@lingui/core/macro'
 
 import {STARTER_PACK_MAX_SIZE} from '#/lib/constants'
 import * as Toast from '#/components/Toast'
@@ -77,12 +77,10 @@ function reducer(state: State, action: Action): State {
     case 'AddProfile':
       if (state.profiles.length > STARTER_PACK_MAX_SIZE) {
         Toast.show(
-          msg`You may only add up to ${plural(STARTER_PACK_MAX_SIZE, {
+          t`You may only add up to ${plural(STARTER_PACK_MAX_SIZE, {
             other: `${STARTER_PACK_MAX_SIZE} profiles`,
-          })}`.message ?? '',
-          {
-            type: 'info',
-          },
+          })}`,
+          {type: 'info'},
         )
       } else {
         updatedState = {...state, profiles: [...state.profiles, action.profile]}
@@ -98,9 +96,7 @@ function reducer(state: State, action: Action): State {
       break
     case 'AddFeed':
       if (state.feeds.length >= 3) {
-        Toast.show(msg`You may only add up to 3 feeds`.message ?? '', {
-          type: 'info',
-        })
+        Toast.show(t`You may only add up to 3 feeds`, {type: 'info'})
       } else {
         updatedState = {...state, feeds: [...state.feeds, action.feed]}
       }
diff --git a/src/screens/StarterPack/Wizard/StepDetails.tsx b/src/screens/StarterPack/Wizard/StepDetails.tsx
index 5a7770f2f0..587e7f5db8 100644
--- a/src/screens/StarterPack/Wizard/StepDetails.tsx
+++ b/src/screens/StarterPack/Wizard/StepDetails.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useProfileQuery} from '#/state/queries/profile'
@@ -13,7 +12,7 @@ import {ScreenTransition} from '#/components/ScreenTransition'
 import {Text} from '#/components/Typography'
 
 export function StepDetails() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const [state, dispatch] = useWizardState()
 
@@ -45,20 +44,16 @@ export function StepDetails() {
           </TextField.LabelText>
           <TextField.Root>
             <TextField.Input
-              label={
-                name ? _(msg`${name}'s starter pack`) : _(msg`My starter pack`)
-              }
+              label={name ? l`${name}'s starter pack` : l`My starter pack`}
               value={state.name}
               onChangeText={text => dispatch({type: 'SetName', name: text})}
             />
             <TextField.SuffixText
-              label={_(
-                msg({
-                  comment:
-                    'Accessibility label describing how many characters the user has entered out of a 50-character limit in a text input field',
-                  message: `${state.name?.length} out of 50`,
-                }),
-              )}>
+              label={l({
+                comment:
+                  'Accessibility label describing how many characters the user has entered out of a 50-character limit in a text input field',
+                message: `${state.name?.length} out of 50`,
+              })}>
               <Text style={[t.atoms.text_contrast_medium]}>
                 {state.name?.length ?? 0}/50
               </Text>
@@ -73,8 +68,8 @@ export function StepDetails() {
             <TextField.Input
               label={
                 name
-                  ? _(msg`${name}'s favorite feeds and people - join me!`)
-                  : _(msg`My favorite feeds and people - join me!`)
+                  ? l`${name}'s favorite feeds and people - join me!`
+                  : l`My favorite feeds and people - join me!`
               }
               value={state.description}
               onChangeText={text =>
diff --git a/src/screens/StarterPack/Wizard/index.tsx b/src/screens/StarterPack/Wizard/index.tsx
index c579f09d67..d2935eaa4a 100644
--- a/src/screens/StarterPack/Wizard/index.tsx
+++ b/src/screens/StarterPack/Wizard/index.tsx
@@ -10,8 +10,7 @@ import {
   AtUri,
   type ModerationOpts,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {type NativeStackScreenProps} from '@react-navigation/native-stack'
@@ -75,7 +74,7 @@ export function Wizard({
   const {currentAccount} = useSession()
   const moderationOpts = useModerationOpts()
 
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   // Use targetDid if provided (from dialog), otherwise use current account
   const profileDid = targetDid || currentAccount!.did
@@ -113,7 +112,7 @@ export function Wizard({
             isLoadingStarterPack || isLoadingProfiles || isLoadingProfile
           }
           isError={isErrorStarterPack || isErrorProfiles || isErrorProfile}
-          errorMessage={_(msg`That starter pack could not be found.`)}
+          errorMessage={l`That starter pack could not be found.`}
         />
       </Layout.Screen>
     )
@@ -123,7 +122,7 @@ export function Wizard({
         <ListMaybePlaceholder
           isLoading={false}
           isError={true}
-          errorMessage={_(msg`That starter pack could not be found.`)}
+          errorMessage={l`That starter pack could not be found.`}
         />
       </Layout.Screen>
     )
@@ -168,7 +167,7 @@ function WizardInner({
 }) {
   const navigation = useNavigation<NavigationProp>()
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const [state, dispatch] = useWizardState()
   const {currentAccount} = useSession()
 
@@ -186,7 +185,7 @@ function WizardInner({
 
   const getDefaultName = () => {
     const displayName = createSanitizedDisplayName(currentProfile!, true)
-    return _(msg`${displayName}'s Starter Pack`).slice(0, 50)
+    return l`${displayName}'s Starter Pack`.slice(0, 50)
   }
 
   const wizardUiStrings: Record<
@@ -194,16 +193,16 @@ function WizardInner({
     {header: string; nextBtn: string; subtitle?: string}
   > = {
     Details: {
-      header: _(msg`Starter Pack`),
-      nextBtn: _(msg`Next`),
+      header: l`Starter Pack`,
+      nextBtn: l`Next`,
     },
     Profiles: {
-      header: _(msg`Choose People`),
-      nextBtn: _(msg`Next`),
+      header: l`Choose People`,
+      nextBtn: l`Next`,
     },
     Feeds: {
-      header: _(msg`Choose Feeds`),
-      nextBtn: state.feeds.length === 0 ? _(msg`Skip`) : _(msg`Finish`),
+      header: l`Choose Feeds`,
+      nextBtn: state.feeds.length === 0 ? l`Skip` : l`Finish`,
     },
   }
   const currUiStrings = wizardUiStrings[state.currentStep]
@@ -247,7 +246,7 @@ function WizardInner({
     onError: e => {
       logger.error('Failed to create starter pack', {safeMessage: e})
       dispatch({type: 'SetProcessing', processing: false})
-      Toast.show(_(msg`Failed to create starter pack`), {
+      Toast.show(l`Failed to create starter pack`, {
         type: 'error',
       })
     },
@@ -257,7 +256,7 @@ function WizardInner({
     onError: e => {
       logger.error('Failed to edit starter pack', {safeMessage: e})
       dispatch({type: 'SetProcessing', processing: false})
-      Toast.show(_(msg`Failed to create starter pack`), {
+      Toast.show(l`Failed to create starter pack`, {
         type: 'error',
       })
     },
@@ -312,8 +311,8 @@ function WizardInner({
     <Layout.Center style={[a.flex_1]}>
       <Layout.Header.Outer>
         <Layout.Header.BackButton
-          label={_(msg`Back`)}
-          accessibilityHint={_(msg`Returns to the previous step`)}
+          label={l`Back`}
+          accessibilityHint={l`Returns to the previous step`}
           onPress={evt => {
             if (state.currentStep !== 'Details') {
               evt.preventDefault()
@@ -328,7 +327,7 @@ function WizardInner({
         </Layout.Header.Content>
         {isEditEnabled ? (
           <Button
-            label={_(msg`Edit`)}
+            label={l`Edit`}
             color="secondary"
             size="small"
             onPress={editDialogControl.open}>
@@ -340,7 +339,6 @@ function WizardInner({
           <Layout.Header.Slot />
         )}
       </Layout.Header.Outer>
-
       <Container>
         {state.currentStep === 'Details' ? (
           <StepDetails />
@@ -350,7 +348,6 @@ function WizardInner({
           <StepFeeds moderationOpts={moderationOpts} />
         ) : null}
       </Container>
-
       {state.currentStep !== 'Details' && (
         <Footer onNext={onNext} nextBtnText={currUiStrings.nextBtn} />
       )}
@@ -366,7 +363,7 @@ function WizardInner({
 }
 
 function Container({children}: {children: React.ReactNode}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const [state, dispatch] = useWizardState()
 
   if (state.currentStep === 'Profiles' || state.currentStep === 'Feeds') {
@@ -381,7 +378,7 @@ function Container({children}: {children: React.ReactNode}) {
       {state.currentStep === 'Details' && (
         <>
           <Button
-            label={_(msg`Next`)}
+            label={l`Next`}
             variant="solid"
             color="primary"
             size="large"
diff --git a/src/screens/Takendown.tsx b/src/screens/Takendown.tsx
index 5ad254fd1c..226177fc74 100644
--- a/src/screens/Takendown.tsx
+++ b/src/screens/Takendown.tsx
@@ -3,8 +3,7 @@ import {View} from 'react-native'
 import {KeyboardAwareScrollView} from 'react-native-keyboard-controller'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import {type ComAtprotoAdminDefs, ToolsOzoneReportDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useMutation} from '@tanstack/react-query'
 import {countGraphemes} from 'unicode-segmenter/grapheme'
@@ -28,7 +27,7 @@ import {IS_WEB} from '#/env'
 const COL_WIDTH = 400
 
 export function Takendown() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const insets = useSafeAreaInsets()
   const {gtMobile} = useBreakpoints()
@@ -73,7 +72,7 @@ export function Takendown() {
       <Button
         color="primary"
         size="large"
-        label={_(msg`Submit appeal`)}
+        label={l`Submit appeal`}
         onPress={() => submitAppeal(reason)}
         disabled={isPending || isOverMaxLength}>
         <ButtonText>
@@ -85,7 +84,7 @@ export function Takendown() {
       <Button
         size="large"
         color="secondary_inverted"
-        label={_(msg`Sign out`)}
+        label={l`Sign out`}
         onPress={() => logoutCurrentAccount('Takendown')}>
         <ButtonText>
           <Trans>Sign Out</Trans>
@@ -99,7 +98,7 @@ export function Takendown() {
         variant="ghost"
         size="large"
         color="secondary"
-        label={_(msg`Cancel`)}
+        label={l`Cancel`}
         onPress={() => setIsAppealling(false)}>
         <ButtonText>
           <Trans>Cancel</Trans>
@@ -111,7 +110,7 @@ export function Takendown() {
       variant="ghost"
       size="large"
       color="secondary"
-      label={_(msg`Appeal suspension`)}
+      label={l`Appeal suspension`}
       onPress={() => setIsAppealling(true)}>
       <ButtonText>
         <Trans>Appeal Suspension</Trans>
@@ -163,10 +162,10 @@ export function Takendown() {
                           MAX_REPORT_REASON_GRAPHEME_LENGTH || !!error
                       }>
                       <TextField.Input
-                        label={_(msg`Reason for appeal`)}
+                        label={l`Reason for appeal`}
                         defaultValue={reason}
                         onChangeText={setReason}
-                        placeholder={_(msg`Why are you appealing?`)}
+                        placeholder={l`Why are you appealing?`}
                         multiline
                         numberOfLines={5}
                         autoFocus
@@ -210,7 +209,7 @@ export function Takendown() {
                 <Trans>
                   Your account was found to be in violation of the{' '}
                   <SimpleInlineLinkText
-                    label={_(msg`Bluesky Social Terms of Service`)}
+                    label={l`Bluesky Social Terms of Service`}
                     to="https://bsky.social/about/support/tos"
                     style={[a.text_md, a.leading_snug]}>
                     Bluesky Social Terms of Service
@@ -238,7 +237,6 @@ export function Takendown() {
           </View>
         </View>
       </KeyboardAwareScrollView>
-
       {!webLayout && (
         <View
           style={[
diff --git a/src/screens/VideoFeed/components/Header.tsx b/src/screens/VideoFeed/components/Header.tsx
index 3d3ff6ede5..94ca66ca12 100644
--- a/src/screens/VideoFeed/components/Header.tsx
+++ b/src/screens/VideoFeed/components/Header.tsx
@@ -1,7 +1,6 @@
 import {useCallback} from 'react'
 import {type GestureResponderEvent, View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
 import {HITSLOP_30} from '#/lib/constants'
@@ -141,7 +140,7 @@ export function FeedHeader({
 
 // TODO: This customization should be a part of the layout component
 export function BackButton({onPress, style, ...props}: Partial<ButtonProps>) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const navigation = useNavigation<NavigationProp>()
 
   const onPressBack = useCallback(
@@ -160,7 +159,7 @@ export function BackButton({onPress, style, ...props}: Partial<ButtonProps>) {
   return (
     <Layout.Header.Slot>
       <Button
-        label={_(msg`Go back`)}
+        label={l`Go back`}
         size="small"
         variant="ghost"
         color="secondary"
diff --git a/src/state/queries/explore-feed-previews.tsx b/src/state/queries/explore-feed-previews.tsx
index acbc4ee7e1..96013a2719 100644
--- a/src/state/queries/explore-feed-previews.tsx
+++ b/src/state/queries/explore-feed-previews.tsx
@@ -5,8 +5,7 @@ import {
   AtUri,
   moderatePost,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {
   type InfiniteData,
   type QueryClient,
@@ -120,7 +119,7 @@ export function useFeedPreviews(
   )
 
   const uris = feeds.map(feed => feed.uri)
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const agent = useAgent()
   const {data: preferences} = usePreferencesQuery()
   const userInterests = aggregateUserInterests(preferences)
@@ -180,7 +179,7 @@ export function useFeedPreviews(
           items.push({
             type: 'preview:error',
             key: 'error',
-            message: _(msg`An error occurred while fetching the feed.`),
+            message: l`An error occurred while fetching the feed.`,
             error: cleanError(error),
           })
         } else if (isEmpty) {
@@ -340,7 +339,7 @@ export function useFeedPreviews(
       isError,
       isPending,
       moderationOpts,
-      _,
+      l,
       error,
     ]),
   }
diff --git a/src/state/queries/pinned-post.ts b/src/state/queries/pinned-post.ts
index 09a0b4c9b9..06f2370430 100644
--- a/src/state/queries/pinned-post.ts
+++ b/src/state/queries/pinned-post.ts
@@ -1,5 +1,4 @@
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {useMutation, useQueryClient} from '@tanstack/react-query'
 
 import {logger} from '#/logger'
@@ -10,7 +9,7 @@ import {useAgent, useSession} from '../session'
 import {useProfileUpdateMutation} from './profile'
 
 export function usePinnedPostMutation() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount} = useSession()
   const agent = useAgent()
   const queryClient = useQueryClient()
@@ -56,9 +55,9 @@ export function usePinnedPostMutation() {
         })
 
         if (pinCurrentPost) {
-          Toast.show(_(msg({message: 'Post pinned', context: 'toast'})))
+          Toast.show(l({message: 'Post pinned', context: 'toast'}))
         } else {
-          Toast.show(_(msg({message: 'Post unpinned', context: 'toast'})))
+          Toast.show(l({message: 'Post unpinned', context: 'toast'}))
         }
 
         queryClient.invalidateQueries({
@@ -72,7 +71,7 @@ export function usePinnedPostMutation() {
           ),
         })
       } catch (e: any) {
-        Toast.show(_(msg`Failed to pin post`))
+        Toast.show(l`Failed to pin post`)
         logger.error('Failed to pin post', {message: String(e)})
         // revert optimistic update
         updatePostShadow(queryClient, postUri, {
diff --git a/src/state/shell/composer/index.tsx b/src/state/shell/composer/index.tsx
index 9a1e212f48..8536404a3e 100644
--- a/src/state/shell/composer/index.tsx
+++ b/src/state/shell/composer/index.tsx
@@ -5,8 +5,7 @@ import {
   type AppBskyUnspeccedGetPostThreadV2,
   type ModerationDecision,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
@@ -74,7 +73,7 @@ const controlsContext = createContext<ControlsContext>({
 controlsContext.displayName = 'ComposerControlsContext'
 
 export function Provider({children}: React.PropsWithChildren<{}>) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const [state, setState] = useState<StateContext>()
   const queryClient = useQueryClient()
 
@@ -102,7 +101,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
         author.viewer?.blockingByList),
     )
     if (isBlocked) {
-      Toast.show(_(msg`Cannot interact with a blocked user`), {
+      Toast.show(l`Cannot interact with a blocked user`, {
         type: 'warning',
       })
     } else {
diff --git a/src/state/shell/progress-guide.tsx b/src/state/shell/progress-guide.tsx
index b6ebf4621b..916fee2900 100644
--- a/src/state/shell/progress-guide.tsx
+++ b/src/state/shell/progress-guide.tsx
@@ -1,6 +1,5 @@
 import {createContext, useContext, useMemo, useRef, useState} from 'react'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {
   ProgressGuideToast,
@@ -72,7 +71,7 @@ export function useProgressGuideControls() {
 
 export function Provider({children}: React.PropsWithChildren<{}>) {
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {data: preferences} = usePreferencesQuery()
   const {mutateAsync, variables, isPending} =
     useSetActiveProgressGuideMutation()
@@ -213,28 +212,28 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
           <>
             <ProgressGuideToast
               ref={firstLikeToastRef}
-              title={_(msg`Your first like!`)}
-              subtitle={_(msg`Like 10 posts to train the Discover feed`)}
+              title={l`Your first like!`}
+              subtitle={l`Like 10 posts to train the Discover feed`}
             />
             <ProgressGuideToast
               ref={fifthLikeToastRef}
-              title={_(msg`Half way there!`)}
-              subtitle={_(msg`Like 10 posts to train the Discover feed`)}
+              title={l`Half way there!`}
+              subtitle={l`Like 10 posts to train the Discover feed`}
             />
             <ProgressGuideToast
               ref={tenthLikeToastRef}
-              title={_(msg`Task complete - 10 likes!`)}
-              subtitle={_(msg`The Discover feed now knows what you like`)}
+              title={l`Task complete - 10 likes!`}
+              subtitle={l`The Discover feed now knows what you like`}
             />
             <ProgressGuideToast
               ref={fifthFollowToastRef}
-              title={_(msg`Half way there!`)}
-              subtitle={_(msg`Follow 10 accounts`)}
+              title={l`Half way there!`}
+              subtitle={l`Follow 10 accounts`}
             />
             <ProgressGuideToast
               ref={tenthFollowToastRef}
-              title={_(msg`Task complete - 10 follows!`)}
-              subtitle={_(msg`You've found some people to follow`)}
+              title={l`Task complete - 10 follows!`}
+              subtitle={l`You've found some people to follow`}
             />
           </>
         )}
diff --git a/src/view/com/auth/SplashScreen.tsx b/src/view/com/auth/SplashScreen.tsx
index 581f7bd2e4..15e1baa8be 100644
--- a/src/view/com/auth/SplashScreen.tsx
+++ b/src/view/com/auth/SplashScreen.tsx
@@ -2,8 +2,7 @@ import {useMemo} from 'react'
 import {Image as RNImage, View} from 'react-native'
 import Animated, {FadeIn, FadeOut} from 'react-native-reanimated'
 import {Image} from 'expo-image'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useHaptics} from '#/lib/haptics'
@@ -28,7 +27,7 @@ export const SplashScreen = ({
   onPressCreateAccount: () => void
 }) => {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const isDarkMode = t.name !== 'light'
 
   const playHaptic = useHaptics()
@@ -60,7 +59,6 @@ export const SplashScreen = ({
         source={{uri: isDarkMode ? darkSplashImageUri : splashImageUri}}
         style={[a.absolute, a.inset_0]}
       />
-
       <Animated.View
         entering={FadeIn.duration(90)}
         exiting={FadeOut.duration(90)}
@@ -86,10 +84,8 @@ export const SplashScreen = ({
               onPressCreateAccount()
               playHaptic('Light')
             }}
-            label={_(msg`Create new account`)}
-            accessibilityHint={_(
-              msg`Opens flow to create a new Bluesky account`,
-            )}
+            label={l`Create new account`}
+            accessibilityHint={l`Opens flow to create a new Bluesky account`}
             size="large"
             color={isDarkMode ? 'secondary_inverted' : 'secondary'}
             style={[
@@ -115,10 +111,8 @@ export const SplashScreen = ({
               onPressSignin()
               playHaptic('Light')
             }}
-            label={_(msg`Sign in`)}
-            accessibilityHint={_(
-              msg`Opens flow to sign in to your existing Bluesky account`,
-            )}
+            label={l`Sign in`}
+            accessibilityHint={l`Opens flow to sign in to your existing Bluesky account`}
             size="large"
             hoverStyle={{opacity: 0.5}}>
             <ButtonText style={{color: 'white'}}>
diff --git a/src/view/com/auth/SplashScreen.web.tsx b/src/view/com/auth/SplashScreen.web.tsx
index ff406a559c..6681e16d11 100644
--- a/src/view/com/auth/SplashScreen.web.tsx
+++ b/src/view/com/auth/SplashScreen.web.tsx
@@ -1,7 +1,6 @@
 import {useEffect, useState} from 'react'
 import {Pressable, View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
@@ -30,7 +29,7 @@ export const SplashScreen = ({
   onPressSignin: () => void
   onPressCreateAccount: () => void
 }) => {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const {isTabletOrMobile: IS_WEB_MOBILE} = useWebMediaQueries()
   const [showClipOverlay, setShowClipOverlay] = useState(false)
@@ -66,7 +65,6 @@ export const SplashScreen = ({
           <TimesIcon width={24} style={t.atoms.text} />
         </Pressable>
       )}
-
       <Layout.Center style={[a.h_full, a.flex_1]} ignoreTabletLayoutOffset>
         <View
           testID="noSessionView"
@@ -107,10 +105,8 @@ export const SplashScreen = ({
               <Button
                 testID="createAccountButton"
                 onPress={onPressCreateAccount}
-                label={_(msg`Create new account`)}
-                accessibilityHint={_(
-                  msg`Opens flow to create a new Bluesky account`,
-                )}
+                label={l`Create new account`}
+                accessibilityHint={l`Opens flow to create a new Bluesky account`}
                 size="large"
                 variant="solid"
                 color="primary">
@@ -121,10 +117,8 @@ export const SplashScreen = ({
               <Button
                 testID="signInButton"
                 onPress={onPressSignin}
-                label={_(msg`Sign in`)}
-                accessibilityHint={_(
-                  msg`Opens flow to sign in to your existing Bluesky account`,
-                )}
+                label={l`Sign in`}
+                accessibilityHint={l`Opens flow to sign in to your existing Bluesky account`}
                 size="large"
                 variant="solid"
                 color="secondary">
@@ -147,7 +141,7 @@ export const SplashScreen = ({
 
 function Footer() {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <View
@@ -166,25 +160,23 @@ function Footer() {
         t.atoms.border_contrast_medium,
       ]}>
       <InlineLinkText
-        label={_(msg`Learn more about Bluesky`)}
+        label={l`Learn more about Bluesky`}
         to="https://bsky.social">
         <Trans>Business</Trans>
       </InlineLinkText>
       <InlineLinkText
-        label={_(msg`Read the Bluesky blog`)}
+        label={l`Read the Bluesky blog`}
         to="https://bsky.social/about/blog">
         <Trans>Blog</Trans>
       </InlineLinkText>
       <InlineLinkText
-        label={_(msg`See jobs at Bluesky`)}
+        label={l`See jobs at Bluesky`}
         to="https://bsky.social/about/join">
         <Trans comment="Link to a page with job openings at Bluesky">
           Jobs
         </Trans>
       </InlineLinkText>
-
       <View style={a.flex_1} />
-
       <AppLanguageDropdown />
     </View>
   )
diff --git a/src/view/com/composer/ComposerReplyTo.tsx b/src/view/com/composer/ComposerReplyTo.tsx
index 00a108bb54..44d908d67d 100644
--- a/src/view/com/composer/ComposerReplyTo.tsx
+++ b/src/view/com/composer/ComposerReplyTo.tsx
@@ -8,8 +8,7 @@ import {
   AppBskyEmbedRecordWithMedia,
   AppBskyFeedPost,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
@@ -24,7 +23,7 @@ import {parseEmbed} from '#/types/bsky/post'
 
 export function ComposerReplyTo({replyTo}: {replyTo: ComposerOptsPostRef}) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {embed} = replyTo
 
   const [showFull, setShowFull] = useState(false)
@@ -99,9 +98,7 @@ export function ComposerReplyTo({replyTo}: {replyTo: ComposerOptsPostRef}) {
       ]}
       onPress={onPress}
       accessibilityRole="button"
-      accessibilityLabel={_(
-        msg`Expand or collapse the full post you are replying to`,
-      )}
+      accessibilityLabel={l`Expand or collapse the full post you are replying to`}
       accessibilityHint="">
       <PreviewableUserAvatar
         size={42}
diff --git a/src/view/com/composer/GifAltText.tsx b/src/view/com/composer/GifAltText.tsx
index b7565e6b6d..16e8bde8f5 100644
--- a/src/view/com/composer/GifAltText.tsx
+++ b/src/view/com/composer/GifAltText.tsx
@@ -1,7 +1,6 @@
 import {useState} from 'react'
 import {TouchableOpacity, View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 
 import {HITSLOP_10, MAX_ALT_TEXT} from '#/lib/constants'
@@ -65,7 +64,7 @@ export function GifAltTextDialogLoaded({
   thumb: string | undefined
 }) {
   const control = Dialog.useDialogControl()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const [altTextDraft, setAltTextDraft] = useState(altText || vendorAltText)
   return (
@@ -73,7 +72,7 @@ export function GifAltTextDialogLoaded({
       <TouchableOpacity
         testID="altTextButton"
         accessibilityRole="button"
-        accessibilityLabel={_(msg`Add alt text`)}
+        accessibilityLabel={l`Add alt text`}
         accessibilityHint=""
         hitSlop={HITSLOP_10}
         onPress={control.open}
@@ -100,14 +99,12 @@ export function GifAltTextDialogLoaded({
           <Trans>ALT</Trans>
         </Text>
       </TouchableOpacity>
-
       <Admonition type="info" style={[a.mt_sm]}>
         <Trans>
           Alt text describes images for blind and low-vision users, and helps
           give context to everyone.
         </Trans>
       </Admonition>
-
       <Dialog.Outer
         control={control}
         onClose={() => {
@@ -144,10 +141,10 @@ function AltTextInner({
   thumb: string | undefined
 }) {
   const t = useTheme()
-  const {_, i18n} = useLingui()
+  const {t: l, i18n} = useLingui()
 
   return (
-    <Dialog.ScrollableInner label={_(msg`Add alt text`)}>
+    <Dialog.ScrollableInner label={l`Add alt text`}>
       <View style={a.flex_col_reverse}>
         <View style={[a.mt_md, a.gap_md]}>
           <View style={[a.gap_sm]}>
@@ -157,7 +154,7 @@ function AltTextInner({
               </TextField.LabelText>
               <TextField.Root>
                 <Dialog.Input
-                  label={_(msg`Alt text`)}
+                  label={l`Alt text`}
                   placeholder={vendorAltText}
                   onChangeText={onChange}
                   defaultValue={altText}
@@ -196,7 +193,7 @@ function AltTextInner({
 
           <AltTextCounterWrapper altText={altText}>
             <Button
-              label={_(msg`Save`)}
+              label={l`Save`}
               size="large"
               color="primary"
               variant="solid"
diff --git a/src/view/com/composer/SelectMediaButton.tsx b/src/view/com/composer/SelectMediaButton.tsx
index d3cb92db7c..0c0b6c42f5 100644
--- a/src/view/com/composer/SelectMediaButton.tsx
+++ b/src/view/com/composer/SelectMediaButton.tsx
@@ -2,8 +2,8 @@ import {useCallback, useEffect, useRef} from 'react'
 import {Keyboard} from 'react-native'
 import {File} from 'expo-file-system'
 import {type ImagePickerAsset} from 'expo-image-picker'
-import {msg, plural} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {plural} from '@lingui/core/macro'
+import {useLingui} from '@lingui/react/macro'
 
 import {
   VIDEO_MAX_DURATION_MS,
@@ -392,7 +392,7 @@ export function SelectMediaButton({
   onSelectAssets,
   autoOpen,
 }: SelectMediaButtonProps) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {requestPhotoAccessIfNeeded} = usePhotoLibraryPermission()
   const {requestVideoAccessIfNeeded} = useVideoLibraryPermission()
   const sheetWrapper = useSheetWrapper()
@@ -419,32 +419,18 @@ export function SelectMediaButton({
        */
       const errors = Array.from(errorCodes).map(error => {
         return {
-          [SelectedAssetError.Unsupported]: _(
-            msg`One or more of your selected files are not supported.`,
-          ),
-          [SelectedAssetError.MixedTypes]: _(
-            msg`Selecting multiple media types is not supported.`,
-          ),
-          [SelectedAssetError.MaxImages]: _(
-            msg({
-              message: `You can select up to ${plural(MAX_GALLERY_IMAGES, {
-                other: '# images',
-              })} in total.`,
-              comment: `Error message for maximum number of images that can be selected to add to a post.`,
-            }),
-          ),
-          [SelectedAssetError.MaxVideos]: _(
-            msg`You can only select one video at a time.`,
-          ),
-          [SelectedAssetError.VideoTooLong]: _(
-            msg`Videos must be less than 3 minutes long.`,
-          ),
-          [SelectedAssetError.MaxGIFs]: _(
-            msg`You can only select one GIF at a time.`,
-          ),
-          [SelectedAssetError.FileTooBig]: _(
-            msg`One or more of your selected files are too large. Maximum size is ${VIDEO_MAX_SIZE_MB} MB.`,
-          ),
+          [SelectedAssetError.Unsupported]: l`One or more of your selected files are not supported.`,
+          [SelectedAssetError.MixedTypes]: l`Selecting multiple media types is not supported.`,
+          [SelectedAssetError.MaxImages]: l({
+            message: `You can select up to ${plural(MAX_GALLERY_IMAGES, {
+              other: '# images',
+            })} in total.`,
+            comment: `Error message for maximum number of images that can be selected to add to a post.`,
+          }),
+          [SelectedAssetError.MaxVideos]: l`You can only select one video at a time.`,
+          [SelectedAssetError.VideoTooLong]: l`Videos must be less than 3 minutes long.`,
+          [SelectedAssetError.MaxGIFs]: l`You can only select one GIF at a time.`,
+          [SelectedAssetError.FileTooBig]: l`One or more of your selected files are too large. Maximum size is ${VIDEO_MAX_SIZE_MB} MB.`,
         }[error]
       })
 
@@ -458,7 +444,7 @@ export function SelectMediaButton({
         errors,
       })
     },
-    [_, onSelectAssets, selectionCountRemaining, allowedAssetTypes],
+    [l, onSelectAssets, selectionCountRemaining, allowedAssetTypes],
   )
 
   const onPressSelectMedia = useCallback(async () => {
@@ -469,7 +455,7 @@ export function SelectMediaButton({
       ])
 
       if (!photoAccess && !videoAccess) {
-        toast.show(_(msg`You need to allow access to your media library.`), {
+        toast.show(l`You need to allow access to your media library.`, {
           type: 'error',
         })
         return
@@ -488,7 +474,7 @@ export function SelectMediaButton({
 
     await processSelectedAssets(assets)
   }, [
-    _,
+    l,
     requestPhotoAccessIfNeeded,
     requestVideoAccessIfNeeded,
     sheetWrapper,
@@ -507,21 +493,17 @@ export function SelectMediaButton({
     <Button
       testID="openMediaBtn"
       onPress={onPressSelectMedia}
-      label={_(
-        msg({
-          message: `Add media to post`,
-          comment: `Accessibility label for button in composer to add images, a video, or a GIF to a post`,
-        }),
-      )}
-      accessibilityHint={_(
-        msg({
-          message: `Opens device gallery to select up to ${plural(
-            MAX_GALLERY_IMAGES,
-            {other: '# images'},
-          )}, or a single video or GIF.`,
-          comment: `Accessibility hint for button in composer to add images, a video, or a GIF to a post.`,
-        }),
-      )}
+      label={l({
+        message: `Add media to post`,
+        comment: `Accessibility label for button in composer to add images, a video, or a GIF to a post`,
+      })}
+      accessibilityHint={l({
+        message: `Opens device gallery to select up to ${plural(
+          MAX_GALLERY_IMAGES,
+          {other: '# images'},
+        )}, or a single video or GIF.`,
+        comment: `Accessibility hint for button in composer to add images, a video, or a GIF to a post.`,
+      })}
       style={a.p_sm}
       variant="ghost"
       shape="round"
diff --git a/src/view/com/composer/drafts/DraftItem.tsx b/src/view/com/composer/drafts/DraftItem.tsx
index cc27922244..0fcc301ad2 100644
--- a/src/view/com/composer/drafts/DraftItem.tsx
+++ b/src/view/com/composer/drafts/DraftItem.tsx
@@ -1,8 +1,8 @@
 import {useCallback, useEffect, useMemo, useState} from 'react'
 import {Pressable, View} from 'react-native'
 import * as VideoThumbnails from 'expo-video-thumbnails'
-import {msg, plural} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {plural} from '@lingui/core/macro'
+import {useLingui} from '@lingui/react/macro'
 
 import * as device from '#/lib/deviceName'
 import {logger} from '#/view/com/composer/drafts/state/logger'
@@ -31,7 +31,7 @@ export function DraftItem({
   onSelect: (draft: DraftSummary) => void
   onDelete: (draft: DraftSummary) => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const discardPromptControl = Prompt.usePromptControl()
   const post = draft.posts[0]
@@ -66,8 +66,8 @@ export function DraftItem({
       <View style={[a.relative]}>
         <Pressable
           accessibilityRole="button"
-          accessibilityLabel={_(msg`Open draft`)}
-          accessibilityHint={_(msg`Opens this draft in the composer`)}
+          accessibilityLabel={l`Open draft`}
+          accessibilityHint={l`Opens this draft in the composer`}
           onPress={() => onSelect(draft)}
           style={({pressed, hovered}) => [
             a.rounded_md,
@@ -114,13 +114,11 @@ export function DraftItem({
                     icon={WarningIcon}
                     text={
                       isUnknownDevice
-                        ? _(msg`Media stored on another device`)
-                        : _(
-                            msg({
-                              message: `Media stored on ${draft.draft.deviceName}`,
-                              comment: `Example: "Media stored on John's iPhone"`,
-                            }),
-                          )
+                        ? l`Media stored on another device`
+                        : l({
+                            message: `Media stored on ${draft.draft.deviceName}`,
+                            comment: `Example: "Media stored on John's iPhone"`,
+                          })
                     }
                   />
                 )}
@@ -128,13 +126,13 @@ export function DraftItem({
                   <DraftMetadataTag
                     display="warning"
                     icon={WarningIcon}
-                    text={_(msg`Missing media`)}
+                    text={l`Missing media`}
                   />
                 )}
                 {draft.meta.hasQuotes && (
                   <DraftMetadataTag
                     icon={CloseQuoteIcon}
-                    text={_(msg`Quote post`)}
+                    text={l`Quote post`}
                   />
                 )}
                 {draft.meta.replyCount > 0 && (
@@ -187,7 +185,7 @@ export function DraftItem({
             },
           ]}>
           <Button
-            label={_(msg`More options`)}
+            label={l`More options`}
             hitSlop={8}
             onPress={e => {
               e.stopPropagation()
@@ -233,13 +231,12 @@ export function DraftItem({
           </Button>
         </View>
       </View>
-
       <Prompt.Basic
         control={discardPromptControl}
-        title={_(msg`Discard draft?`)}
-        description={_(msg`This draft will be permanently deleted.`)}
+        title={l`Discard draft?`}
+        description={l`This draft will be permanently deleted.`}
         onConfirm={handleDelete}
-        confirmButtonCta={_(msg`Discard`)}
+        confirmButtonCta={l`Discard`}
         confirmButtonColor="negative"
       />
     </>
diff --git a/src/view/com/composer/drafts/DraftsButton.tsx b/src/view/com/composer/drafts/DraftsButton.tsx
index 11628544b6..1d1fb5789f 100644
--- a/src/view/com/composer/drafts/DraftsButton.tsx
+++ b/src/view/com/composer/drafts/DraftsButton.tsx
@@ -1,5 +1,4 @@
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {atoms as a} from '#/alf'
@@ -30,7 +29,7 @@ export function DraftsButton({
   canSaveDraft: boolean
   textLength: number
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const draftsDialogControl = Dialog.useDialogControl()
   const savePromptControl = Prompt.usePromptControl()
@@ -67,7 +66,7 @@ export function DraftsButton({
   return (
     <>
       <Button
-        label={_(msg`Drafts`)}
+        label={l`Drafts`}
         variant="ghost"
         color="primary"
         shape="default"
@@ -79,12 +78,10 @@ export function DraftsButton({
           <Trans>Drafts</Trans>
         </ButtonText>
       </Button>
-
       <DraftsListDialog
         control={draftsDialogControl}
         onSelectDraft={onSelectDraft}
       />
-
       <Prompt.Outer control={savePromptControl}>
         <Prompt.Content>
           <Prompt.TitleText>
@@ -122,17 +119,17 @@ export function DraftsButton({
         <Prompt.Actions>
           {canSaveDraft && (
             <Prompt.Action
-              cta={isEditingDraft ? _(msg`Save changes`) : _(msg`Save draft`)}
+              cta={isEditingDraft ? l`Save changes` : l`Save draft`}
               onPress={handleSaveAndOpen}
               color="primary"
             />
           )}
           <Prompt.Action
-            cta={_(msg`Discard`)}
+            cta={l`Discard`}
             onPress={handleDiscardAndOpen}
             color="negative_subtle"
           />
-          <Prompt.Cancel cta={_(msg`Keep editing`)} />
+          <Prompt.Cancel cta={l`Keep editing`} />
         </Prompt.Actions>
       </Prompt.Outer>
     </>
diff --git a/src/view/com/composer/drafts/DraftsListDialog.tsx b/src/view/com/composer/drafts/DraftsListDialog.tsx
index 30525f5cbc..f5acfffa43 100644
--- a/src/view/com/composer/drafts/DraftsListDialog.tsx
+++ b/src/view/com/composer/drafts/DraftsListDialog.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useEffect, useMemo} from 'react'
 import {Keyboard, View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useCallOnce} from '#/lib/once'
@@ -26,7 +25,7 @@ export function DraftsListDialog({
   control: Dialog.DialogControlProps
   onSelectDraft: (draft: DraftSummary) => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const {gtPhone} = useBreakpoints()
   const ax = useAnalytics()
@@ -84,7 +83,7 @@ export function DraftsListDialog({
   const backButton = useCallback(
     () => (
       <Button
-        label={_(msg`Back`)}
+        label={l`Back`}
         onPress={() => control.close()}
         size="small"
         color="primary"
@@ -94,7 +93,7 @@ export function DraftsListDialog({
         </ButtonText>
       </Button>
     ),
-    [control, _],
+    [control, l],
   )
 
   const renderItem = useCallback(
@@ -140,11 +139,11 @@ export function DraftsListDialog({
     return (
       <EmptyState
         icon={PageXIcon}
-        message={_(msg`No drafts yet`)}
+        message={l`No drafts yet`}
         style={[a.justify_center, {minHeight: 500}]}
       />
     )
-  }, [isLoading, _])
+  }, [isLoading, l])
 
   const footerComponent = useMemo(
     () => (
diff --git a/src/view/com/composer/labels/LabelsBtn.tsx b/src/view/com/composer/labels/LabelsBtn.tsx
index 9471dc0d2e..6650b2bbd7 100644
--- a/src/view/com/composer/labels/LabelsBtn.tsx
+++ b/src/view/com/composer/labels/LabelsBtn.tsx
@@ -1,6 +1,5 @@
 import {Keyboard, View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {
@@ -28,7 +27,7 @@ export function LabelsBtn({
   onChange: (v: SelfLabel[]) => void
 }) {
   const control = Dialog.useDialogControl()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const hasLabel = labels.length > 0
 
@@ -58,10 +57,8 @@ export function LabelsBtn({
           Keyboard.dismiss()
           control.open()
         }}
-        label={_(msg`Content warnings`)}
-        accessibilityHint={_(
-          msg`Opens a dialog to add a content warning to your post`,
-        )}>
+        label={l`Content warnings`}
+        accessibilityHint={l`Opens a dialog to add a content warning to your post`}>
         <ButtonIcon icon={hasLabel ? Check : Shield_Stroke2_Corner0_Rounded} />
         <ButtonText numberOfLines={1} maxFontSizeMultiplier={2}>
           {labels.length > 0 ? (
@@ -72,7 +69,6 @@ export function LabelsBtn({
         </ButtonText>
         <ButtonIcon icon={TinyChevronIcon} size="2xs" />
       </Button>
-
       <Dialog.Outer control={control} nativeOptions={{preventExpansion: true}}>
         <Dialog.Handle />
         <DialogInner
@@ -94,13 +90,13 @@ function DialogInner({
   updateAdultLabels: (labels: AdultSelfLabel[]) => void
   updateOtherLabels: (labels: OtherSelfLabel[]) => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const control = Dialog.useDialogContext()
   const t = useTheme()
 
   return (
     <Dialog.ScrollableInner
-      label={_(msg`Add a content warning`)}
+      label={l`Add a content warning`}
       style={[{maxWidth: 500}, a.w_full]}>
       <View style={[a.flex_1]}>
         <View style={[a.gap_sm]}>
@@ -131,25 +127,25 @@ function DialogInner({
                 t.atoms.border_contrast_medium,
               ]}>
               <Toggle.Group
-                label={_(msg`Adult Content labels`)}
+                label={l`Adult Content labels`}
                 values={labels}
                 onChange={values => {
                   updateAdultLabels(values as AdultSelfLabel[])
                 }}>
                 <View style={[a.gap_sm]}>
-                  <Toggle.Item name="sexual" label={_(msg`Suggestive`)}>
+                  <Toggle.Item name="sexual" label={l`Suggestive`}>
                     <Toggle.Checkbox />
                     <Toggle.LabelText>
                       <Trans>Suggestive</Trans>
                     </Toggle.LabelText>
                   </Toggle.Item>
-                  <Toggle.Item name="nudity" label={_(msg`Nudity`)}>
+                  <Toggle.Item name="nudity" label={l`Nudity`}>
                     <Toggle.Checkbox />
                     <Toggle.LabelText>
                       <Trans>Nudity</Trans>
                     </Toggle.LabelText>
                   </Toggle.Item>
-                  <Toggle.Item name="porn" label={_(msg`Porn`)}>
+                  <Toggle.Item name="porn" label={l`Porn`}>
                     <Toggle.Checkbox />
                     <Toggle.LabelText>
                       <Trans>Adult</Trans>
@@ -189,12 +185,12 @@ function DialogInner({
                 t.atoms.border_contrast_medium,
               ]}>
               <Toggle.Group
-                label={_(msg`Adult Content labels`)}
+                label={l`Adult Content labels`}
                 values={labels}
                 onChange={values => {
                   updateOtherLabels(values as OtherSelfLabel[])
                 }}>
-                <Toggle.Item name="graphic-media" label={_(msg`Graphic Media`)}>
+                <Toggle.Item name="graphic-media" label={l`Graphic Media`}>
                   <Toggle.Checkbox />
                   <Toggle.LabelText>
                     <Trans>Graphic Media</Trans>
@@ -213,10 +209,9 @@ function DialogInner({
           </View>
         </View>
       </View>
-
       <View style={[a.mt_sm, web([a.flex_row, a.ml_auto])]}>
         <Button
-          label={_(msg`Done`)}
+          label={l`Done`}
           onPress={() => control.close()}
           color="primary"
           size={IS_WEB ? 'small' : 'large'}
diff --git a/src/view/com/composer/photos/EditImageDialog.web.tsx b/src/view/com/composer/photos/EditImageDialog.web.tsx
index 6a3f65602c..f48d014a4f 100644
--- a/src/view/com/composer/photos/EditImageDialog.web.tsx
+++ b/src/view/com/composer/photos/EditImageDialog.web.tsx
@@ -2,8 +2,7 @@ import 'react-image-crop/dist/ReactCrop.css'
 
 import {useCallback, useImperativeHandle, useRef, useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import ReactCrop, {type PercentCrop} from 'react-image-crop'
 
@@ -34,14 +33,14 @@ function DialogInner({
   circularCrop,
   aspectRatio,
 }: EditImageDialogProps) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const [pending, setPending] = useState(false)
   const ref = useRef<{save: () => Promise<void>}>(null)
 
   const cancelButton = useCallback(
     () => (
       <Button
-        label={_(msg`Cancel`)}
+        label={l`Cancel`}
         disabled={pending}
         onPress={() => control.close()}
         size="small"
@@ -54,13 +53,13 @@ function DialogInner({
         </ButtonText>
       </Button>
     ),
-    [control, _, pending],
+    [control, l, pending],
   )
 
   const saveButton = useCallback(
     () => (
       <Button
-        label={_(msg`Save`)}
+        label={l`Save`}
         onPress={async () => {
           setPending(true)
           await ref.current?.save()
@@ -78,12 +77,12 @@ function DialogInner({
         {pending && <ButtonIcon icon={Loader} />}
       </Button>
     ),
-    [_, pending],
+    [l, pending],
   )
 
   return (
     <Dialog.Inner
-      label={_(msg`Edit image`)}
+      label={l`Edit image`}
       header={
         <Dialog.Header renderLeft={cancelButton} renderRight={saveButton}>
           <Dialog.HeaderText>
diff --git a/src/view/com/composer/photos/Gallery.tsx b/src/view/com/composer/photos/Gallery.tsx
index 98bfac779d..7341909745 100644
--- a/src/view/com/composer/photos/Gallery.tsx
+++ b/src/view/com/composer/photos/Gallery.tsx
@@ -11,8 +11,7 @@ import {
   type ViewStyle,
 } from 'react-native'
 import {Image} from 'expo-image'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
@@ -154,7 +153,7 @@ const GalleryItem = ({
   onChange,
   onRemove,
 }: GalleryItemProps): React.ReactNode => {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const ax = useAnalytics()
 
@@ -198,7 +197,7 @@ const GalleryItem = ({
       <TouchableOpacity
         testID="altTextButton"
         accessibilityRole="button"
-        accessibilityLabel={_(msg`Add alt text`)}
+        accessibilityLabel={l`Add alt text`}
         accessibilityHint=""
         onPress={onAltTextEdit}
         style={[styles.altTextControl, altTextControlStyle]}>
@@ -215,7 +214,7 @@ const GalleryItem = ({
         <TouchableOpacity
           testID="editPhotoButton"
           accessibilityRole="button"
-          accessibilityLabel={_(msg`Edit image`)}
+          accessibilityLabel={l`Edit image`}
           accessibilityHint=""
           onPress={onImageEdit}
           style={styles.imageControl}>
@@ -224,7 +223,7 @@ const GalleryItem = ({
         <TouchableOpacity
           testID="removePhotoButton"
           accessibilityRole="button"
-          accessibilityLabel={_(msg`Remove image`)}
+          accessibilityLabel={l`Remove image`}
           accessibilityHint=""
           onPress={onRemove}
           style={styles.imageControl}>
@@ -233,12 +232,11 @@ const GalleryItem = ({
       </View>
       <TouchableOpacity
         accessibilityRole="button"
-        accessibilityLabel={_(msg`Add alt text`)}
+        accessibilityLabel={l`Add alt text`}
         accessibilityHint=""
         onPress={onAltTextEdit}
         style={styles.altTextHiddenRegion}
       />
-
       <Image
         testID="selectedPhotoImage"
         style={[styles.image, imageStyle]}
@@ -252,16 +250,13 @@ const GalleryItem = ({
         autoplay={false}
         contentFit="cover"
       />
-
       <MediaInsetBorder />
-
       <ImageAltTextDialog
         control={altTextControl}
         image={image}
         onChange={onChange}
         sourceViewTag={altBtnViewTag}
       />
-
       <EditImageDialog
         control={editControl}
         image={image}
diff --git a/src/view/com/composer/photos/ImageAltTextDialog.tsx b/src/view/com/composer/photos/ImageAltTextDialog.tsx
index 08de8d8d99..d82347807b 100644
--- a/src/view/com/composer/photos/ImageAltTextDialog.tsx
+++ b/src/view/com/composer/photos/ImageAltTextDialog.tsx
@@ -1,8 +1,7 @@
 import {useMemo, useState} from 'react'
 import {type ImageStyle, useWindowDimensions, View} from 'react-native'
 import {Image} from 'expo-image'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 
 import {MAX_ALT_TEXT} from '#/lib/constants'
@@ -65,7 +64,7 @@ const ImageAltTextInner = ({
   control: DialogControlProps
   image: Props['image']
 }): React.ReactNode => {
-  const {_, i18n} = useLingui()
+  const {t: l, i18n} = useLingui()
   const t = useTheme()
   const {width: screenWidth} = useWindowDimensions()
 
@@ -92,9 +91,8 @@ const ImageAltTextInner = ({
   }, [image, screenWidth])
 
   return (
-    <Dialog.ScrollableInner label={_(msg`Add alt text`)}>
+    <Dialog.ScrollableInner label={l`Add alt text`}>
       <Dialog.Close />
-
       <View>
         {/* vertical space is too precious - gets scrolled out of the way anyway */}
         {IS_WEB && (
@@ -116,7 +114,6 @@ const ImageAltTextInner = ({
           />
         </View>
       </View>
-
       <View style={[a.mt_md, a.gap_md]}>
         <View style={[a.gap_sm]}>
           <View style={[a.relative, {width: '100%'}]}>
@@ -125,7 +122,7 @@ const ImageAltTextInner = ({
             </TextField.LabelText>
             <TextField.Root>
               <Dialog.Input
-                label={_(msg`Alt text`)}
+                label={l`Alt text`}
                 onChangeText={text => {
                   setAltText(text)
                 }}
@@ -160,7 +157,7 @@ const ImageAltTextInner = ({
 
         <AltTextCounterWrapper altText={altText}>
           <Button
-            label={_(msg`Save`)}
+            label={l`Save`}
             disabled={altText === image.alt}
             size="large"
             color="primary"
diff --git a/src/view/com/composer/photos/OpenCameraBtn.tsx b/src/view/com/composer/photos/OpenCameraBtn.tsx
index 6365765fc9..5a79203831 100644
--- a/src/view/com/composer/photos/OpenCameraBtn.tsx
+++ b/src/view/com/composer/photos/OpenCameraBtn.tsx
@@ -1,7 +1,6 @@
 import {useCallback} from 'react'
 import * as MediaLibrary from 'expo-media-library'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {useCameraPermission} from '#/lib/hooks/usePermissions'
 import {openCamera} from '#/lib/media/picker'
@@ -14,7 +13,7 @@ import {IS_NATIVE, IS_WEB_MOBILE} from '#/env'
 import {type OpenCameraBtnProps} from './OpenCameraBtn.shared'
 
 export function OpenCameraBtn({disabled, onAdd}: OpenCameraBtnProps) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {requestCameraAccessIfNeeded} = useCameraPermission()
   const [mediaPermissionRes, requestMediaPermission] =
     MediaLibrary.usePermissions({granularPermissions: ['photo']})
@@ -62,8 +61,8 @@ export function OpenCameraBtn({disabled, onAdd}: OpenCameraBtnProps) {
     <Button
       testID="openCameraButton"
       onPress={onPressTakePicture}
-      label={_(msg`Camera`)}
-      accessibilityHint={_(msg`Opens camera on device`)}
+      label={l`Camera`}
+      accessibilityHint={l`Opens camera on device`}
       style={a.p_sm}
       variant="ghost"
       shape="round"
diff --git a/src/view/com/composer/photos/SelectGifBtn.tsx b/src/view/com/composer/photos/SelectGifBtn.tsx
index 151578bbed..d1b1ea0818 100644
--- a/src/view/com/composer/photos/SelectGifBtn.tsx
+++ b/src/view/com/composer/photos/SelectGifBtn.tsx
@@ -1,7 +1,6 @@
 import {useCallback} from 'react'
 import {Keyboard} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {atoms as a, useTheme} from '#/alf'
 import {Button} from '#/components/Button'
@@ -19,7 +18,7 @@ type Props = {
 
 export function SelectGifBtn({onClose, onSelectGif, disabled}: Props) {
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const control = Dialog.useDialogControl()
   const t = useTheme()
 
@@ -34,20 +33,16 @@ export function SelectGifBtn({onClose, onSelectGif, disabled}: Props) {
       <Button
         testID="openGifBtn"
         onPress={onPressSelectGif}
-        label={_(
-          msg({
-            message: 'Select GIF',
-            comment:
-              'Accessibility label for the button in the post composer that opens the GIF picker dialog.',
-          }),
-        )}
-        accessibilityHint={_(
-          msg({
-            message: 'Opens the GIF picker dialog',
-            comment:
-              'Accessibility hint announced after the GIF picker button label, describing what activating it will do.',
-          }),
-        )}
+        label={l({
+          message: 'Select GIF',
+          comment:
+            'Accessibility label for the button in the post composer that opens the GIF picker dialog.',
+        })}
+        accessibilityHint={l({
+          message: 'Opens the GIF picker dialog',
+          comment:
+            'Accessibility hint announced after the GIF picker button label, describing what activating it will do.',
+        })}
         style={a.p_sm}
         variant="ghost"
         shape="round"
@@ -55,7 +50,6 @@ export function SelectGifBtn({onClose, onSelectGif, disabled}: Props) {
         disabled={disabled}>
         <GifIcon size="lg" style={disabled && t.atoms.text_contrast_low} />
       </Button>
-
       <GifPickerDialog
         control={control}
         onClose={onClose}
diff --git a/src/view/com/composer/select-language/PostLanguageSelect.tsx b/src/view/com/composer/select-language/PostLanguageSelect.tsx
index 6ecd5116a1..84cb144123 100644
--- a/src/view/com/composer/select-language/PostLanguageSelect.tsx
+++ b/src/view/com/composer/select-language/PostLanguageSelect.tsx
@@ -6,8 +6,7 @@ import Animated, {
   withSequence,
   withTiming,
 } from 'react-native-reanimated'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {LANG_DROPDOWN_HITSLOP} from '#/lib/constants'
@@ -43,7 +42,7 @@ export function PostLanguageSelect({
    */
   nudgeAt?: number
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const langPrefs = useLanguagePrefs()
   const setLangPrefs = useLanguagePrefsApi()
   const languageDialogControl = Dialog.useDialogControl()
@@ -88,7 +87,7 @@ export function PostLanguageSelect({
   return (
     <>
       <Menu.Root>
-        <Menu.Trigger label={_(msg`Select post language`)}>
+        <Menu.Trigger label={l`Select post language`}>
           {({props}) => (
             <LanguageBtn
               currentLanguages={currentLanguages}
@@ -107,7 +106,7 @@ export function PostLanguageSelect({
               return (
                 <Menu.Item
                   key={historyItem}
-                  label={_(msg`Select ${langName}`)}
+                  label={l`Select ${langName}`}
                   onPress={() => {
                     setLangPrefs.setPostLanguage(historyItem)
                     onSelectLanguage?.(historyItem)
@@ -122,7 +121,7 @@ export function PostLanguageSelect({
           </Menu.Group>
           <Menu.Divider />
           <Menu.Item
-            label={_(msg`More languages...`)}
+            label={l`More languages...`}
             onPress={languageDialogControl.open}>
             <Menu.ItemText>
               <Trans>More languages...</Trans>
@@ -131,7 +130,6 @@ export function PostLanguageSelect({
           </Menu.Item>
         </Menu.Outer>
       </Menu.Root>
-
       <LanguageSelectDialog
         titleText={<Trans>Choose post languages</Trans>}
         subtitleText={<Trans>Select up to 3 languages used in this post</Trans>}
@@ -157,7 +155,7 @@ function LanguageBtn({
 }) {
   const t = useTheme()
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const langPrefs = useLanguagePrefs()
 
   const postLanguagesPref = toPostLanguages(langPrefs.postLanguage)
@@ -191,13 +189,11 @@ function LanguageBtn({
       testID="selectLangBtn"
       size="small"
       hitSlop={LANG_DROPDOWN_HITSLOP}
-      label={_(
-        msg({
-          message: `Post language selection`,
-          comment: `Accessibility label for button that opens dialog to choose post language settings`,
-        }),
-      )}
-      accessibilityHint={_(msg`Opens post language settings`)}
+      label={l({
+        message: `Post language selection`,
+        comment: `Accessibility label for button that opens dialog to choose post language settings`,
+      })}
+      accessibilityHint={l`Opens post language settings`}
       style={[a.mr_xs, a.overflow_hidden]}
       {...props}
       onPress={e => {
diff --git a/src/view/com/composer/videos/SubtitleDialog.tsx b/src/view/com/composer/videos/SubtitleDialog.tsx
index 237f842406..8994346883 100644
--- a/src/view/com/composer/videos/SubtitleDialog.tsx
+++ b/src/view/com/composer/videos/SubtitleDialog.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useState} from 'react'
 import {Keyboard, type StyleProp, View, type ViewStyle} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 
 import {MAX_ALT_TEXT} from '#/lib/constants'
@@ -33,16 +32,16 @@ interface Props {
 
 export function SubtitleDialogBtn(props: Props) {
   const control = Dialog.useDialogControl()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <View style={[a.flex_row, a.my_xs]}>
       <Button
-        label={IS_WEB ? _(msg`Captions & alt text`) : _(msg`Alt text`)}
+        label={IS_WEB ? l`Captions & alt text` : l`Alt text`}
         accessibilityHint={
           IS_WEB
-            ? _(msg`Opens captions and alt text dialog`)
-            : _(msg`Opens alt text dialog`)
+            ? l`Opens captions and alt text dialog`
+            : l`Opens alt text dialog`
         }
         size="small"
         color="secondary"
@@ -75,7 +74,7 @@ function SubtitleDialogInner({
   setCaptions,
 }: Props) {
   const control = Dialog.useDialogContext()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const {primaryLanguage} = useLanguagePrefs()
 
@@ -104,15 +103,15 @@ function SubtitleDialogInner({
   })
 
   return (
-    <Dialog.ScrollableInner label={_(msg`Video settings`)}>
+    <Dialog.ScrollableInner label={l`Video settings`}>
       <View style={a.gap_md}>
         <Text style={[a.text_xl, a.font_semi_bold, a.leading_tight]}>
           <Trans>Alt text</Trans>
         </Text>
         <TextField.Root isInvalid={isOverMaxLength}>
           <Dialog.Input
-            label={_(msg`Alt text`)}
-            placeholder={_(msg`Add alt text (optional)`)}
+            label={l`Alt text`}
+            placeholder={l`Add alt text (optional)`}
             value={altText}
             onChangeText={setAltText}
             maxLength={MAX_ALT_TEXT * 10}
@@ -189,7 +188,7 @@ function SubtitleDialogInner({
 
         <View style={web([a.flex_row, a.justify_end])}>
           <Button
-            label={_(msg`Done`)}
+            label={l`Done`}
             size={IS_WEB ? 'small' : 'large'}
             color="primary"
             variant="solid"
@@ -223,7 +222,7 @@ function SubtitleFileRow({
   setCaptions: (updater: (prev: CaptionsTrack[]) => CaptionsTrack[]) => void
   style: StyleProp<ViewStyle>
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
 
   const handleValueChange = useCallback(
@@ -281,9 +280,8 @@ function SubtitleFileRow({
           </select>
         </View>
       </View>
-
       <Button
-        label={_(msg`Remove caption file`)}
+        label={l`Remove caption file`}
         size="tiny"
         shape="round"
         variant="outline"
diff --git a/src/view/com/composer/videos/SubtitleFilePicker.tsx b/src/view/com/composer/videos/SubtitleFilePicker.tsx
index 23277c8681..893e637e10 100644
--- a/src/view/com/composer/videos/SubtitleFilePicker.tsx
+++ b/src/view/com/composer/videos/SubtitleFilePicker.tsx
@@ -1,7 +1,6 @@
 import {useRef} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {logger} from '#/logger'
@@ -15,7 +14,7 @@ export function SubtitleFilePicker({
   onSelectFile,
   disabled,
 }: SubtitleFilePickerProps) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ref = useRef<HTMLInputElement>(null)
 
   const handleClick = () => {
@@ -36,7 +35,7 @@ export function SubtitleFilePicker({
         logger.error('Invalid subtitle file type', {
           safeMessage: `File: ${selectedFile.name} (${selectedFile.type})`,
         })
-        Toast.show(_(msg`Only WebVTT (.vtt) files are supported`))
+        Toast.show(l`Only WebVTT (.vtt) files are supported`)
       }
     }
   }
@@ -55,7 +54,7 @@ export function SubtitleFilePicker({
       <View style={a.flex_row}>
         <Button
           onPress={handleClick}
-          label={_(msg`Select caption file (.vtt)`)}
+          label={l`Select caption file (.vtt)`}
           size="large"
           color="primary"
           variant="solid"
diff --git a/src/view/com/feeds/ComposerPrompt.tsx b/src/view/com/feeds/ComposerPrompt.tsx
index b221b0fae3..836e9e9cbd 100644
--- a/src/view/com/feeds/ComposerPrompt.tsx
+++ b/src/view/com/feeds/ComposerPrompt.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useState} from 'react'
 import {Keyboard, Pressable, View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useOpenComposer} from '#/lib/hooks/useOpenComposer'
@@ -27,7 +26,7 @@ import {IS_NATIVE} from '#/env'
 export function ComposerPrompt() {
   const t = useTheme()
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {openComposer} = useOpenComposer()
   const profile = useCurrentAccountProfile()
   const [hover, setHover] = useState(false)
@@ -144,8 +143,8 @@ export function ComposerPrompt() {
       onPress={onPress}
       android_ripple={null}
       accessibilityRole="button"
-      accessibilityLabel={_(msg`Compose new post`)}
-      accessibilityHint={_(msg`Opens the post composer`)}
+      accessibilityLabel={l`Compose new post`}
+      accessibilityHint={l`Opens the post composer`}
       onPointerEnter={() => setHover(true)}
       onPointerLeave={() => setHover(false)}
       style={({pressed}) => [
@@ -198,8 +197,8 @@ export function ComposerPrompt() {
                 e.stopPropagation()
                 onPressCamera()
               }}
-              label={_(msg`Open camera`)}
-              accessibilityHint={_(msg`Opens device camera`)}
+              label={l`Open camera`}
+              accessibilityHint={l`Opens device camera`}
               variant="ghost"
               shape="round">
               {({hovered, pressed, focused}) => (
@@ -220,8 +219,8 @@ export function ComposerPrompt() {
               e.stopPropagation()
               onPressImage()
             }}
-            label={_(msg`Add image`)}
-            accessibilityHint={_(msg`Opens image picker`)}
+            label={l`Add image`}
+            accessibilityHint={l`Opens image picker`}
             variant="ghost"
             shape="round">
             {({hovered, pressed, focused}) => (
diff --git a/src/view/com/feeds/FeedPage.tsx b/src/view/com/feeds/FeedPage.tsx
index 331c62e0d1..eada088afd 100644
--- a/src/view/com/feeds/FeedPage.tsx
+++ b/src/view/com/feeds/FeedPage.tsx
@@ -8,8 +8,7 @@ import {
 } from 'react'
 import {View} from 'react-native'
 import {type AppBskyActorDefs, AppBskyFeedDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {type NavigationProp, useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -64,7 +63,7 @@ export function FeedPage({
 }) {
   const ax = useAnalytics()
   const {hasSession} = useSession()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const navigation = useNavigation<NavigationProp<AllNavigatorParams>>()
   const queryClient = useQueryClient()
   const {openComposer} = useOpenComposer()
@@ -165,18 +164,17 @@ export function FeedPage({
       {(isScrolledDown || hasNew) && (
         <LoadLatestBtn
           onPress={onPressLoadLatest}
-          label={_(msg`Load new posts`)}
+          label={l`Load new posts`}
           showIndicator={hasNew}
         />
       )}
-
       {hasSession && (
         <FAB
           testID="composeFAB"
           onPress={onPressCompose}
           icon={<EditBigIcon size="lg" fill={t.palette.white} />}
           accessibilityRole="button"
-          accessibilityLabel={_(msg({message: `New post`, context: 'action'}))}
+          accessibilityLabel={l({message: `New post`, context: 'action'})}
           accessibilityHint=""
         />
       )}
diff --git a/src/view/com/feeds/FeedSourceCard.tsx b/src/view/com/feeds/FeedSourceCard.tsx
index c307d03221..4fa0144ffa 100644
--- a/src/view/com/feeds/FeedSourceCard.tsx
+++ b/src/view/com/feeds/FeedSourceCard.tsx
@@ -5,8 +5,7 @@ import {
   type AppBskyGraphDefs,
   AtUri,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 
 import {sanitizeHandle} from '#/lib/strings/handles'
@@ -97,7 +96,7 @@ export function FeedSourceCardLoaded({
   error?: unknown
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   /*
    * LOAD STATE
@@ -185,12 +184,8 @@ export function FeedSourceCardLoaded({
         testID={`feed-${feed.displayName}`}
         label={
           feed.type === 'feed'
-            ? _(
-                msg`${feed.displayName}, a feed by ${sanitizeHandle(feed.creatorHandle, '@')}, liked by ${feed.likeCount || 0}`,
-              )
-            : _(
-                msg`${feed.displayName}, a list by ${sanitizeHandle(feed.creatorHandle, '@')}`,
-              )
+            ? l`${feed.displayName}, a feed by ${sanitizeHandle(feed.creatorHandle, '@')}, liked by ${feed.likeCount || 0}`
+            : l`${feed.displayName}, a list by ${sanitizeHandle(feed.creatorHandle, '@')}`
         }
         to={{
           screen: feed.type === 'feed' ? 'ProfileFeed' : 'ProfileList',
diff --git a/src/view/com/feeds/MissingFeed.tsx b/src/view/com/feeds/MissingFeed.tsx
index bc2af31077..a57824d0fb 100644
--- a/src/view/com/feeds/MissingFeed.tsx
+++ b/src/view/com/feeds/MissingFeed.tsx
@@ -1,7 +1,6 @@
 import {type StyleProp, View, type ViewStyle} from 'react-native'
 import {AtUri} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {cleanError} from '#/lib/strings/errors'
@@ -29,7 +28,7 @@ export function MissingFeed({
   error?: unknown
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const control = Dialog.useDialogControl()
 
   const type = getFeedTypeFromUri(uri)
@@ -39,10 +38,10 @@ export function MissingFeed({
       <Button
         label={
           type === 'feed'
-            ? _(msg`Could not connect to custom feed`)
-            : _(msg`Deleted list`)
+            ? l`Could not connect to custom feed`
+            : l`Deleted list`
         }
-        accessibilityHint={_(msg`Tap for more information`)}
+        accessibilityHint={l`Tap for more information`}
         onPress={control.open}
         style={[
           a.flex_1,
@@ -93,7 +92,6 @@ export function MissingFeed({
           </View>
         </View>
       </Button>
-
       <Dialog.Outer control={control} nativeOptions={{preventExpansion: true}}>
         <Dialog.Handle />
         <DialogInner uri={uri} type={type} error={error} />
@@ -113,7 +111,7 @@ function DialogInner({
 }) {
   const control = Dialog.useDialogContext()
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const atUri = new AtUri(uri)
   const {data: profile, isError: isProfileError} = useProfileQuery({
     did: atUri.host,
@@ -123,9 +121,7 @@ function DialogInner({
   return (
     <Dialog.ScrollableInner
       label={
-        type === 'feed'
-          ? _(msg`Unavailable feed information`)
-          : _(msg`Deleted list`)
+        type === 'feed' ? l`Unavailable feed information` : l`Deleted list`
       }
       style={web({maxWidth: 500})}>
       <View style={[a.gap_sm]}>
@@ -208,7 +204,7 @@ function DialogInner({
       </View>
       {IS_NATIVE && (
         <Button
-          label={_(msg`Close`)}
+          label={l`Close`}
           onPress={() => control.close()}
           size="small"
           variant="solid"
diff --git a/src/view/com/feeds/ProfileFeedgens.tsx b/src/view/com/feeds/ProfileFeedgens.tsx
index effa9ad430..e97396b3d2 100644
--- a/src/view/com/feeds/ProfileFeedgens.tsx
+++ b/src/view/com/feeds/ProfileFeedgens.tsx
@@ -12,8 +12,7 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -64,7 +63,7 @@ export function ProfileFeedgens({
   testID,
   setScrollViewTag,
 }: ProfileFeedgensProps) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const [isPTRing, setIsPTRing] = useState(false)
   const {height} = useWindowDimensions()
@@ -157,15 +156,15 @@ export function ProfileFeedgens({
             icon={HashtagWideIcon}
             message={
               isSelf
-                ? _(msg`You haven't made any custom feeds yet.`)
-                : _(msg`No custom feeds yet`)
+                ? l`You haven't made any custom feeds yet.`
+                : l`No custom feeds yet`
             }
             textStyle={[t.atoms.text_contrast_medium, a.font_medium]}
             button={
               isSelf
                 ? {
-                    label: _(msg`Browse custom feeds`),
-                    text: _(msg`Browse custom feeds`),
+                    label: l`Browse custom feeds`,
+                    text: l`Browse custom feeds`,
                     onPress: () => navigation.navigate('Feeds' as never),
                     size: 'small',
                     color: 'secondary',
@@ -181,9 +180,7 @@ export function ProfileFeedgens({
       } else if (item === LOAD_MORE_ERROR_ITEM) {
         return (
           <LoadMoreRetryBtn
-            label={_(
-              msg`There was an issue fetching your lists. Tap here to try again.`,
-            )}
+            label={l`There was an issue fetching your lists. Tap here to try again.`}
             onPress={onPressRetryLoadMore}
           />
         )
@@ -206,7 +203,7 @@ export function ProfileFeedgens({
       return null
     },
     [
-      _,
+      l,
       t,
       error,
       refetch,
diff --git a/src/view/com/home/HomeHeaderLayout.web.tsx b/src/view/com/home/HomeHeaderLayout.web.tsx
index ffd09523f5..e64e6fe2a2 100644
--- a/src/view/com/home/HomeHeaderLayout.web.tsx
+++ b/src/view/com/home/HomeHeaderLayout.web.tsx
@@ -1,7 +1,6 @@
 import {type JSX} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {HITSLOP_10} from '#/lib/constants'
 import {useSession} from '#/state/session'
@@ -38,7 +37,7 @@ function HomeHeaderLayoutDesktopAndTablet({
   const t = useTheme()
   const {headerHeight} = useShellLayout()
   const {hasSession} = useSession()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const logoVariant = useLogoVariant()
   const gutters = useGutters([0, 'base'])
@@ -64,7 +63,7 @@ function HomeHeaderLayoutDesktopAndTablet({
             <Link
               to="/feeds"
               hitSlop={HITSLOP_10}
-              label={_(msg`View your feeds and explore more`)}
+              label={l`View your feeds and explore more`}
               size="small"
               variant="ghost"
               color="secondary"
diff --git a/src/view/com/home/HomeHeaderLayoutMobile.tsx b/src/view/com/home/HomeHeaderLayoutMobile.tsx
index 7e8ed5e265..62b72a3dfe 100644
--- a/src/view/com/home/HomeHeaderLayoutMobile.tsx
+++ b/src/view/com/home/HomeHeaderLayoutMobile.tsx
@@ -1,8 +1,7 @@
 import {View} from 'react-native'
 import Animated from 'react-native-reanimated'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
 import {HITSLOP_10} from '#/lib/constants'
@@ -30,7 +29,7 @@ export function HomeHeaderLayoutMobile({
   tabBarAnchor: React.ReactElement | null | undefined
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const {headerHeight} = useShellLayout()
   const insets = useSafeAreaInsets()
@@ -83,7 +82,7 @@ export function HomeHeaderLayoutMobile({
               testID="viewHeaderHomeFeedPrefsBtn"
               to={{screen: 'Feeds'}}
               hitSlop={HITSLOP_10}
-              label={_(msg`View your feeds and explore more`)}
+              label={l`View your feeds and explore more`}
               size="small"
               variant="ghost"
               color="secondary"
diff --git a/src/view/com/lists/ListMembers.tsx b/src/view/com/lists/ListMembers.tsx
index 04876eefb2..3e2025869f 100644
--- a/src/view/com/lists/ListMembers.tsx
+++ b/src/view/com/lists/ListMembers.tsx
@@ -7,8 +7,7 @@ import {
   type ViewStyle,
 } from 'react-native'
 import {type AppBskyGraphDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {cleanError} from '#/lib/strings/errors'
@@ -70,7 +69,7 @@ export function ListMembers({
   desktopFixedHeightOffset?: number
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const [isRefreshing, setIsRefreshing] = useState(false)
   const {currentAccount} = useSession()
   const moderationOpts = useModerationOpts()
@@ -176,9 +175,7 @@ export function ListMembers({
         case 'load_more_error': {
           return (
             <LoadMoreRetryBtn
-              label={_(
-                msg`There was an issue fetching the list. Tap here to try again.`,
-              )}
+              label={l`There was an issue fetching the list. Tap here to try again.`}
               onPress={onPressRetryLoadMore}
             />
           )
@@ -212,7 +209,7 @@ export function ListMembers({
                     {isOwner && (
                       <Button
                         testID={`user-${profile.handle}-editBtn`}
-                        label={_(msg({message: 'Edit', context: 'action'}))}
+                        label={l({message: 'Edit', context: 'action'})}
                         onPress={e => onPressEditMembership(e, profile)}
                         size="small"
                         color="secondary">
@@ -244,7 +241,7 @@ export function ListMembers({
       moderationOpts,
       isOwner,
       onPressEditMembership,
-      _,
+      l,
       t,
     ],
   )
diff --git a/src/view/com/lists/MyLists.tsx b/src/view/com/lists/MyLists.tsx
index 0ec9828102..1f52c8c04d 100644
--- a/src/view/com/lists/MyLists.tsx
+++ b/src/view/com/lists/MyLists.tsx
@@ -8,8 +8,7 @@ import {
   type ViewStyle,
 } from 'react-native'
 import {type AppBskyGraphDefs as GraphDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {usePalette} from '#/lib/hooks/usePalette'
 import {cleanError} from '#/lib/strings/errors'
@@ -43,7 +42,7 @@ export function MyLists({
 }) {
   const pal = usePalette('default')
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const moderationOpts = useModerationOpts()
   const [isPTRing, setIsPTRing] = useState(false)
   const {data, isFetching, isFetched, isError, error, refetch} =
@@ -68,17 +67,13 @@ export function MyLists({
   let emptyText
   switch (filter) {
     case 'curate':
-      emptyText = _(
-        msg`Lists allow you to see content from your favorite people.`,
-      )
+      emptyText = l`Lists allow you to see content from your favorite people.`
       break
     case 'mod':
-      emptyText = _(
-        msg`Public, sharable lists of users to mute or block in bulk.`,
-      )
+      emptyText = l`Public, sharable lists of users to mute or block in bulk.`
       break
     default:
-      emptyText = _(msg`You have no lists.`)
+      emptyText = l`You have no lists.`
       break
   }
 
diff --git a/src/view/com/lists/ProfileLists.tsx b/src/view/com/lists/ProfileLists.tsx
index afc4c63791..fcb02f8e1c 100644
--- a/src/view/com/lists/ProfileLists.tsx
+++ b/src/view/com/lists/ProfileLists.tsx
@@ -12,8 +12,7 @@ import {
   View,
   type ViewStyle,
 } from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -64,7 +63,7 @@ export function ProfileLists({
   testID,
   setScrollViewTag,
 }: ProfileListsProps) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const [isPTRing, setIsPTRing] = useState(false)
   const {height} = useWindowDimensions()
@@ -155,16 +154,14 @@ export function ProfileLists({
           <EmptyState
             icon={ListIcon}
             message={
-              isSelf
-                ? _(msg`You haven't created any lists yet.`)
-                : _(msg`No lists`)
+              isSelf ? l`You haven't created any lists yet.` : l`No lists`
             }
             textStyle={[t.atoms.text_contrast_medium, a.font_medium]}
             button={
               isSelf
                 ? {
-                    label: _(msg`Create a list`),
-                    text: _(msg`Create a list`),
+                    label: l`Create a list`,
+                    text: l`Create a list`,
                     onPress: () => navigation.navigate('Lists' as never),
                     size: 'small',
                     color: 'primary',
@@ -180,9 +177,7 @@ export function ProfileLists({
       } else if (item === LOAD_MORE_ERROR_ITEM) {
         return (
           <LoadMoreRetryBtn
-            label={_(
-              msg`There was an issue fetching your lists. Tap here to try again.`,
-            )}
+            label={l`There was an issue fetching your lists. Tap here to try again.`}
             onPress={onPressRetryLoadMore}
           />
         )
@@ -205,7 +200,7 @@ export function ProfileLists({
       return null
     },
     [
-      _,
+      l,
       t,
       error,
       refetch,
diff --git a/src/view/com/notifications/NotificationFeed.tsx b/src/view/com/notifications/NotificationFeed.tsx
index a4c4c6a973..7cbf20e22b 100644
--- a/src/view/com/notifications/NotificationFeed.tsx
+++ b/src/view/com/notifications/NotificationFeed.tsx
@@ -5,8 +5,7 @@ import {
   StyleSheet,
   View,
 } from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender'
 import {usePostViewTracking} from '#/lib/hooks/usePostViewTracking'
@@ -46,7 +45,7 @@ export function NotificationFeed({
 }) {
   const initialNumToRender = useInitialNumToRender()
   const [isPTRing, setIsPTRing] = useState(false)
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const moderationOpts = useModerationOpts()
   const trackPostView = usePostViewTracking('Notifications')
   const {
@@ -122,16 +121,14 @@ export function NotificationFeed({
         return (
           <EmptyState
             icon={BellIcon}
-            message={_(msg`No notifications yet!`)}
+            message={l`No notifications yet!`}
             style={styles.emptyState}
           />
         )
       } else if (item === LOAD_MORE_ERROR_ITEM) {
         return (
           <LoadMoreRetryBtn
-            label={_(
-              msg`There was an issue fetching notifications. Tap here to try again.`,
-            )}
+            label={l`There was an issue fetching notifications. Tap here to try again.`}
             onPress={onPressRetryLoadMore}
           />
         )
@@ -147,7 +144,7 @@ export function NotificationFeed({
         />
       )
     },
-    [moderationOpts, _, onPressRetryLoadMore, filter],
+    [moderationOpts, l, onPressRetryLoadMore, filter],
   )
 
   const FeedFooter = useCallback(
diff --git a/src/view/com/notifications/NotificationFeedItem.tsx b/src/view/com/notifications/NotificationFeedItem.tsx
index a89431938d..91137394ed 100644
--- a/src/view/com/notifications/NotificationFeedItem.tsx
+++ b/src/view/com/notifications/NotificationFeedItem.tsx
@@ -19,8 +19,8 @@ import {
 } from '@atproto/api'
 import {AtUri} from '@atproto/api'
 import {TID} from '@atproto/common-web'
-import {msg, plural} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {plural} from '@lingui/core/macro'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
@@ -93,7 +93,7 @@ let NotificationFeedItem = ({
 }): React.ReactNode => {
   const queryClient = useQueryClient()
   const t = useTheme()
-  const {_, i18n} = useLingui()
+  const {t: l, i18n} = useLingui()
   const ax = useAnalytics()
   const [isAuthorsExpanded, setIsAuthorsExpanded] = useState<boolean>(false)
   const [isHoveringAuthorsList, setIsHoveringAuthorsList] = useState(false)
@@ -253,7 +253,7 @@ let NotificationFeedItem = ({
         to={firstAuthor.href}
         disableMismatchWarning
         emoji
-        label={_(msg`Go to ${firstAuthorName}'s profile`)}>
+        label={l`Go to ${firstAuthorName}'s profile`}>
         {forceLTR(firstAuthorName)}
         <ProfileBadges
           profile={firstAuthor.profile}
@@ -293,13 +293,11 @@ let NotificationFeedItem = ({
 
   if (item.type === 'post-like') {
     a11yLabel = hasMultipleAuthors
-      ? _(
-          msg`${firstAuthorName} and ${plural(additionalAuthorsCount, {
-            one: `${formattedAuthorsCount} other`,
-            other: `${formattedAuthorsCount} others`,
-          })} liked your post`,
-        )
-      : _(msg`${firstAuthorName} liked your post`)
+      ? l`${firstAuthorName} and ${plural(additionalAuthorsCount, {
+          one: `${formattedAuthorsCount} other`,
+          other: `${formattedAuthorsCount} others`,
+        })} liked your post`
+      : l`${firstAuthorName} liked your post`
     notificationContent = hasMultipleAuthors ? (
       <Trans>
         {firstAuthorLink} and{' '}
@@ -317,13 +315,11 @@ let NotificationFeedItem = ({
     )
   } else if (item.type === 'repost') {
     a11yLabel = hasMultipleAuthors
-      ? _(
-          msg`${firstAuthorName} and ${plural(additionalAuthorsCount, {
-            one: `${formattedAuthorsCount} other`,
-            other: `${formattedAuthorsCount} others`,
-          })} reposted your post`,
-        )
-      : _(msg`${firstAuthorName} reposted your post`)
+      ? l`${firstAuthorName} and ${plural(additionalAuthorsCount, {
+          one: `${formattedAuthorsCount} other`,
+          other: `${formattedAuthorsCount} others`,
+        })} reposted your post`
+      : l`${firstAuthorName} reposted your post`
     notificationContent = hasMultipleAuthors ? (
       <Trans>
         {firstAuthorLink} and{' '}
@@ -346,17 +342,15 @@ let NotificationFeedItem = ({
        * Follow-backs are ungrouped, grouped follow-backs not supported atm,
        * see `src/state/queries/notifications/util.ts`
        */
-      a11yLabel = _(msg`${firstAuthorName} followed you back`)
+      a11yLabel = l`${firstAuthorName} followed you back`
       notificationContent = <Trans>{firstAuthorLink} followed you back</Trans>
     } else {
       a11yLabel = hasMultipleAuthors
-        ? _(
-            msg`${firstAuthorName} and ${plural(additionalAuthorsCount, {
-              one: `${formattedAuthorsCount} other`,
-              other: `${formattedAuthorsCount} others`,
-            })} followed you`,
-          )
-        : _(msg`${firstAuthorName} followed you`)
+        ? l`${firstAuthorName} and ${plural(additionalAuthorsCount, {
+            one: `${formattedAuthorsCount} other`,
+            other: `${formattedAuthorsCount} others`,
+          })} followed you`
+        : l`${firstAuthorName} followed you`
       notificationContent = hasMultipleAuthors ? (
         <Trans>
           {firstAuthorLink} and{' '}
@@ -375,7 +369,7 @@ let NotificationFeedItem = ({
     }
     icon = <PersonPlusIcon size="xl" style={{color: t.palette.primary_500}} />
   } else if (item.type === 'contact-match') {
-    a11yLabel = _(msg`Your contact ${firstAuthorName} is on Bluesky`)
+    a11yLabel = l`Your contact ${firstAuthorName} is on Bluesky`
     notificationContent = (
       <Trans>Your contact {firstAuthorLink} is on Bluesky</Trans>
     )
@@ -384,13 +378,11 @@ let NotificationFeedItem = ({
     )
   } else if (item.type === 'feedgen-like') {
     a11yLabel = hasMultipleAuthors
-      ? _(
-          msg`${firstAuthorName} and ${plural(additionalAuthorsCount, {
-            one: `${formattedAuthorsCount} other`,
-            other: `${formattedAuthorsCount} others`,
-          })} liked your custom feed`,
-        )
-      : _(msg`${firstAuthorName} liked your custom feed`)
+      ? l`${firstAuthorName} and ${plural(additionalAuthorsCount, {
+          one: `${formattedAuthorsCount} other`,
+          other: `${formattedAuthorsCount} others`,
+        })} liked your custom feed`
+      : l`${firstAuthorName} liked your custom feed`
     notificationContent = hasMultipleAuthors ? (
       <Trans>
         {firstAuthorLink} and{' '}
@@ -408,13 +400,11 @@ let NotificationFeedItem = ({
     )
   } else if (item.type === 'starterpack-joined') {
     a11yLabel = hasMultipleAuthors
-      ? _(
-          msg`${firstAuthorName} and ${plural(additionalAuthorsCount, {
-            one: `${formattedAuthorsCount} other`,
-            other: `${formattedAuthorsCount} others`,
-          })} signed up with your starter pack`,
-        )
-      : _(msg`${firstAuthorName} signed up with your starter pack`)
+      ? l`${firstAuthorName} and ${plural(additionalAuthorsCount, {
+          one: `${formattedAuthorsCount} other`,
+          other: `${formattedAuthorsCount} others`,
+        })} signed up with your starter pack`
+      : l`${firstAuthorName} signed up with your starter pack`
     notificationContent = hasMultipleAuthors ? (
       <Trans>
         {firstAuthorLink} and{' '}
@@ -437,13 +427,11 @@ let NotificationFeedItem = ({
     )
   } else if (item.type === 'verified') {
     a11yLabel = hasMultipleAuthors
-      ? _(
-          msg`${firstAuthorName} and ${plural(additionalAuthorsCount, {
-            one: `${formattedAuthorsCount} other`,
-            other: `${formattedAuthorsCount} others`,
-          })} verified you`,
-        )
-      : _(msg`${firstAuthorName} verified you`)
+      ? l`${firstAuthorName} and ${plural(additionalAuthorsCount, {
+          one: `${formattedAuthorsCount} other`,
+          other: `${formattedAuthorsCount} others`,
+        })} verified you`
+      : l`${firstAuthorName} verified you`
     notificationContent = hasMultipleAuthors ? (
       <Trans>
         {firstAuthorLink} and{' '}
@@ -462,13 +450,11 @@ let NotificationFeedItem = ({
     icon = <VerifiedCheck size="xl" />
   } else if (item.type === 'unverified') {
     a11yLabel = hasMultipleAuthors
-      ? _(
-          msg`${firstAuthorName} and ${plural(additionalAuthorsCount, {
-            one: `${formattedAuthorsCount} other`,
-            other: `${formattedAuthorsCount} others`,
-          })} removed their verifications from your account`,
-        )
-      : _(msg`${firstAuthorName} removed their verification from your account`)
+      ? l`${firstAuthorName} and ${plural(additionalAuthorsCount, {
+          one: `${formattedAuthorsCount} other`,
+          other: `${formattedAuthorsCount} others`,
+        })} removed their verifications from your account`
+      : l`${firstAuthorName} removed their verification from your account`
     notificationContent = hasMultipleAuthors ? (
       <Trans>
         {firstAuthorLink} and{' '}
@@ -489,13 +475,11 @@ let NotificationFeedItem = ({
     icon = <VerifiedCheck size="xl" fill={t.palette.contrast_500} />
   } else if (item.type === 'like-via-repost') {
     a11yLabel = hasMultipleAuthors
-      ? _(
-          msg`${firstAuthorName} and ${plural(additionalAuthorsCount, {
-            one: `${formattedAuthorsCount} other`,
-            other: `${formattedAuthorsCount} others`,
-          })} liked your repost`,
-        )
-      : _(msg`${firstAuthorName} liked your repost`)
+      ? l`${firstAuthorName} and ${plural(additionalAuthorsCount, {
+          one: `${formattedAuthorsCount} other`,
+          other: `${formattedAuthorsCount} others`,
+        })} liked your repost`
+      : l`${firstAuthorName} liked your repost`
     notificationContent = hasMultipleAuthors ? (
       <Trans>
         {firstAuthorLink} and{' '}
@@ -513,13 +497,11 @@ let NotificationFeedItem = ({
     )
   } else if (item.type === 'repost-via-repost') {
     a11yLabel = hasMultipleAuthors
-      ? _(
-          msg`${firstAuthorName} and ${plural(additionalAuthorsCount, {
-            one: `${formattedAuthorsCount} other`,
-            other: `${formattedAuthorsCount} others`,
-          })} reposted your repost`,
-        )
-      : _(msg`${firstAuthorName} reposted your repost`)
+      ? l`${firstAuthorName} and ${plural(additionalAuthorsCount, {
+          one: `${formattedAuthorsCount} other`,
+          other: `${formattedAuthorsCount} others`,
+        })} reposted your repost`
+      : l`${firstAuthorName} reposted your repost`
     notificationContent = hasMultipleAuthors ? (
       <Trans>
         {firstAuthorLink} and{' '}
@@ -539,21 +521,17 @@ let NotificationFeedItem = ({
   } else if (item.type === 'subscribed-post') {
     const postsCount = 1 + (item.additional?.length || 0)
     a11yLabel = hasMultipleAuthors
-      ? _(
-          msg`New posts from ${firstAuthorName} and ${plural(
-            additionalAuthorsCount,
-            {
-              one: `${formattedAuthorsCount} other`,
-              other: `${formattedAuthorsCount} others`,
-            },
-          )}`,
-        )
-      : _(
-          msg`New ${plural(postsCount, {
-            one: 'post',
-            other: 'posts',
-          })} from ${firstAuthorName}`,
-        )
+      ? l`New posts from ${firstAuthorName} and ${plural(
+          additionalAuthorsCount,
+          {
+            one: `${formattedAuthorsCount} other`,
+            other: `${formattedAuthorsCount} others`,
+          },
+        )}`
+      : l`New ${plural(postsCount, {
+          one: 'post',
+          other: 'posts',
+        })} from ${firstAuthorName}`
     notificationContent = hasMultipleAuthors ? (
       <Trans>
         New posts from {firstAuthorLink} and{' '}
@@ -608,18 +586,16 @@ let NotificationFeedItem = ({
               {
                 name: 'toggleAuthorsExpanded',
                 label: isAuthorsExpanded
-                  ? _(msg`Collapse list of users`)
-                  : _(msg`Expand list of users`),
+                  ? l`Collapse list of users`
+                  : l`Expand list of users`,
               },
             ]
           : [
               {
                 name: 'viewProfile',
-                label: _(
-                  msg`View ${
-                    authors[0].profile.displayName || authors[0].profile.handle
-                  }'s profile`,
-                ),
+                label: l`View ${
+                  authors[0].profile.displayName || authors[0].profile.handle
+                }'s profile`,
               },
             ]
       }
@@ -767,7 +743,7 @@ function ExpandListPressable({
 }
 
 function FollowBackButton({profile}: {profile: AppBskyActorDefs.ProfileView}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount, hasSession} = useSession()
   const profileShadow = useProfileShadow(profile)
   const [queueFollow, queueUnfollow] = useProfileFollowMutationQueue(
@@ -787,15 +763,13 @@ function FollowBackButton({profile}: {profile: AppBskyActorDefs.ProfileView}) {
     try {
       await queueFollow()
       Toast.show(
-        _(
-          msg`Following ${sanitizeDisplayName(
-            profile.displayName || profile.handle,
-          )}`,
-        ),
+        l`Following ${sanitizeDisplayName(
+          profile.displayName || profile.handle,
+        )}`,
       )
     } catch (err: any) {
       if (err?.name !== 'AbortError') {
-        Toast.show(_(msg`An issue occurred, please try again.`), {
+        Toast.show(l`An issue occurred, please try again.`, {
           type: 'error',
         })
       }
@@ -809,15 +783,13 @@ function FollowBackButton({profile}: {profile: AppBskyActorDefs.ProfileView}) {
     try {
       await queueUnfollow()
       Toast.show(
-        _(
-          msg`No longer following ${sanitizeDisplayName(
-            profile.displayName || profile.handle,
-          )}`,
-        ),
+        l`No longer following ${sanitizeDisplayName(
+          profile.displayName || profile.handle,
+        )}`,
       )
     } catch (err: any) {
       if (err?.name !== 'AbortError') {
-        Toast.show(_(msg`An issue occurred, please try again.`), {
+        Toast.show(l`An issue occurred, please try again.`, {
           type: 'error',
         })
       }
@@ -838,12 +810,10 @@ function FollowBackButton({profile}: {profile: AppBskyActorDefs.ProfileView}) {
 
   const isFollowing = profileShadow.viewer.following
   const isFollowedBy = profileShadow.viewer.followedBy
-  const followingLabel = _(
-    msg({
-      message: 'Following',
-      comment: 'User is following this account, click to unfollow',
-    }),
-  )
+  const followingLabel = l({
+    message: 'Following',
+    comment: 'User is following this account, click to unfollow',
+  })
 
   return (
     <View style={[a.pt_sm]}>
@@ -861,7 +831,7 @@ function FollowBackButton({profile}: {profile: AppBskyActorDefs.ProfileView}) {
         </Button>
       ) : (
         <Button
-          label={isFollowedBy ? _(msg`Follow back`) : _(msg`Follow`)}
+          label={isFollowedBy ? l`Follow back` : l`Follow`}
           color="primary"
           size="small"
           style={[a.self_start]}
@@ -877,7 +847,7 @@ function FollowBackButton({profile}: {profile: AppBskyActorDefs.ProfileView}) {
 }
 
 function SayHelloBtn({profile}: {profile: AppBskyActorDefs.ProfileView}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const agent = useAgent()
   const navigation = useNavigation<NavigationProp>()
   const [isLoading, setIsLoading] = useState(false)
@@ -892,7 +862,7 @@ function SayHelloBtn({profile}: {profile: AppBskyActorDefs.ProfileView}) {
 
   return (
     <Button
-      label={_(msg`Say hello!`)}
+      label={l`Say hello!`}
       variant="ghost"
       color="primary"
       size="small"
@@ -935,7 +905,7 @@ function CondensedAuthorsList({
   showDmButton?: boolean
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   if (!visible) {
     return (
@@ -944,10 +914,8 @@ function CondensedAuthorsList({
           style={styles.expandedAuthorsCloseBtn}
           onPress={onToggleAuthorsExpanded}
           accessibilityRole="button"
-          accessibilityLabel={_(msg`Hide user list`)}
-          accessibilityHint={_(
-            msg`Collapses list of users for a given notification`,
-          )}>
+          accessibilityLabel={l`Hide user list`}
+          accessibilityHint={l`Collapses list of users for a given notification`}>
           <ChevronUpIcon
             size="md"
             style={[a.ml_xs, a.mr_md, t.atoms.text_contrast_high]}
diff --git a/src/view/com/post-thread/PostLikedBy.tsx b/src/view/com/post-thread/PostLikedBy.tsx
index 48669d99ce..f728b1f5fe 100644
--- a/src/view/com/post-thread/PostLikedBy.tsx
+++ b/src/view/com/post-thread/PostLikedBy.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useMemo, useState} from 'react'
 import {type AppBskyFeedGetLikes as GetLikes} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender'
 import {cleanError} from '#/lib/strings/errors'
@@ -27,7 +26,7 @@ function keyExtractor(item: GetLikes.Like) {
 }
 
 export function PostLikedBy({uri}: {uri: string}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const initialNumToRender = useInitialNumToRender()
 
   const [isPTRing, setIsPTRing] = useState(false)
@@ -81,10 +80,8 @@ export function PostLikedBy({uri}: {uri: string}) {
         isLoading={isLoadingUri || isLoadingLikes}
         isError={isError}
         emptyType="results"
-        emptyTitle={_(msg`No likes yet`)}
-        emptyMessage={_(
-          msg`Nobody has liked this yet. Maybe you should be the first!`,
-        )}
+        emptyTitle={l`No likes yet`}
+        emptyMessage={l`Nobody has liked this yet. Maybe you should be the first!`}
         errorMessage={cleanError(resolveError || error)}
         sideBorders={false}
         topBorder={false}
diff --git a/src/view/com/post-thread/PostQuotes.tsx b/src/view/com/post-thread/PostQuotes.tsx
index b16281f9e0..067a6d2ab7 100644
--- a/src/view/com/post-thread/PostQuotes.tsx
+++ b/src/view/com/post-thread/PostQuotes.tsx
@@ -5,8 +5,7 @@ import {
   moderatePost,
   type ModerationDecision,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender'
 import {usePostViewTracking} from '#/lib/hooks/usePostViewTracking'
@@ -43,7 +42,7 @@ function keyExtractor(item: {
 }
 
 export function PostQuotes({uri}: {uri: string}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const initialNumToRender = useInitialNumToRender()
   const [isPTRing, setIsPTRing] = useState(false)
   const trackPostView = usePostViewTracking('PostQuotes')
@@ -111,10 +110,8 @@ export function PostQuotes({uri}: {uri: string}) {
         isLoading={isLoadingUri || isLoadingQuotes}
         isError={isError}
         emptyType="results"
-        emptyTitle={_(msg`No quotes yet`)}
-        emptyMessage={_(
-          msg`Nobody has quoted this yet. Maybe you should be the first!`,
-        )}
+        emptyTitle={l`No quotes yet`}
+        emptyMessage={l`Nobody has quoted this yet. Maybe you should be the first!`}
         errorMessage={cleanError(resolveError || error)}
         sideBorders={false}
       />
@@ -139,7 +136,7 @@ export function PostQuotes({uri}: {uri: string}) {
           error={cleanError(error)}
           onRetry={fetchNextPage}
           showEndMessage
-          endMessageText={_(msg`That's all, folks!`)}
+          endMessageText={l`That's all, folks!`}
         />
       }
       // @ts-ignore our .web version only -prf
diff --git a/src/view/com/post-thread/PostRepostedBy.tsx b/src/view/com/post-thread/PostRepostedBy.tsx
index 4c2db9eda0..129059dacc 100644
--- a/src/view/com/post-thread/PostRepostedBy.tsx
+++ b/src/view/com/post-thread/PostRepostedBy.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useMemo, useState} from 'react'
 import {type AppBskyActorDefs as ActorDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender'
 import {cleanError} from '#/lib/strings/errors'
@@ -33,7 +32,7 @@ function keyExtractor(item: ActorDefs.ProfileView) {
 }
 
 export function PostRepostedBy({uri}: {uri: string}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const initialNumToRender = useInitialNumToRender()
 
   const [isPTRing, setIsPTRing] = useState(false)
@@ -87,10 +86,8 @@ export function PostRepostedBy({uri}: {uri: string}) {
         isLoading={isLoadingUri || isLoadingRepostedBy}
         isError={isError}
         emptyType="results"
-        emptyTitle={_(msg`No reposts yet`)}
-        emptyMessage={_(
-          msg`Nobody has reposted this yet. Maybe you should be the first!`,
-        )}
+        emptyTitle={l`No reposts yet`}
+        emptyMessage={l`Nobody has reposted this yet. Maybe you should be the first!`}
         errorMessage={cleanError(resolveError || error)}
         sideBorders={false}
       />
diff --git a/src/view/com/posts/FeedShutdownMsg.tsx b/src/view/com/posts/FeedShutdownMsg.tsx
index 459cb5870e..4cb8c7ba16 100644
--- a/src/view/com/posts/FeedShutdownMsg.tsx
+++ b/src/view/com/posts/FeedShutdownMsg.tsx
@@ -1,7 +1,6 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {PROD_DEFAULT_FEED} from '#/lib/constants'
@@ -21,7 +20,7 @@ import {Text} from '#/components/Typography'
 
 export function FeedShutdownMsg({feedUri}: {feedUri: string}) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const setSelectedFeed = useSetSelectedFeed()
   const {data: preferences} = usePreferencesQuery()
   const {mutateAsync: removeFeed, isPending: isRemovePending} =
@@ -42,23 +41,21 @@ export function FeedShutdownMsg({feedUri}: {feedUri: string}) {
     try {
       if (feedConfig) {
         await removeFeed(feedConfig)
-        Toast.show(_(msg`Removed from your feeds`))
+        Toast.show(l`Removed from your feeds`)
       }
       if (hasDiscoverPinned) {
         setSelectedFeed(`feedgen|${PROD_DEFAULT_FEED('whats-hot')}`)
       }
     } catch (err: any) {
       Toast.show(
-        _(
-          msg`There was an issue updating your feeds, please check your internet connection and try again.`,
-        ),
+        l`There was an issue updating your feeds, please check your internet connection and try again.`,
         {
           type: 'warning',
         },
       )
       logger.error('Failed to update feeds', {message: err})
     }
-  }, [removeFeed, feedConfig, _, hasDiscoverPinned, setSelectedFeed])
+  }, [removeFeed, feedConfig, l, hasDiscoverPinned, setSelectedFeed])
 
   const onReplaceFeed = useCallback(async () => {
     try {
@@ -67,12 +64,10 @@ export function FeedShutdownMsg({feedUri}: {feedUri: string}) {
         discoverFeedConfig,
       })
       setSelectedFeed(`feedgen|${PROD_DEFAULT_FEED('whats-hot')}`)
-      Toast.show(_(msg`The feed has been replaced with Discover.`))
+      Toast.show(l`The feed has been replaced with Discover.`)
     } catch (err: any) {
       Toast.show(
-        _(
-          msg`There was an issue updating your feeds, please check your internet connection and try again.`,
-        ),
+        l`There was an issue updating your feeds, please check your internet connection and try again.`,
         {
           type: 'warning',
         },
@@ -84,7 +79,7 @@ export function FeedShutdownMsg({feedUri}: {feedUri: string}) {
     discoverFeedConfig,
     feedConfig,
     setSelectedFeed,
-    _,
+    l,
   ])
 
   const isProcessing = isReplacePending || isRemovePending
@@ -104,7 +99,7 @@ export function FeedShutdownMsg({feedUri}: {feedUri: string}) {
         <Trans>
           This feed is no longer online. We are showing{' '}
           <InlineLinkText
-            label={_(msg`The Discover feed`)}
+            label={l`The Discover feed`}
             to="/profile/bsky.app/feed/whats-hot"
             style={[a.text_md]}>
             Discover
@@ -118,7 +113,7 @@ export function FeedShutdownMsg({feedUri}: {feedUri: string}) {
             variant="outline"
             color="primary"
             size="small"
-            label={_(msg`Remove feed`)}
+            label={l`Remove feed`}
             disabled={isProcessing}
             onPress={onRemoveFeed}>
             <ButtonText>
@@ -131,7 +126,7 @@ export function FeedShutdownMsg({feedUri}: {feedUri: string}) {
               variant="solid"
               color="primary"
               size="small"
-              label={_(msg`Replace with Discover`)}
+              label={l`Replace with Discover`}
               disabled={isProcessing}
               onPress={onReplaceFeed}>
               <ButtonText>
diff --git a/src/view/com/posts/PostFeedErrorMessage.tsx b/src/view/com/posts/PostFeedErrorMessage.tsx
index 0298ce228b..7e10778185 100644
--- a/src/view/com/posts/PostFeedErrorMessage.tsx
+++ b/src/view/com/posts/PostFeedErrorMessage.tsx
@@ -5,8 +5,7 @@ import {
   AppBskyFeedGetAuthorFeed,
   AtUri,
 } from '@atproto/api'
-import {msg as msgLingui} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
@@ -47,7 +46,7 @@ export function PostFeedErrorMessage({
   onPressTryAgain: () => void
   savedFeedConfig?: AppBskyActorDefs.SavedFeed
 }) {
-  const {_: _l} = useLingui()
+  const {t: l} = useLingui()
   const knownError = useMemo(
     () => detectKnownError(feedDesc, error),
     [feedDesc, error],
@@ -73,7 +72,7 @@ export function PostFeedErrorMessage({
       <EmptyState
         icon={WarningIcon}
         iconSize="2xl"
-        message={_l(msgLingui`Posts hidden`)}
+        message={l`Posts hidden`}
         style={{paddingVertical: 40}}
       />
     )
@@ -99,36 +98,22 @@ function FeedgenErrorMessage({
   savedFeedConfig?: AppBskyActorDefs.SavedFeed
 }) {
   const pal = usePalette('default')
-  const {_: _l} = useLingui()
+  const {t: l} = useLingui()
   const navigation = useNavigation<NavigationProp>()
   const msg = useMemo(
     () =>
       ({
         [KnownError.Unknown]: '',
         [KnownError.Block]: '',
-        [KnownError.FeedgenDoesNotExist]: _l(
-          msgLingui`Hmm, we're having trouble finding this feed. It may have been deleted.`,
-        ),
-        [KnownError.FeedgenMisconfigured]: _l(
-          msgLingui`Hmm, the feed server appears to be misconfigured. Please let the feed owner know about this issue.`,
-        ),
-        [KnownError.FeedgenBadResponse]: _l(
-          msgLingui`Hmm, the feed server gave a bad response. Please let the feed owner know about this issue.`,
-        ),
-        [KnownError.FeedgenOffline]: _l(
-          msgLingui`Hmm, the feed server appears to be offline. Please let the feed owner know about this issue.`,
-        ),
-        [KnownError.FeedSignedInOnly]: _l(
-          msgLingui`This content is not viewable without a Bluesky account.`,
-        ),
-        [KnownError.FeedgenUnknown]: _l(
-          msgLingui`Hmm, some kind of issue occurred when contacting the feed server. Please let the feed owner know about this issue.`,
-        ),
-        [KnownError.FeedTooManyRequests]: _l(
-          msgLingui`This feed is currently receiving high traffic and is temporarily unavailable. Please try again later.`,
-        ),
+        [KnownError.FeedgenDoesNotExist]: l`Hmm, we're having trouble finding this feed. It may have been deleted.`,
+        [KnownError.FeedgenMisconfigured]: l`Hmm, the feed server appears to be misconfigured. Please let the feed owner know about this issue.`,
+        [KnownError.FeedgenBadResponse]: l`Hmm, the feed server gave a bad response. Please let the feed owner know about this issue.`,
+        [KnownError.FeedgenOffline]: l`Hmm, the feed server appears to be offline. Please let the feed owner know about this issue.`,
+        [KnownError.FeedSignedInOnly]: l`This content is not viewable without a Bluesky account.`,
+        [KnownError.FeedgenUnknown]: l`Hmm, some kind of issue occurred when contacting the feed server. Please let the feed owner know about this issue.`,
+        [KnownError.FeedTooManyRequests]: l`This feed is currently receiving high traffic and is temporarily unavailable. Please try again later.`,
       })[knownError],
-    [_l, knownError],
+    [l, knownError],
   )
   const [__, uri] = feedDesc.split('|')
   const [ownerDid] = safeParseFeedgenUri(uri)
@@ -149,14 +134,12 @@ function FeedgenErrorMessage({
       await removeFeed(savedFeedConfig)
     } catch (err) {
       Toast.show(
-        _l(
-          msgLingui`There was an issue removing this feed. Please check your internet connection and try again.`,
-        ),
+        l`There was an issue removing this feed. Please check your internet connection and try again.`,
         'exclamation-circle',
       )
       logger.error('Failed to remove feed', {message: err})
     }
-  }, [removeFeed, _l, savedFeedConfig])
+  }, [removeFeed, l, savedFeedConfig])
 
   const cta = useMemo(() => {
     switch (knownError) {
@@ -174,20 +157,20 @@ function FeedgenErrorMessage({
               savedFeedConfig && (
                 <Button
                   type="inverted"
-                  label={_l(msgLingui`Remove feed`)}
+                  label={l`Remove feed`}
                   onPress={onRemoveFeed}
                 />
               )}
             <Button
               type="default-light"
-              label={_l(msgLingui`View profile`)}
+              label={l`View profile`}
               onPress={onViewProfile}
             />
           </View>
         )
       }
     }
-  }, [knownError, onViewProfile, onRemoveFeed, _l, savedFeedConfig])
+  }, [knownError, onViewProfile, onRemoveFeed, l, savedFeedConfig])
 
   return (
     <>
@@ -212,13 +195,12 @@ function FeedgenErrorMessage({
 
         {cta}
       </View>
-
       <Prompt.Basic
         control={removePromptControl}
-        title={_l(msgLingui`Remove feed?`)}
-        description={_l(msgLingui`Remove this feed from your saved feeds`)}
+        title={l`Remove feed?`}
+        description={l`Remove this feed from your saved feeds`}
         onConfirm={onPressRemoveFeed}
-        confirmButtonCta={_l(msgLingui`Remove`)}
+        confirmButtonCta={l`Remove`}
         confirmButtonColor="negative"
       />
     </>
diff --git a/src/view/com/posts/PostFeedReason.tsx b/src/view/com/posts/PostFeedReason.tsx
index fd3ec73470..b6e29469c1 100644
--- a/src/view/com/posts/PostFeedReason.tsx
+++ b/src/view/com/posts/PostFeedReason.tsx
@@ -1,7 +1,6 @@
 import {StyleSheet, View} from 'react-native'
 import {AppBskyFeedDefs, type ModerationDecision} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {isReasonFeedSource, type ReasonFeedSource} from '#/lib/api/feed/types'
@@ -30,13 +29,13 @@ export function PostFeedReason({
   onOpenReposter?: () => void
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const {currentAccount} = useSession()
 
   if (isReasonFeedSource(reason)) {
     return (
-      <Link label={_(msg`Go to feed`)} to={reason.href}>
+      <Link label={l`Go to feed`} to={reason.href}>
         <Text
           style={[
             t.atoms.text_contrast_medium,
@@ -74,9 +73,7 @@ export function PostFeedReason({
       <Link
         style={styles.includeReason}
         to={makeProfileLink(reason.by)}
-        label={
-          isOwner ? _(msg`Reposted by you`) : _(msg`Reposted by ${reposter}`)
-        }
+        label={isOwner ? l`Reposted by you` : l`Reposted by ${reposter}`}
         onPress={onOpenReposter}>
         <RepostIcon
           style={[t.atoms.text_contrast_medium, {marginRight: 3}]}
diff --git a/src/view/com/profile/ProfileSubpageHeader.tsx b/src/view/com/profile/ProfileSubpageHeader.tsx
index 072583938a..a8db0cdce7 100644
--- a/src/view/com/profile/ProfileSubpageHeader.tsx
+++ b/src/view/com/profile/ProfileSubpageHeader.tsx
@@ -2,8 +2,7 @@ import {useCallback} from 'react'
 import {Pressable, View} from 'react-native'
 import Animated, {useAnimatedRef} from 'react-native-reanimated'
 import {type AppBskyGraphDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
@@ -47,7 +46,7 @@ export function ProfileSubpageHeader({
   avatarType: UserAvatarType | 'starter-pack'
 }>) {
   const navigation = useNavigation<NavigationProp>()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {isMobile} = useWebMediaQueries()
   const {openLightbox} = useLightboxControls()
   const pal = usePalette('default')
@@ -90,7 +89,6 @@ export function ProfileSubpageHeader({
         <Layout.Header.Content />
         {children}
       </Layout.Header.Outer>
-
       <View
         style={{
           flexDirection: 'row',
@@ -105,7 +103,7 @@ export function ProfileSubpageHeader({
             testID="headerAviButton"
             onPress={onPressAvi}
             accessibilityRole="image"
-            accessibilityLabel={_(msg`View the avatar`)}
+            accessibilityLabel={l`View the avatar`}
             accessibilityHint=""
             style={{width: 58}}>
             {avatarType === 'starter-pack' ? (
diff --git a/src/view/com/util/ErrorBoundary.tsx b/src/view/com/util/ErrorBoundary.tsx
index 712473c77f..3111c5167b 100644
--- a/src/view/com/util/ErrorBoundary.tsx
+++ b/src/view/com/util/ErrorBoundary.tsx
@@ -1,7 +1,6 @@
 import {Component, type ErrorInfo, type ReactNode} from 'react'
 import {type StyleProp, type ViewStyle} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {logger} from '#/logger'
 import {ErrorScreen} from './error/ErrorScreen'
@@ -50,14 +49,12 @@ export class ErrorBoundary extends Component<Props, State> {
 }
 
 function TranslatedErrorScreen({details}: {details?: string}) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <ErrorScreen
-      title={_(msg`Oh no!`)}
-      message={_(
-        msg`There was an unexpected issue in the application. Please let us know if this happened to you!`,
-      )}
+      title={l`Oh no!`}
+      message={l`There was an unexpected issue in the application. Please let us know if this happened to you!`}
       details={details}
     />
   )
diff --git a/src/view/com/util/PostMeta.tsx b/src/view/com/util/PostMeta.tsx
index 29f3cf3fd8..f52e623114 100644
--- a/src/view/com/util/PostMeta.tsx
+++ b/src/view/com/util/PostMeta.tsx
@@ -1,8 +1,7 @@
 import {memo, useCallback} from 'react'
 import {type StyleProp, View, type ViewStyle} from 'react-native'
 import {type AppBskyActorDefs, type ModerationDecision} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
 import {makeProfileLink} from '#/lib/routes/links'
@@ -37,7 +36,7 @@ interface PostMetaOpts {
 
 let PostMeta = (opts: PostMetaOpts): React.ReactNode => {
   const t = useTheme()
-  const {i18n, _} = useLingui()
+  const {i18n, t: l} = useLingui()
 
   const author = useProfileShadow(opts.author)
   const displayName = author.displayName || author.handle
@@ -89,7 +88,7 @@ let PostMeta = (opts: PostMetaOpts): React.ReactNode => {
               emoji
               numberOfLines={1}
               to={profileLink}
-              label={_(msg`View profile`)}
+              label={l`View profile`}
               disableMismatchWarning
               onPress={opts.linkDisabled ? undefined : onBeforePressAuthor}
               style={[
@@ -117,7 +116,7 @@ let PostMeta = (opts: PostMetaOpts): React.ReactNode => {
               emoji
               numberOfLines={1}
               to={profileLink}
-              label={_(msg`View profile`)}
+              label={l`View profile`}
               disableMismatchWarning
               disableUnderline
               onPress={opts.linkDisabled ? undefined : onBeforePressAuthor}
diff --git a/src/view/com/util/UserAvatar.tsx b/src/view/com/util/UserAvatar.tsx
index f139542857..649b8b2f64 100644
--- a/src/view/com/util/UserAvatar.tsx
+++ b/src/view/com/util/UserAvatar.tsx
@@ -12,8 +12,7 @@ import {
 import Svg, {Circle, Path, Rect} from 'react-native-svg'
 import {Image as ExpoImage} from 'expo-image'
 import {type ModerationUI} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -361,7 +360,7 @@ let EditableUserAvatar = ({
   onSelectNewAvatar,
 }: EditableUserAvatarProps): React.ReactNode => {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {requestCameraAccessIfNeeded} = useCameraPermission()
   const {requestPhotoAccessIfNeeded} = usePhotoLibraryPermission()
   const [rawImage, setRawImage] = useState<ComposerImage | undefined>()
@@ -461,7 +460,7 @@ let EditableUserAvatar = ({
   return (
     <>
       <Menu.Root>
-        <Menu.Trigger label={_(msg`Edit avatar`)}>
+        <Menu.Trigger label={l`Edit avatar`}>
           {({props}) => (
             <Pressable {...props} testID="changeAvatarBtn">
               {avatar ? (
@@ -491,7 +490,7 @@ let EditableUserAvatar = ({
             {IS_NATIVE && (
               <Menu.Item
                 testID="changeAvatarCameraBtn"
-                label={_(msg`Upload from Camera`)}
+                label={l`Upload from Camera`}
                 onPress={onOpenCamera}>
                 <Menu.ItemText>
                   <Trans>Upload from Camera</Trans>
@@ -502,7 +501,7 @@ let EditableUserAvatar = ({
 
             <Menu.Item
               testID="changeAvatarLibraryBtn"
-              label={_(msg`Upload from Library`)}
+              label={l`Upload from Library`}
               onPress={onOpenLibrary}>
               <Menu.ItemText>
                 {IS_NATIVE ? (
@@ -520,7 +519,7 @@ let EditableUserAvatar = ({
               <Menu.Group>
                 <Menu.Item
                   testID="changeAvatarRemoveBtn"
-                  label={_(msg`Remove Avatar`)}
+                  label={l`Remove Avatar`}
                   onPress={onRemoveAvatar}>
                   <Menu.ItemText>
                     <Trans>Remove Avatar</Trans>
@@ -532,7 +531,6 @@ let EditableUserAvatar = ({
           )}
         </Menu.Outer>
       </Menu.Root>
-
       <EditImageDialog
         control={editImageDialogControl}
         image={rawImage}
@@ -556,7 +554,7 @@ let PreviewableUserAvatar = ({
   ...props
 }: PreviewableUserAvatarProps): React.ReactNode => {
   const ax = useAnalytics()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const queryClient = useQueryClient()
   const status = useActorStatus(profile)
   const liveControl = useDialogControl()
@@ -595,12 +593,10 @@ let PreviewableUserAvatar = ({
       ) : status.isActive && (IS_NATIVE || IS_WEB_TOUCH_DEVICE) ? (
         <>
           <Button
-            label={_(
-              msg`${sanitizeDisplayName(
-                profile.displayName || sanitizeHandle(profile.handle),
-              )}'s avatar`,
-            )}
-            accessibilityHint={_(msg`Opens live status dialog`)}
+            label={l`${sanitizeDisplayName(
+              profile.displayName || sanitizeHandle(profile.handle),
+            )}'s avatar`}
+            accessibilityHint={l`Opens live status dialog`}
             onPress={onOpenLiveStatus}>
             {avatarEl}
           </Button>
@@ -613,12 +609,10 @@ let PreviewableUserAvatar = ({
         </>
       ) : (
         <Link
-          label={_(
-            msg`${sanitizeDisplayName(
-              profile.displayName || sanitizeHandle(profile.handle),
-            )}'s avatar`,
-          )}
-          accessibilityHint={_(msg`Opens this profile`)}
+          label={l`${sanitizeDisplayName(
+            profile.displayName || sanitizeHandle(profile.handle),
+          )}'s avatar`}
+          accessibilityHint={l`Opens this profile`}
           to={makeProfileLink({
             did: profile.did,
             handle: profile.handle,
diff --git a/src/view/com/util/UserBanner.tsx b/src/view/com/util/UserBanner.tsx
index ff4b6631bd..6b80c4b9c2 100644
--- a/src/view/com/util/UserBanner.tsx
+++ b/src/view/com/util/UserBanner.tsx
@@ -2,8 +2,7 @@ import {useCallback, useState} from 'react'
 import {Pressable, StyleSheet, View} from 'react-native'
 import {Image} from 'expo-image'
 import {type ModerationUI} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {IMAGE_SIZE_CONFIG_2K_1MB} from '#/lib/constants'
@@ -47,7 +46,7 @@ export function UserBanner({
   onSelectNewBanner?: (img: PickerImage | null) => void
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {requestCameraAccessIfNeeded} = useCameraPermission()
   const {requestPhotoAccessIfNeeded} = usePhotoLibraryPermission()
   const sheetWrapper = useSheetWrapper()
@@ -122,7 +121,7 @@ export function UserBanner({
     <>
       <EventStopper onKeyDown={true}>
         <Menu.Root>
-          <Menu.Trigger label={_(msg`Edit avatar`)}>
+          <Menu.Trigger label={l`Edit avatar`}>
             {({props}) => (
               <Pressable {...props} testID="changeBannerBtn">
                 {banner ? (
@@ -161,7 +160,7 @@ export function UserBanner({
               {IS_NATIVE && (
                 <Menu.Item
                   testID="changeBannerCameraBtn"
-                  label={_(msg`Upload from Camera`)}
+                  label={l`Upload from Camera`}
                   onPress={onOpenCamera}>
                   <Menu.ItemText>
                     <Trans>Upload from Camera</Trans>
@@ -172,7 +171,7 @@ export function UserBanner({
 
               <Menu.Item
                 testID="changeBannerLibraryBtn"
-                label={_(msg`Upload from Library`)}
+                label={l`Upload from Library`}
                 onPress={onOpenLibrary}>
                 <Menu.ItemText>
                   {IS_NATIVE ? (
@@ -190,7 +189,7 @@ export function UserBanner({
                 <Menu.Group>
                   <Menu.Item
                     testID="changeBannerRemoveBtn"
-                    label={_(msg`Remove Banner`)}
+                    label={l`Remove Banner`}
                     onPress={onRemoveBanner}>
                     <Menu.ItemText>
                       <Trans>Remove Banner</Trans>
diff --git a/src/view/com/util/error/ErrorScreen.tsx b/src/view/com/util/error/ErrorScreen.tsx
index e37d686f18..947bcf8ce1 100644
--- a/src/view/com/util/error/ErrorScreen.tsx
+++ b/src/view/com/util/error/ErrorScreen.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {usePalette} from '#/lib/hooks/usePalette'
@@ -28,7 +27,7 @@ export function ErrorScreen({
 }) {
   const t = useTheme()
   const pal = usePalette('default')
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <Layout.Center testID={testID}>
@@ -88,10 +87,8 @@ export function ErrorScreen({
               variant="solid"
               color="secondary_inverted"
               size="small"
-              label={_(msg`Retry`)}
-              accessibilityHint={_(
-                msg`Retries the last action, which errored out`,
-              )}>
+              label={l`Retry`}
+              accessibilityHint={l`Retries the last action, which errored out`}>
               <ButtonIcon icon={ArrowRotateCounterClockwiseIcon} />
               <ButtonText>
                 <Trans context="action">Try again</Trans>
diff --git a/src/view/screens/CommunityGuidelines.tsx b/src/view/screens/CommunityGuidelines.tsx
index fa947be3da..a46e1de10c 100644
--- a/src/view/screens/CommunityGuidelines.tsx
+++ b/src/view/screens/CommunityGuidelines.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {usePalette} from '#/lib/hooks/usePalette'
@@ -21,11 +20,11 @@ type Props = NativeStackScreenProps<
 >
 export const CommunityGuidelinesScreen = (_props: Props) => {
   const pal = usePalette('default')
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <Layout.Screen>
-      <ViewHeader title={_(msg`Community Guidelines`)} />
+      <ViewHeader title={l`Community Guidelines`} />
       <ScrollView style={[s.hContentRegion, pal.view]}>
         <View style={[s.p20]}>
           <Text style={pal.text}>
diff --git a/src/view/screens/CopyrightPolicy.tsx b/src/view/screens/CopyrightPolicy.tsx
index 00d7d454fb..332fb2f197 100644
--- a/src/view/screens/CopyrightPolicy.tsx
+++ b/src/view/screens/CopyrightPolicy.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {usePalette} from '#/lib/hooks/usePalette'
@@ -18,11 +17,11 @@ import {ViewHeader} from '../com/util/ViewHeader'
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'CopyrightPolicy'>
 export const CopyrightPolicyScreen = (_props: Props) => {
   const pal = usePalette('default')
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <Layout.Screen>
-      <ViewHeader title={_(msg`Copyright Policy`)} />
+      <ViewHeader title={l`Copyright Policy`} />
       <ScrollView style={[s.hContentRegion, pal.view]}>
         <View style={[s.p20]}>
           <Text style={pal.text}>
diff --git a/src/view/screens/DebugMod.tsx b/src/view/screens/DebugMod.tsx
index c3fe8fba8e..596c95ccce 100644
--- a/src/view/screens/DebugMod.tsx
+++ b/src/view/screens/DebugMod.tsx
@@ -17,8 +17,7 @@ import {
   type ModerationOpts,
   RichText,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 
 import {useGlobalLabelStrings} from '#/lib/moderation/useGlobalLabelStrings'
 import {
@@ -948,12 +947,12 @@ function MockAccountScreen({
   moderationOpts: ModerationOpts
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   return (
     <View style={[t.atoms.border_contrast_medium, a.border, a.mb_md]}>
       <ScreenHider
         style={{}}
-        screenDescription={_(msg`profile`)}
+        screenDescription={l`profile`}
         modui={moderation.ui('profileView')}>
         <ProfileHeaderStandard
           // @ts-ignore ProfileViewBasic is close enough -prf
diff --git a/src/view/screens/Feeds.tsx b/src/view/screens/Feeds.tsx
index 971c63734d..1ea41c153b 100644
--- a/src/view/screens/Feeds.tsx
+++ b/src/view/screens/Feeds.tsx
@@ -1,8 +1,7 @@
 import {useCallback, useMemo, useRef, useState} from 'react'
 import {ActivityIndicator, StyleSheet, View} from 'react-native'
 import {type AppBskyFeedDefs} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import debounce from 'lodash.debounce'
 
@@ -124,7 +123,7 @@ export function FeedsScreen(_props: Props) {
     isFetchingNextPage: isPopularFeedsFetchingNextPage,
     hasNextPage: hasNextPopularFeedsPage,
   } = useGetPopularFeedsQuery()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {
     data: searchResults,
     mutate: search,
@@ -434,7 +433,7 @@ export function FeedsScreen(_props: Props) {
             <FeedsAboutHeader />
             <View style={{paddingHorizontal: 12, paddingBottom: 4}}>
               <SearchInput
-                placeholder={_(msg`Search feeds`)}
+                placeholder={l`Search feeds`}
                 value={query}
                 onChangeText={onChangeQuery}
                 onClearText={onPressCancelSearch}
@@ -483,7 +482,7 @@ export function FeedsScreen(_props: Props) {
       return null
     },
     [
-      _,
+      l,
       pal.border,
       pal.textLight,
       query,
@@ -508,7 +507,7 @@ export function FeedsScreen(_props: Props) {
             <Link
               testID="editFeedsBtn"
               to="/settings/saved-feeds"
-              label={_(msg`Edit My Feeds`)}
+              label={l`Edit My Feeds`}
               size="small"
               variant="ghost"
               color="secondary"
@@ -535,14 +534,13 @@ export function FeedsScreen(_props: Props) {
           sideBorders={false}
         />
       </Layout.Center>
-
       {hasSession && (
         <FAB
           testID="composeFAB"
           onPress={onPressCompose}
           icon={<EditBigIcon size="lg" fill={t.palette.white} />}
           accessibilityRole="button"
-          accessibilityLabel={_(msg`New post`)}
+          accessibilityLabel={l`New post`}
           accessibilityHint=""
         />
       )}
@@ -560,7 +558,7 @@ function FeedOrFollowing({savedFeed}: {savedFeed: SavedFeedItem}) {
 
 function FollowingFeed() {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   return (
     <View
       style={[
@@ -593,7 +591,7 @@ function FollowingFeed() {
           />
         </View>
         <FeedCard.TitleAndByline
-          title={_(msg({message: 'Following', context: 'feed-name'}))}
+          title={l({message: 'Following', context: 'feed-name'})}
         />
       </FeedCard.Header>
     </View>
diff --git a/src/view/screens/Lists.tsx b/src/view/screens/Lists.tsx
index 54f3568fc0..4da3d86077 100644
--- a/src/view/screens/Lists.tsx
+++ b/src/view/screens/Lists.tsx
@@ -1,7 +1,6 @@
 import {useCallback} from 'react'
 import {AtUri} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
@@ -21,7 +20,7 @@ import * as Layout from '#/components/Layout'
 
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'Lists'>
 export function ListsScreen({}: Props) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const navigation = useNavigation<NavigationProp>()
   const requireEmailVerification = useRequireEmailVerification()
   const createListDialogControl = useDialogControl()
@@ -61,7 +60,7 @@ export function ListsScreen({}: Props) {
           </Layout.Header.TitleText>
         </Layout.Header.Content>
         <Button
-          label={_(msg`New list`)}
+          label={l`New list`}
           testID="newUserListBtn"
           color="secondary"
           size="small"
@@ -72,9 +71,7 @@ export function ListsScreen({}: Props) {
           </ButtonText>
         </Button>
       </Layout.Header.Outer>
-
       <MyLists filter="curate" style={a.flex_grow} />
-
       <CreateOrEditListDialog
         purpose="app.bsky.graph.defs#curatelist"
         control={createListDialogControl}
diff --git a/src/view/screens/ModerationModlists.tsx b/src/view/screens/ModerationModlists.tsx
index 4ef555a6c2..8fb32320f5 100644
--- a/src/view/screens/ModerationModlists.tsx
+++ b/src/view/screens/ModerationModlists.tsx
@@ -1,7 +1,6 @@
 import {useCallback} from 'react'
 import {AtUri} from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
@@ -21,7 +20,7 @@ import * as Layout from '#/components/Layout'
 
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'ModerationModlists'>
 export function ModerationModlistsScreen({}: Props) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const navigation = useNavigation<NavigationProp>()
   const requireEmailVerification = useRequireEmailVerification()
   const createListDialogControl = useDialogControl()
@@ -61,7 +60,7 @@ export function ModerationModlistsScreen({}: Props) {
           </Layout.Header.TitleText>
         </Layout.Header.Content>
         <Button
-          label={_(msg`New list`)}
+          label={l`New list`}
           testID="newModListBtn"
           color="secondary"
           variant="solid"
@@ -73,9 +72,7 @@ export function ModerationModlistsScreen({}: Props) {
           </ButtonText>
         </Button>
       </Layout.Header.Outer>
-
       <MyLists filter="mod" style={a.flex_grow} />
-
       <CreateOrEditListDialog
         purpose="app.bsky.graph.defs#modlist"
         control={createListDialogControl}
diff --git a/src/view/screens/Notifications.tsx b/src/view/screens/Notifications.tsx
index 54b56e7d99..2f580e9115 100644
--- a/src/view/screens/Notifications.tsx
+++ b/src/view/screens/Notifications.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useEffect, useMemo, useRef, useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useFocusEffect, useIsFocused} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
@@ -47,7 +46,7 @@ type Props = NativeStackScreenProps<
   'Notifications'
 >
 export function NotificationsScreen({}: Props) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const {openComposer} = useOpenComposer()
   const unreadNotifs = useUnreadNotifications()
@@ -83,7 +82,7 @@ export function NotificationsScreen({}: Props) {
   const sections = useMemo(() => {
     return [
       {
-        title: _(msg`All`),
+        title: l`All`,
         component: (
           <NotificationsTab
             filter="all"
@@ -96,7 +95,7 @@ export function NotificationsScreen({}: Props) {
         ),
       },
       {
-        title: _(msg`Mentions`),
+        title: l`Mentions`,
         component: (
           <NotificationsTab
             filter="mentions"
@@ -110,7 +109,7 @@ export function NotificationsScreen({}: Props) {
       },
     ]
   }, [
-    _,
+    l,
     hasNew,
     checkUnreadAll,
     checkUnreadMentions,
@@ -131,7 +130,7 @@ export function NotificationsScreen({}: Props) {
         <Layout.Header.Slot>
           <Link
             to={{screen: 'NotificationSettings'}}
-            label={_(msg`Notification settings`)}
+            label={l`Notification settings`}
             size="small"
             variant="ghost"
             color="secondary"
@@ -162,7 +161,7 @@ export function NotificationsScreen({}: Props) {
         onPress={() => openComposer({logContext: 'Fab'})}
         icon={<EditBigIcon size="lg" fill={t.palette.white} />}
         accessibilityRole="button"
-        accessibilityLabel={_(msg`New post`)}
+        accessibilityLabel={l`New post`}
         accessibilityHint=""
       />
     </Layout.Screen>
@@ -184,7 +183,7 @@ function NotificationsTab({
   checkUnread: ({invalidate}: {invalidate: boolean}) => Promise<void>
   setIsLoadingLatest: (v: boolean) => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const [isScrolledDown, setIsScrolledDown] = useState(false)
   const scrollElRef = useRef<ListMethods>(null)
   const queryClient = useQueryClient()
@@ -268,7 +267,7 @@ function NotificationsTab({
       {(isScrolledDown || hasNew) && (
         <LoadLatestBtn
           onPress={onPressLoadLatest}
-          label={_(msg`Load new notifications`)}
+          label={l`Load new notifications`}
           showIndicator={hasNew}
         />
       )}
@@ -278,7 +277,7 @@ function NotificationsTab({
 
 function DisabledNotificationsWarning({active}: {active: boolean}) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {data} = useNotificationSettingsQuery({enabled: active})
 
   if (!data) return null
@@ -293,7 +292,7 @@ function DisabledNotificationsWarning({active}: {active: boolean}) {
             notifications, so this tab will no longer update. To adjust this,
             visit your{' '}
             <InlineLinkText
-              label={_(msg`Visit your notification settings`)}
+              label={l`Visit your notification settings`}
               to={{screen: 'NotificationSettings'}}>
               notification settings
             </InlineLinkText>
diff --git a/src/view/screens/PrivacyPolicy.tsx b/src/view/screens/PrivacyPolicy.tsx
index 7853c1bd7a..e97502afb9 100644
--- a/src/view/screens/PrivacyPolicy.tsx
+++ b/src/view/screens/PrivacyPolicy.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {usePalette} from '#/lib/hooks/usePalette'
@@ -18,11 +17,11 @@ import {ViewHeader} from '../com/util/ViewHeader'
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'PrivacyPolicy'>
 export const PrivacyPolicyScreen = (_props: Props) => {
   const pal = usePalette('default')
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <Layout.Screen>
-      <ViewHeader title={_(msg`Privacy Policy`)} />
+      <ViewHeader title={l`Privacy Policy`} />
       <ScrollView style={[s.hContentRegion, pal.view]}>
         <View style={[s.p20]}>
           <Text style={pal.text}>
diff --git a/src/view/screens/Profile.tsx b/src/view/screens/Profile.tsx
index ead74bae94..a1a0a3c092 100644
--- a/src/view/screens/Profile.tsx
+++ b/src/view/screens/Profile.tsx
@@ -8,8 +8,7 @@ import {
   type ModerationOpts,
   RichText as RichTextAPI,
 } from '@atproto/api'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useFocusEffect, useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
@@ -70,7 +69,7 @@ export function ProfileScreen(props: Props) {
 }
 
 function ProfileScreenInner({route}: Props) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {currentAccount} = useSession()
   const queryClient = useQueryClient()
   const name =
@@ -130,7 +129,7 @@ function ProfileScreenInner({route}: Props) {
       <SafeAreaView style={[a.flex_1]}>
         <ErrorScreen
           testID="profileErrorScreen"
-          title={profileError ? _(msg`Not Found`) : _(msg`Oops!`)}
+          title={profileError ? l`Not Found` : l`Oops!`}
           message={cleanError(resolveError || profileError)}
           onPressTryAgain={onPressTryAgain}
           showHeader
@@ -189,7 +188,7 @@ function ProfileScreenLoaded({
   })
   const [currentPage, setCurrentPage] = useState(0)
   const [isRefreshing, setIsRefreshing] = useState(false)
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   const [scrollViewTag, setScrollViewTag] = useState<number | null>(null)
 
@@ -231,16 +230,16 @@ function ProfileScreenLoaded({
   const showListsTab = hasSession && (isMe || listCount > 0)
 
   const sectionTitles = [
-    showFiltersTab ? _(msg`Labels`) : undefined,
-    showListsTab && hasLabeler ? _(msg`Lists`) : undefined,
-    showPostsTab ? _(msg`Posts`) : undefined,
-    showRepliesTab ? _(msg`Replies`) : undefined,
-    showMediaTab ? _(msg`Media`) : undefined,
-    showVideosTab ? _(msg`Videos`) : undefined,
-    showLikesTab ? _(msg`Likes`) : undefined,
-    showFeedsTab ? _(msg`Feeds`) : undefined,
-    showStarterPacksTab ? _(msg`Starter Packs`) : undefined,
-    showListsTab && !hasLabeler ? _(msg`Lists`) : undefined,
+    showFiltersTab ? l`Labels` : undefined,
+    showListsTab && hasLabeler ? l`Lists` : undefined,
+    showPostsTab ? l`Posts` : undefined,
+    showRepliesTab ? l`Replies` : undefined,
+    showMediaTab ? l`Media` : undefined,
+    showVideosTab ? l`Videos` : undefined,
+    showLikesTab ? l`Likes` : undefined,
+    showFeedsTab ? l`Feeds` : undefined,
+    showStarterPacksTab ? l`Starter Packs` : undefined,
+    showListsTab && !hasLabeler ? l`Lists` : undefined,
   ].filter(Boolean) as string[]
 
   let nextIndex = 0
@@ -393,7 +392,7 @@ function ProfileScreenLoaded({
     <ScreenHider
       testID="profileView"
       style={styles.container}
-      screenDescription={_(msg`user`)}
+      screenDescription={l`user`}
       modui={moderation.ui('profileView')}>
       <PagerWithHeader
         testID="profilePager"
@@ -440,12 +439,12 @@ function ProfileScreenLoaded({
                 scrollElRef={scrollElRef as ListRef}
                 ignoreFilterFor={profile.did}
                 setScrollViewTag={setScrollViewTag}
-                emptyStateMessage={_(msg`No posts yet`)}
+                emptyStateMessage={l`No posts yet`}
                 emptyStateButton={
                   isMe
                     ? {
-                        label: _(msg`Write a post`),
-                        text: _(msg`Write a post`),
+                        label: l`Write a post`,
+                        text: l`Write a post`,
                         onPress: () =>
                           openComposer({logContext: 'ProfileFeed'}),
                         size: 'small',
@@ -467,7 +466,7 @@ function ProfileScreenLoaded({
                 scrollElRef={scrollElRef as ListRef}
                 ignoreFilterFor={profile.did}
                 setScrollViewTag={setScrollViewTag}
-                emptyStateMessage={_(msg`No replies yet`)}
+                emptyStateMessage={l`No replies yet`}
                 emptyStateIcon={MessageIcon}
               />
             )
@@ -482,12 +481,12 @@ function ProfileScreenLoaded({
                 scrollElRef={scrollElRef as ListRef}
                 ignoreFilterFor={profile.did}
                 setScrollViewTag={setScrollViewTag}
-                emptyStateMessage={_(msg`No media yet`)}
+                emptyStateMessage={l`No media yet`}
                 emptyStateButton={
                   isMe
                     ? {
-                        label: _(msg`Post a photo`),
-                        text: _(msg`Post a photo`),
+                        label: l`Post a photo`,
+                        text: l`Post a photo`,
                         onPress: () =>
                           openComposer({logContext: 'ProfileFeed'}),
                         size: 'small',
@@ -509,12 +508,12 @@ function ProfileScreenLoaded({
                 scrollElRef={scrollElRef as ListRef}
                 ignoreFilterFor={profile.did}
                 setScrollViewTag={setScrollViewTag}
-                emptyStateMessage={_(msg`No video posts yet`)}
+                emptyStateMessage={l`No video posts yet`}
                 emptyStateButton={
                   isMe
                     ? {
-                        label: _(msg`Post a video`),
-                        text: _(msg`Post a video`),
+                        label: l`Post a video`,
+                        text: l`Post a video`,
                         onPress: () =>
                           openComposer({logContext: 'ProfileFeed'}),
                         size: 'small',
@@ -536,7 +535,7 @@ function ProfileScreenLoaded({
                 scrollElRef={scrollElRef as ListRef}
                 ignoreFilterFor={profile.did}
                 setScrollViewTag={setScrollViewTag}
-                emptyStateMessage={_(msg`No likes yet`)}
+                emptyStateMessage={l`No likes yet`}
                 emptyStateIcon={HeartIcon}
               />
             )
@@ -565,16 +564,14 @@ function ProfileScreenLoaded({
                 setScrollViewTag={setScrollViewTag}
                 emptyStateMessage={
                   isMe
-                    ? _(
-                        msg`Starter Packs let you share your favorite feeds and people with your friends.`,
-                      )
-                    : _(msg`No Starter Packs yet`)
+                    ? l`Starter Packs let you share your favorite feeds and people with your friends.`
+                    : l`No Starter Packs yet`
                 }
                 emptyStateButton={
                   isMe
                     ? {
-                        label: _(msg`Create a Starter Pack`),
-                        text: _(msg`Create a Starter Pack`),
+                        label: l`Create a Starter Pack`,
+                        text: l`Create a Starter Pack`,
                         onPress: wrappedNavToWizard,
                         color: 'primary',
                         size: 'small',
@@ -604,7 +601,7 @@ function ProfileScreenLoaded({
           onPress={onPressCompose}
           icon={<EditBigIcon size="lg" fill={t.palette.white} />}
           accessibilityRole="button"
-          accessibilityLabel={_(msg`New post`)}
+          accessibilityLabel={l`New post`}
           accessibilityHint=""
         />
       )}
diff --git a/src/view/screens/Storybook/Admonitions.tsx b/src/view/screens/Storybook/Admonitions.tsx
index de356dbf89..2116dbe30c 100644
--- a/src/view/screens/Storybook/Admonitions.tsx
+++ b/src/view/screens/Storybook/Admonitions.tsx
@@ -1,6 +1,5 @@
 import {Text as RNText, View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {atoms as a, useTheme} from '#/alf'
@@ -20,13 +19,12 @@ import {InlineLinkText} from '#/components/Link'
 import {H1} from '#/components/Typography'
 
 export function Admonitions() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
 
   return (
     <View style={[a.gap_md]}>
       <H1>Admonitions</H1>
-
       <Admonition>The quick brown fox jumps over the lazy dog.</Admonition>
       <Admonition type="info">
         How happy the blameless vestal's lot, the world forgetting by the world
@@ -47,7 +45,6 @@ export function Admonitions() {
       <Admonition type="error">
         The quick brown fox jumps over the lazy dog.
       </Admonition>
-
       <AdmonitionOuter type="error">
         <AdmonitionRow>
           <AdmonitionIcon />
@@ -58,7 +55,7 @@ export function Admonitions() {
           </AdmonitionContent>
           <AdmonitionButton
             color="negative_subtle"
-            label={_(msg`Retry loading report options`)}
+            label={l`Retry loading report options`}
             onPress={() => {}}>
             <ButtonText>
               <Trans>Retry</Trans>
@@ -67,7 +64,6 @@ export function Admonitions() {
           </AdmonitionButton>
         </AdmonitionRow>
       </AdmonitionOuter>
-
       <AdmonitionOuter type="tip">
         <AdmonitionRow>
           <AdmonitionIcon />
@@ -91,7 +87,7 @@ export function Admonitions() {
                 If you want to restrict who can receive notifications for your
                 account's activity, you can change this in{' '}
                 <InlineLinkText
-                  label={_(msg`Privacy and Security settings`)}
+                  label={l`Privacy and Security settings`}
                   to={{screen: 'ActivityPrivacySettings'}}
                   style={[a.font_bold]}>
                   Settings &rarr; Privacy and Security
diff --git a/src/view/screens/Support.tsx b/src/view/screens/Support.tsx
index 3fbad73e40..e95c1a0746 100644
--- a/src/view/screens/Support.tsx
+++ b/src/view/screens/Support.tsx
@@ -1,5 +1,4 @@
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {HELP_DESK_URL} from '#/lib/constants'
@@ -18,11 +17,11 @@ import * as Layout from '#/components/Layout'
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'Support'>
 export const SupportScreen = (_props: Props) => {
   const pal = usePalette('default')
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <Layout.Screen>
-      <ViewHeader title={_(msg`Support`)} />
+      <ViewHeader title={l`Support`} />
       <CenteredView>
         <Text type="title-xl" style={[pal.text, s.p20, s.pb5]}>
           <Trans>Support</Trans>
@@ -32,7 +31,7 @@ export const SupportScreen = (_props: Props) => {
             The support form has been moved. If you need help, please{' '}
             <TextLink
               href={HELP_DESK_URL}
-              text={_(msg`click here`)}
+              text={l`click here`}
               style={pal.link}
             />{' '}
             or visit {HELP_DESK_URL} to get in touch with us.
diff --git a/src/view/screens/TermsOfService.tsx b/src/view/screens/TermsOfService.tsx
index 08e93188ba..2bc19af8de 100644
--- a/src/view/screens/TermsOfService.tsx
+++ b/src/view/screens/TermsOfService.tsx
@@ -1,6 +1,5 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {usePalette} from '#/lib/hooks/usePalette'
@@ -18,11 +17,11 @@ import {ViewHeader} from '../com/util/ViewHeader'
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'TermsOfService'>
 export const TermsOfServiceScreen = (_props: Props) => {
   const pal = usePalette('default')
-  const {_} = useLingui()
+  const {t: l} = useLingui()
 
   return (
     <Layout.Screen>
-      <ViewHeader title={_(msg`Terms of Service`)} />
+      <ViewHeader title={l`Terms of Service`} />
       <ScrollView style={[s.hContentRegion, pal.view]}>
         <View style={[s.p20]}>
           <Text style={pal.text}>
diff --git a/src/view/shell/Drawer.tsx b/src/view/shell/Drawer.tsx
index 358759f379..6f42b8e727 100644
--- a/src/view/shell/Drawer.tsx
+++ b/src/view/shell/Drawer.tsx
@@ -7,8 +7,8 @@ import {
   View,
 } from 'react-native'
 import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {msg, plural} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {plural} from '@lingui/core/macro'
+import {useLingui} from '@lingui/react/macro'
 import {Plural, Trans} from '@lingui/react/macro'
 import {StackActions, useNavigation} from '@react-navigation/native'
 
@@ -80,7 +80,7 @@ let DrawerProfileCard = ({
   onPressProfile: () => void
   onPressShare?: () => void
 }): React.ReactNode => {
-  const {_, i18n} = useLingui()
+  const {t: l, i18n} = useLingui()
   const t = useTheme()
   const {data: profile} = useProfileQuery({did: account.did})
   const {isActive: live} = useActorStatus(profile)
@@ -88,8 +88,8 @@ let DrawerProfileCard = ({
   return (
     <TouchableOpacity
       testID="profileCardButton"
-      accessibilityLabel={_(msg`Profile`)}
-      accessibilityHint={_(msg`Navigates to your profile`)}
+      accessibilityLabel={l`Profile`}
+      accessibilityHint={l`Navigates to your profile`}
       onPress={onPressProfile}
       style={[a.gap_sm, a.pr_lg]}>
       <UserAvatar
@@ -118,10 +118,8 @@ let DrawerProfileCard = ({
           {onPressShare && (
             <Pressable
               accessibilityRole="button"
-              accessibilityLabel={_(msg`Invite friends`)}
-              accessibilityHint={_(
-                msg`Opens the invite friends sheet to share your profile`,
-              )}
+              accessibilityLabel={l`Invite friends`}
+              accessibilityHint={l`Opens the invite friends sheet to share your profile`}
               onPress={onPressShare}
               hitSlop={8}
               style={({pressed}) => [
@@ -399,7 +397,7 @@ let DrawerFooter = ({
   onPressFeedback: () => void
   onPressHelp: () => void
 }): React.ReactNode => {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const insets = useSafeAreaInsets()
   return (
     <View
@@ -417,7 +415,7 @@ let DrawerFooter = ({
         },
       ]}>
       <Button
-        label={_(msg`Send feedback`)}
+        label={l`Send feedback`}
         size="small"
         variant="solid"
         color="secondary"
@@ -428,7 +426,7 @@ let DrawerFooter = ({
         </ButtonText>
       </Button>
       <Button
-        label={_(msg`Get help`)}
+        label={l`Get help`}
         size="small"
         variant="outline"
         color="secondary"
@@ -459,7 +457,7 @@ let SearchMenuItem = ({
   isActive: boolean
   onPress: () => void
 }): React.ReactNode => {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   return (
     <MenuItem
@@ -470,7 +468,7 @@ let SearchMenuItem = ({
           <MagnifyingGlass style={[t.atoms.text]} width={iconWidth} />
         )
       }
-      label={_(msg`Explore`)}
+      label={l`Explore`}
       bold={isActive}
       onPress={onPress}
     />
@@ -485,7 +483,7 @@ let HomeMenuItem = ({
   isActive: boolean
   onPress: () => void
 }): React.ReactNode => {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   return (
     <MenuItem
@@ -496,7 +494,7 @@ let HomeMenuItem = ({
           <Home style={[t.atoms.text]} width={iconWidth} />
         )
       }
-      label={_(msg`Home`)}
+      label={l`Home`}
       bold={isActive}
       onPress={onPress}
     />
@@ -511,7 +509,7 @@ let ChatMenuItem = ({
   isActive: boolean
   onPress: () => void
 }): React.ReactNode => {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   return (
     <MenuItem
@@ -522,7 +520,7 @@ let ChatMenuItem = ({
           <Message style={[t.atoms.text]} width={iconWidth} />
         )
       }
-      label={_(msg`Chat`)}
+      label={l`Chat`}
       bold={isActive}
       onPress={onPress}
     />
@@ -537,7 +535,7 @@ let NotificationsMenuItem = ({
   isActive: boolean
   onPress: () => void
 }): React.ReactNode => {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const numUnreadNotifications = useUnreadNotifications()
   return (
@@ -549,16 +547,14 @@ let NotificationsMenuItem = ({
           <Bell style={[t.atoms.text]} width={iconWidth} />
         )
       }
-      label={_(msg`Notifications`)}
+      label={l`Notifications`}
       accessibilityHint={
         numUnreadNotifications === ''
           ? ''
-          : _(
-              plural(numUnreadNotifications ?? 0, {
-                one: '# unread item',
-                other: '# unread items',
-              }),
-            )
+          : plural(numUnreadNotifications ?? 0, {
+              one: '# unread item',
+              other: '# unread items',
+            })
       }
       count={numUnreadNotifications}
       bold={isActive}
@@ -575,7 +571,7 @@ let FeedsMenuItem = ({
   isActive: boolean
   onPress: () => void
 }): React.ReactNode => {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   return (
     <MenuItem
@@ -586,7 +582,7 @@ let FeedsMenuItem = ({
           <Hashtag width={iconWidth} style={[t.atoms.text]} />
         )
       }
-      label={_(msg`Feeds`)}
+      label={l`Feeds`}
       bold={isActive}
       onPress={onPress}
     />
@@ -595,13 +591,13 @@ let FeedsMenuItem = ({
 FeedsMenuItem = memo(FeedsMenuItem)
 
 let ListsMenuItem = ({onPress}: {onPress: () => void}): React.ReactNode => {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
 
   return (
     <MenuItem
       icon={<List style={[t.atoms.text]} width={iconWidth} />}
-      label={_(msg`Lists`)}
+      label={l`Lists`}
       onPress={onPress}
     />
   )
@@ -615,7 +611,7 @@ let BookmarksMenuItem = ({
   isActive: boolean
   onPress: () => void
 }): React.ReactNode => {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
 
   return (
@@ -627,7 +623,7 @@ let BookmarksMenuItem = ({
           <Bookmark style={[t.atoms.text]} width={iconWidth} />
         )
       }
-      label={_(msg({message: 'Saved', context: 'link to bookmarks screen'}))}
+      label={l({message: 'Saved', context: 'link to bookmarks screen'})}
       onPress={onPress}
     />
   )
@@ -641,7 +637,7 @@ let ProfileMenuItem = ({
   isActive: boolean
   onPress: () => void
 }): React.ReactNode => {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   return (
     <MenuItem
@@ -652,7 +648,7 @@ let ProfileMenuItem = ({
           <UserCircle style={[t.atoms.text]} width={iconWidth} />
         )
       }
-      label={_(msg`Profile`)}
+      label={l`Profile`}
       onPress={onPress}
     />
   )
@@ -660,12 +656,12 @@ let ProfileMenuItem = ({
 ProfileMenuItem = memo(ProfileMenuItem)
 
 let SettingsMenuItem = ({onPress}: {onPress: () => void}): React.ReactNode => {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   return (
     <MenuItem
       icon={<Settings style={[t.atoms.text]} width={iconWidth} />}
-      label={_(msg`Settings`)}
+      label={l`Settings`}
       onPress={onPress}
     />
   )
@@ -745,7 +741,7 @@ function MenuItem({icon, label, count, bold, onPress}: MenuItemProps) {
 }
 
 function ExtraLinks() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const logoVariant = useLogoVariant()
 
@@ -753,14 +749,14 @@ function ExtraLinks() {
     <View style={[a.flex_col, a.gap_md, a.flex_wrap]}>
       <InlineLinkText
         style={[a.text_md]}
-        label={_(msg`Terms of Service`)}
+        label={l`Terms of Service`}
         to="https://bsky.social/about/support/tos">
         <Trans>Terms of Service</Trans>
       </InlineLinkText>
       <InlineLinkText
         style={[a.text_md]}
         to="https://bsky.social/about/support/privacy-policy"
-        label={_(msg`Privacy Policy`)}>
+        label={l`Privacy Policy`}>
         <Trans>Privacy Policy</Trans>
       </InlineLinkText>
       {logoVariant === 'kawaii' && (
diff --git a/src/view/shell/NavSignupCard.tsx b/src/view/shell/NavSignupCard.tsx
index 27f4738034..e61a98ffe3 100644
--- a/src/view/shell/NavSignupCard.tsx
+++ b/src/view/shell/NavSignupCard.tsx
@@ -1,7 +1,6 @@
 import {memo, useCallback} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 
 import {useLoggedOutViewControls} from '#/state/shell/logged-out'
@@ -14,7 +13,7 @@ import {Link} from '#/components/Link'
 import {Text} from '#/components/Typography'
 
 let NavSignupCard = ({}: {}): React.ReactNode => {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {requestSwitchToAccount} = useLoggedOutViewControls()
   const closeAllActiveElements = useCloseAllActiveElements()
 
@@ -34,18 +33,16 @@ let NavSignupCard = ({}: {}): React.ReactNode => {
       <Link to="/" label="Bluesky - Home">
         <Logo allowVariants={false} width={32} />
       </Link>
-
       <View style={[a.pt_lg]}>
         <Text
           style={[a.text_3xl, a.font_bold, {lineHeight: a.text_3xl.fontSize}]}>
           <Trans>Join the conversation</Trans>
         </Text>
       </View>
-
       <View style={[a.flex_row, a.flex_wrap, a.gap_sm, a.pt_md]}>
         <Button
           onPress={showCreateAccount}
-          label={_(msg`Create account`)}
+          label={l`Create account`}
           size="small"
           variant="solid"
           color="primary">
@@ -55,7 +52,7 @@ let NavSignupCard = ({}: {}): React.ReactNode => {
         </Button>
         <Button
           onPress={showSignIn}
-          label={_(msg`Sign in`)}
+          label={l`Sign in`}
           size="small"
           variant="solid"
           color="secondary">
@@ -64,7 +61,6 @@ let NavSignupCard = ({}: {}): React.ReactNode => {
           </ButtonText>
         </Button>
       </View>
-
       <View style={[a.mt_md, a.w_full, {height: 32}]}>
         <AppLanguageDropdown />
       </View>
diff --git a/src/view/shell/bottom-bar/BottomBarWeb.tsx b/src/view/shell/bottom-bar/BottomBarWeb.tsx
index 3cb1984fca..de25c20664 100644
--- a/src/view/shell/bottom-bar/BottomBarWeb.tsx
+++ b/src/view/shell/bottom-bar/BottomBarWeb.tsx
@@ -1,8 +1,8 @@
 import {useCallback} from 'react'
 import {View} from 'react-native'
 import Animated from 'react-native-reanimated'
-import {msg, plural} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {plural} from '@lingui/core/macro'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useNavigationState} from '@react-navigation/native'
 
@@ -50,7 +50,7 @@ import {styles} from './BottomBarStyles'
 type NavItemValue = 'home' | 'search' | 'chat' | 'notifications' | 'profile'
 
 export function BottomBarWeb() {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {hasSession, currentAccount} = useSession()
   const t = useTheme()
   const footerMinimalShellTransform = useMinimalShellFooterTransform()
@@ -85,7 +85,6 @@ export function BottomBarWeb() {
   return (
     <>
       <SwitchAccountDialog control={accountSwitchControl} />
-
       <Animated.View
         role="navigation"
         style={[
@@ -237,7 +236,7 @@ export function BottomBarWeb() {
               <View style={[a.flex_row, a.flex_wrap, a.gap_sm]}>
                 <Button
                   onPress={showCreateAccount}
-                  label={_(msg`Create account`)}
+                  label={l`Create account`}
                   size="small"
                   variant="solid"
                   color="primary">
@@ -247,7 +246,7 @@ export function BottomBarWeb() {
                 </Button>
                 <Button
                   onPress={showSignIn}
-                  label={_(msg`Sign in`)}
+                  label={l`Sign in`}
                   size="small"
                   variant="solid"
                   color="secondary">
@@ -282,7 +281,7 @@ const NavItem: React.FC<{
   onLongPress,
 }) => {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const {currentAccount} = useSession()
   const currentRoute = useNavigationState(state => {
@@ -330,12 +329,10 @@ const NavItem: React.FC<{
             styles.notificationCountWeb,
             {backgroundColor: t.palette.primary_500},
           ]}
-          aria-label={_(
-            msg`${plural(notificationCount, {
-              one: '# unread item',
-              other: '# unread items',
-            })}`,
-          )}>
+          aria-label={l`${plural(notificationCount, {
+            one: '# unread item',
+            other: '# unread items',
+          })}`}>
           <Text style={styles.notificationCountLabel}>{notificationCount}</Text>
         </View>
       ) : hasNew ? (
diff --git a/src/view/shell/desktop/Feeds.tsx b/src/view/shell/desktop/Feeds.tsx
index 8e4e98addc..6d9951ebad 100644
--- a/src/view/shell/desktop/Feeds.tsx
+++ b/src/view/shell/desktop/Feeds.tsx
@@ -1,6 +1,5 @@
 import {Pressable, View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {useNavigation, useNavigationState} from '@react-navigation/native'
 
 import {getCurrentRoute} from '#/lib/routes/helpers'
@@ -22,7 +21,7 @@ import {useAnalytics} from '#/analytics'
 
 export function DesktopFeeds() {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const ax = useAnalytics()
   const {data: pinnedFeedInfos, error, isLoading} = usePinnedFeedsInfos()
   const selectedFeed = useSelectedFeed()
@@ -100,10 +99,9 @@ export function DesktopFeeds() {
           />
         )
       })}
-
       <Link
         to="/feeds"
-        label={_(msg`More feeds`)}
+        label={l`More feeds`}
         style={[
           a.flex_row,
           a.align_center,
@@ -150,7 +148,7 @@ export function DesktopFeeds() {
                       : t.atoms.text_contrast_medium,
                 ]}
                 numberOfLines={1}>
-                {_(msg`More feeds`)}
+                {l`More feeds`}
               </Text>
             </>
           )
@@ -170,7 +168,7 @@ function FeedItem({
   onPress: () => void
 }) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {
     state: hovered,
     onIn: onHoverIn,
@@ -182,7 +180,7 @@ function FeedItem({
     <Pressable
       accessibilityRole="link"
       accessibilityLabel={feedInfo.displayName}
-      accessibilityHint={_(msg`Opens ${feedInfo.displayName} feed`)}
+      accessibilityHint={l`Opens ${feedInfo.displayName} feed`}
       onPress={onPress}
       onHoverIn={onHoverIn}
       onHoverOut={onHoverOut}
diff --git a/src/view/shell/desktop/RightNav.tsx b/src/view/shell/desktop/RightNav.tsx
index 558e3a081b..379a8a9407 100644
--- a/src/view/shell/desktop/RightNav.tsx
+++ b/src/view/shell/desktop/RightNav.tsx
@@ -1,7 +1,6 @@
 import {useEffect, useState} from 'react'
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {Trans} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 
@@ -44,7 +43,7 @@ function useWebQueryParams() {
 
 export function DesktopRightNav({routeName}: {routeName: string}) {
   const t = useTheme()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const {hasSession, currentAccount} = useSession()
   const logoVariant = useLogoVariant()
   const gutters = useGutters(['base', 0, 'base', 'wide'])
@@ -86,17 +85,14 @@ export function DesktopRightNav({routeName}: {routeName: string}) {
         }),
       ]}>
       {!isSearchScreen && <DesktopSearch />}
-
       {hasSession && (
         <>
           <DesktopFeeds />
           <ProgressGuideList />
         </>
       )}
-
       {showExploreScreenDuplicatedContent && <SidebarLiveEventFeedsBanner />}
       {showExploreScreenDuplicatedContent && <SidebarTrendingTopics />}
-
       <Text style={[a.leading_snug, t.atoms.text_contrast_low]}>
         {hasSession && (
           <>
@@ -106,8 +102,8 @@ export function DesktopRightNav({routeName}: {routeName: string}) {
                 handle: currentAccount?.handle,
               })}
               style={[t.atoms.text_contrast_medium]}
-              label={_(msg`Feedback`)}>
-              {_(msg`Feedback`)}
+              label={l`Feedback`}>
+              {l`Feedback`}
             </InlineLinkText>
             <Text style={[t.atoms.text_contrast_low]}>{' ∙ '}</Text>
           </>
@@ -115,38 +111,36 @@ export function DesktopRightNav({routeName}: {routeName: string}) {
         <InlineLinkText
           to="https://bsky.social/about/support/privacy-policy"
           style={[t.atoms.text_contrast_medium]}
-          label={_(msg`Privacy`)}>
-          {_(msg`Privacy`)}
+          label={l`Privacy`}>
+          {l`Privacy`}
         </InlineLinkText>
         <Text style={[t.atoms.text_contrast_low]}>{' ∙ '}</Text>
         <InlineLinkText
           to="https://bsky.social/about/support/tos"
           style={[t.atoms.text_contrast_medium]}
-          label={_(msg`Terms`)}>
-          {_(msg`Terms`)}
+          label={l`Terms`}>
+          {l`Terms`}
         </InlineLinkText>
         <Text style={[t.atoms.text_contrast_low]}>{' ∙ '}</Text>
         <InlineLinkText
-          label={_(msg`Help`)}
+          label={l`Help`}
           to={HELP_DESK_URL}
           style={[t.atoms.text_contrast_medium]}>
-          {_(msg`Help`)}
+          {l`Help`}
         </InlineLinkText>
       </Text>
-
       {logoVariant === 'kawaii' && (
         <Text style={[t.atoms.text_contrast_medium, {marginTop: 12}]}>
           <Trans>
             Logo by{' '}
             <InlineLinkText
-              label={_(msg`Logo by @sawaratsuki.bsky.social`)}
+              label={l`Logo by @sawaratsuki.bsky.social`}
               to="/profile/sawaratsuki.bsky.social">
               @sawaratsuki.bsky.social
             </InlineLinkText>
           </Trans>
         </Text>
       )}
-
       {!hasSession && leftNavMinimal && (
         <View style={[a.w_full, {height: 32}]}>
           <AppLanguageDropdown />
diff --git a/src/view/shell/index.web.tsx b/src/view/shell/index.web.tsx
index 6a68530f05..08ba4041ae 100644
--- a/src/view/shell/index.web.tsx
+++ b/src/view/shell/index.web.tsx
@@ -1,7 +1,6 @@
 import {useCallback, useEffect, useLayoutEffect, useState} from 'react'
 import {StyleSheet, TouchableWithoutFeedback, View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {useLingui} from '@lingui/react/macro'
 import {useNavigation} from '@react-navigation/native'
 import {RemoveScrollBar} from 'react-remove-scroll-bar'
 
@@ -94,7 +93,7 @@ function DrawerLayout({children}: {children: React.ReactNode}) {
   const isDrawerOpen = useIsDrawerOpen()
   const setDrawerOpen = useSetDrawerOpen()
   const {gtTablet} = useBreakpoints()
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const showDrawer = !gtTablet && isDrawerOpen
   const [showDrawerDelayedExit, setShowDrawerDelayedExit] = useState(showDrawer)
 
@@ -124,7 +123,7 @@ function DrawerLayout({children}: {children: React.ReactNode}) {
                 setDrawerOpen(false)
               }
             }}
-            accessibilityLabel={_(msg`Close drawer menu`)}
+            accessibilityLabel={l`Close drawer menu`}
             accessibilityHint="">
             <View
               style={[