diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb
index 2f9af8a6fc..238d75bf79 100644
--- a/app/controllers/admin/roles_controller.rb
+++ b/app/controllers/admin/roles_controller.rb
@@ -62,7 +62,7 @@ module Admin
 
     def resource_params
       params
-        .expect(user_role: [:name, :color, :highlighted, :position, permissions_as_keys: []])
+        .expect(user_role: [:name, :color, :highlighted, :position, :require_2fa, permissions_as_keys: []])
     end
   end
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f6d3ce35ab..a19fcc7a0a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -61,19 +61,25 @@ class ApplicationController < ActionController::Base
     return if request.referer.blank?
 
     redirect_uri = URI(request.referer)
-    return if redirect_uri.path.start_with?('/auth')
+    return if redirect_uri.path.start_with?('/auth', '/settings/two_factor_authentication', '/settings/otp_authentication')
 
     stored_url = redirect_uri.to_s if redirect_uri.host == request.host && redirect_uri.port == request.port
 
     store_location_for(:user, stored_url)
   end
 
+  def mfa_setup_path(path_params = {})
+    settings_two_factor_authentication_methods_path(path_params)
+  end
+
   def require_functional!
     return if current_user.functional?
 
     respond_to do |format|
       format.any do
-        if current_user.confirmed?
+        if current_user.missing_2fa?
+          redirect_to mfa_setup_path
+        elsif current_user.confirmed?
           redirect_to edit_user_registration_path
         else
           redirect_to auth_setup_path
@@ -85,6 +91,8 @@ class ApplicationController < ActionController::Base
           render json: { error: 'Your login is missing a confirmed e-mail address' }, status: 403
         elsif !current_user.approved?
           render json: { error: 'Your login is currently pending approval' }, status: 403
+        elsif current_user.missing_2fa?
+          render json: { error: 'Your account requires two-factor authentication' }, status: 403
         elsif !current_user.functional?
           render json: { error: 'Your login is currently disabled' }, status: 403
         end
diff --git a/app/controllers/concerns/challengable_concern.rb b/app/controllers/concerns/challengable_concern.rb
index 7fbc469bdf..bd97037da6 100644
--- a/app/controllers/concerns/challengable_concern.rb
+++ b/app/controllers/concerns/challengable_concern.rb
@@ -42,7 +42,7 @@ module ChallengableConcern
   end
 
   def render_challenge
-    render 'auth/challenges/new', layout: 'auth'
+    render 'auth/challenges/new', layout: params[:oauth] ? 'modal' : 'auth'
   end
 
   def challenge_passed?
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb
index 75f0b42e83..8b3b41e72f 100644
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@@ -24,4 +24,8 @@ class OAuth::AuthorizationsController < Doorkeeper::AuthorizationsController
   def truthy_param?(key)
     ActiveModel::Type::Boolean.new.cast(params[key])
   end
+
+  def mfa_setup_path
+    super({ oauth: true })
+  end
 end
diff --git a/app/controllers/settings/two_factor_authentication/base_controller.rb b/app/controllers/settings/two_factor_authentication/base_controller.rb
new file mode 100644
index 0000000000..8770f927e7
--- /dev/null
+++ b/app/controllers/settings/two_factor_authentication/base_controller.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Settings
+  module TwoFactorAuthentication
+    class BaseController < ::Settings::BaseController
+      layout -> { truthy_param?(:oauth) ? 'modal' : 'admin' }
+    end
+  end
+end
diff --git a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
index eae990e79b..61e2aef5a8 100644
--- a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
@@ -4,12 +4,15 @@ module Settings
   module TwoFactorAuthentication
     class ConfirmationsController < BaseController
       include ChallengableConcern
+      include Devise::Controllers::StoreLocation
 
       skip_before_action :require_functional!
 
       before_action :require_challenge!
       before_action :ensure_otp_secret
 
+      helper_method :return_to_app_url
+
       def new
         prepare_two_factor_form
       end
@@ -37,6 +40,10 @@ module Settings
 
       private
 
+      def return_to_app_url
+        stored_location_for(:user)
+      end
+
       def confirmation_params
         params.expect(form_two_factor_confirmation: [:otp_attempt])
       end
diff --git a/app/controllers/settings/two_factor_authentication/otp_authentication_controller.rb b/app/controllers/settings/two_factor_authentication/otp_authentication_controller.rb
index ca8d46afe4..5460448d99 100644
--- a/app/controllers/settings/two_factor_authentication/otp_authentication_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/otp_authentication_controller.rb
@@ -17,7 +17,7 @@ module Settings
       def create
         session[:new_otp_secret] = User.generate_otp_secret
 
-        redirect_to new_settings_two_factor_authentication_confirmation_path
+        redirect_to new_settings_two_factor_authentication_confirmation_path(params.permit(:oauth))
       end
 
       private
diff --git a/app/controllers/settings/two_factor_authentication_methods_controller.rb b/app/controllers/settings/two_factor_authentication_methods_controller.rb
index a6d5c1fe2d..49579b3677 100644
--- a/app/controllers/settings/two_factor_authentication_methods_controller.rb
+++ b/app/controllers/settings/two_factor_authentication_methods_controller.rb
@@ -22,7 +22,7 @@ module Settings
     private
 
     def require_otp_enabled
-      redirect_to settings_otp_authentication_path unless current_user.otp_enabled?
+      redirect_to settings_otp_authentication_path(params.permit(:oauth)) unless current_user.otp_enabled?
     end
   end
 end
diff --git a/app/helpers/json_ld_helper.rb b/app/helpers/json_ld_helper.rb
index 804cc72d70..3ab00819d8 100644
--- a/app/helpers/json_ld_helper.rb
+++ b/app/helpers/json_ld_helper.rb
@@ -70,6 +70,10 @@ module JsonLdHelper
     !json.nil? && equals_or_includes?(json['@context'], ActivityPub::TagManager::CONTEXT)
   end
 
+  def supported_security_context?(json)
+    !json.nil? && equals_or_includes?(json['@context'], 'https://w3id.org/security/v1')
+  end
+
   def unsupported_uri_scheme?(uri)
     uri.nil? || !uri.start_with?('http://', 'https://')
   end
diff --git a/app/javascript/mastodon/actions/interactions.js b/app/javascript/mastodon/actions/interactions.js
index 437f597314..60df9abc53 100644
--- a/app/javascript/mastodon/actions/interactions.js
+++ b/app/javascript/mastodon/actions/interactions.js
@@ -6,7 +6,10 @@ import { fetchRelationships } from './accounts';
 import { importFetchedAccounts, importFetchedStatus } from './importer';
 import { unreblog, reblog } from './interactions_typed';
 import { openModal } from './modal';
-import { timelineExpandPinnedFromStatus } from './timelines_typed';
+import {
+  insertPinnedStatusIntoTimelines,
+  removePinnedStatusFromTimelines,
+} from './timelines_typed';
 
 export const REBLOGS_EXPAND_REQUEST = 'REBLOGS_EXPAND_REQUEST';
 export const REBLOGS_EXPAND_SUCCESS = 'REBLOGS_EXPAND_SUCCESS';
@@ -369,7 +372,7 @@ export function pin(status) {
     api().post(`/api/v1/statuses/${status.get('id')}/pin`).then(response => {
       dispatch(importFetchedStatus(response.data));
       dispatch(pinSuccess(status));
-      dispatch(timelineExpandPinnedFromStatus(status));
+      dispatch(insertPinnedStatusIntoTimelines(status));
     }).catch(error => {
       dispatch(pinFail(status, error));
     });
@@ -408,7 +411,7 @@ export function unpin (status) {
     api().post(`/api/v1/statuses/${status.get('id')}/unpin`).then(response => {
       dispatch(importFetchedStatus(response.data));
       dispatch(unpinSuccess(status));
-      dispatch(timelineExpandPinnedFromStatus(status));
+      dispatch(removePinnedStatusFromTimelines(status));
     }).catch(error => {
       dispatch(unpinFail(status, error));
     });
diff --git a/app/javascript/mastodon/actions/timelines_typed.ts b/app/javascript/mastodon/actions/timelines_typed.ts
index f07b1274e2..9816561779 100644
--- a/app/javascript/mastodon/actions/timelines_typed.ts
+++ b/app/javascript/mastodon/actions/timelines_typed.ts
@@ -7,8 +7,8 @@ import type { Status } from '../models/status';
 import { createAppThunk } from '../store/typed_functions';
 
 import {
-  expandAccountFeaturedTimeline,
   expandTimeline,
+  insertIntoTimeline,
   TIMELINE_NON_STATUS_MARKERS,
 } from './timelines';
 
@@ -173,9 +173,13 @@ export function parseTimelineKey(key: string): TimelineParams | null {
   return null;
 }
 
-export function isTimelineKeyPinned(key: string) {
+export function isTimelineKeyPinned(key: string, accountId?: string) {
   const parsedKey = parseTimelineKey(key);
-  return parsedKey?.type === 'account' && parsedKey.pinned;
+  const isPinned = parsedKey?.type === 'account' && parsedKey.pinned;
+  if (!accountId || !isPinned) {
+    return isPinned;
+  }
+  return parsedKey.userId === accountId;
 }
 
 export function isNonStatusId(value: unknown) {
@@ -199,52 +203,71 @@ export const timelineDelete = createAction<{
   reblogOf: string | null;
 }>('timelines/delete');
 
-export const timelineExpandPinnedFromStatus = createAppThunk(
+export const timelineDeleteStatus = createAction<{
+  statusId: string;
+  timelineKey: string;
+}>('timelines/deleteStatus');
+
+export const insertPinnedStatusIntoTimelines = createAppThunk(
   (status: Status, { dispatch, getState }) => {
-    const accountId = status.getIn(['account', 'id']) as string;
-    if (!accountId) {
+    const currentAccountId = getState().meta.get('me', null) as string | null;
+    if (!currentAccountId) {
       return;
     }
 
-    // Verify that any of the relevant timelines are actually expanded before dispatching, to avoid unnecessary API calls.
+    const tags =
+      (
+        status.get('tags') as
+          | ImmutableList<ImmutableMap<'name', string>> // We only care about the tag name.
+          | undefined
+      )
+        ?.map((tag) => tag.get('name') as string)
+        .toArray() ?? [];
+
     const timelines = getState().timelines as ImmutableMap<string, unknown>;
-    if (!timelines.some((_, key) => key.startsWith(`account:${accountId}:`))) {
-      return;
-    }
-
-    void dispatch(
-      expandTimelineByParams({
-        type: 'account',
-        userId: accountId,
-        pinned: true,
-      }),
-    );
-    void dispatch(expandAccountFeaturedTimeline(accountId));
-
-    // Iterate over tags and clear those too.
-    const tags = status.get('tags') as
-      | ImmutableList<ImmutableMap<'name', string>> // We only care about the tag name.
-      | undefined;
-    if (!tags) {
-      return;
-    }
-    tags.forEach((tag) => {
-      const tagName = tag.get('name');
-      if (!tagName) {
-        return;
+    const accountTimelines = timelines.filter((_, key) => {
+      if (!key.startsWith(`account:${currentAccountId}:`)) {
+        return false;
+      }
+      const parsed = parseTimelineKey(key);
+      const isPinned = parsed?.type === 'account' && parsed.pinned;
+      if (!isPinned) {
+        return false;
       }
 
-      void dispatch(
-        expandTimelineByParams({
-          type: 'account',
-          userId: accountId,
-          pinned: true,
-          tagged: tagName,
-        }),
-      );
-      void dispatch(
-        expandAccountFeaturedTimeline(accountId, { tagged: tagName }),
-      );
+      return !parsed.tagged || tags.includes(parsed.tagged);
+    });
+
+    accountTimelines.forEach((_, key) => {
+      dispatch(insertIntoTimeline(key, status.get('id') as string, 0));
+    });
+  },
+);
+
+export const removePinnedStatusFromTimelines = createAppThunk(
+  (status: Status, { dispatch, getState }) => {
+    const currentAccountId = getState().meta.get('me', null) as string | null;
+    if (!currentAccountId) {
+      return;
+    }
+
+    const statusId = status.get('id') as string;
+    const timelines = getState().timelines as ImmutableMap<
+      string,
+      ImmutableMap<'items' | 'pendingItems', ImmutableList<string>>
+    >;
+
+    timelines.forEach((timeline, key) => {
+      if (!isTimelineKeyPinned(key, currentAccountId)) {
+        return;
+      }
+
+      if (
+        timeline.get('items')?.includes(statusId) ||
+        timeline.get('pendingItems')?.includes(statusId)
+      ) {
+        dispatch(timelineDeleteStatus({ statusId, timelineKey: key }));
+      }
     });
   },
 );
diff --git a/app/javascript/mastodon/components/exit_animation_wrapper.tsx b/app/javascript/mastodon/components/exit_animation_wrapper.tsx
index dba7d3e92c..4339068565 100644
--- a/app/javascript/mastodon/components/exit_animation_wrapper.tsx
+++ b/app/javascript/mastodon/components/exit_animation_wrapper.tsx
@@ -26,7 +26,7 @@ export const ExitAnimationWrapper: React.FC<{
    * Render prop that provides the nested component with the `delayedIsActive` flag
    */
   children: (delayedIsActive: boolean) => React.ReactNode;
-}> = ({ isActive = false, delayMs = 500, withEntryDelay, children }) => {
+}> = ({ isActive, delayMs = 500, withEntryDelay, children }) => {
   const [delayedIsActive, setDelayedIsActive] = useState(
     isActive && !withEntryDelay,
   );
diff --git a/app/javascript/mastodon/components/form_fields/text_area_field.tsx b/app/javascript/mastodon/components/form_fields/text_area_field.tsx
index bbde89574f..6cbced9faf 100644
--- a/app/javascript/mastodon/components/form_fields/text_area_field.tsx
+++ b/app/javascript/mastodon/components/form_fields/text_area_field.tsx
@@ -1,5 +1,5 @@
 import type { ComponentPropsWithoutRef } from 'react';
-import { forwardRef } from 'react';
+import { forwardRef, useCallback } from 'react';
 
 import classNames from 'classnames';
 
@@ -36,12 +36,26 @@ TextAreaField.displayName = 'TextAreaField';
 export const TextArea = forwardRef<
   HTMLTextAreaElement,
   ComponentPropsWithoutRef<'textarea'>
->(({ className, ...otherProps }, ref) => (
-  <textarea
-    {...otherProps}
-    className={classNames(className, classes.input)}
-    ref={ref}
-  />
-));
+>(({ className, onKeyDown, ...otherProps }, ref) => {
+  const handleSubmitHotkey = useCallback(
+    (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
+      onKeyDown?.(e);
+      if (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) {
+        const targetForm = e.currentTarget.form;
+        targetForm?.requestSubmit();
+      }
+    },
+    [onKeyDown],
+  );
+
+  return (
+    <textarea
+      {...otherProps}
+      onKeyDown={handleSubmitHotkey}
+      className={classNames(className, classes.input)}
+      ref={ref}
+    />
+  );
+});
 
 TextArea.displayName = 'TextArea';
diff --git a/app/javascript/mastodon/features/account_timeline/v2/context.tsx b/app/javascript/mastodon/features/account_timeline/v2/context.tsx
index d0d1332c2d..f41e19acf6 100644
--- a/app/javascript/mastodon/features/account_timeline/v2/context.tsx
+++ b/app/javascript/mastodon/features/account_timeline/v2/context.tsx
@@ -7,7 +7,7 @@ import {
   useState,
 } from 'react';
 
-import { useStorage } from '@/mastodon/hooks/useStorage';
+import { useStorageState } from '@/mastodon/hooks/useStorage';
 
 interface AccountTimelineContextValue {
   accountId: string;
@@ -26,30 +26,34 @@ export const AccountTimelineProvider: FC<{
   accountId: string;
   children: ReactNode;
 }> = ({ accountId, children }) => {
-  const { getItem, setItem } = useStorage({
+  const storageOptions = {
     type: 'session',
     prefix: `filters-${accountId}:`,
-  });
-  const [boosts, setBoosts] = useState(
-    () => (getItem('boosts') === '0' ? false : true), // Default to enabled.
+  } as const;
+
+  const [boosts, setBoosts] = useStorageState<boolean>(
+    'boosts',
+    true,
+    storageOptions,
   );
-  const [replies, setReplies] = useState(() =>
-    getItem('replies') === '1' ? true : false,
+
+  const [replies, setReplies] = useStorageState<boolean>(
+    'replies',
+    false,
+    storageOptions,
   );
 
   const handleSetBoosts = useCallback(
     (value: boolean) => {
       setBoosts(value);
-      setItem('boosts', value ? '1' : '0');
     },
-    [setBoosts, setItem],
+    [setBoosts],
   );
   const handleSetReplies = useCallback(
     (value: boolean) => {
       setReplies(value);
-      setItem('replies', value ? '1' : '0');
     },
-    [setReplies, setItem],
+    [setReplies],
   );
 
   const [showAllPinned, setShowAllPinned] = useState(false);
diff --git a/app/javascript/mastodon/features/followers/components/empty.tsx b/app/javascript/mastodon/features/followers/components/empty.tsx
new file mode 100644
index 0000000000..3fb92c1061
--- /dev/null
+++ b/app/javascript/mastodon/features/followers/components/empty.tsx
@@ -0,0 +1,64 @@
+import type { FC, ReactNode } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { LimitedAccountHint } from '@/mastodon/features/account_timeline/components/limited_account_hint';
+import { useAccountVisibility } from '@/mastodon/hooks/useAccountVisibility';
+import type { Account } from '@/mastodon/models/account';
+
+import { RemoteHint } from './remote';
+
+interface BaseEmptyMessageProps {
+  account?: Account;
+  defaultMessage: ReactNode;
+}
+export type EmptyMessageProps = Omit<BaseEmptyMessageProps, 'defaultMessage'>;
+
+export const BaseEmptyMessage: FC<BaseEmptyMessageProps> = ({
+  account,
+  defaultMessage,
+}) => {
+  const { blockedBy, hidden, suspended } = useAccountVisibility(account?.id);
+
+  if (!account) {
+    return null;
+  }
+
+  if (suspended) {
+    return (
+      <FormattedMessage
+        id='empty_column.account_suspended'
+        defaultMessage='Account suspended'
+      />
+    );
+  }
+
+  if (hidden) {
+    return <LimitedAccountHint accountId={account.id} />;
+  }
+
+  if (blockedBy) {
+    return (
+      <FormattedMessage
+        id='empty_column.account_unavailable'
+        defaultMessage='Profile unavailable'
+      />
+    );
+  }
+
+  if (account.hide_collections) {
+    return (
+      <FormattedMessage
+        id='empty_column.account_hides_collections'
+        defaultMessage='This user has chosen to not make this information available'
+      />
+    );
+  }
+
+  const domain = account.acct.split('@')[1];
+  if (domain) {
+    return <RemoteHint domain={domain} url={account.url} />;
+  }
+
+  return defaultMessage;
+};
diff --git a/app/javascript/mastodon/features/followers/components/list.tsx b/app/javascript/mastodon/features/followers/components/list.tsx
new file mode 100644
index 0000000000..24d442d229
--- /dev/null
+++ b/app/javascript/mastodon/features/followers/components/list.tsx
@@ -0,0 +1,104 @@
+import { useMemo } from 'react';
+import type { FC, ReactNode } from 'react';
+
+import { Account } from '@/mastodon/components/account';
+import { Column } from '@/mastodon/components/column';
+import { ColumnBackButton } from '@/mastodon/components/column_back_button';
+import { LoadingIndicator } from '@/mastodon/components/loading_indicator';
+import ScrollableList from '@/mastodon/components/scrollable_list';
+import BundleColumnError from '@/mastodon/features/ui/components/bundle_column_error';
+import { useAccount } from '@/mastodon/hooks/useAccount';
+import { useAccountVisibility } from '@/mastodon/hooks/useAccountVisibility';
+import { useLayout } from '@/mastodon/hooks/useLayout';
+
+import { AccountHeader } from '../../account_timeline/components/account_header';
+
+import { RemoteHint } from './remote';
+
+export interface AccountList {
+  hasMore: boolean;
+  isLoading: boolean;
+  items: string[];
+}
+
+interface AccountListProps {
+  accountId?: string | null;
+  append?: ReactNode;
+  emptyMessage: ReactNode;
+  footer?: ReactNode;
+  list?: AccountList | null;
+  loadMore: () => void;
+  prependAccountId?: string | null;
+  scrollKey: string;
+}
+
+export const AccountList: FC<AccountListProps> = ({
+  accountId,
+  append,
+  emptyMessage,
+  footer,
+  list,
+  loadMore,
+  prependAccountId,
+  scrollKey,
+}) => {
+  const account = useAccount(accountId);
+
+  const { blockedBy, hidden, suspended } = useAccountVisibility(accountId);
+  const forceEmptyState = blockedBy || hidden || suspended;
+
+  const children = useMemo(() => {
+    if (forceEmptyState) {
+      return [];
+    }
+    const children =
+      list?.items.map((followerId) => (
+        <Account key={followerId} id={followerId} />
+      )) ?? [];
+
+    if (prependAccountId) {
+      children.unshift(
+        <Account key={prependAccountId} id={prependAccountId} minimal />,
+      );
+    }
+    return children;
+  }, [prependAccountId, list, forceEmptyState]);
+
+  const { multiColumn } = useLayout();
+
+  // Null means accountId does not exist (e.g. invalid acct). Undefined means loading.
+  if (accountId === null) {
+    return <BundleColumnError multiColumn={multiColumn} errorType='routing' />;
+  }
+
+  if (!accountId || !account) {
+    return (
+      <Column bindToDocument={!multiColumn}>
+        <LoadingIndicator />
+      </Column>
+    );
+  }
+
+  const domain = account.acct.split('@')[1];
+
+  return (
+    <Column>
+      <ColumnBackButton />
+
+      <ScrollableList
+        scrollKey={scrollKey}
+        hasMore={!forceEmptyState && list?.hasMore}
+        isLoading={list?.isLoading ?? true}
+        onLoadMore={loadMore}
+        prepend={<AccountHeader accountId={accountId} hideTabs />}
+        alwaysPrepend
+        append={append ?? <RemoteHint domain={domain} url={account.url} />}
+        emptyMessage={emptyMessage}
+        bindToDocument={!multiColumn}
+        footer={footer}
+      >
+        {children}
+      </ScrollableList>
+    </Column>
+  );
+};
diff --git a/app/javascript/mastodon/features/followers/components/remote.tsx b/app/javascript/mastodon/features/followers/components/remote.tsx
new file mode 100644
index 0000000000..68341095ef
--- /dev/null
+++ b/app/javascript/mastodon/features/followers/components/remote.tsx
@@ -0,0 +1,32 @@
+import type { FC } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { TimelineHint } from '@/mastodon/components/timeline_hint';
+
+export const RemoteHint: FC<{ domain?: string; url: string }> = ({
+  domain,
+  url,
+}) => {
+  if (!domain) {
+    return null;
+  }
+  return (
+    <TimelineHint
+      url={url}
+      message={
+        <FormattedMessage
+          id='hints.profiles.followers_may_be_missing'
+          defaultMessage='Followers for this profile may be missing.'
+        />
+      }
+      label={
+        <FormattedMessage
+          id='hints.profiles.see_more_followers'
+          defaultMessage='See more followers on {domain}'
+          values={{ domain: <strong>{domain}</strong> }}
+        />
+      }
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/followers/index.jsx b/app/javascript/mastodon/features/followers/index.jsx
deleted file mode 100644
index e55d3d9cd6..0000000000
--- a/app/javascript/mastodon/features/followers/index.jsx
+++ /dev/null
@@ -1,187 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { FormattedMessage } from 'react-intl';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
-
-import { debounce } from 'lodash';
-
-import { Account } from 'mastodon/components/account';
-import { TimelineHint } from 'mastodon/components/timeline_hint';
-import { AccountHeader } from 'mastodon/features/account_timeline/components/account_header';
-import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error';
-import { normalizeForLookup } from 'mastodon/reducers/accounts_map';
-import { getAccountHidden } from 'mastodon/selectors/accounts';
-import { useAppSelector } from 'mastodon/store';
-
-import {
-  lookupAccount,
-  fetchAccount,
-  fetchFollowers,
-  expandFollowers,
-} from '../../actions/accounts';
-import { ColumnBackButton } from '../../components/column_back_button';
-import { LoadingIndicator } from '../../components/loading_indicator';
-import ScrollableList from '../../components/scrollable_list';
-import { LimitedAccountHint } from '../account_timeline/components/limited_account_hint';
-import Column from '../ui/components/column';
-
-const mapStateToProps = (state, { params: { acct, id } }) => {
-  const accountId = id || state.accounts_map[normalizeForLookup(acct)];
-
-  if (!accountId) {
-    return {
-      isLoading: true,
-    };
-  }
-
-  return {
-    accountId,
-    remote: !!(state.getIn(['accounts', accountId, 'acct']) !== state.getIn(['accounts', accountId, 'username'])),
-    remoteUrl: state.getIn(['accounts', accountId, 'url']),
-    isAccount: !!state.getIn(['accounts', accountId]),
-    accountIds: state.getIn(['user_lists', 'followers', accountId, 'items']),
-    hasMore: !!state.getIn(['user_lists', 'followers', accountId, 'next']),
-    isLoading: state.getIn(['user_lists', 'followers', accountId, 'isLoading'], true),
-    suspended: state.getIn(['accounts', accountId, 'suspended'], false),
-    hideCollections: state.getIn(['accounts', accountId, 'hide_collections'], false),
-    hidden: getAccountHidden(state, accountId),
-    blockedBy: state.getIn(['relationships', accountId, 'blocked_by'], false),
-  };
-};
-
-const RemoteHint = ({ accountId, url }) => {
-  const acct = useAppSelector(state => state.accounts.get(accountId)?.acct);
-  const domain = acct ? acct.split('@')[1] : undefined;
-
-  return (
-    <TimelineHint
-      url={url}
-      message={<FormattedMessage id='hints.profiles.followers_may_be_missing' defaultMessage='Followers for this profile may be missing.' />}
-      label={<FormattedMessage id='hints.profiles.see_more_followers' defaultMessage='See more followers on {domain}' values={{ domain: <strong>{domain}</strong> }} />}
-    />
-  );
-};
-
-RemoteHint.propTypes = {
-  url: PropTypes.string.isRequired,
-  accountId: PropTypes.string.isRequired,
-};
-
-class Followers extends ImmutablePureComponent {
-
-  static propTypes = {
-    params: PropTypes.shape({
-      acct: PropTypes.string,
-      id: PropTypes.string,
-    }).isRequired,
-    accountId: PropTypes.string,
-    dispatch: PropTypes.func.isRequired,
-    accountIds: ImmutablePropTypes.list,
-    hasMore: PropTypes.bool,
-    isLoading: PropTypes.bool,
-    blockedBy: PropTypes.bool,
-    isAccount: PropTypes.bool,
-    suspended: PropTypes.bool,
-    hidden: PropTypes.bool,
-    remote: PropTypes.bool,
-    remoteUrl: PropTypes.string,
-    multiColumn: PropTypes.bool,
-  };
-
-  _load () {
-    const { accountId, isAccount, dispatch } = this.props;
-
-    if (!isAccount) dispatch(fetchAccount(accountId));
-    dispatch(fetchFollowers(accountId));
-  }
-
-  componentDidMount () {
-    const { params: { acct }, accountId, dispatch } = this.props;
-
-    if (accountId) {
-      this._load();
-    } else {
-      dispatch(lookupAccount(acct));
-    }
-  }
-
-  componentDidUpdate (prevProps) {
-    const { params: { acct }, accountId, dispatch } = this.props;
-
-    if (prevProps.accountId !== accountId && accountId) {
-      this._load();
-    } else if (prevProps.params.acct !== acct) {
-      dispatch(lookupAccount(acct));
-    }
-  }
-
-  handleLoadMore = debounce(() => {
-    this.props.dispatch(expandFollowers(this.props.accountId));
-  }, 300, { leading: true });
-
-  render () {
-    const { accountId, accountIds, hasMore, blockedBy, isAccount, multiColumn, isLoading, suspended, hidden, remote, remoteUrl, hideCollections } = this.props;
-
-    if (!isAccount) {
-      return (
-        <BundleColumnError multiColumn={multiColumn} errorType='routing' />
-      );
-    }
-
-    if (!accountIds) {
-      return (
-        <Column>
-          <LoadingIndicator />
-        </Column>
-      );
-    }
-
-    let emptyMessage;
-
-    const forceEmptyState = blockedBy || suspended || hidden;
-
-    if (suspended) {
-      emptyMessage = <FormattedMessage id='empty_column.account_suspended' defaultMessage='Account suspended' />;
-    } else if (hidden) {
-      emptyMessage = <LimitedAccountHint accountId={accountId} />;
-    } else if (blockedBy) {
-      emptyMessage = <FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' />;
-    } else if (hideCollections && accountIds.isEmpty()) {
-      emptyMessage = <FormattedMessage id='empty_column.account_hides_collections' defaultMessage='This user has chosen to not make this information available' />;
-    } else if (remote && accountIds.isEmpty()) {
-      emptyMessage = <RemoteHint accountId={accountId} url={remoteUrl} />;
-    } else {
-      emptyMessage = <FormattedMessage id='account.followers.empty' defaultMessage='No one follows this user yet.' />;
-    }
-
-    const remoteMessage = remote ? <RemoteHint accountId={accountId} url={remoteUrl} /> : null;
-
-    return (
-      <Column>
-        <ColumnBackButton />
-
-        <ScrollableList
-          scrollKey='followers'
-          hasMore={!forceEmptyState && hasMore}
-          isLoading={isLoading}
-          onLoadMore={this.handleLoadMore}
-          prepend={<AccountHeader accountId={this.props.accountId} hideTabs />}
-          alwaysPrepend
-          append={remoteMessage}
-          emptyMessage={emptyMessage}
-          bindToDocument={!multiColumn}
-        >
-          {forceEmptyState ? [] : accountIds.map(id =>
-            <Account key={id} id={id} />,
-          )}
-        </ScrollableList>
-      </Column>
-    );
-  }
-
-}
-
-export default connect(mapStateToProps)(Followers);
diff --git a/app/javascript/mastodon/features/followers/index.tsx b/app/javascript/mastodon/features/followers/index.tsx
new file mode 100644
index 0000000000..15dcbb5a69
--- /dev/null
+++ b/app/javascript/mastodon/features/followers/index.tsx
@@ -0,0 +1,90 @@
+import { useEffect } from 'react';
+import type { FC } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { useDebouncedCallback } from 'use-debounce';
+
+import { expandFollowers, fetchFollowers } from '@/mastodon/actions/accounts';
+import { useAccount } from '@/mastodon/hooks/useAccount';
+import { useAccountId } from '@/mastodon/hooks/useAccountId';
+import { useRelationship } from '@/mastodon/hooks/useRelationship';
+import { selectUserListWithoutMe } from '@/mastodon/selectors/user_lists';
+import { useAppDispatch, useAppSelector } from '@/mastodon/store';
+
+import type { EmptyMessageProps } from './components/empty';
+import { BaseEmptyMessage } from './components/empty';
+import { AccountList } from './components/list';
+
+const Followers: FC = () => {
+  const accountId = useAccountId();
+  const account = useAccount(accountId);
+  const currentAccountId = useAppSelector(
+    (state) => (state.meta.get('me') as string | null) ?? null,
+  );
+  const followerList = useAppSelector((state) =>
+    selectUserListWithoutMe(state, 'followers', accountId),
+  );
+
+  const dispatch = useAppDispatch();
+  useEffect(() => {
+    if (!followerList && accountId) {
+      dispatch(fetchFollowers(accountId));
+    }
+  }, [accountId, dispatch, followerList]);
+
+  const loadMore = useDebouncedCallback(
+    () => {
+      if (accountId) {
+        dispatch(expandFollowers(accountId));
+      }
+    },
+    300,
+    { leading: true },
+  );
+
+  const relationship = useRelationship(accountId);
+
+  const followerId = relationship?.following ? currentAccountId : null;
+  const followersExceptMeHidden = !!(
+    account?.hide_collections &&
+    followerList?.items.length === 0 &&
+    followerId
+  );
+
+  const footer = followersExceptMeHidden && (
+    <div className='empty-column-indicator'>
+      <FormattedMessage
+        id='followers.hide_other_followers'
+        defaultMessage='This user has chosen to not make their other followers visible'
+      />
+    </div>
+  );
+
+  return (
+    <AccountList
+      accountId={accountId}
+      footer={footer}
+      emptyMessage={<EmptyMessage account={account} />}
+      list={followerList}
+      loadMore={loadMore}
+      prependAccountId={followerId}
+      scrollKey='followers'
+    />
+  );
+};
+
+const EmptyMessage: FC<EmptyMessageProps> = (props) => (
+  <BaseEmptyMessage
+    {...props}
+    defaultMessage={
+      <FormattedMessage
+        id='account.followers.empty'
+        defaultMessage='No one follows this user yet.'
+      />
+    }
+  />
+);
+
+// eslint-disable-next-line import/no-default-export -- Used by async components.
+export default Followers;
diff --git a/app/javascript/mastodon/features/following/components/remote.tsx b/app/javascript/mastodon/features/following/components/remote.tsx
new file mode 100644
index 0000000000..7d1c6c580d
--- /dev/null
+++ b/app/javascript/mastodon/features/following/components/remote.tsx
@@ -0,0 +1,32 @@
+import type { FC } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { TimelineHint } from '@/mastodon/components/timeline_hint';
+
+export const RemoteHint: FC<{ domain?: string; url: string }> = ({
+  domain,
+  url,
+}) => {
+  if (!domain) {
+    return null;
+  }
+  return (
+    <TimelineHint
+      url={url}
+      message={
+        <FormattedMessage
+          id='hints.profiles.follows_may_be_missing'
+          defaultMessage='Follows for this profile may be missing.'
+        />
+      }
+      label={
+        <FormattedMessage
+          id='hints.profiles.see_more_follows'
+          defaultMessage='See more follows on {domain}'
+          values={{ domain: <strong>{domain}</strong> }}
+        />
+      }
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/following/index.jsx b/app/javascript/mastodon/features/following/index.jsx
deleted file mode 100644
index 1dc39df0ee..0000000000
--- a/app/javascript/mastodon/features/following/index.jsx
+++ /dev/null
@@ -1,187 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { FormattedMessage } from 'react-intl';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
-
-import { debounce } from 'lodash';
-
-import { Account } from 'mastodon/components/account';
-import { TimelineHint } from 'mastodon/components/timeline_hint';
-import { AccountHeader } from 'mastodon/features/account_timeline/components/account_header';
-import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error';
-import { normalizeForLookup } from 'mastodon/reducers/accounts_map';
-import { getAccountHidden } from 'mastodon/selectors/accounts';
-import { useAppSelector } from 'mastodon/store';
-
-import {
-  lookupAccount,
-  fetchAccount,
-  fetchFollowing,
-  expandFollowing,
-} from '../../actions/accounts';
-import { ColumnBackButton } from '../../components/column_back_button';
-import { LoadingIndicator } from '../../components/loading_indicator';
-import ScrollableList from '../../components/scrollable_list';
-import { LimitedAccountHint } from '../account_timeline/components/limited_account_hint';
-import Column from '../ui/components/column';
-
-const mapStateToProps = (state, { params: { acct, id } }) => {
-  const accountId = id || state.accounts_map[normalizeForLookup(acct)];
-
-  if (!accountId) {
-    return {
-      isLoading: true,
-    };
-  }
-
-  return {
-    accountId,
-    remote: !!(state.getIn(['accounts', accountId, 'acct']) !== state.getIn(['accounts', accountId, 'username'])),
-    remoteUrl: state.getIn(['accounts', accountId, 'url']),
-    isAccount: !!state.getIn(['accounts', accountId]),
-    accountIds: state.getIn(['user_lists', 'following', accountId, 'items']),
-    hasMore: !!state.getIn(['user_lists', 'following', accountId, 'next']),
-    isLoading: state.getIn(['user_lists', 'following', accountId, 'isLoading'], true),
-    suspended: state.getIn(['accounts', accountId, 'suspended'], false),
-    hideCollections: state.getIn(['accounts', accountId, 'hide_collections'], false),
-    hidden: getAccountHidden(state, accountId),
-    blockedBy: state.getIn(['relationships', accountId, 'blocked_by'], false),
-  };
-};
-
-const RemoteHint = ({ accountId, url }) => {
-  const acct = useAppSelector(state => state.accounts.get(accountId)?.acct);
-  const domain = acct ? acct.split('@')[1] : undefined;
-
-  return (
-    <TimelineHint
-      url={url}
-      message={<FormattedMessage id='hints.profiles.follows_may_be_missing' defaultMessage='Follows for this profile may be missing.' />}
-      label={<FormattedMessage id='hints.profiles.see_more_follows' defaultMessage='See more follows on {domain}' values={{ domain: <strong>{domain}</strong> }} />}
-    />
-  );
-};
-
-RemoteHint.propTypes = {
-  url: PropTypes.string.isRequired,
-  accountId: PropTypes.string.isRequired,
-};
-
-class Following extends ImmutablePureComponent {
-
-  static propTypes = {
-    params: PropTypes.shape({
-      acct: PropTypes.string,
-      id: PropTypes.string,
-    }).isRequired,
-    accountId: PropTypes.string,
-    dispatch: PropTypes.func.isRequired,
-    accountIds: ImmutablePropTypes.list,
-    hasMore: PropTypes.bool,
-    isLoading: PropTypes.bool,
-    blockedBy: PropTypes.bool,
-    isAccount: PropTypes.bool,
-    suspended: PropTypes.bool,
-    hidden: PropTypes.bool,
-    remote: PropTypes.bool,
-    remoteUrl: PropTypes.string,
-    multiColumn: PropTypes.bool,
-  };
-
-  _load () {
-    const { accountId, isAccount, dispatch } = this.props;
-
-    if (!isAccount) dispatch(fetchAccount(accountId));
-    dispatch(fetchFollowing(accountId));
-  }
-
-  componentDidMount () {
-    const { params: { acct }, accountId, dispatch } = this.props;
-
-    if (accountId) {
-      this._load();
-    } else {
-      dispatch(lookupAccount(acct));
-    }
-  }
-
-  componentDidUpdate (prevProps) {
-    const { params: { acct }, accountId, dispatch } = this.props;
-
-    if (prevProps.accountId !== accountId && accountId) {
-      this._load();
-    } else if (prevProps.params.acct !== acct) {
-      dispatch(lookupAccount(acct));
-    }
-  }
-
-  handleLoadMore = debounce(() => {
-    this.props.dispatch(expandFollowing(this.props.accountId));
-  }, 300, { leading: true });
-
-  render () {
-    const { accountId, accountIds, hasMore, blockedBy, isAccount, multiColumn, isLoading, suspended, hidden, remote, remoteUrl, hideCollections } = this.props;
-
-    if (!isAccount) {
-      return (
-        <BundleColumnError multiColumn={multiColumn} errorType='routing' />
-      );
-    }
-
-    if (!accountIds) {
-      return (
-        <Column>
-          <LoadingIndicator />
-        </Column>
-      );
-    }
-
-    let emptyMessage;
-
-    const forceEmptyState = blockedBy || suspended || hidden;
-
-    if (suspended) {
-      emptyMessage = <FormattedMessage id='empty_column.account_suspended' defaultMessage='Account suspended' />;
-    } else if (hidden) {
-      emptyMessage = <LimitedAccountHint accountId={accountId} />;
-    } else if (blockedBy) {
-      emptyMessage = <FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' />;
-    } else if (hideCollections && accountIds.isEmpty()) {
-      emptyMessage = <FormattedMessage id='empty_column.account_hides_collections' defaultMessage='This user has chosen to not make this information available' />;
-    } else if (remote && accountIds.isEmpty()) {
-      emptyMessage = <RemoteHint accountId={accountId} url={remoteUrl} />;
-    } else {
-      emptyMessage = <FormattedMessage id='account.follows.empty' defaultMessage="This user doesn't follow anyone yet." />;
-    }
-
-    const remoteMessage = remote ? <RemoteHint accountId={accountId} url={remoteUrl} /> : null;
-
-    return (
-      <Column>
-        <ColumnBackButton />
-
-        <ScrollableList
-          scrollKey='following'
-          hasMore={!forceEmptyState && hasMore}
-          isLoading={isLoading}
-          onLoadMore={this.handleLoadMore}
-          prepend={<AccountHeader accountId={this.props.accountId} hideTabs />}
-          alwaysPrepend
-          append={remoteMessage}
-          emptyMessage={emptyMessage}
-          bindToDocument={!multiColumn}
-        >
-          {forceEmptyState ? [] : accountIds.map(id =>
-            <Account key={id} id={id} />,
-          )}
-        </ScrollableList>
-      </Column>
-    );
-  }
-
-}
-
-export default connect(mapStateToProps)(Following);
diff --git a/app/javascript/mastodon/features/following/index.tsx b/app/javascript/mastodon/features/following/index.tsx
new file mode 100644
index 0000000000..6e6218cc68
--- /dev/null
+++ b/app/javascript/mastodon/features/following/index.tsx
@@ -0,0 +1,94 @@
+import { useEffect } from 'react';
+import type { FC } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { useDebouncedCallback } from 'use-debounce';
+
+import { expandFollowing, fetchFollowing } from '@/mastodon/actions/accounts';
+import { useAccount } from '@/mastodon/hooks/useAccount';
+import { useAccountId } from '@/mastodon/hooks/useAccountId';
+import { useRelationship } from '@/mastodon/hooks/useRelationship';
+import { selectUserListWithoutMe } from '@/mastodon/selectors/user_lists';
+import { useAppDispatch, useAppSelector } from '@/mastodon/store';
+
+import type { EmptyMessageProps } from '../followers/components/empty';
+import { BaseEmptyMessage } from '../followers/components/empty';
+import { AccountList } from '../followers/components/list';
+
+import { RemoteHint } from './components/remote';
+
+const Followers: FC = () => {
+  const accountId = useAccountId();
+  const account = useAccount(accountId);
+  const currentAccountId = useAppSelector(
+    (state) => (state.meta.get('me') as string | null) ?? null,
+  );
+  const followingList = useAppSelector((state) =>
+    selectUserListWithoutMe(state, 'following', accountId),
+  );
+
+  const dispatch = useAppDispatch();
+  useEffect(() => {
+    if (!followingList && accountId) {
+      dispatch(fetchFollowing(accountId));
+    }
+  }, [accountId, dispatch, followingList]);
+
+  const loadMore = useDebouncedCallback(
+    () => {
+      if (accountId) {
+        dispatch(expandFollowing(accountId));
+      }
+    },
+    300,
+    { leading: true },
+  );
+
+  const relationship = useRelationship(accountId);
+
+  const followedId = relationship?.followed_by ? currentAccountId : null;
+  const followingExceptMeHidden = !!(
+    account?.hide_collections &&
+    followingList?.items.length === 0 &&
+    followedId
+  );
+
+  const footer = followingExceptMeHidden && (
+    <div className='empty-column-indicator'>
+      <FormattedMessage
+        id='following.hide_other_following'
+        defaultMessage='This user has chosen to not make the rest of who they follow visible'
+      />
+    </div>
+  );
+
+  const domain = account?.acct.split('@')[1];
+  return (
+    <AccountList
+      accountId={accountId}
+      append={domain && <RemoteHint domain={domain} url={account.url} />}
+      emptyMessage={<EmptyMessage account={account} />}
+      footer={footer}
+      list={followingList}
+      loadMore={loadMore}
+      prependAccountId={currentAccountId}
+      scrollKey='following'
+    />
+  );
+};
+
+const EmptyMessage: FC<EmptyMessageProps> = (props) => (
+  <BaseEmptyMessage
+    {...props}
+    defaultMessage={
+      <FormattedMessage
+        id='account.follows.empty'
+        defaultMessage="This user doesn't follow anyone yet."
+      />
+    }
+  />
+);
+
+// eslint-disable-next-line import/no-default-export -- Used by async components.
+export default Followers;
diff --git a/app/javascript/mastodon/hooks/useLayout.ts b/app/javascript/mastodon/hooks/useLayout.ts
index fc1cf136bf..51f3e0122a 100644
--- a/app/javascript/mastodon/hooks/useLayout.ts
+++ b/app/javascript/mastodon/hooks/useLayout.ts
@@ -8,6 +8,7 @@ export const useLayout = () => {
 
   return {
     singleColumn: layout === 'single-column' || layout === 'mobile',
+    multiColumn: layout === 'multi-column',
     layout,
   };
 };
diff --git a/app/javascript/mastodon/hooks/useRelationship.ts b/app/javascript/mastodon/hooks/useRelationship.ts
new file mode 100644
index 0000000000..b1e8f5174f
--- /dev/null
+++ b/app/javascript/mastodon/hooks/useRelationship.ts
@@ -0,0 +1,19 @@
+import { useEffect } from 'react';
+
+import { fetchRelationships } from '../actions/accounts';
+import { useAppDispatch, useAppSelector } from '../store';
+
+export function useRelationship(accountId?: string | null) {
+  const relationship = useAppSelector((state) =>
+    accountId ? state.relationships.get(accountId) : null,
+  );
+
+  const dispatch = useAppDispatch();
+  useEffect(() => {
+    if (accountId && !relationship) {
+      dispatch(fetchRelationships([accountId]));
+    }
+  }, [accountId, dispatch, relationship]);
+
+  return relationship;
+}
diff --git a/app/javascript/mastodon/hooks/useStorage.ts b/app/javascript/mastodon/hooks/useStorage.ts
index 6ee64217d2..d4af1df6cc 100644
--- a/app/javascript/mastodon/hooks/useStorage.ts
+++ b/app/javascript/mastodon/hooks/useStorage.ts
@@ -1,9 +1,14 @@
-import { useCallback, useMemo } from 'react';
+import { useCallback, useMemo, useState } from 'react';
+
+interface StorageOptions {
+  type?: 'local' | 'session';
+  prefix?: string;
+}
 
 export function useStorage({
   type = 'local',
   prefix = '',
-}: { type?: 'local' | 'session'; prefix?: string } = {}) {
+}: StorageOptions = {}) {
   const storageType = type === 'local' ? 'localStorage' : 'sessionStorage';
   const isAvailable = useMemo(
     () => storageAvailable(storageType),
@@ -23,6 +28,7 @@ export function useStorage({
     },
     [isAvailable, storageType, prefix],
   );
+
   const setItem = useCallback(
     (key: string, value: string) => {
       if (!isAvailable) {
@@ -35,13 +41,52 @@ export function useStorage({
     [isAvailable, storageType, prefix],
   );
 
+  const removeItem = useCallback(
+    (key: string) => {
+      if (!isAvailable) {
+        return;
+      }
+      try {
+        window[storageType].removeItem(prefix ? `${prefix};${key}` : key);
+      } catch {}
+    },
+    [isAvailable, storageType, prefix],
+  );
+
   return {
     isAvailable,
     getItem,
     setItem,
+    removeItem,
   };
 }
 
+export function useStorageState<T extends string | boolean>(
+  key: string,
+  initialState: T,
+  options?: StorageOptions,
+) {
+  const { getItem, setItem, removeItem } = useStorage(options);
+  const [state, setState] = useState<T>(
+    () => (retrieveBooleanOrString(getItem(key)) as T | null) ?? initialState,
+  );
+
+  const handleSetState = useCallback(
+    (newValue: T) => {
+      setItem(key, castToString(newValue));
+      setState(newValue);
+    },
+    [key, setItem],
+  );
+
+  const removeState = useCallback(() => {
+    removeItem(key);
+    setState(initialState);
+  }, [initialState, key, removeItem]);
+
+  return [state, handleSetState, removeState] as const;
+}
+
 // Tests the storage availability for the given type. Taken from MDN:
 // https://developer.mozilla.org/en-US/docs/Web/API/Web_Storage_API/Using_the_Web_Storage_API
 export function storageAvailable(type: 'localStorage' | 'sessionStorage') {
@@ -62,3 +107,21 @@ export function storageAvailable(type: 'localStorage' | 'sessionStorage') {
     );
   }
 }
+
+function castToString(value: string | boolean) {
+  if (typeof value === 'boolean') {
+    return value ? '1' : '0';
+  } else {
+    return value;
+  }
+}
+
+function retrieveBooleanOrString(value: string | null) {
+  if (value === '1') {
+    return true;
+  } else if (value === '0') {
+    return false;
+  } else {
+    return value;
+  }
+}
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 94c244ea38..7d1e5cb8a3 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -14,7 +14,10 @@
   "about.powered_by": "شبكة اجتماعية لامركزية مدعومة من {mastodon}",
   "about.rules": "قواعد الخادم",
   "account.account_note_header": "ملاحظة شخصية",
+  "account.activity": "النشاط",
+  "account.add_note": "إضافة ملاحظة شخصية",
   "account.add_or_remove_from_list": "الإضافة أو الإزالة من القائمة",
+  "account.badges.admin": "مدير",
   "account.badges.bot": "آلي",
   "account.badges.group": "فريق",
   "account.block": "احجب @{name}",
@@ -38,8 +41,18 @@
   "account.featured.hashtags": "هاشتاقات",
   "account.featured_tags.last_status_at": "آخر منشور في {date}",
   "account.featured_tags.last_status_never": "لا توجد رسائل",
+  "account.fields.scroll_next": "أظْهِر التَّالي",
+  "account.fields.scroll_prev": "أظْهِر السَّابِق",
+  "account.filters.all": "جميع الأنشطة",
+  "account.filters.posts_only": "منشورات",
+  "account.filters.posts_replies": "المنشورات والردود",
+  "account.filters.replies_toggle": "اعرض الردود",
   "account.follow": "متابعة",
   "account.follow_back": "تابعه بالمثل",
+  "account.follow_back_short": "تابعه بالمثل",
+  "account.follow_request": "طلب المتابعة",
+  "account.follow_request_cancel": "إلغاء الطلب",
+  "account.follow_request_cancel_short": "إلغاء",
   "account.followers": "مُتابِعون",
   "account.followers.empty": "لا أحدَ يُتابع هذا المُستخدم إلى حد الآن.",
   "account.followers_counter": "{count, plural, zero{لا مُتابع} one {مُتابعٌ واحِد} two {مُتابعانِ اِثنان} few {{counter} مُتابِعين} many {{counter} مُتابِعًا} other {{counter} مُتابع}}",
@@ -57,6 +70,7 @@
   "account.locked_info": "تم ضبط حالة خصوصية هذا الحساب على أنه مؤمّن. إذ يراجع صاحبه يدويًا من يُسمح له بالمتابعة.",
   "account.media": "وسائط",
   "account.mention": "أذكُر @{name}",
+  "account.menu.copy": "نسخ الرابط",
   "account.moved_to": "أشار {name} إلى أن حسابه الجديد الآن:",
   "account.mute": "أكتم @{name}",
   "account.mute_notifications_short": "كتم الإشعارات",
@@ -65,6 +79,11 @@
   "account.muting": "مكتوم",
   "account.mutual": "أنتم تتابعون بعضكم البعض",
   "account.no_bio": "لم يتم تقديم وصف.",
+  "account.node_modal.field_label": "ملاحظة شخصية",
+  "account.node_modal.save": "حفظ",
+  "account.node_modal.title": "إضافة ملاحظة شخصية",
+  "account.note.edit_button": "تعديل",
+  "account.note.title": "ملاحظة شخصية (مرئية لك فقط)",
   "account.open_original_page": "افتح الصفحة الأصلية",
   "account.posts": "منشورات",
   "account.posts_with_replies": "المنشورات والرُدود",
@@ -107,11 +126,16 @@
   "alt_text_modal.describe_for_people_with_visual_impairments": "قم بوصفها للأشخاص ذوي الإعاقة البصرية…",
   "alt_text_modal.done": "تمّ",
   "announcement.announcement": "إعلان",
+  "annual_report.summary.archetype.replier.name": "الفراشة",
+  "annual_report.summary.close": "اغلق",
+  "annual_report.summary.copy_link": "نسخ الرابط",
   "annual_report.summary.most_used_app.most_used_app": "التطبيق الأكثر استخداماً",
   "annual_report.summary.most_used_hashtag.most_used_hashtag": "الهاشتاق الأكثر استخداماً",
   "annual_report.summary.new_posts.new_posts": "المنشورات الجديدة",
   "annual_report.summary.percentile.text": "<topLabel>هذا يجعلك من بين أكثر </topLabel><percentage></percentage><bottomLabel>مستخدمي {domain} نشاطاً </bottomLabel>",
   "annual_report.summary.percentile.we_wont_tell_bernie": "سيبقى هذا الأمر بيننا.",
+  "annual_report.summary.share_elsewhere": "شاركها في مكان آخر",
+  "annual_report.summary.share_on_mastodon": "شاركها على ماستدون",
   "attachments_list.unprocessed": "(غير معالَج)",
   "audio.hide": "إخفاء المقطع الصوتي",
   "block_modal.remote_users_caveat": "سوف نطلب من الخادم {domain} أن يحترم قرارك، لكن الالتزام غير مضمون لأن بعض الخواديم قد تتعامل مع نصوص الكتل بشكل مختلف. قد تظل المنشورات العامة مرئية للمستخدمين غير المسجلين الدخول.",
@@ -137,11 +161,21 @@
   "bundle_modal_error.close": "إغلاق",
   "bundle_modal_error.message": "حدث خطأ أثناء تحميل هذه الشاشة.",
   "bundle_modal_error.retry": "إعادة المُحاولة",
+  "callout.dismiss": "تجاهل",
   "closed_registrations.other_server_instructions": "بما أن ماستدون لامركزي، يمكنك إنشاء حساب على خادم آخر للاستمرار في التفاعل مع هذا الخادم.",
   "closed_registrations_modal.description": "لا يمكن إنشاء حساب على {domain} حاليا، ولكن على فكرة لست بحاجة إلى حساب على {domain} بذاته لاستخدام ماستدون.",
   "closed_registrations_modal.find_another_server": "ابحث على خادم آخر",
   "closed_registrations_modal.preamble": "ماستدون لامركزي، لذلك بغض النظر عن مكان إنشاء حسابك، سيكون بإمكانك المتابعة والتفاعل مع أي شخص على هذا الخادم. يمكنك حتى أن تستضيفه ذاتياً!",
   "closed_registrations_modal.title": "إنشاء حساب على ماستدون",
+  "collections.collection_description": "الوصف",
+  "collections.collection_name": "الاسم",
+  "collections.collection_topic": "الموضوع",
+  "collections.content_warning": "تحذير عن المحتوى",
+  "collections.continue": "مواصلة",
+  "collections.create.settings_title": "الإعدادات",
+  "collections.create.steps": "الخطوة {step}/{total}",
+  "collections.edit_settings": "تعديل الإعدادات",
+  "collections.manage_accounts": "إدارة الحسابات",
   "column.about": "عن",
   "column.blocks": "المُستَخدِمون المَحظورون",
   "column.bookmarks": "الفواصل المرجعية",
@@ -201,6 +235,7 @@
   "confirmations.delete.confirm": "حذف",
   "confirmations.delete.message": "هل أنتَ مُتأكدٌ أنك تُريدُ حَذفَ هذا المنشور؟",
   "confirmations.delete.title": "أتريد حذف المنشور؟",
+  "confirmations.delete_collection.confirm": "حذف",
   "confirmations.delete_list.confirm": "حذف",
   "confirmations.delete_list.message": "هل أنتَ مُتأكدٌ أنكَ تُريدُ حَذفَ هذِهِ القائمة بشكلٍ دائم؟",
   "confirmations.delete_list.title": "أتريد حذف القائمة؟",
@@ -375,6 +410,9 @@
   "follow_suggestions.who_to_follow": "حسابات للمُتابَعة",
   "followed_tags": "الوسوم المتابَعة",
   "footer.about": "عن",
+  "footer.about_mastodon": "عن ماستدون",
+  "footer.about_server": "عن {domain}",
+  "footer.about_this_server": "عن",
   "footer.directory": "دليل الصفحات التعريفية",
   "footer.get_app": "احصل على التطبيق",
   "footer.keyboard_shortcuts": "اختصارات لوحة المفاتيح",
@@ -382,6 +420,7 @@
   "footer.source_code": "الاطلاع على الشفرة المصدرية",
   "footer.status": "الحالة",
   "footer.terms_of_service": "شروط الخدمة",
+  "form_field.optional": "(اختياري)",
   "generic.saved": "تم الحفظ",
   "getting_started.heading": "استعدّ للبدء",
   "hashtag.admin_moderation": "افتح الواجهة الإشراف لـ #{name}",
@@ -448,6 +487,7 @@
   "keyboard_shortcuts.column": "للتركيز على منشور على أحد الأعمدة",
   "keyboard_shortcuts.compose": "للتركيز على نافذة تحرير النصوص",
   "keyboard_shortcuts.description": "الوصف",
+  "keyboard_shortcuts.direct": "لفتح عمود الإشارات الخاصة",
   "keyboard_shortcuts.down": "للانتقال إلى أسفل القائمة",
   "keyboard_shortcuts.enter": "لفتح المنشور",
   "keyboard_shortcuts.favourite": "لإضافة المنشور إلى المفضلة",
@@ -457,6 +497,7 @@
   "keyboard_shortcuts.home": "لفتح الخيط الرئيسي",
   "keyboard_shortcuts.hotkey": "مفتاح الاختصار",
   "keyboard_shortcuts.legend": "لعرض هذا المفتاح",
+  "keyboard_shortcuts.load_more": "للتركيز على زر \"تحميل المزيد\"",
   "keyboard_shortcuts.local": "لفتح الخيط العام المحلي",
   "keyboard_shortcuts.mention": "لذِكر الناشر",
   "keyboard_shortcuts.muted": "لفتح قائمة المستخدِمين المكتومين",
@@ -873,6 +914,7 @@
   "status.quote_error.revoked": "تمت إزالة المنشور من قبل صاحبه",
   "status.quote_followers_only": "يمكن فقط للمتابعين اقتباس هذا المنشور",
   "status.quote_manual_review": "الكاتب سوف يراجع يدوياً",
+  "status.quote_noun": "اقتباس",
   "status.quote_policy_change": "تغيير من يمكنه الاقتباس",
   "status.quote_post_author": "اقتبس @{name} منشورا",
   "status.quote_private": "المنشورات الخاصة لا يمكن اقتباسها",
@@ -913,6 +955,7 @@
   "tabs_bar.notifications": "الإشعارات",
   "tabs_bar.publish": "منشور جديد",
   "tabs_bar.search": "ابحث",
+  "tag.remove": "إزالة",
   "terms_of_service.effective_as_of": "مطبق اعتباراً من {date}",
   "terms_of_service.title": "شروط الخدمة",
   "terms_of_service.upcoming_changes_on": "تغييرات قادمة في تاريخ {date}",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 2406962528..4e78a5e621 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Схаваць пашырэнні ў стужцы",
   "account.menu.mention": "Згадаць",
   "account.menu.mute": "Ігнараваць уліковы запіс",
+  "account.menu.note.description": "Бачна толькі Вам",
   "account.menu.open_original_page": "Паказаць на {domain}",
   "account.menu.remove_follower": "Выдаліць падпісчыка",
   "account.menu.report": "Паскардзіцца на профіль",
@@ -104,6 +105,13 @@
   "account.muted": "Ігнаруецца",
   "account.muting": "Ігнараванне",
   "account.mutual": "Вы падпісаныя адно на аднаго",
+  "account.name.help.domain": "{domain} — сервер, які ўтрымлівае профіль і допісы гэтага карыстальніка.",
+  "account.name.help.domain_self": "{domain} — Ваш сервер, які ўтрымлівае Ваш профіль і допісы.",
+  "account.name.help.footer": "Гэтак жа, як Вы можаце адпраўляць электронныя лісты людзям праз розныя кліенты электроннай пошты, Вы таксама можаце ўзаемадзейнічаць з людзьмі з іншых сервераў Mastodon, а таксама з усімі, хто карыстаецца іншымі сацыяльнымі сеткамі, якія працуюць па тых жа правілах, што і Mastodon (пратакол ActivityPub).",
+  "account.name.help.header": "Ідэнтыфікатар карыстальніка падобны да адраса электроннай пошты",
+  "account.name.help.username": "{username} — імя карыстальніка гэтага ўліковага запісу на гэтым серверы. У некага на іншым серверы яно можа быць такім жа.",
+  "account.name.help.username_self": "{username} — Вашае імя карыстальніка на гэтым серверы. У некага на іншым серверы яно можа быць такім жа.",
+  "account.name_info": "Што гэта азначае?",
   "account.no_bio": "Апісанне адсутнічае.",
   "account.node_modal.callout": "Асабістыя нататкі бачныя толькі Вам.",
   "account.node_modal.edit_title": "Рэдагаваць асабістую нататку",
@@ -312,7 +320,7 @@
   "compose.published.open": "Адкрыць",
   "compose.saved.body": "Допіс захаваны.",
   "compose_form.direct_message_warning_learn_more": "Даведацца больш",
-  "compose_form.encryption_warning": "Допісы ў Mastodon не абаронены скразным шыфраваннем. Не дзяліцеся ніякай канфідэнцыяльнай інфармацыяй праз Mastodon.",
+  "compose_form.encryption_warning": "Допісы ў Mastodon не абароненыя скразным шыфраваннем. Не дзяліцеся ніякай канфідэнцыяльнай інфармацыяй праз Mastodon.",
   "compose_form.hashtag_warning": "Гэты допіс не будзе паказаны пад аніякім хэштэгам, бо ён не публічны. Толькі публічныя допісы можна знайсці па хэштэгу.",
   "compose_form.lock_disclaimer": "Ваш уліковы запіс не {locked}. Усе могуць падпісацца на вас, каб бачыць допісы толькі для падпісчыкаў.",
   "compose_form.lock_disclaimer.lock": "закрыты",
@@ -526,7 +534,7 @@
   "follow_suggestions.similar_to_recently_followed_longer": "Падобныя профілі, за якімі Вы нядаўна сачылі",
   "follow_suggestions.view_all": "Праглядзець усё",
   "follow_suggestions.who_to_follow": "На каго падпісацца",
-  "followed_tags": "Падпіскі",
+  "followed_tags": "Падпіскі на хэштэгі",
   "footer.about": "Пра нас",
   "footer.about_mastodon": "Пра Mastodon",
   "footer.about_server": "Пра {domain}",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 2496abfa0a..1df6aba2b8 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Skjul fremhævelser på tidslinje",
   "account.menu.mention": "Omtal",
   "account.menu.mute": "Skjul konto",
+  "account.menu.note.description": "Kun synlig for dig",
   "account.menu.open_original_page": "Vis på {domain}",
   "account.menu.remove_follower": "Fjern følger",
   "account.menu.report": "Anmeld konto",
@@ -104,6 +105,13 @@
   "account.muted": "Skjult",
   "account.muting": "Skjuler",
   "account.mutual": "I følger hinanden",
+  "account.name.help.domain": "{domain} er den server, der er vært for brugerens profil og indlæg.",
+  "account.name.help.domain_self": "{domain} er din server, der er vært for din profil og indlæg.",
+  "account.name.help.footer": "Ligesom du kan sende e-mails til personer, der bruger forskellige e-mail-klienter, kan du interagere med personer på andre Mastodon-servere – og med alle på andre sociale apps, der bruger de samme regler som Mastodon (ActivityPub-protokollen).",
+  "account.name.help.header": "Et handle svarer til en e-mailadresse",
+  "account.name.help.username": "{username} er denne kontos brugernavn på deres server. En konto på en anden server kan have det samme brugernavn.",
+  "account.name.help.username_self": "{username} er dit brugernavn på denne server. En konto på en anden server kan have det samme brugernavn.",
+  "account.name_info": "Hvad betyder dette?",
   "account.no_bio": "Ingen beskrivelse til rådighed.",
   "account.node_modal.callout": "Personlige noter er kun synlige for dig.",
   "account.node_modal.edit_title": "Rediger personlig note",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 3e07f21eb1..65d40ba05a 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Geteilte Beiträge in der Timeline ausblenden",
   "account.menu.mention": "Erwähnen",
   "account.menu.mute": "Konto stummschalten",
+  "account.menu.note.description": "Nur für dich sichtbar",
   "account.menu.open_original_page": "Auf {domain} ansehen",
   "account.menu.remove_follower": "Follower entfernen",
   "account.menu.report": "Konto melden",
@@ -104,6 +105,13 @@
   "account.muted": "Stummgeschaltet",
   "account.muting": "Stummgeschaltet",
   "account.mutual": "Ihr folgt einander",
+  "account.name.help.domain": "{domain} ist der Server, auf dem das Profil registriert ist und die Beiträge verwaltet werden.",
+  "account.name.help.domain_self": "{domain} ist der Server, auf dem du registriert bist und deine Beiträge verwaltet werden.",
+  "account.name.help.footer": "So wie du E-Mails an andere trotz unterschiedlicher E-Mail-Clients senden kannst, so kannst du auch mit anderen Profilen auf unterschiedlichen Mastodon-Servern interagieren. Wenn andere soziale Apps die gleichen Kommunikationsregeln (das ActivityPub-Protokoll) wie Mastodon verwenden, dann funktioniert die Kommunikation auch dort.",
+  "account.name.help.header": "Deine Adresse im Fediverse ist wie eine E-Mail-Adresse",
+  "account.name.help.username": "{username} ist der Profilname auf deren Server. Es ist möglich, dass jemand auf einem anderen Server den gleichen Profilnamen hat.",
+  "account.name.help.username_self": "{username} ist dein Profilname auf diesem Server. Es ist möglich, dass jemand auf einem anderen Server den gleichen Profilnamen hat.",
+  "account.name_info": "Was bedeutet das?",
   "account.no_bio": "Keine Beschreibung verfügbar.",
   "account.node_modal.callout": "Persönliche Notizen sind nur für dich sichtbar.",
   "account.node_modal.edit_title": "Persönliche Notiz bearbeiten",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 653106c3e1..4a9627384c 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Απόκρυψη ενισχύσεων στο χρονολόγιο",
   "account.menu.mention": "Επισήμανση",
   "account.menu.mute": "Σίγαση λογαριασμού",
+  "account.menu.note.description": "Ορατή μόνο σε εσάς",
   "account.menu.open_original_page": "Προβολή στο {domain}",
   "account.menu.remove_follower": "Αφαίρεση ακολούθου",
   "account.menu.report": "Αναφορά λογαριασμού",
@@ -104,6 +105,13 @@
   "account.muted": "Σε σίγαση",
   "account.muting": "Σίγαση",
   "account.mutual": "Ακολουθείτε ο ένας τον άλλο",
+  "account.name.help.domain": "Το {domain} είναι ο διακομιστής που φιλοξενεί το προφίλ και τις αναρτήσεις του χρήστη.",
+  "account.name.help.domain_self": "Το {domain} είναι ο διακομιστής σας που φιλοξενεί το προφίλ και τις αναρτήσεις σας.",
+  "account.name.help.footer": "Ακριβώς όπως μπορείτε να στείλετε μηνύματα ηλεκτρονικού ταχυδρομείου σε άτομα χρησιμοποιώντας διαφορετικούς παρόχους email, μπορείτε να αλληλεπιδράσετε με άτομα σε άλλους διακομιστές Mastodon – και με οποιονδήποτε σε άλλες κοινωνικές εφαρμογές που τροφοδοτούνται από το ίδιο σύνολο κανόνων όπως χρησιμοποιεί το Mastodon (το πρωτόκολλο ActivityPub).",
+  "account.name.help.header": "Ένα πλήρες όνομα χρήστη είναι σαν μια διεύθυνση email",
+  "account.name.help.username": "Το {username} είναι το όνομα χρήστη αυτού του λογαριασμού στο διακομιστή τους. Κάποιος σε άλλο διακομιστή μπορεί να έχει το ίδιο όνομα χρήστη.",
+  "account.name.help.username_self": "Το {username} είναι το όνομα χρήστη σας σε αυτόν το διακομιστή. Κάποιος σε άλλο διακομιστή μπορεί να έχει το ίδιο όνομα χρήστη.",
+  "account.name_info": "Τι σημαίνει αυτό;",
   "account.no_bio": "Δεν υπάρχει περιγραφή.",
   "account.node_modal.callout": "Οι προσωπικές σημειώσεις είναι ορατές μόνο σε εσάς.",
   "account.node_modal.edit_title": "Επεξεργασία προσωπικής σημείωσης",
@@ -421,7 +429,7 @@
   "domain_pill.their_username": "Το μοναδικό του αναγνωριστικό στο διακομιστή του. Είναι πιθανό να βρεις χρήστες με το ίδιο όνομα χρήστη σε διαφορετικούς διακομιστές.",
   "domain_pill.username": "Όνομα χρήστη",
   "domain_pill.whats_in_a_handle": "Τί υπάρχει σε ένα πλήρες όνομα χρήστη;",
-  "domain_pill.who_they_are": "Από τη στιγμή που τα πλήρη ονόματα λένε ποιος είναι κάποιος και πού είναι, μπορείς να αλληλεπιδράσεις με άτομα απ' όλο τον κοινωνικό ιστό των <button> πλατφορμών που στηρίζονται στο ActivityPub</button>.",
+  "domain_pill.who_they_are": "Από τη στιγμή που τα πλήρη ονόματα χρηστών λένε ποιος είναι κάποιος και πού είναι, μπορείς να αλληλεπιδράσεις με άτομα απ' όλο τον κοινωνικό ιστό των <button>πλατφορμών που στηρίζονται στο ActivityPub</button>.",
   "domain_pill.who_you_are": "Επειδή το πλήρες όνομα χρήστη σου λέει ποιος είσαι και πού βρίσκεσαι, άτομα μπορούν να αλληλεπιδράσουν μαζί σου στον κοινωνικό ιστό των <button>πλατφορμών που στηρίζονται στο ActivityPub</button>.",
   "domain_pill.your_handle": "Το πλήρες όνομα χρήστη σου:",
   "domain_pill.your_server": "Το ψηφιακό σου σπίτι, όπου ζουν όλες σου οι αναρτήσεις. Δε σ' αρέσει αυτός; Μετακινήσου σε διακομιστές ανά πάσα στιγμή και πάρε και τους ακόλουθούς σου.",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 901da2f5ad..e62ce6f719 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Hide boosts in timeline",
   "account.menu.mention": "Mention",
   "account.menu.mute": "Mute account",
+  "account.menu.note.description": "Visible only to you",
   "account.menu.open_original_page": "View on {domain}",
   "account.menu.remove_follower": "Remove follower",
   "account.menu.report": "Report account",
@@ -104,6 +105,13 @@
   "account.muted": "Muted",
   "account.muting": "Muting",
   "account.mutual": "You follow each other",
+  "account.name.help.domain": "{domain} is the server that hosts the user’s profile and posts.",
+  "account.name.help.domain_self": "{domain} is your server that hosts your profile and posts.",
+  "account.name.help.footer": "Just like you can send emails to people using different email clients, you can interact with people on other Mastodon servers – and with anyone on other social apps powered by the same set of rules as Mastodon uses (the ActivityPub protocol).",
+  "account.name.help.header": "A handle is like an email address",
+  "account.name.help.username": "{username} is this account’s username on their server. Someone on another server might have the same username.",
+  "account.name.help.username_self": "{username} is your username on this server. Someone on another server might have the same username.",
+  "account.name_info": "What does this mean?",
   "account.no_bio": "No description provided.",
   "account.node_modal.callout": "Personal notes are visible only to you.",
   "account.node_modal.edit_title": "Edit personal note",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index b383546cb2..0fd37b3102 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -535,6 +535,8 @@
   "follow_suggestions.view_all": "View all",
   "follow_suggestions.who_to_follow": "Who to follow",
   "followed_tags": "Followed hashtags",
+  "followers.hide_other_followers": "This user has chosen to not make their other followers visible",
+  "following.hide_other_following": "This user has chosen to not make the rest of who they follow visible",
   "footer.about": "About",
   "footer.about_mastodon": "About Mastodon",
   "footer.about_server": "About {domain}",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 18aa53fd64..5949871ea9 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Ocultar adhesiones en la línea temporal",
   "account.menu.mention": "Mención",
   "account.menu.mute": "Silenciar cuenta",
+  "account.menu.note.description": "Visible solo para vos",
   "account.menu.open_original_page": "Ver en {domain}",
   "account.menu.remove_follower": "Quitar seguidor",
   "account.menu.report": "Denunciar cuenta",
@@ -104,6 +105,13 @@
   "account.muted": "Silenciado",
   "account.muting": "Silenciada",
   "account.mutual": "Se siguen mutuamente",
+  "account.name.help.domain": "«{domain}» es el servidor que hospeda el perfil y los mensajes del usuario.",
+  "account.name.help.domain_self": "«{domain}» es tu servidor que hospeda tu perfil y tus mensajes.",
+  "account.name.help.footer": "Así como podés enviar correos electrónicos a personas usando diferentes clientes de email, del mismo modo podés interactuar con cuentas en otros servidores de Mastodon; y con cuentas en otras aplicaciones sociales que funcionen bajo las mismas normas que Mastodon (esto es, el protocolo ActivityPub).",
+  "account.name.help.header": "Un alias es similar a una dirección de correo electrónico",
+  "account.name.help.username": "«{username}» es el nombre de usuario de esta cuenta en su servidor. Alguien en otro servidor puede tener el mismo nombre de usuario.",
+  "account.name.help.username_self": "«{username}» es tu nombre de usuario en este servidor. Alguien en otro servidor puede tener el mismo nombre de usuario.",
+  "account.name_info": "¿Qué significa?",
   "account.no_bio": "Sin descripción provista.",
   "account.node_modal.callout": "Las notas personales son visibles solo para vos.",
   "account.node_modal.edit_title": "Editar nota personal",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 2528f38879..dca26c6e59 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Ocultar impulsos en la cronología",
   "account.menu.mention": "Mencionar",
   "account.menu.mute": "Silenciar cuenta",
+  "account.menu.note.description": "Visible solo para ti",
   "account.menu.open_original_page": "Ver en {domain}",
   "account.menu.remove_follower": "Eliminar seguidor",
   "account.menu.report": "Denunciar cuenta",
@@ -104,6 +105,13 @@
   "account.muted": "Silenciado",
   "account.muting": "Silenciando",
   "account.mutual": "Se siguen el uno al otro",
+  "account.name.help.domain": "{domain} es el servidor que aloja el perfil y las publicaciones del usuario.",
+  "account.name.help.domain_self": "{domain} es el servidor que aloja tu perfil y tus publicaciones.",
+  "account.name.help.footer": "Al igual que puedes enviar correos electrónicos a personas que utilizan diferentes clientes de correo electrónico, puedes interactuar con personas en otros servidores Mastodon, y con cualquier persona en otras aplicaciones sociales que funcionen con el mismo conjunto de reglas que utiliza Mastodon (el protocolo ActivityPub).",
+  "account.name.help.header": "Un identificador es como una dirección de correo electrónico",
+  "account.name.help.username": "{username} es el nombre de usuario de esta cuenta en su servidor. Es posible que alguien en otro servidor tenga el mismo nombre de usuario.",
+  "account.name.help.username_self": "{username} es tu nombre de usuario en este servidor. Es posible que alguien en otro servidor tenga el mismo nombre de usuario.",
+  "account.name_info": "¿Qué significa esto?",
   "account.no_bio": "Sin biografía.",
   "account.node_modal.callout": "Las notas personales solo son visibles para ti.",
   "account.node_modal.edit_title": "Editar nota personal",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 23526ab7af..2278b4c946 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Ocultar impulsos en la cronología",
   "account.menu.mention": "Mencionar",
   "account.menu.mute": "Silenciar cuenta",
+  "account.menu.note.description": "Visible sólo para ti",
   "account.menu.open_original_page": "Ver en {domain}",
   "account.menu.remove_follower": "Eliminar seguidor",
   "account.menu.report": "Denunciar cuenta",
@@ -104,6 +105,13 @@
   "account.muted": "Silenciado",
   "account.muting": "Silenciando",
   "account.mutual": "Os seguís mutuamente",
+  "account.name.help.domain": "{domain} es el servidor que alberga el perfil y las publicaciones del usuario.",
+  "account.name.help.domain_self": "{domain} es tu servidor que aloja tu perfil y publicaciones.",
+  "account.name.help.footer": "Al igual que puedes enviar correos electrónicos a personas usando diferentes clientes de correo electrónico, puedes interactuar con personas en otros servidores de Mastodon – y con personas en otras aplicaciones sociales que hablen el mismo idioma que Mastodon (el protocolo ActivityPub).",
+  "account.name.help.header": "Un alias es como una dirección de correo electrónico",
+  "account.name.help.username": "{username} es el nombre de usuario de esta cuenta en su servidor. Alguien en otro servidor puede tener el mismo nombre de usuario.",
+  "account.name.help.username_self": "{username} es tu nombre de usuario en este servidor. Alguien en otro servidor puede tener el mismo nombre de usuario.",
+  "account.name_info": "¿Qué significa esto?",
   "account.no_bio": "Sin biografía.",
   "account.node_modal.callout": "Las notas personales solo son visibles para ti.",
   "account.node_modal.edit_title": "Editar nota personal",
@@ -242,7 +250,7 @@
   "collections.content_warning": "Advertencia de contenido",
   "collections.continue": "Continuar",
   "collections.create.accounts_subtitle": "Solo pueden añadirse cuentas que sigues y que han activado el descubrimiento.",
-  "collections.create.accounts_title": "¿A quién presentarás en esta colección?",
+  "collections.create.accounts_title": "¿A quién vas a destacar en esta colección?",
   "collections.create.basic_details_title": "Datos básicos",
   "collections.create.settings_title": "Ajustes",
   "collections.create.steps": "Paso {step}/{total}",
@@ -250,7 +258,7 @@
   "collections.create_collection": "Crear colección",
   "collections.delete_collection": "Eliminar colección",
   "collections.description_length_hint": "Limitado a 100 caracteres",
-  "collections.edit_details": "Cambiar datos básicos",
+  "collections.edit_details": "Editar datos básicos",
   "collections.edit_settings": "Cambiar ajustes",
   "collections.error_loading_collections": "Se ha producido un error al intentar cargar tus colecciones.",
   "collections.manage_accounts": "Administrar cuentas",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index baa5dd4f29..1d0cc531c0 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Piilota tehostukset aikajanalta",
   "account.menu.mention": "Mainitse",
   "account.menu.mute": "Mykistä tili",
+  "account.menu.note.description": "Näkyvät vain sinulle",
   "account.menu.open_original_page": "Näytä palvelimella {domain}",
   "account.menu.remove_follower": "Poista seuraaja",
   "account.menu.report": "Raportoi tili",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 45689cec26..6b15622fb3 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Fjal stimbranir í tíðarlinju",
   "account.menu.mention": "Umrøð",
   "account.menu.mute": "Doyv kontu",
+  "account.menu.note.description": "Einans sjónligt fyri teg",
   "account.menu.open_original_page": "Vís á {domain}",
   "account.menu.remove_follower": "Strika fylgjara",
   "account.menu.report": "Melda kontu",
@@ -104,6 +105,13 @@
   "account.muted": "Sløkt/ur",
   "account.muting": "Doyvir",
   "account.mutual": "Tit fylgja hvønn annan",
+  "account.name.help.domain": "{domain} er ambætarin, sum hýsir vangan og postarnar hjá brúkaranum.",
+  "account.name.help.domain_self": "{domain} er tín ambætari, sum hýsir tín vanga og postar.",
+  "account.name.help.footer": "Eins og tú kanst senda teldubrøv til fólk, sum brúka ymiskar teldupostskipanir, so kanst tú samvirka við fólk á øðrum Mastodon ambætarum - og við ein og hvønn á øðrum sosialum appum, ið eru bygdar á sama sett av reglum, sum Mastodon brúkar (ActivityPub protokollin).",
+  "account.name.help.header": "Eitt hald er sum ein teldupostbústaður",
+  "account.name.help.username": "{username} er brúkaranavnið hjá hesari kontuni á teirra ambætara. Onkur á einum øðrum ambætara kann hava sama brúkaranavn.",
+  "account.name.help.username_self": "{username} er brúkaranavnið hjá tær á hesum ambætaranum. Onkur á einum øðrum ambætara kann hava sama brúkaranavn.",
+  "account.name_info": "Hvat merkir hetta?",
   "account.no_bio": "Lýsing vantar.",
   "account.node_modal.callout": "Einans tú sær tínar persónligu notur.",
   "account.node_modal.edit_title": "Rætta persónliga notu",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 5ff6073495..7f595d4152 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Masquer les partages dans le fil d’actualité",
   "account.menu.mention": "Mentionner",
   "account.menu.mute": "Masquer le compte",
+  "account.menu.note.description": "Visible uniquement par vous",
   "account.menu.open_original_page": "Voir sur {domain}",
   "account.menu.remove_follower": "Supprimer des abonné·e·s",
   "account.menu.report": "Signaler le compte",
@@ -104,6 +105,13 @@
   "account.muted": "Masqué·e",
   "account.muting": "Masqué",
   "account.mutual": "Vous vous suivez mutuellement",
+  "account.name.help.domain": "{domain} est le serveur qui héberge le profil et les messages du compte.",
+  "account.name.help.domain_self": "{domain} est le serveur qui héberge votre profil et vos messages.",
+  "account.name.help.footer": "Tout comme vous pouvez envoyer des courriels à des personnes utilisant différents logiciels de messagerie, vous pouvez interagir avec des personnes sur d'autres serveurs Mastodon — et avec n'importe qui sur d'autres applications sociales propulsées par le même ensemble de règles que Mastodon utilise (le protocole ActivityPub).",
+  "account.name.help.header": "Un identifiant est comme une adresse de courriel",
+  "account.name.help.username": "{username} est le nom d'utilisateur·ice de ce compte sur son serveur. Quelqu'un sur un autre serveur peut avoir le même nom.",
+  "account.name.help.username_self": "{username} est votre nom d'utilisateur·ice sur ce serveur. Quelqu'un sur un autre serveur peut avoir le même nom.",
+  "account.name_info": "Qu'est-ce que cela signifie ?",
   "account.no_bio": "Description manquante.",
   "account.node_modal.callout": "Les notes personnelles sont ne sont visibles que pour vous.",
   "account.node_modal.edit_title": "Modifier la note personnelle",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index fd90425094..c6193f3bbc 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Masquer les partages dans le fil d’actualité",
   "account.menu.mention": "Mentionner",
   "account.menu.mute": "Masquer le compte",
+  "account.menu.note.description": "Visible uniquement par vous",
   "account.menu.open_original_page": "Voir sur {domain}",
   "account.menu.remove_follower": "Supprimer des abonné·e·s",
   "account.menu.report": "Signaler le compte",
@@ -104,6 +105,13 @@
   "account.muted": "Masqué·e",
   "account.muting": "Masqué",
   "account.mutual": "Vous vous suivez mutuellement",
+  "account.name.help.domain": "{domain} est le serveur qui héberge le profil et les messages du compte.",
+  "account.name.help.domain_self": "{domain} est le serveur qui héberge votre profil et vos messages.",
+  "account.name.help.footer": "Tout comme vous pouvez envoyer des courriels à des personnes utilisant différents logiciels de messagerie, vous pouvez interagir avec des personnes sur d'autres serveurs Mastodon — et avec n'importe qui sur d'autres applications sociales propulsées par le même ensemble de règles que Mastodon utilise (le protocole ActivityPub).",
+  "account.name.help.header": "Un identifiant est comme une adresse de courriel",
+  "account.name.help.username": "{username} est le nom d'utilisateur·ice de ce compte sur son serveur. Quelqu'un sur un autre serveur peut avoir le même nom.",
+  "account.name.help.username_self": "{username} est votre nom d'utilisateur·ice sur ce serveur. Quelqu'un sur un autre serveur peut avoir le même nom.",
+  "account.name_info": "Qu'est-ce que cela signifie ?",
   "account.no_bio": "Aucune description fournie.",
   "account.node_modal.callout": "Les notes personnelles sont ne sont visibles que pour vous.",
   "account.node_modal.edit_title": "Modifier la note personnelle",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 83175433d3..d7b428146b 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Folaigh borradh sa líne ama",
   "account.menu.mention": "Luaigh",
   "account.menu.mute": "Balbhaigh cuntas",
+  "account.menu.note.description": "Le feiceáil agatsa amháin",
   "account.menu.open_original_page": "Féach ar {domain}",
   "account.menu.remove_follower": "Bain leantóir",
   "account.menu.report": "Tuairiscigh cuntas",
@@ -104,6 +105,13 @@
   "account.muted": "Balbhaithe",
   "account.muting": "Ag balbhaigh",
   "account.mutual": "Leanann sibh a chéile",
+  "account.name.help.domain": "Is é {domain} an freastalaí a óstálann próifíl agus poist an úsáideora.",
+  "account.name.help.domain_self": "Is é {domain} an freastalaí a óstálann do phróifíl agus do phoist.",
+  "account.name.help.footer": "Díreach mar is féidir leat ríomhphoist a sheoladh chuig daoine ag baint úsáide as cliaint ríomhphoist éagsúla, is féidir leat idirghníomhú le daoine ar fhreastalaithe Mastodon eile – agus le duine ar bith ar aipeanna sóisialta eile atá faoi thiomáint ag an tsraith rialacha chéanna a úsáideann Mastodon (an prótacal ActivityPub).",
+  "account.name.help.header": "Is cosúil le seoladh ríomhphoist é láimhseáil",
+  "account.name.help.username": "Is é {username} ainm úsáideora an chuntais seo ar a bhfreastalaí. D’fhéadfadh an t-ainm úsáideora céanna a bheith ag duine éigin ar fhreastalaí eile.",
+  "account.name.help.username_self": "Is é {username} d'ainm úsáideora ar an bhfreastalaí seo. D'fhéadfadh an t-ainm úsáideora céanna a bheith ag duine éigin ar fhreastalaí eile.",
+  "account.name_info": "Cad is brí leis seo?",
   "account.no_bio": "Níor tugadh tuairisc.",
   "account.node_modal.callout": "Ní féidir ach leatsa nótaí pearsanta a fheiceáil.",
   "account.node_modal.edit_title": "Cuir nóta pearsanta in eagar",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index c94a84256d..c35834cbf4 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Ocultar as promocións na cronoloxía",
   "account.menu.mention": "Mencionar a",
   "account.menu.mute": "Silenciar conta",
+  "account.menu.note.description": "Só ti podes vela",
   "account.menu.open_original_page": "Ver en {domain}",
   "account.menu.remove_follower": "Quitar seguidora",
   "account.menu.report": "Denunciar conta",
@@ -104,6 +105,13 @@
   "account.muted": "Acalada",
   "account.muting": "Silenciamento",
   "account.mutual": "Seguimento mútuo",
+  "account.name.help.domain": "{domain} é o servidor que aloxa o perfil e as publicacións da usuaria.",
+  "account.name.help.domain_self": "{domain} é o servidor que aloxa o teu perfil e publicacións.",
+  "account.name.help.footer": "Ao igual que envías correos electrónicos a persoas que usan diferentes provedores, podes interactuar con persoas en outros servidores Mastodon ― e con calquera outra que use aplicacións que sigan o mesmo sistema que usa Mastodon (o protocolo ActivityPub).",
+  "account.name.help.header": "Un alcume é o como o enderezo de correo",
+  "account.name.help.username": "{username} é o nome de usuaria da conta no seu servidor. Alguén noutro servidor podería ter o mesmo nome de usuaria.",
+  "account.name.help.username_self": "{username} é o teu nome de usuaria nete servidor. Alguén noutro sevidor podería ter o mesmo nome de usuaria.",
+  "account.name_info": "Isto que significa?",
   "account.no_bio": "Sen descrición.",
   "account.node_modal.callout": "As notas persoais só as podes ver ti.",
   "account.node_modal.edit_title": "Editar nota persoal",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index c774620bf7..cf9e4ce78d 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "הסתר הדהודים בקו הזמן",
   "account.menu.mention": "אזכור",
   "account.menu.mute": "השתקת חשבון",
+  "account.menu.note.description": "גלוי לך בלבד",
   "account.menu.open_original_page": "לצפות אצל {domain}",
   "account.menu.remove_follower": "הסרת עוקב",
   "account.menu.report": "דווח על חשבון",
@@ -104,6 +105,13 @@
   "account.muted": "מושתק",
   "account.muting": "רשימת החשבונות המושתקים",
   "account.mutual": "אתם עוקביםות הדדית",
+  "account.name.help.domain": "{domain} הוא השרת שמארח את פרופיל המשתמש(ת) וההודעות שכתב(ה).",
+  "account.name.help.domain_self": "{domain} הוא השרת שמארח את פרופיל המשתמש(ת) שלך ואת ההודעות שכתבת.",
+  "account.name.help.footer": "בדיוק כמו שתוכלו לשלוח דואל לאנשים דרך תוכנות דואל שונות, ניתן להיות בקשר עם אנשים על שרתי מסטודון וכל אדם בשרתי פדיברס (המשתמשים בפרוטוכול אקטיביטיפאב ActivityPub).",
+  "account.name.help.header": "כינוי הוא כמו כתובת דואל",
+  "account.name.help.username": "{username} הוא שם המשתמש של החשבון בשרת שלהם. מישהו משרת אחר יכול להחזיק באותו שם משתמש.",
+  "account.name.help.username_self": "{username} הוא שם המשתמש של החשבון שלכם בשרת זה. מישהו משרת אחר יכול להחזיק באותו שם משתמש.",
+  "account.name_info": "מה זה אומר?",
   "account.no_bio": "לא סופק תיאור.",
   "account.node_modal.callout": "הערות פרטיות גלויות לך בלבד.",
   "account.node_modal.edit_title": "עריכת הערה פרטית",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 5dd7258a14..e254085a23 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Fela endurbirtingar í tímalínu",
   "account.menu.mention": "Minnst á",
   "account.menu.mute": "Þagga niður í aðgangi",
+  "account.menu.note.description": "Einungis sýnilegt þér",
   "account.menu.open_original_page": "Skoða á {domain}",
   "account.menu.remove_follower": "Fjarlægja fylgjanda",
   "account.menu.report": "Kæra aðgang",
@@ -104,7 +105,14 @@
   "account.muted": "Þaggaður",
   "account.muting": "Þöggun",
   "account.mutual": "Þið fylgist með hvor öðrum",
-  "account.no_bio": "Engri lýsingu útvegað.",
+  "account.name.help.domain": "{domain} er netþjónninn sem hýsir upplýsingasnið um notandann og færslurnar hans.",
+  "account.name.help.domain_self": "{domain} er netþjónninn þinn sem hýsir upplýsingasniðið þitt og færslurnar þínar.",
+  "account.name.help.footer": "Rétt eins og að þú getur sent tölvupóst á fólk í gegnum mismunandi þjónustur og forrit, þá getur þú átt í samskiptum við fólk á öðrum Mastodon-netþjónum – og reyndar við hverja þá sem eru á öðrum þeim samfélagsmiðlum sem nota sömu samskiptareglur og Mastodon notar (sem er ActivityPub-samskiptamátinn).",
+  "account.name.help.header": "Kennislóð (handle) líkist tölvupóstfangi",
+  "account.name.help.username": "{username} er notandanafn þessa aðgangs á netþjóni viðkomandi. Einhver annar á öðrum netþjóni getur verið með sama notandanafnið.",
+  "account.name.help.username_self": "{username} er notandanafnið þitt á þessum netþjóni. Einhver annar á öðrum netþjóni getur verið með sama notandanafnið.",
+  "account.name_info": "Hvað þýðir þetta?",
+  "account.no_bio": "Engin lýsing gefin upp.",
   "account.node_modal.callout": "Persónulegir einkaminnispunktar eru einungis sýnilegir þér.",
   "account.node_modal.edit_title": "Breyta einkaminnispunkti",
   "account.node_modal.error_unknown": "Tókst ekki að vista minnispunktinn",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index c732bc0a63..fa1548cf72 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -11,7 +11,7 @@
   "about.domain_blocks.suspended.title": "Sospeso",
   "about.language_label": "Lingua",
   "about.not_available": "Queste informazioni non sono state rese disponibili su questo server.",
-  "about.powered_by": "Social media decentralizzato alimentato da {mastodon}",
+  "about.powered_by": "Social media decentralizzato basato su {mastodon}",
   "about.rules": "Regole del server",
   "account.account_note_header": "Note personali",
   "account.activity": "Attività",
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Nascondi le condivisioni nella timeline",
   "account.menu.mention": "Menziona",
   "account.menu.mute": "Silenzia l'account",
+  "account.menu.note.description": "Visibile solo a te",
   "account.menu.open_original_page": "Visualizza su {domain}",
   "account.menu.remove_follower": "Rimuovi il seguace",
   "account.menu.report": "Segnala l'account",
@@ -104,6 +105,13 @@
   "account.muted": "Mutato",
   "account.muting": "Account silenziato",
   "account.mutual": "Vi seguite a vicenda",
+  "account.name.help.domain": "{domain} è il server che ospita il profilo e i post dell'utente.",
+  "account.name.help.domain_self": "{domain} è il tuo server che ospita il tuo profilo e i post.",
+  "account.name.help.footer": "Proprio come puoi inviare email a persone che usano diversi client di posta elettronica, così puoi interagire con le persone su altri server Mastodon — e con chiunque utilizzi altre app social basate sulle stesse regole che Mastodon usa (il protocollo ActivityPub).",
+  "account.name.help.header": "Un nome univoco è come un indirizzo email",
+  "account.name.help.username": "{username} è il nome utente di questo account sul suo server. Qualcuno su un altro server potrebbe avere lo stesso nome utente.",
+  "account.name.help.username_self": "{username} è il tuo nome utente su questo server. Qualcuno su un altro server potrebbe avere lo stesso nome utente.",
+  "account.name_info": "Cosa significa questo?",
   "account.no_bio": "Nessuna descrizione fornita.",
   "account.node_modal.callout": "Le note personali sono visibili solo per te.",
   "account.node_modal.edit_title": "Modifica la nota personale",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 1614b547b3..f839d7da02 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -83,20 +83,21 @@
   "account.menu.add_to_list": "Aan lijst toevoegen…",
   "account.menu.block": "Account blokkeren",
   "account.menu.block_domain": "{domain} blokkeren",
-  "account.menu.copied": "Accountlink gekopieerd naar het klembord",
+  "account.menu.copied": "Accountlink naar het klembord gekopieerd",
   "account.menu.copy": "Link kopiëren",
-  "account.menu.direct": "Privé vermelden",
-  "account.menu.hide_reblogs": "Boosts verbergen in tijdlijn",
+  "account.menu.direct": "Privébericht",
+  "account.menu.hide_reblogs": "Boosts in tijdlijn verbergen",
   "account.menu.mention": "Vermelding",
   "account.menu.mute": "Account negeren",
-  "account.menu.open_original_page": "Bekijken op {domain}",
+  "account.menu.note.description": "Alleen voor jou zichtbaar",
+  "account.menu.open_original_page": "Op {domain} bekijken",
   "account.menu.remove_follower": "Volger verwijderen",
   "account.menu.report": "Account rapporteren",
   "account.menu.share": "Delen…",
   "account.menu.show_reblogs": "Boosts in tijdlijn tonen",
   "account.menu.unblock": "Account deblokkeren",
   "account.menu.unblock_domain": "{domain} deblokkeren",
-  "account.menu.unmute": "Negeren van account opheffen",
+  "account.menu.unmute": "Account niet langer negeren",
   "account.moved_to": "{name} is verhuisd naar:",
   "account.mute": "@{name} negeren",
   "account.mute_notifications_short": "Meldingen negeren",
@@ -104,6 +105,13 @@
   "account.muted": "Genegeerd",
   "account.muting": "Genegeerd",
   "account.mutual": "Jullie volgen elkaar",
+  "account.name.help.domain": "{domain} is de server waar zich het profiel en de berichten van de gebruiker bevinden.",
+  "account.name.help.domain_self": "{domain} is jouw server waar zich jouw profiel en berichten bevinden.",
+  "account.name.help.footer": "Net zoals je e-mails kunt verzenden naar mensen met verschillende e-mailproviders, kun je interactie hebben met mensen op andere Mastodon-servers – en met iedereen op andere social apps, die met behulp van het ActivityPub-protocol met Mastodon kunnen communiceren.",
+  "account.name.help.header": "Een fediverse-adres valt te vergelijken met een e-mailadres",
+  "account.name.help.username": "{username} is de gebruikersnaam van het account op hun server. Het is mogelijk dat iemand anders dezelfde gebruikersnaam op een andere server heeft.",
+  "account.name.help.username_self": "{username} is jouw gebruikersnaam op deze server. Het is mogelijk dat iemand anders dezelfde gebruikersnaam op een andere server heeft.",
+  "account.name_info": "Wat betekent dit?",
   "account.no_bio": "Geen beschrijving opgegeven.",
   "account.node_modal.callout": "Persoonlijke opmerkingen zijn alleen zichtbaar voor jou.",
   "account.node_modal.edit_title": "Persoonlijke opmerking bewerken",
@@ -241,15 +249,15 @@
   "collections.collection_topic": "Onderwerp",
   "collections.content_warning": "Inhoudswaarschuwing",
   "collections.continue": "Doorgaan",
-  "collections.create.accounts_subtitle": "Alleen accounts die je volgt die voor ontdekking gekozen hebben, kunnen worden toegevoegd.",
-  "collections.create.accounts_title": "Wie ga je laten zien in deze verzameling?",
+  "collections.create.accounts_subtitle": "Alleen accounts die je volgt en ontdekt willen worden, kunnen worden toegevoegd.",
+  "collections.create.accounts_title": "Wie wil je aan deze verzameling toevoegen?",
   "collections.create.basic_details_title": "Basisgegevens",
   "collections.create.settings_title": "Instellingen",
   "collections.create.steps": "Stap {step}/{total}",
   "collections.create_a_collection_hint": "Een verzameling aanmaken om je favoriete accounts aan te bevelen of te delen met anderen.",
   "collections.create_collection": "Verzameling aanmaken",
   "collections.delete_collection": "Verzameling verwijderen",
-  "collections.description_length_hint": "100 tekens limiet",
+  "collections.description_length_hint": "Maximaal 100 karakters",
   "collections.edit_details": "Basisgegevens bewerken",
   "collections.edit_settings": "Instellingen bewerken",
   "collections.error_loading_collections": "Er is een fout opgetreden bij het laden van je verzamelingen.",
@@ -263,10 +271,10 @@
   "collections.topic_hint": "Voeg een hashtag toe die anderen helpt het hoofdonderwerp van deze collectie te begrijpen.",
   "collections.view_collection": "Verzameling bekijken",
   "collections.visibility_public": "Openbaar",
-  "collections.visibility_public_hint": "Ontdekbaar in zoekresultaten en andere gebieden waar aanbevelingen verschijnen.",
-  "collections.visibility_title": "Zichbaarheid",
-  "collections.visibility_unlisted": "Niet weergegeven",
-  "collections.visibility_unlisted_hint": "Zichtbaar voor iedereen met een link. Verborgen voor zoekresultaten en aanbevelingen.",
+  "collections.visibility_public_hint": "Te zien onder zoekresultaten en in andere gebieden waar aanbevelingen verschijnen.",
+  "collections.visibility_title": "Zichtbaarheid",
+  "collections.visibility_unlisted": "Niet zichtbaar",
+  "collections.visibility_unlisted_hint": "Zichtbaar voor iedereen met een link. Verborgen onder zoekresultaten en aanbevelingen.",
   "column.about": "Over",
   "column.blocks": "Geblokkeerde gebruikers",
   "column.bookmarks": "Bladwijzers",
@@ -301,7 +309,7 @@
   "combobox.loading": "Laden",
   "combobox.no_results_found": "Geen resultaten voor deze zoekopdracht",
   "combobox.open_results": "Resultaten openen",
-  "combobox.results_available": "{count, plural, one {# suggesties} other {# suggesties}} beschikbaar. Gebruik de pijltjes omhoog en omlaag om te navigeren. Druk op Enter om te selecteren.",
+  "combobox.results_available": "{count, plural, one {# suggestie} other {# suggesties}} beschikbaar. Gebruik de pijltjes omhoog en omlaag om te navigeren. Druk op Enter om te selecteren.",
   "community.column_settings.local_only": "Alleen lokaal",
   "community.column_settings.media_only": "Alleen media",
   "community.column_settings.remote_only": "Alleen andere servers",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 410c6b3bc1..69e4537127 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Zaman çizelgesinde yeniden gönderimleri gizle",
   "account.menu.mention": "Bahset",
   "account.menu.mute": "Hesabı sessize al",
+  "account.menu.note.description": "Sadece sizin tarafınızdan görülebilir",
   "account.menu.open_original_page": "{domain} alan adında görüntüle",
   "account.menu.remove_follower": "Takipçiyi kaldır",
   "account.menu.report": "Hesabı bildir",
@@ -104,6 +105,13 @@
   "account.muted": "Susturuldu",
   "account.muting": "Sessize alınıyor",
   "account.mutual": "Birbirinizi takip ediyorsunuz",
+  "account.name.help.domain": "{domain} kullanıcının profilini ve gönderilerini barındıran sunucudur.",
+  "account.name.help.domain_self": "{domain} profilinizi ve gönderilerinizi barındıran sunucunuzdur.",
+  "account.name.help.footer": "Farklı e-posta istemcileri kullanan kişilere e-posta gönderebileceğiniz gibi, diğer Mastodon sunucularındaki kişilerle ve Mastodon'un kullandığı kurallarla (ActivityPub protokolü) çalışan diğer sosyal uygulamalardaki herkesle etkileşim kurabilirsiniz.",
+  "account.name.help.header": "Takma ad bir e-posta adresi gibidir",
+  "account.name.help.username": "{username} bu hesabın sunucudaki kullanıcı adıdır. Başka bir sunucudaki başka bir kişi de aynı kullanıcı adına sahip olabilir.",
+  "account.name.help.username_self": "{username} bu sunucudaki kullanıcı adınızdır. Başka bir sunucudaki başka bir kullanıcı da aynı kullanıcı adına sahip olabilir.",
+  "account.name_info": "Bu ne anlama geliyor?",
   "account.no_bio": "Herhangi bir açıklama belirtilmedi.",
   "account.node_modal.callout": "Kişisel notları sadece siz görüntüleyebilirsiniz.",
   "account.node_modal.edit_title": "Kişisel notu düzenle",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index c442e50786..5ef36b0564 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Ẩn đăng lại trên bảng tin",
   "account.menu.mention": "Nhắc đến",
   "account.menu.mute": "Phớt lờ tài khoản",
+  "account.menu.note.description": "Chỉ hiển thị với bạn",
   "account.menu.open_original_page": "Xem trên {domain}",
   "account.menu.remove_follower": "Xóa người theo dõi",
   "account.menu.report": "Báo cáo tài khoản",
@@ -104,6 +105,13 @@
   "account.muted": "Đã phớt lờ",
   "account.muting": "Đang ẩn",
   "account.mutual": "Theo dõi nhau",
+  "account.name.help.domain": "{domain} là máy chủ lưu trữ hồ sơ và tút của người dùng.",
+  "account.name.help.domain_self": "{domain} là máy chủ lưu trữ hồ sơ và tút của bạn.",
+  "account.name.help.footer": "Giống như bạn có thể gửi email cho mọi người bằng các dịch vụ email khác nhau, bạn có thể tương tác với mọi người trên các máy chủ Mastodon khác – và với bất kỳ ai trên các ứng dụng xã hội khác được cung cấp bởi cùng một bộ quy tắc mà Mastodon sử dụng (giao thức ActivityPub).",
+  "account.name.help.header": "Một địa chỉ giống như một địa chỉ email",
+  "account.name.help.username": "{username} là tên người dùng của tài khoản này trên máy chủ của họ. Trên máy chủ khác có thể có tên người dùng giống vậy.",
+  "account.name.help.username_self": "{username} là tên người dùng của bạn trên máy chủ này. Trên máy chủ khác có thể có tên người dùng giống bạn.",
+  "account.name_info": "Điều này nghĩa là gì?",
   "account.no_bio": "Chưa có miêu tả.",
   "account.node_modal.callout": "Các ghi chú chỉ hiển thị với bạn.",
   "account.node_modal.edit_title": "Sửa ghi chú",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index b25608d601..8cb54de1a2 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "於時間軸中隱藏轉嘟",
   "account.menu.mention": "提及",
   "account.menu.mute": "靜音帳號",
+  "account.menu.note.description": "僅有您可見",
   "account.menu.open_original_page": "於 {domain} 檢視",
   "account.menu.remove_follower": "移除跟隨者",
   "account.menu.report": "檢舉帳號",
@@ -104,6 +105,13 @@
   "account.muted": "已靜音",
   "account.muting": "靜音",
   "account.mutual": "跟隨彼此",
+  "account.name.help.domain": "{domain} 為託管此使用者個人檔案與嘟文之伺服器。",
+  "account.name.help.domain_self": "{domain} 為託管您個人檔案與嘟文之伺服器。",
+  "account.name.help.footer": "就像是您的以不同 email 程式寄信給他人一樣，您能與其他 Mastodon 伺服器中的人們互動，並且能和使用與 Mastodon 一樣規則 (ActivityPub 協定) 的其他社群軟體上任何人互動。",
+  "account.name.help.header": "@handle 就像是 email 地址一樣",
+  "account.name.help.username": "{username} 為該使用者於他們伺服器上的帳號名稱。其他伺服器上的某個人可能擁有一樣的使用者名稱。",
+  "account.name.help.username_self": "{username} 為您於此伺服器上的帳號名稱。其他伺服器上的某個人可能擁有一樣的使用者名稱。",
+  "account.name_info": "這是什麼？",
   "account.no_bio": "無個人檔案描述。",
   "account.node_modal.callout": "僅有您能見到您的個人備註。",
   "account.node_modal.edit_title": "編輯個人備註",
diff --git a/app/javascript/mastodon/reducers/notification_groups.ts b/app/javascript/mastodon/reducers/notification_groups.ts
index d43714beb7..ec74379602 100644
--- a/app/javascript/mastodon/reducers/notification_groups.ts
+++ b/app/javascript/mastodon/reducers/notification_groups.ts
@@ -292,7 +292,7 @@ function shouldMarkNewNotificationsAsRead(
 
 function updateLastReadId(
   state: NotificationGroupsState,
-  group: NotificationGroup | undefined = undefined,
+  group?: NotificationGroup,
 ) {
   if (shouldMarkNewNotificationsAsRead(state)) {
     group = group ?? state.groups.find(isNotificationGroup);
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js
index df0a26bf8d..ae9ea34582 100644
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@@ -20,7 +20,12 @@ import {
   TIMELINE_GAP,
   disconnectTimeline,
 } from '../actions/timelines';
-import { timelineDelete, isTimelineKeyPinned, isNonStatusId } from '../actions/timelines_typed';
+import {
+  timelineDelete,
+  timelineDeleteStatus,
+  isTimelineKeyPinned,
+  isNonStatusId,
+} from '../actions/timelines_typed';
 import { compareId } from '../compare_id';
 
 const initialState = ImmutableMap();
@@ -145,6 +150,11 @@ const deleteStatus = (state, id, references, exclude_account = null) => {
   return state;
 };
 
+const deleteStatusFromTimeline = (state, statusId, timelineKey) => {
+  const helper = list => list.filterNot((status) => status === statusId);
+  return state.updateIn([timelineKey, 'items'], helper).updateIn([timelineKey, 'pendingItems'], helper);
+}
+
 const clearTimeline = (state, timeline) => {
   return state.set(timeline, initialTimeline);
 };
@@ -200,25 +210,12 @@ export default function timelines(state = initialState, action) {
     return expandNormalizedTimeline(state, action.timeline, fromJS(action.statuses), action.next, action.partial, action.isLoadingRecent, action.usePendingItems);
   case TIMELINE_UPDATE:
     return updateTimeline(state, action.timeline, fromJS(action.status), action.usePendingItems);
-  case timelineDelete.type:
-    return deleteStatus(state, action.payload.statusId, action.payload.references, action.payload.reblogOf);
   case TIMELINE_CLEAR:
     return clearTimeline(state, action.timeline);
-  case blockAccountSuccess.type:
-  case muteAccountSuccess.type:
-    return filterTimelines(state, action.payload.relationship, action.payload.statuses);
-  case unfollowAccountSuccess.type:
-    return filterTimeline('home', state, action.payload.relationship, action.payload.statuses);
   case TIMELINE_SCROLL_TOP:
     return updateTop(state, action.timeline, action.top);
   case TIMELINE_CONNECT:
     return state.update(action.timeline, initialTimeline, map => reconnectTimeline(map, action.usePendingItems));
-  case disconnectTimeline.type:
-    return state.update(
-      action.payload.timeline,
-      initialTimeline,
-      map => map.set('online', false).update(action.payload.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(TIMELINE_GAP) : items),
-    );
   case TIMELINE_MARK_AS_PARTIAL:
     return state.update(
       action.timeline,
@@ -238,6 +235,29 @@ export default function timelines(state = initialState, action) {
       })
     );
   default:
+    if (timelineDelete.match(action)) {
+      return deleteStatus(state, action.payload.statusId, action.payload.references, action.payload.reblogOf);
+    } else if (timelineDeleteStatus.match(action)) {
+      return deleteStatusFromTimeline(state, action.payload.statusId, action.payload.timelineKey);
+    } else if (blockAccountSuccess.match(action) || muteAccountSuccess.match(action)) {
+      return filterTimelines(state, action.payload.relationship, action.payload.statuses);
+    } else if (unfollowAccountSuccess.match(action)) {
+      return filterTimeline('home', state, action.payload.relationship, action.payload.statuses);
+    } else if (disconnectTimeline.match(action)) {
+      return state.update(
+        action.payload.timeline,
+        initialTimeline,
+        (map) => map.set('online', false).update(
+          action.payload.usePendingItems
+            ? 'pendingItems'
+            : 'items',
+          items => items.first()
+            ? items.unshift(TIMELINE_GAP)
+            : items
+        ),
+      );
+    }
+
     return state;
   }
 }
diff --git a/app/javascript/mastodon/selectors/timelines.ts b/app/javascript/mastodon/selectors/timelines.ts
index 5db50ea894..af1a4ebb21 100644
--- a/app/javascript/mastodon/selectors/timelines.ts
+++ b/app/javascript/mastodon/selectors/timelines.ts
@@ -47,5 +47,5 @@ export function toTypedTimeline(timeline?: ImmutableMap<string, unknown>) {
       emptyList,
     ) as ImmutableList<string>,
     items: timeline.get('items', emptyList) as ImmutableList<string>,
-  } as TimelineShape;
+  } satisfies TimelineShape;
 }
diff --git a/app/javascript/mastodon/selectors/user_lists.ts b/app/javascript/mastodon/selectors/user_lists.ts
new file mode 100644
index 0000000000..9d681aa255
--- /dev/null
+++ b/app/javascript/mastodon/selectors/user_lists.ts
@@ -0,0 +1,35 @@
+import type { Map as ImmutableMap } from 'immutable';
+import { List as ImmutableList } from 'immutable';
+
+import { createAppSelector } from '../store';
+
+export const selectUserListWithoutMe = createAppSelector(
+  [
+    (state) => state.user_lists,
+    (state) => (state.meta.get('me') as string | null) ?? null,
+    (_state, listName: string) => listName,
+    (_state, _listName, accountId?: string | null) => accountId ?? null,
+  ],
+  (lists, currentAccountId, listName, accountId) => {
+    if (!accountId || !listName) {
+      return null;
+    }
+    const list = lists.getIn([listName, accountId]) as
+      | ImmutableMap<string, unknown>
+      | undefined;
+    if (!list) {
+      return null;
+    }
+
+    // Returns the list except the current account.
+    return {
+      items: (
+        list.get('items', ImmutableList<string>()) as ImmutableList<string>
+      )
+        .filter((id) => id !== currentAccountId)
+        .toArray(),
+      isLoading: !!list.get('isLoading', true),
+      hasMore: !!list.get('hasMore', false),
+    };
+  },
+);
diff --git a/app/models/user.rb b/app/models/user.rb
index 1db8b40697..e938e2cb55 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -226,7 +226,11 @@ class User < ApplicationRecord
   end
 
   def functional_or_moved?
-    confirmed? && approved? && !disabled? && !account.unavailable? && !account.memorial?
+    confirmed? && approved? && !disabled? && !account.unavailable? && !account.memorial? && !missing_2fa?
+  end
+
+  def missing_2fa?
+    !two_factor_enabled? && role.require_2fa?
   end
 
   def unconfirmed_or_pending?
diff --git a/app/models/user_role.rb b/app/models/user_role.rb
index 31c8ff20a6..afeed324cc 100644
--- a/app/models/user_role.rb
+++ b/app/models/user_role.rb
@@ -5,11 +5,12 @@
 # Table name: user_roles
 #
 #  id          :bigint(8)        not null, primary key
-#  name        :string           default(""), not null
 #  color       :string           default(""), not null
-#  position    :integer          default(0), not null
-#  permissions :bigint(8)        default(0), not null
 #  highlighted :boolean          default(FALSE), not null
+#  name        :string           default(""), not null
+#  permissions :bigint(8)        default(0), not null
+#  position    :integer          default(0), not null
+#  require_2fa :boolean          default(FALSE), not null
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
 #
@@ -160,7 +161,7 @@ class UserRole < ApplicationRecord
     @computed_permissions ||= begin
       permissions = self.class.everyone.permissions | self.permissions
 
-      if permissions & FLAGS[:administrator] == FLAGS[:administrator]
+      if administrator?
         Flags::ALL
       else
         permissions
@@ -172,6 +173,10 @@ class UserRole < ApplicationRecord
     name
   end
 
+  def administrator?
+    permissions & FLAGS[:administrator] == FLAGS[:administrator]
+  end
+
   private
 
   def in_permissions?(privilege)
@@ -189,6 +194,7 @@ class UserRole < ApplicationRecord
 
     errors.add(:permissions_as_keys, :own_role) if permissions_changed?
     errors.add(:position, :own_role) if position_changed?
+    errors.add(:require_2fa, :own_role) if require_2fa_changed? && !administrator?
   end
 
   def validate_permissions_elevation
diff --git a/app/serializers/activitypub/add_featured_item_serializer.rb b/app/serializers/activitypub/add_featured_item_serializer.rb
new file mode 100644
index 0000000000..2962d782ed
--- /dev/null
+++ b/app/serializers/activitypub/add_featured_item_serializer.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class ActivityPub::AddFeaturedItemSerializer < ActivityPub::Serializer
+  include RoutingHelper
+
+  attributes :type, :actor, :target
+  has_one :object, serializer: ActivityPub::FeaturedItemSerializer
+
+  def type
+    'Add'
+  end
+
+  def actor
+    ActivityPub::TagManager.instance.uri_for(collection.account)
+  end
+
+  def target
+    ActivityPub::TagManager.instance.uri_for(collection)
+  end
+
+  private
+
+  def collection
+    @collection ||= object.collection
+  end
+end
diff --git a/app/serializers/activitypub/featured_collection_serializer.rb b/app/serializers/activitypub/featured_collection_serializer.rb
index af4c554851..d6242b9d5b 100644
--- a/app/serializers/activitypub/featured_collection_serializer.rb
+++ b/app/serializers/activitypub/featured_collection_serializer.rb
@@ -1,22 +1,6 @@
 # frozen_string_literal: true
 
 class ActivityPub::FeaturedCollectionSerializer < ActivityPub::Serializer
-  class FeaturedItemSerializer < ActivityPub::Serializer
-    attributes :type, :featured_object, :featured_object_type
-
-    def type
-      'FeaturedItem'
-    end
-
-    def featured_object
-      ActivityPub::TagManager.instance.uri_for(object.account)
-    end
-
-    def featured_object_type
-      object.account.actor_type || 'Person'
-    end
-  end
-
   attributes :id, :type, :total_items, :name, :attributed_to,
              :sensitive, :discoverable, :published, :updated
 
@@ -25,7 +9,7 @@ class ActivityPub::FeaturedCollectionSerializer < ActivityPub::Serializer
 
   has_one :tag, key: :topic, serializer: ActivityPub::NoteSerializer::TagSerializer
 
-  has_many :collection_items, key: :ordered_items, serializer: FeaturedItemSerializer
+  has_many :collection_items, key: :ordered_items, serializer: ActivityPub::FeaturedItemSerializer
 
   def id
     ActivityPub::TagManager.instance.uri_for(object)
diff --git a/app/serializers/activitypub/featured_item_serializer.rb b/app/serializers/activitypub/featured_item_serializer.rb
new file mode 100644
index 0000000000..87db67d95b
--- /dev/null
+++ b/app/serializers/activitypub/featured_item_serializer.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class ActivityPub::FeaturedItemSerializer < ActivityPub::Serializer
+  attributes :type, :featured_object, :featured_object_type
+
+  def type
+    'FeaturedItem'
+  end
+
+  def featured_object
+    ActivityPub::TagManager.instance.uri_for(object.account)
+  end
+
+  def featured_object_type
+    object.account.actor_type || 'Person'
+  end
+end
diff --git a/app/services/activitypub/fetch_remote_key_service.rb b/app/services/activitypub/fetch_remote_key_service.rb
index e96b5ad3bb..b6d9cfa733 100644
--- a/app/services/activitypub/fetch_remote_key_service.rb
+++ b/app/services/activitypub/fetch_remote_key_service.rb
@@ -12,7 +12,7 @@ class ActivityPub::FetchRemoteKeyService < BaseService
     @json = fetch_resource(uri, false)
 
     raise Error, "Unable to fetch key JSON at #{uri}" if @json.nil?
-    raise Error, "Unsupported JSON-LD context for document #{uri}" unless supported_context?(@json)
+    raise Error, "Unsupported JSON-LD context for document #{uri}" unless supported_context?(@json) || (supported_security_context?(@json) && @json['owner'].present? && !actor_type?)
     raise Error, "Unexpected object type for key #{uri}" unless expected_type?
     return find_actor(@json['id'], @json, suppress_errors) if actor_type?
 
diff --git a/app/services/add_account_to_collection_service.rb b/app/services/add_account_to_collection_service.rb
index 4477384dd0..2109baf67e 100644
--- a/app/services/add_account_to_collection_service.rb
+++ b/app/services/add_account_to_collection_service.rb
@@ -9,7 +9,11 @@ class AddAccountToCollectionService
 
     raise Mastodon::NotPermittedError, I18n.t('accounts.errors.cannot_be_added_to_collections') unless AccountPolicy.new(@collection.account, @account).feature?
 
-    create_collection_item
+    @collection_item = create_collection_item
+
+    distribute_add_activity if @account.local? && Mastodon::Feature.collections_federation_enabled?
+
+    @collection_item
   end
 
   private
@@ -20,4 +24,12 @@ class AddAccountToCollectionService
       state: :accepted
     )
   end
+
+  def distribute_add_activity
+    ActivityPub::AccountRawDistributionWorker.perform_async(activity_json, @collection.account_id)
+  end
+
+  def activity_json
+    ActiveModelSerializers::SerializableResource.new(@collection_item, serializer: ActivityPub::AddFeaturedItemSerializer, adapter: ActivityPub::Adapter).to_json
+  end
 end
diff --git a/app/views/admin/roles/_form.html.haml b/app/views/admin/roles/_form.html.haml
index 0b1c310162..f76a594534 100644
--- a/app/views/admin/roles/_form.html.haml
+++ b/app/views/admin/roles/_form.html.haml
@@ -25,6 +25,11 @@
     = form.input :highlighted,
                  wrapper: :with_label
 
+  - if current_user.role.administrator? || current_user.role != form.object
+    .fields-group
+      = form.input :require_2fa,
+                   wrapper: :with_label
+
   %hr.spacer/
 
 - unless current_user.role == form.object
diff --git a/app/views/admin/roles/_role.html.haml b/app/views/admin/roles/_role.html.haml
index df813bbaf4..0b1d541035 100644
--- a/app/views/admin/roles/_role.html.haml
+++ b/app/views/admin/roles/_role.html.haml
@@ -21,9 +21,13 @@
     .announcements-list__item__meta
       - if role.everyone?
         = t('admin.roles.everyone_full_description_html')
+        = t('admin.roles.requires_2fa') if role.require_2fa?
       - else
         = link_to t('admin.roles.assigned_users', count: role.users.count), admin_accounts_path(role_ids: role.id)
         ·
         %abbr{ title: role.permissions_as_keys.map { |privilege| I18n.t("admin.roles.privileges.#{privilege}") }.join(', ') }= t('admin.roles.permissions_count', count: role.permissions_as_keys.size)
+        - if role.require_2fa?
+          ·
+          = t('admin.roles.requires_2fa')
     .announcements-list__item__actions
       = table_link_to 'edit', t('admin.accounts.edit'), edit_admin_role_path(role) if can?(:update, role)
diff --git a/app/views/settings/two_factor_authentication/confirmations/new.html.haml b/app/views/settings/two_factor_authentication/confirmations/new.html.haml
index a35479b84e..2ce422e997 100644
--- a/app/views/settings/two_factor_authentication/confirmations/new.html.haml
+++ b/app/views/settings/two_factor_authentication/confirmations/new.html.haml
@@ -12,6 +12,8 @@
       %samp.qr-alternative__code= @new_otp_secret.scan(/.{4}/).join(' ')
 
   .fields-group
+    = hidden_field_tag :oauth, params[:oauth]
+
     = f.input :otp_attempt,
               hint: t('otp_authentication.code_hint'),
               input_html: { autocomplete: 'off' },
diff --git a/app/views/settings/two_factor_authentication/otp_authentication/show.html.haml b/app/views/settings/two_factor_authentication/otp_authentication/show.html.haml
index 0ba4ad6893..ef87f998db 100644
--- a/app/views/settings/two_factor_authentication/otp_authentication/show.html.haml
+++ b/app/views/settings/two_factor_authentication/otp_authentication/show.html.haml
@@ -1,9 +1,12 @@
 - content_for :page_title do
   = t('settings.two_factor_authentication')
 
+- if current_user.role.require_2fa?
+  .flash-message= t('two_factor_authentication.role_requirement', domain: site_hostname)
+
 .simple_form
   %p.hint= t('otp_authentication.description_html')
 
   %hr.spacer/
 
-  = link_to t('otp_authentication.setup'), settings_otp_authentication_path, data: { method: :post }, class: 'button button--block'
+  = link_to t('otp_authentication.setup'), settings_otp_authentication_path(params.permit(:oauth)), data: { method: :post }, class: 'button button--block'
diff --git a/app/views/settings/two_factor_authentication/recovery_codes/index.html.haml b/app/views/settings/two_factor_authentication/recovery_codes/index.html.haml
index d47ee840e1..c56c71c0e8 100644
--- a/app/views/settings/two_factor_authentication/recovery_codes/index.html.haml
+++ b/app/views/settings/two_factor_authentication/recovery_codes/index.html.haml
@@ -7,3 +7,9 @@
   - @recovery_codes.each do |code|
     %li<
       %samp= code
+
+- if params[:oauth]
+  %hr.spacer/
+
+  .simple_form
+    = link_to t('two_factor_authentication.resume_app_authorization'), return_to_app_url, class: 'button button--block'
diff --git a/app/views/settings/two_factor_authentication_methods/index.html.haml b/app/views/settings/two_factor_authentication_methods/index.html.haml
index 8088b4423a..4863a279c0 100644
--- a/app/views/settings/two_factor_authentication_methods/index.html.haml
+++ b/app/views/settings/two_factor_authentication_methods/index.html.haml
@@ -2,7 +2,10 @@
   = t('settings.two_factor_authentication')
 
 - content_for :heading_actions do
-  = link_to t('two_factor_authentication.disable'), disable_settings_two_factor_authentication_methods_path, class: 'button button--destructive', method: :post
+  = link_to t('two_factor_authentication.disable'), disable_settings_two_factor_authentication_methods_path, class: 'button button--destructive', method: :post unless current_user.role.require_2fa?
+
+- if current_user.role.require_2fa?
+  .flash-message= t('two_factor_authentication.role_requirement', domain: site_hostname)
 
 %p.hint
   %span.positive-hint
diff --git a/config/locales/an.yml b/config/locales/an.yml
index 72b2de5d20..a09175b777 100644
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@@ -1444,10 +1444,6 @@ an:
       too_late: Ye masiau tarde pa apelar esta amonestación
   tags:
     does_not_match_previous_name: no coincide con o nombre anterior
-  themes:
-    contrast: Mastodon (Alto contraste)
-    default: Mastodon (Fosco)
-    mastodon-light: Mastodon (claro)
   time:
     formats:
       default: "%d de %b de %Y, %H:%M"
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index d988ce54b9..6e5f4e8fce 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -898,6 +898,10 @@ ar:
         all: للجميع
         disabled: لا أحد
         users: للمستخدمين المتصلين محليا
+      landing_page:
+        values:
+          about: عن
+          trends: المتداوَلة
       registrations:
         moderation_recommandation: الرجاء التأكد من أن لديك فريق إشراف كافي وفعال قبل فتح التسجيلات للجميع!
         preamble: تحكّم في مَن الذي يمكنه إنشاء حساب على خادمك الخاص.
@@ -951,6 +955,7 @@ ar:
       no_status_selected: لم يطرأ أي تغيير على أي منشور بما أنه لم يتم اختيار أي واحد
       open: افتح المنشور
       original_status: المنشور الأصلي
+      quotes: الاقتباسات
       reblogs: المعاد تدوينها
       replied_to_html: تم الرد على %{acct_link}
       status_changed: عُدّل المنشور
@@ -958,6 +963,7 @@ ar:
       title: منشورات الحساب - @%{name}
       trending: المتداولة
       view_publicly: رؤية الجزء العلني
+      view_quoted_post: عرض المنشور المقتبس
       visibility: مدى الظهور
       with_media: تحتوي على وسائط
     strikes:
@@ -1251,6 +1257,7 @@ ar:
     hint_html: إذا كنت ترغب في الانتقال من حساب آخر إلى هذا الحساب الحالي، يمكنك إنشاء اسم مستعار هنا، والذي هو مطلوب قبل أن تتمكن من المضي قدما في نقل متابِعيك من الحساب القديم إلى هذا الحساب. هذا الإجراء بحد ذاته هو <strong>غير مؤذي و قابل للعكس</strong>. <strong>تتم بداية تهجير الحساب من الحساب القديم</strong>.
     remove: إلغاء ربط الكنية
   appearance:
+    advanced_settings: الإعدادات المتقدمة
     animations_and_accessibility: الإتاحة والحركة
     discovery: الاستكشاف
     localization:
@@ -1368,6 +1375,12 @@ ar:
     hint_html: "<strong>توصية:</strong> لن نطلب منك ثانية كلمتك السرية في غضون الساعة اللاحقة."
     invalid_password: الكلمة السرية خاطئة
     prompt: أكِّد الكلمة السرية للمواصلة
+  color_scheme:
+    auto: تلقائي
+    dark: داكن
+    light: فاتح
+  contrast:
+    auto: تلقائي
   crypto:
     errors:
       invalid_key: ليس بمفتاح Ed25519 أو Curve25519 صالح
@@ -1733,6 +1746,9 @@ ar:
       expires_at: تنتهي مدة صلاحيتها في
       uses: عدد الاستخدامات
     title: دعوة أشخاص
+  link_preview:
+    potentially_sensitive_content:
+      hide_button: إخفاء
   lists:
     errors:
       limit: لقد بلغت الحد الأقصى للقوائم
@@ -2052,6 +2068,9 @@ ar:
         zero: "%{count} فيديوهات"
     boosted_from_html: تم إعادة ترقيته مِن %{acct_link}
     content_warning: 'تحذير عن المحتوى: %{warning}'
+    content_warnings:
+      hide: إخفاء المنشور
+      show: إظهار المزيد
     default_language: نفس لغة الواجهة
     disallowed_hashtags:
       few: 'يحتوي على وسوم غير مسموح بها: %{tags}'
@@ -2128,11 +2147,6 @@ ar:
     past_preamble_html: لقد غيرنا شروط خدمتنا منذ زيارتكم الأخيرة. نشجعكم على مراجعة الشروط المحدثة.
     review_link: مراجعة شروط الخدمة
     title: شروط خدمة النطاق %{domain} ستتغير
-  themes:
-    contrast: ماستدون (تباين عالٍ)
-    default: ماستدون (داكن)
-    mastodon-light: ماستدون (فاتح)
-    system: تلقائي (استخدم سمة النظام)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
@@ -2304,6 +2318,7 @@ ar:
       error: حدثت مشكلة ما خلال حذف مفتاح أمانك. الرجاء المحاولة مرة أخرى.
       success: تم حذف مفتاح الأمان الخاص بك.
     invalid_credential: مفتاح الأمان غير صالح
+    nickname: الكنية
     nickname_hint: أدخل اسم مستعار لمفتاح الأمان الجديد الخاص بك
     not_enabled: لم تقم بتفعيل WebAuthn بعد
     not_supported: هذا المتصفح لا يدعم مفاتيح الأمان
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 9bb87ce8e1..836ecd161b 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -834,10 +834,6 @@ ast:
     sensitive_content: Conteníu sensible
   tags:
     does_not_match_previous_name: nun concasa col nome anterior
-  themes:
-    contrast: Mastodon (contraste altu)
-    default: Mastodon (escuridá)
-    mastodon-light: Mastodon (claridá)
   two_factor_authentication:
     enabled: L'autenticación en dos pasos ta activada
     enabled_success: L'autenticación en dos pasos activóse correutamente
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 7bad3e0432..bc7d0a9e0f 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1834,7 +1834,7 @@ be:
           trillion: трлн
   otp_authentication:
     code_hint: Каб пацвердзіць, увядзіце код, згенераваны праграмай-аўтэнтыфікатарам
-    description_html: Калі вы ўключыце <strong>двухфактарную аўтэнтыфікацыю</strong> праз праграму-аўтэнтыфікатар, то каб увайсці ва ўліковы запіс, вам трэба мець тэлефон, які будзе генераваць токены для ўводу.
+    description_html: Калі вы ўключыце <strong>двухфактарную аўтэнтыфікацыю</strong> праз праграму-аўтэнтыфікатар, то для ўваходу ва ўліковы запіс вам трэба будзе мець тэлефон, які будзе генераваць токены для ўводу.
     enable: Уключыць
     instructions_html: "<strong>Скануйце гэты QR-код у Google Authenticator або ў аналагічнай TOTP-праграме на вашым тэлефоне</strong>. З гэтага моманту праграма будзе генераваць токены, якія вам трэба будзе ўводзіць пры ўваходзе ва ўліковы запіс."
     manual_instructions: 'Калі вы не можаце сканаваць QR-код і трэба ўвесці яго ўручную, вось ключ у форме тэксту:'
@@ -2109,10 +2109,7 @@ be:
     review_link: Прачытаць умовы карыстання
     title: На %{domain} змяняюцца ўмовы карыстання
   themes:
-    contrast: Mastodon (высокі кантраст)
-    default: Mastodon (цёмная)
-    mastodon-light: Mastodon (светлая)
-    system: Аўтаматычна (выкарыстоўваць сістэмную тэму)
+    default: Mastodon
   time:
     formats:
       default: "%d.%m.%Y %H:%M"
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 2f56d9025e..98179b316c 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1975,11 +1975,6 @@ bg:
     past_preamble_html: Променихме условията на услугата ни от последното ви посещение. Насърчаваме ви да разгледате обновените условия.
     review_link: Разглеждане на условията на услугата
     title: Условията на услугата на %{domain} се променят
-  themes:
-    contrast: Mastodon (висок контраст)
-    default: Mastodon (тъмно)
-    mastodon-light: Mastodon (светло)
-    system: Самодейно (употреба на системната тема)
   time:
     formats:
       default: "%d %b, %Y, %H:%M"
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 56a8500d00..c1b2906548 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -867,11 +867,6 @@ br:
       '7889238': 3 mizvezh
   terms_of_service:
     title: Divizoù implijout
-  themes:
-    contrast: Mastodon (Dargemm kreñv)
-    default: Mastodon (Teñval)
-    mastodon-light: Mastodon (Sklaer)
-    system: Emgefreek (implijout neuz ar reizhiad)
   time:
     formats:
       default: "%d a viz %b %Y, %H:%M"
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 3f462b691d..b271a7c4ae 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1995,11 +1995,6 @@ ca:
     past_preamble_html: Hem fet canvis a les condicions de servei des de la vostra darrera visita. Us recomanem que hi doneu un cop d'ull.
     review_link: Revisió de les condicions de servei
     title: Les condicions de servei de %{domain} han canviat
-  themes:
-    contrast: Mastodon (alt contrast)
-    default: Mastodon (fosc)
-    mastodon-light: Mastodon (clar)
-    system: Automàtic (utilitza el tema del sistema)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
index 2a4051ba6f..f2798a64c8 100644
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@@ -939,10 +939,6 @@ ckb:
     sensitive_content: ناوەڕۆکی هەستیار
   tags:
     does_not_match_previous_name: لەگەڵ ناوی پێشوو یەک ناگرێتەوە
-  themes:
-    contrast: ماستۆدۆن (کۆنتراستی بەرز)
-    default: ماستۆدۆن (ڕەش)
-    mastodon-light: ماستۆدۆن (کاڵ)
   two_factor_authentication:
     add: زیادکردن
     disable: لەکارخستنی 2FA
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 80be761bca..553aa92fb1 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -950,10 +950,6 @@ co:
     sensitive_content: Cuntenutu sensibile
   tags:
     does_not_match_previous_name: ùn currisponde micca à l'anzianu nome
-  themes:
-    contrast: Mastodon (Cuntrastu altu)
-    default: Mastodon (Scuru)
-    mastodon-light: Mastodon (Chjaru)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 5a0c7c169d..8cf28f6c60 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -2103,11 +2103,6 @@ cs:
     past_preamble_html: Od vaší poslední návštěvy jsme změnili podmínky služby. Doporučujeme vám zkontrolovat aktualizované podmínky.
     review_link: Zkontrolovat podmínky užívání služby
     title: Podmínky služby %{domain} se mění
-  themes:
-    contrast: Mastodon (vysoký kontrast)
-    default: Mastodon (tmavý)
-    mastodon-light: Mastodon (světlý)
-    system: Automaticky (dle motivu systému)
   time:
     formats:
       default: "%d. %b %Y, %H:%M"
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 897e410e41..3bbc3f8ea2 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -2189,11 +2189,6 @@ cy:
     past_preamble_html: Rydym wedi newid ein telerau gwasanaeth ers eich ymweliad diwethaf. Rydym yn eich annog i ddarllen y telerau wedi'u diweddaru.
     review_link: Darllen y telerau gwasanaeth
     title: Mae telerau gwasanaeth %{domain} yn newid
-  themes:
-    contrast: Mastodon (Cyferbyniad uchel)
-    default: Mastodon (Tywyll)
-    mastodon-light: Mastodon (Golau)
-    system: Awtomatig (defnyddio thema system)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 2c686c1f95..f9c80b4a63 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -2021,10 +2021,7 @@ da:
     review_link: Gennemgå Tjenestevilkår
     title: Tjenestevilkårene for %{domain} ændres
   themes:
-    contrast: Mastodon (høj kontrast)
-    default: Mastodon (mørkt)
-    mastodon-light: Mastodon (lyst)
-    system: Automatisk (benyt systemtema)
+    default: Mastodon
   time:
     formats:
       default: "%d. %b %Y, %H:%M"
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 9a46e99cc7..d472687b63 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2021,10 +2021,7 @@ de:
     review_link: Nutzungsbedingungen lesen
     title: Die Nutzungsbedingungen von %{domain} ändern sich
   themes:
-    contrast: Mastodon (Hoher Kontrast)
-    default: Mastodon (Dunkel)
-    mastodon-light: Mastodon (Hell)
-    system: Automatisch (wie Betriebssystem)
+    default: Mastodon
   time:
     formats:
       default: "%d. %b %Y, %H:%M Uhr"
diff --git a/config/locales/el.yml b/config/locales/el.yml
index e436005caf..dd57f0532e 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -2021,10 +2021,7 @@ el:
     review_link: Επισκόπηση όρων υπηρεσίας
     title: Οι όροι παροχής υπηρεσιών του %{domain} αλλάζουν
   themes:
-    contrast: Mastodon (Υψηλή αντίθεση)
-    default: Mastodon (Σκοτεινό)
-    mastodon-light: Mastodon (Ανοιχτόχρωμο)
-    system: Αυτόματο (θέμα συστήματος)
+    default: Mastodon
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 141ed8779b..dbef4a6a8e 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -2021,10 +2021,7 @@ en-GB:
     review_link: Review terms of service
     title: The terms of service of %{domain} are changing
   themes:
-    contrast: Mastodon (High contrast)
-    default: Mastodon (Dark)
-    mastodon-light: Mastodon (Light)
-    system: Automatic (use system theme)
+    default: Mastodon
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8d8657d1d2..2c777e72d3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -802,6 +802,7 @@ en:
         view_devops_description: Allows users to access Sidekiq and pgHero dashboards
         view_feeds: View live and topic feeds
         view_feeds_description: Allows users to access the live and topic feeds regardless of server settings
+      requires_2fa: Requires two-factor authentication
       title: Roles
     rules:
       add_new: Add rule
@@ -2047,6 +2048,8 @@ en:
     recovery_codes: Backup recovery codes
     recovery_codes_regenerated: Recovery codes successfully regenerated
     recovery_instructions_html: If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account. <strong>Keep the recovery codes safe</strong>. For example, you may print them and store them with other important documents.
+    resume_app_authorization: Resume application authorization
+    role_requirement: "%{domain} requires you to set up Two-Factor Authentication before you can use Mastodon."
     webauthn: Security keys
   user_mailer:
     announcement_published:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index fb54537b7c..46b7dfe330 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1957,11 +1957,6 @@ eo:
   terms_of_service_interstitial:
     past_preamble_html: Ni ŝanĝis niajn servkondiĉojn ekde via lasta vizito. Ni instigas vin revizii la ĝisdatigitajn kondiĉojn.
     title: La servkondiĉoj de %{domain} ŝanĝiĝas
-  themes:
-    contrast: Mastodon (Forta kontrasto)
-    default: Mastodon (Malhela)
-    mastodon-light: Mastodon (Hela)
-    system: Aŭtomata (uzu sisteman temon)
   time:
     formats:
       default: "%Y.%b.%d, %H:%M"
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index c258394629..584efc5d1e 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -2021,10 +2021,7 @@ es-AR:
     review_link: Revisar los términos del servicio
     title: Los términos del servicio de %{domain} están cambiando
   themes:
-    contrast: Alto contraste
-    default: Oscuro
-    mastodon-light: Claro
-    system: Automático (usar tema del sistema)
+    default: Mastodon
   time:
     formats:
       default: "%Y.%b.%d, %H:%M"
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index bc52d92add..8a0bc1cf14 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -2021,10 +2021,7 @@ es-MX:
     review_link: Revisar los términos de servicio
     title: Los términos de servicio de %{domain} van a cambiar
   themes:
-    contrast: Alto contraste
     default: Mastodon
-    mastodon-light: Mastodon (claro)
-    system: Automático (usar tema del sistema)
   time:
     formats:
       default: "%d de %b del %Y, %H:%M"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index f845ac45ac..712a7b64d8 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2021,10 +2021,7 @@ es:
     review_link: Revisar los términos de servicio
     title: Los términos de servicio de %{domain} van a cambiar
   themes:
-    contrast: Mastodon (alto contraste)
-    default: Mastodon (oscuro)
-    mastodon-light: Mastodon (claro)
-    system: Automático (usar tema del sistema)
+    default: Mastodon
   time:
     formats:
       default: "%d de %b del %Y, %H:%M"
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 3247895475..6d6ac75d7c 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -2022,11 +2022,6 @@ et:
     past_preamble_html: Peale sinu viimast külastust oleme muutnud oma kasutustingimusi. Palun vaata muutunud tingimused üle.
     review_link: Vaata üle kasutustingimused
     title: "%{domain} saidi kasutustingimused muutuvad"
-  themes:
-    contrast: Mastodon (Kõrge kontrast)
-    default: Mastodon (Tume)
-    mastodon-light: Mastodon (Hele)
-    system: Automaatne (kasuta süsteemi teemat)
   time:
     formats:
       default: "%d. %B, %Y. aastal, kell %H:%M"
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index b0fc5241ed..05c3845b61 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1921,11 +1921,6 @@ eu:
     future_preamble_html: Gure zerbitzu-baldintzetan aldaketa batzuk egiten ari gara, eta <strong>%{date}</strong>-tik aurrera jarriko dira indarrean. Eguneratutako baldintzak berrikustea gomendatzen dizugu.
     past_preamble_html: Zerbitzu-baldintzak aldatu ditugu zure azken bisitatik. Baldintza eguneratuak berrikustera animatzen zaitugu.
     review_link: Berrikusi zerbitzu-baldintzak
-  themes:
-    contrast: Mastodon (Kontraste altua)
-    default: Mastodon (Iluna)
-    mastodon-light: Mastodon (Argia)
-    system: Automatikoa (erabili sistemaren gaia)
   time:
     formats:
       default: "%Y(e)ko %b %d, %H:%M"
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 5bb36b1c33..b7f2f8a5d2 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -2016,11 +2016,6 @@ fa:
     past_preamble_html: شرایط خدماتمان را تغییر داده‌ایم. تشویقتان می‌کنیم که شرایط به‌روز شده را بازبینی کنید.
     review_link: بازبینی شرایط استفاده
     title: شرایط خدمات %{domain} در حال تغییر است
-  themes:
-    contrast: ماستودون (سایه‌روشن بالا)
-    default: ماستودون (تیره)
-    mastodon-light: ماستودون (روشن)
-    system: خودکار (استفاده از زمینهٔ سامانه)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 6af6739f95..38579f8116 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -2021,10 +2021,7 @@ fi:
     review_link: Käy käyttöehdot läpi
     title: Palvelimen %{domain} käyttöehdot muuttuvat
   themes:
-    contrast: Mastodon (suuri kontrasti)
-    default: Mastodon (tumma)
-    mastodon-light: Mastodon (vaalea)
-    system: Automaattinen (käytä järjestelmän teemaa)
+    default: Mastodon
   time:
     formats:
       default: "%-d.%-m.%Y klo %-H.%M"
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index aea4d294e7..3617e6b0d3 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -2018,10 +2018,7 @@ fo:
     review_link: Eftirkanna tænastutreytir
     title: Tænastutreytirnar á %{domain} verða broyttar
   themes:
-    contrast: Mastodon (høgur kontrastur)
-    default: Mastodon (myrkt)
-    mastodon-light: Mastodon (ljóst)
-    system: Sjálvvirkandi (brúka vanligt uppsetingareyðkenni)
+    default: Mastodon
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 473d89cfe3..86c6bd3f5b 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -2024,10 +2024,7 @@ fr-CA:
     review_link: Vérifier les conditions d'utilisation
     title: Les conditions d'utilisation de %{domain} ont changées
   themes:
-    contrast: Mastodon (Contraste élevé)
-    default: Mastodon (Sombre)
-    mastodon-light: Mastodon (Clair)
-    system: Automatique (utiliser le thème système)
+    default: Mastodon
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 391de6bafd..bbdaf60ac2 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -2024,10 +2024,7 @@ fr:
     review_link: Vérifier les conditions d'utilisation
     title: Les conditions d'utilisation de %{domain} ont changées
   themes:
-    contrast: Mastodon (Contraste élevé)
-    default: Mastodon (Sombre)
-    mastodon-light: Mastodon (Clair)
-    system: Automatique (utiliser le thème système)
+    default: Mastodon
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index e5133203a5..91fae58527 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1948,11 +1948,6 @@ fy:
     past_preamble_html: Wy hawwe ús gebrûksbetingsten wizige sûnt jo lêste besite. Wy rekommandearje jo oan om de bywurke betingsten troch te nimmen.
     review_link: Gebrûksbetingsten besjen
     title: De gebrûksbetingsten fan %{domain} wizigje
-  themes:
-    contrast: Mastodon (heech kontrast)
-    default: Mastodon (donker)
-    mastodon-light: Mastodon (ljocht)
-    system: Automatysk (systeemtema brûke)
   time:
     formats:
       default: "%d %B %Y om %H:%M"
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 15adc1861a..6adfd4aeeb 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -2155,10 +2155,7 @@ ga:
     review_link: Athbhreithnigh téarmaí seirbhíse
     title: Tá téarmaí seirbhíse %{domain} ag athrú
   themes:
-    contrast: Mastodon (Codarsnacht ard)
-    default: Mastodon (Dorcha)
-    mastodon-light: Mastodon (Solas)
-    system: Uathoibríoch (úsáid téama córais)
+    default: Mastodon
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 4a72db0624..422dc5197c 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -2103,11 +2103,6 @@ gd:
     past_preamble_html: Dh’atharraich sinn teirmichean na seirbheise againn on turas mu dheireadh a thadhail thu oirnn. Mholamaid gun dèan thu lèirmheas air na teirmichean ùra.
     review_link: Dèan lèirmheas air teirmichean na seirbheise
     title: Tha teirmichean na seirbheise aig %{domain} gu bhith atharrachadh
-  themes:
-    contrast: Mastodon (iomsgaradh àrd)
-    default: Mastodon (dorcha)
-    mastodon-light: Mastodon (soilleir)
-    system: Fèin-obrachail (cleachd ùrlar an t-siostaim)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index d06f62c266..ec4401d232 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -2021,10 +2021,7 @@ gl:
     review_link: Revisar as condicións do sevizo
     title: Cambios nas condicións do servizo de %{domain}
   themes:
-    contrast: Mastodon (Alto contraste)
-    default: Mastodon (Escuro)
-    mastodon-light: Mastodon (Claro)
-    system: Automático (seguir ao sistema)
+    default: Mastodon
   time:
     formats:
       default: "%d %b, %Y, %H:%M"
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 10dec56bcf..74b6dd8fb2 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -2109,10 +2109,7 @@ he:
     review_link: קריאת תנאי השירות
     title: תנאי השירות של %{domain} משתנים
   themes:
-    contrast: מסטודון (ניגודיות גבוהה)
-    default: מסטודון (כהה)
-    mastodon-light: מסטודון (בהיר)
-    system: אוטומטי (לפי המערכת)
+    default: מסטודון
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 37b2eb9a8d..962552e45c 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -2020,11 +2020,6 @@ hu:
     past_preamble_html: A legutóbbi látogatásod óta módosítottunk a felhasználási feltétleinken. Azt javasoljuk, hogy tekintsd át a frissített feltételeket.
     review_link: Felhasználási feltételek áttekintése
     title: A(z) %{domain} felhasználási feltételei megváltoznak
-  themes:
-    contrast: Mastodon (nagy kontrasztú)
-    default: Mastodon (sötét)
-    mastodon-light: Mastodon (világos)
-    system: Automatikus (rendszertéma használata)
   time:
     formats:
       default: "%Y. %b %d., %H:%M"
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index 3280ffc4eb..5e4b9a8708 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -786,10 +786,6 @@ hy:
       '7889238': 3 ամիս
   stream_entries:
     sensitive_content: Կասկածելի բովանդակութիւն
-  themes:
-    contrast: Mastodon (բարձր կոնտրաստով)
-    default: Mastodon (Մուգ)
-    mastodon-light: Mastodon (Լուսավոր)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 2afbd1b780..a3561c7c0c 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1997,11 +1997,6 @@ ia:
     past_preamble_html: Nos ha cambiate nostre conditiones de servicio desde tu ultime visita. Nos te invita a revider le conditiones actualisate.
     review_link: Revider le conditiones de servicio
     title: Le conditiones de servicio de %{domain} cambia
-  themes:
-    contrast: Mastodon (Alte contrasto)
-    default: Mastodon (Obscur)
-    mastodon-light: Mastodon (Clar)
-    system: Automatic (usar thema del systema)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/id.yml b/config/locales/id.yml
index f3f6207133..d7e76e40e2 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1413,10 +1413,6 @@ id:
       too_late: Terlambat untuk mengajukan banding hukuman ini
   tags:
     does_not_match_previous_name: tidak cocok dengan nama sebelumnya
-  themes:
-    contrast: Mastodon (Kontras tinggi)
-    default: Mastodon (Gelap)
-    mastodon-light: Mastodon (Terang)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index cb0dec5e83..0f35b085ec 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1657,11 +1657,6 @@ ie:
       too_late: It es tro tard por apellar ti admoniment
   tags:
     does_not_match_previous_name: ne concorda li anteyan nómine
-  themes:
-    contrast: Mastodon (Alt contraste)
-    default: Mastodon (Obscur)
-    mastodon-light: Mastodon (Luminosi)
-    system: Automatic (usar tema del sistema)
   time:
     formats:
       default: "%d.%m.%Y ye %H:%M"
diff --git a/config/locales/io.yml b/config/locales/io.yml
index 576b7d136c..66c01f8d0e 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -1778,10 +1778,6 @@ io:
       too_late: Ol esas tro tarda ye apelar ca strekizo
   tags:
     does_not_match_previous_name: ne parigesas a antea nomo
-  themes:
-    contrast: Mastodon (Alta kontrasteso)
-    default: Mastodon (Obskura)
-    mastodon-light: Mastodon (Brila)
   time:
     formats:
       default: "%d %b, %Y, %H:%M"
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 1fba521318..19850a4659 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -2025,10 +2025,7 @@ is:
     review_link: Yfirfara þjónustuskilmála
     title: Þjónustuskilmálar eru að breytast á %{domain}
   themes:
-    contrast: Mastodon (mikil birtuskil)
-    default: Mastodon (dökkt)
-    mastodon-light: Mastodon (ljóst)
-    system: Sjálfvirkt (nota þema kerfis)
+    default: Mastodon
   time:
     formats:
       default: "%d. %b, %Y, %H:%M"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 8a630520f0..f38673f4a9 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -2021,10 +2021,7 @@ it:
     review_link: Rivedi i termini di servizio
     title: I termini di servizio di %{domain} stanno cambiando
   themes:
-    contrast: Mastodon (contrasto elevato)
-    default: Mastodon (scuro)
-    mastodon-light: Mastodon (chiaro)
-    system: Automatico (usa il tema di sistema)
+    default: Mastodon
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 095410a994..914e217100 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1915,11 +1915,6 @@ ja:
     past_preamble_html: 前回の訪問時から利用規約が変更されました。更新された条件を確認することをお勧めします。
     review_link: 利用規約を確認する
     title: "%{domain} の利用規約が変更されています"
-  themes:
-    contrast: Mastodon (ハイコントラスト)
-    default: Mastodon (ダーク)
-    mastodon-light: Mastodon (ライト)
-    system: 自動 (システムのテーマを使用)
   time:
     formats:
       default: "%Y年%m月%d日 %H:%M"
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index acbfb6802e..d4dfe17e1e 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -435,10 +435,6 @@ ka:
       public: საჯარო
   stream_entries:
     sensitive_content: მგრძნობიარე კონტენტი
-  themes:
-    contrast: მაღალი კონტრასტი
-    default: მასტოდონი
-    mastodon-light: მასტოდონი (ღია)
   two_factor_authentication:
     disable: გათიშვა
     enabled: მეორე-ფაქტორის აუტენტიფიკაცია ჩართულია
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 932badcc5d..2ca05de205 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -968,10 +968,6 @@ kab:
     sensitive_content: Agbur amḥulfu
   terms_of_service:
     title: Tiwtilin n useqdec
-  themes:
-    contrast: Maṣṭudun (agnil awriran)
-    default: Maṣṭudun (Aberkan)
-    mastodon-light: Maṣṭudun (Aceɛlal)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index d054c51b45..d478ab031e 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -650,10 +650,6 @@ kk:
     sensitive_content: Нәзік мазмұн
   tags:
     does_not_match_previous_name: алдыңғы атқа сәйкес келмейді
-  themes:
-    contrast: Mastodon (Жоғары контраст)
-    default: Mastodon (Қою)
-    mastodon-light: Mastodon (Ашық)
   two_factor_authentication:
     disable: Ажырату
     enabled: Екі-факторлы авторизация қосылған
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 6ade109e34..c1ba5ca928 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1959,11 +1959,6 @@ ko:
     past_preamble_html: 마지막 방문으로부터 이용약관이 변경되었습니다. 변경된 약관을 확인하시기 바랍니다.
     review_link: 이용 약관 검토하기
     title: "%{domain} 도메인의 이용 약관에 변경 있음"
-  themes:
-    contrast: 마스토돈 (고대비)
-    default: 마스토돈 (어두움)
-    mastodon-light: 마스토돈 (밝음)
-    system: 자동 (시스템 테마 사용)
   time:
     formats:
       default: "%Y-%m-%d %H:%M"
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index 1541ec1ac1..24d55dcc73 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -1439,10 +1439,6 @@ ku:
       too_late: Pir dereng e ji bo îtîrazê li ser vê binpêkirinê
   tags:
     does_not_match_previous_name: bi navê berê re li hev nayê
-  themes:
-    contrast: Mastodon (Dijberiya bilind)
-    default: Mastodon (Tarî)
-    mastodon-light: Mastodon (Ronahî)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 95c931270c..61a6c290b1 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -1869,10 +1869,6 @@ lad:
     does_not_match_previous_name: no koensida kon el nombre anterior
   terms_of_service:
     title: Terminos de servisyo
-  themes:
-    contrast: Mastodon (alto kontraste)
-    default: Mastodon (eskuro)
-    mastodon-light: Mastodon (klaro)
   time:
     formats:
       default: "%d de %b del %Y, %H:%M"
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 6d68e28078..40034e1cfe 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1283,11 +1283,6 @@ lt:
     sensitive_content: Jautrus turinys
   terms_of_service:
     title: Paslaugų sąlygos
-  themes:
-    contrast: Mastodon (didelis kontrastas)
-    default: Mastodon (Tamsus)
-    mastodon-light: Mastodon (Šviesus)
-    system: Automatinis (naudoti sistemos temą)
   two_factor_authentication:
     add: Pridėti
     disable: Išjungti 2FA
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index eda3eed69b..6d04df7035 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1960,11 +1960,6 @@ lv:
     past_preamble_html: Kopš jūsu pēdējā apmeklējuma esam veikuši dažas izmaiņas pakalpojumu izmantošanas noteikumus. Iesakām pārskatīt atjauninātos noteikumus.
     review_link: Pārskatīt pakalpojumu izmantošanas noteikumus
     title: Mainās %{domain} pakalpojuma izmantošanas noteikumi
-  themes:
-    contrast: Mastodon (Augsts kontrasts)
-    default: Mastodon (Tumšs)
-    mastodon-light: Mastodon (Gaišs)
-    system: Automātisks (ievēro sistēmas izskatu)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 5e30ca8d86..ea4b49fa9e 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1589,10 +1589,6 @@ ms:
       too_late: Rayuan pelanggaran ini sudah terlalu lambat
   tags:
     does_not_match_previous_name: tidak sepadan dengan nama sebelumnya
-  themes:
-    contrast: Mastodon (Kontras tinggi)
-    default: Mastodon (Gelap)
-    mastodon-light: Mastodon (Cahaya)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 854c55b32f..84fc8d1003 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -1580,10 +1580,6 @@ my:
       too_late: ဤလုပ်ဆောင်ချက်တင်ပြရန် နောက်ကျသွားပါပြီ
   tags:
     does_not_match_previous_name: ယခင်အမည်နှင့် မကိုက်ညီပါ
-  themes:
-    contrast: Mastodon (စာသားအလင်းပုံစံ)
-    default: Mastodon (အနက်နောက်ခံပုံစံ)
-    mastodon-light: Mastodon (အလင်းနောက်ခံပုံစံ)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index b53e827811..674095d9b6 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -2021,10 +2021,7 @@ nl:
     review_link: De gebruiksvoorwaarden bekijken
     title: De gebruiksvoorwaarden van %{domain} worden gewijzigd
   themes:
-    contrast: Mastodon (hoog contrast)
-    default: Mastodon (donker)
-    mastodon-light: Mastodon (licht)
-    system: Automatisch (systeemthema gebruiken)
+    default: Mastodon
   time:
     formats:
       default: "%d %B %Y om %H:%M"
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 716f4a0257..17473de767 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -2020,11 +2020,6 @@ nn:
     past_preamble_html: Me har endra brukarvilkåra våre sidan du var her sist. Det er fint viss du ser på dei oppdaterte vilkåra.
     review_link: Les gjennom brukarvilkåra
     title: Brukarvilkåra på %{domain} er endra
-  themes:
-    contrast: Mastodon (Høg kontrast)
-    default: Mastodon (Mørkt)
-    mastodon-light: Mastodon (Lyst)
-    system: Automatisk (bruk systemdrakta)
   time:
     formats:
       default: "%d.%b %Y, %H:%M"
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 137b564569..bf85efe77a 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1666,10 +1666,6 @@
     does_not_match_previous_name: samsvarer ikke med det forrige navnet
   terms_of_service:
     title: Bruksvilkår
-  themes:
-    contrast: Mastodon (Høykontrast)
-    default: Mastodon
-    mastodon-light: Mastodon (Lyst)
   time:
     formats:
       default: "%-d. %b %Y, %H:%M"
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 176a8bf95e..4efdbc6a92 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -879,10 +879,6 @@ oc:
     sensitive_content: Contengut sensible
   tags:
     does_not_match_previous_name: correspond pas al nom precedent
-  themes:
-    contrast: Mastodon (Fòrt contrast)
-    default: Mastodon (Escur)
-    mastodon-light: Mastodon (Clar)
   time:
     formats:
       default: Lo %-d %B de %Y a %Ho%M
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 118af18cfb..bee3f5f168 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -2058,11 +2058,6 @@ pl:
     past_preamble_html: Od czasu twojej ostatniej wizyty zmieniliśmy warunki korzystania z usługi. Zachęcamy do zapoznania się z aktualnymi warunkami.
     review_link: Przeglądnij Warunki Korzystania
     title: Warunki korzystania z %{domain} zmieniają się
-  themes:
-    contrast: Mastodon (Wysoki kontrast)
-    default: Mastodon (Ciemny)
-    mastodon-light: Mastodon (Jasny)
-    system: Automatyczny (odpowiadający motywowi systemu)
   time:
     formats:
       default: "%d. %b %Y, %H:%M"
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 1e197af51a..6bdd0c4139 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -2018,11 +2018,6 @@ pt-BR:
     past_preamble_html: Alteramos nossos termos de serviço desde a sua última visita. Recomendamos que você revise os termos atualizados.
     review_link: Revisar os termos do serviço
     title: Os termos de serviço do %{domain} estão mudando
-  themes:
-    contrast: Mastodon  (Alto contraste)
-    default: Mastodon (Noturno)
-    mastodon-light: Mastodon (Diurno)
-    system: Automático (usar tema do sistema)
   time:
     formats:
       default: "%H:%M em %d de %b de %Y"
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 9333108ca3..c48fefb7b5 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -2020,11 +2020,6 @@ pt-PT:
     past_preamble_html: Alterámos os nossos termos de serviço desde a sua última visita. Recomendamos que reveja os termos atualizados.
     review_link: Rever termos de serviço
     title: Os termos de serviço de %{domain} estão a ser alterados
-  themes:
-    contrast: Mastodon (alto contraste)
-    default: Mastodon (escuro)
-    mastodon-light: Mastodon (claro)
-    system: Automático (usar tema do sistema)
   time:
     formats:
       default: "%H:%M em %d de %b de %Y"
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index c908f2b36e..1af3dbbff3 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -688,10 +688,6 @@ ro:
     sensitive_content: Conținut sensibil
   tags:
     does_not_match_previous_name: nu se potrivește cu numele anterior
-  themes:
-    contrast: Mastodon (contrast mare)
-    default: Mastodon (Întunecat)
-    mastodon-light: Mastodon (Luminat)
   time:
     formats:
       default: "%d %m, %Y, %H:%M"
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 2db4e6c702..2519f8944a 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -2037,11 +2037,6 @@ ru:
     past_preamble_html: Мы изменили наше пользовательское соглашение с момента вашего последнего посещения. Мы рекомендуем вам ознакомиться с обновленным соглашением.
     review_link: Посмотреть пользовательское соглашение
     title: Изменяется пользовательское соглашение на сервере %{domain}
-  themes:
-    contrast: Mastodon (высококонтрастная)
-    default: Mastodon (тёмная)
-    mastodon-light: Mastodon (светлая)
-    system: Автоматически (как в системе)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index c1cc7c18e7..6924ba67c4 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -1167,10 +1167,6 @@ sc:
     sensitive_content: Cuntenutu sensìbile
   tags:
     does_not_match_previous_name: non cointzidet cun su nòmine anteriore
-  themes:
-    contrast: Mastodon (cuntrastu artu)
-    default: Mastodon (iscuru)
-    mastodon-light: Mastodon (craru)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 2a6ca23c6f..9c62915f28 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -1429,10 +1429,6 @@ sco:
       too_late: It is ower late fir tae appeal this strike
   tags:
     does_not_match_previous_name: disnae match the previous nemm
-  themes:
-    contrast: Mastodon (Heich contrast)
-    default: Mastodon (Daurk)
-    mastodon-light: Mastodon (Licht)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/si.yml b/config/locales/si.yml
index 868d36b518..2091caad01 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -1299,9 +1299,6 @@ si:
       too_late: මෙම වර්ජනයට අභියාචනයක් ඉදිරිපත් කිරීමට ප්‍රමාද වැඩියි
   tags:
     does_not_match_previous_name: පෙර නමට නොගැලපේ
-  themes:
-    default: මාස්ටඩන් (අඳුරු)
-    mastodon-light: මාස්ටඩන් (දීප්ත)
   time:
     formats:
       default: "%Y %b %d, %H:%M"
diff --git a/config/locales/simple_form.be.yml b/config/locales/simple_form.be.yml
index 063f795398..c3f894a413 100644
--- a/config/locales/simple_form.be.yml
+++ b/config/locales/simple_form.be.yml
@@ -216,7 +216,7 @@ be:
         avatar: Аватар
         bot: Гэта бот
         chosen_languages: Фільтр моў
-        confirm_new_password: Пацвердзіць новы пароль
+        confirm_new_password: Пацвердзіце новы пароль
         confirm_password: Пацвердзіць пароль
         context: Фільтр кантэкстаў
         current_password: Бягучы пароль
@@ -238,7 +238,7 @@ be:
         phrase: Ключавое слова ці фраза
         setting_advanced_layout: Уключыць пашыраны вэб-інтэрфейс
         setting_aggregate_reblogs: Групаваць прасоўванні ў стужках
-        setting_always_send_emails: Заўжды дасылаць для апавяшчэнні эл. пошты
+        setting_always_send_emails: Заўжды дасылаць апавяшчэнні на электронную пошту
         setting_auto_play_gif: Аўтапрайграванне анімаваных GIF
         setting_boost_modal: Кантроль бачнасці пашырэння
         setting_color_scheme: Рэжым
@@ -342,7 +342,7 @@ be:
         follow_request: Нехта даслаў вам запыт на падпіску
         mention: Нехта згадаў вас
         pending_account: Новы акаўнт патрабуе разгляду
-        quote: Хтосьці цытаваў Вас
+        quote: Нехта цытаваў Вас
         reblog: Нехта пашырыў ваш допіс
         report: Новая скарга даслана
         software_updates:
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index a91ba29a0d..1d8ec63f03 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -183,9 +183,9 @@ el:
         show_collections: Εμφάνιση ακολούθων και ακολουθουμένων στο προφίλ
         unlocked: Αυτόματη αποδοχή νέων ακολούθων
       account_alias:
-        acct: Διακριτικό του παλιού λογαριασμού
+        acct: Πλήρες όνομα χρήστη του παλιού λογαριασμού
       account_migration:
-        acct: Διακριτικό του νέου λογαριασμού
+        acct: Πλήρες όνομα χρήστη του νέου λογαριασμού
       account_warning_preset:
         text: Προκαθορισμένο κείμενο
         title: Τίτλος
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index e4e6d50ead..7fff363ff1 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -164,6 +164,7 @@ en:
         name: Public name of the role, if role is set to be displayed as a badge
         permissions_as_keys: Users with this role will have access to...
         position: Higher role decides conflict resolution in certain situations. Certain actions can only be performed on roles with a lower priority
+        require_2fa: Users with this role will be required to set up two-factor authentication to use Mastodon
       username_block:
         allow_with_approval: Instead of preventing sign-up outright, matching sign-ups will require your approval
         comparison: Please be mindful of the Scunthorpe Problem when blocking partial matches
@@ -239,7 +240,7 @@ en:
         setting_always_send_emails: Always send e-mail notifications
         setting_auto_play_gif: Auto-play animated GIFs
         setting_boost_modal: Control boosting visibility
-        setting_color_scheme: Mode
+        setting_color_scheme: Color scheme
         setting_contrast: Contrast
         setting_default_language: Posting language
         setting_default_privacy: Posting visibility
@@ -387,6 +388,7 @@ en:
         name: Name
         permissions_as_keys: Permissions
         position: Priority
+        require_2fa: Require two-factor authentication
       username_block:
         allow_with_approval: Allow registrations with approval
         comparison: Method of comparison
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 05961652be..dbe4b43c84 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1360,10 +1360,6 @@ sk:
     sensitive_content: Senzitívny obsah
   tags:
     does_not_match_previous_name: nezhoduje sa s predošlým názvom
-  themes:
-    contrast: Mastodon (vysoký kontrast)
-    default: Mastodon (tmavý)
-    mastodon-light: Mastodon (svetlý)
   time:
     formats:
       default: "%b %d, %R, %H:%M"
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index e442df4081..aeb9b8adb9 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -2063,11 +2063,6 @@ sl:
     title: Pogoji uporabe
   terms_of_service_interstitial:
     title: Spreminjajo se pogoji uporabe domene %{domain}
-  themes:
-    contrast: Mastodon (Visok kontrast)
-    default: Mastodon (Temna)
-    mastodon-light: Mastodon (Svetla)
-    system: Samodejno (uporabi sistemsko temo)
   time:
     formats:
       default: "%b %d %Y, %H:%M"
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 8a5feb6a11..875539a187 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -2004,11 +2004,6 @@ sq:
     past_preamble_html: Kemi ndryshuar termat tanë të shërbimit, që prej vizitës tuaj të fundit. Ju nxisim të shqyrtoni termat e përditësuar.
     review_link: Shqyrtoni termat e shërbimit
     title: Termat e shërbimit të %{domain} po ndryshojnë
-  themes:
-    contrast: Mastodon (Me shumë kontrast)
-    default: Mastodon (I errët)
-    mastodon-light: Mastodon (I çelët)
-    system: E automatizuar (përdor temë sistemi)
   time:
     formats:
       default: "%d %b, %Y, %H:%M"
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index b9e6722fe3..83292c737c 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1690,11 +1690,6 @@ sr-Latn:
       too_late: Istekao je rok za podnošenje žalbe na zabeležen prestup
   tags:
     does_not_match_previous_name: ne poklapa se sa prethodnim imenom
-  themes:
-    contrast: Veliki kontrast
-    default: Mastodon (tamna)
-    mastodon-light: Mastodon (svetla)
-    system: Automatski (korišćenje sistemske teme)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 6530aecb67..3eb00aae8c 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1720,11 +1720,6 @@ sr:
       too_late: Истекао је рок за подношење жалбе на забележен преступ
   tags:
     does_not_match_previous_name: не поклапа се са претходним именом
-  themes:
-    contrast: Велики контраст
-    default: Mastodon (тамна)
-    mastodon-light: Mastodon (светла)
-    system: Аутоматски (коришћење системске теме)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index d070808a33..207499c9dc 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -2017,11 +2017,6 @@ sv:
     past_preamble_html: Vi har ändrat våra användarvillkor sedan ditt senaste besök. Vi uppmanar dig att granska de uppdaterade villkoren.
     review_link: Granska villkoren för tjänsten
     title: Villkoren för tjänsten i %{domain} ändras
-  themes:
-    contrast: Mastodon (Hög kontrast)
-    default: Mastodon (Mörk)
-    mastodon-light: Mastodon (ljust)
-    system: Automatisk (använd systemtema)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 2e7c6c75a2..949d642b56 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1857,11 +1857,6 @@ th:
     does_not_match_previous_name: ไม่ตรงกับชื่อก่อนหน้านี้
   terms_of_service:
     title: เงื่อนไขการให้บริการ
-  themes:
-    contrast: Mastodon (ความคมชัดสูง)
-    default: Mastodon (มืด)
-    mastodon-light: Mastodon (สว่าง)
-    system: อัตโนมัติ (ใช้ชุดรูปแบบของระบบ)
   time:
     formats:
       default: "%d %b %Y %H:%M น."
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 1eb418911f..65e0385e96 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -2021,10 +2021,7 @@ tr:
     review_link: Hizmet şartlarını incele
     title: "%{domain} adresindeki hizmet şartları değişiyor"
   themes:
-    contrast: Mastodon (Yüksek karşıtlık)
-    default: Mastodon (Karanlık)
-    mastodon-light: Mastodon (Açık)
-    system: Otomatik (sistem temasını kullan)
+    default: Mastodon
   time:
     formats:
       default: "%d %b %Y %H:%M"
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 85bcaaeafa..a9677476ae 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -529,8 +529,6 @@ tt:
       '604800': 1 атна
       '63113904': 2 ел
       '7889238': 3 ай
-  themes:
-    default: Mastodon (Караңгы)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 2d49c326d7..f85f803de3 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1925,11 +1925,6 @@ uk:
     does_not_match_previous_name: не збігається з попереднім ім'ям
   terms_of_service:
     title: Умови використання
-  themes:
-    contrast: Mastodon (Висока контрастність)
-    default: Mastodon (Темна)
-    mastodon-light: Mastodon (світла)
-    system: Автоматично (використовувати системну тему)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 15185484a5..3c3b9dc55e 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1977,10 +1977,7 @@ vi:
     review_link: Xem lại điều khoản dịch vụ
     title: Sửa đổi điều khoản dịch vụ %{domain}
   themes:
-    contrast: Mastodon (Tương phản)
-    default: Mastodon (Tối)
-    mastodon-light: Mastodon (Sáng)
-    system: Theo hệ thống
+    default: Mastodon
   time:
     formats:
       default: "%-d.%m.%Y %H:%M"
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 8acfce541c..9aec0244c4 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1977,10 +1977,7 @@ zh-CN:
     review_link: 查看服务条款
     title: "%{domain} 更新了服务条款"
   themes:
-    contrast: Mastodon（高对比度）
-    default: Mastodon（暗色主题）
-    mastodon-light: Mastodon（亮色主题）
-    system: 自动切换（使用系统主题）
+    default: Mastodon
   time:
     formats:
       default: "%Y年%m月%d日 %H:%M"
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index deaa117a89..a9a338168b 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1669,11 +1669,6 @@ zh-HK:
       too_late: 對此次警告提出申訴已經太遲
   tags:
     does_not_match_previous_name: 和舊有名稱並不符合
-  themes:
-    contrast: 高對比
-    default: 萬象
-    mastodon-light: 萬象（亮色主題）
-    system: 自動（使用系統主題）
   time:
     formats:
       default: "%Y年%b月%d日 %H:%M"
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index d0e67e1e74..07872b20a3 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1979,10 +1979,7 @@ zh-TW:
     review_link: 檢視服務條款
     title: "%{domain} 之服務條款正在悄悄發生變化"
   themes:
-    contrast: Mastodon（高對比）
-    default: Mastodon（深色）
-    mastodon-light: Mastodon（亮色）
-    system: 自動（使用系統佈景主題）
+    default: Mastodon
   time:
     formats:
       default: "%Y 年 %b 月 %d 日 %H:%M"
diff --git a/db/migrate/20260211132603_add_require2_fa_to_user_roles.rb b/db/migrate/20260211132603_add_require2_fa_to_user_roles.rb
new file mode 100644
index 0000000000..316b1f36d2
--- /dev/null
+++ b/db/migrate/20260211132603_add_require2_fa_to_user_roles.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddRequire2FaToUserRoles < ActiveRecord::Migration[8.0]
+  def change
+    add_column :user_roles, :require_2fa, :boolean, null: false, default: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9b19d78eef..81ee44de9e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2026_02_09_143308) do
+ActiveRecord::Schema[8.0].define(version: 2026_02_11_132603) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
 
@@ -1288,6 +1288,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_02_09_143308) do
     t.boolean "highlighted", default: false, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.boolean "require_2fa", default: false, null: false
   end
 
   create_table "username_blocks", force: :cascade do |t|
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 25d464fd75..4c35e442bb 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -450,6 +450,7 @@ export default tseslint.config([
     rules: {
       '@typescript-eslint/no-unnecessary-boolean-literal-compare': 'off',
       '@typescript-eslint/no-unnecessary-condition': 'off',
+      '@typescript-eslint/no-useless-default-assignment': 'off',
       '@typescript-eslint/prefer-nullish-coalescing': 'off',
     },
   },
diff --git a/package.json b/package.json
index a2996d2e6a..1df752fe6f 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
     "workbox-window": "^7.3.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.23.0",
+    "@eslint/js": "^9.39.2",
     "@formatjs/cli": "^6.1.1",
     "@storybook/addon-a11y": "^10.0.6",
     "@storybook/addon-docs": "^10.0.6",
@@ -166,18 +166,18 @@
     "@vitest/coverage-v8": "^4.0.5",
     "@vitest/ui": "^4.0.5",
     "chromatic": "^13.3.3",
-    "eslint": "^9.23.0",
+    "eslint": "^9.39.2",
     "eslint-import-resolver-typescript": "^4.2.5",
     "eslint-plugin-formatjs": "^5.3.1",
     "eslint-plugin-import": "~2.32.0",
-    "eslint-plugin-jsdoc": "^61.1.11",
+    "eslint-plugin-jsdoc": "^61.7.1",
     "eslint-plugin-jsx-a11y": "~6.10.2",
     "eslint-plugin-promise": "~7.2.1",
     "eslint-plugin-react": "^7.37.4",
     "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-storybook": "^10.0.2",
+    "eslint-plugin-storybook": "^10.2.8",
     "fake-indexeddb": "^6.0.1",
-    "globals": "^17.0.0",
+    "globals": "^17.3.0",
     "husky": "^9.0.11",
     "lint-staged": "^16.2.6",
     "msw": "^2.12.1",
@@ -190,7 +190,7 @@
     "stylelint-config-prettier-scss": "^1.0.0",
     "stylelint-config-standard-scss": "^17.0.0",
     "typescript": "~5.9.0",
-    "typescript-eslint": "^8.45.0",
+    "typescript-eslint": "^8.55.0",
     "typescript-plugin-css-modules": "^5.2.0",
     "vitest": "^4.0.5"
   },
diff --git a/spec/models/user_role_spec.rb b/spec/models/user_role_spec.rb
index 48768719a1..547fc718cc 100644
--- a/spec/models/user_role_spec.rb
+++ b/spec/models/user_role_spec.rb
@@ -47,6 +47,17 @@ RSpec.describe UserRole do
 
         it { is_expected.to_not allow_value(100).for(:permissions).against(:permissions_as_keys).with_message(:own_role) }
         it { is_expected.to_not allow_value(100).for(:position).with_message(:own_role) }
+        it { is_expected.to_not allow_value(true).for(:require_2fa).with_message(:own_role) }
+      end
+
+      context 'when current_account is changing their own role and is an admin' do
+        subject { Fabricate(:user_role, permissions: UserRole::FLAGS[:administrator]) }
+
+        let(:account) { Fabricate :account, user: Fabricate(:user, role: subject) }
+
+        it { is_expected.to_not allow_value(100).for(:permissions).against(:permissions_as_keys).with_message(:own_role) }
+        it { is_expected.to_not allow_value(100).for(:position).with_message(:own_role) }
+        it { is_expected.to allow_value(true).for(:require_2fa) }
       end
     end
   end
diff --git a/spec/serializers/activitypub/add_featured_item_serializer_spec.rb b/spec/serializers/activitypub/add_featured_item_serializer_spec.rb
new file mode 100644
index 0000000000..57bece6273
--- /dev/null
+++ b/spec/serializers/activitypub/add_featured_item_serializer_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ActivityPub::AddFeaturedItemSerializer do
+  subject { serialized_record_json(object, described_class, adapter: ActivityPub::Adapter) }
+
+  let(:tag_manager) { ActivityPub::TagManager.instance }
+  let(:collection) { Fabricate(:collection) }
+  let(:object) { Fabricate(:collection_item, collection:) }
+
+  it 'serializes to the expected json' do
+    expect(subject).to include({
+      'type' => 'Add',
+      'actor' => tag_manager.uri_for(collection.account),
+      'target' => tag_manager.uri_for(collection),
+      'object' => a_hash_including({
+        'type' => 'FeaturedItem',
+      }),
+    })
+
+    expect(subject).to_not have_key('id')
+    expect(subject).to_not have_key('published')
+    expect(subject).to_not have_key('to')
+    expect(subject).to_not have_key('cc')
+  end
+end
diff --git a/spec/services/activitypub/fetch_remote_key_service_spec.rb b/spec/services/activitypub/fetch_remote_key_service_spec.rb
index 847a154108..ddd1a8067e 100644
--- a/spec/services/activitypub/fetch_remote_key_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_key_service_spec.rb
@@ -71,7 +71,7 @@ RSpec.describe ActivityPub::FetchRemoteKeyService do
       let(:public_key_id) { 'https://example.com/alice-public-key.json' }
 
       before do
-        stub_request(:get, public_key_id).to_return(body: Oj.dump(key_json.merge({ '@context': ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1'] })), headers: { 'Content-Type': 'application/activity+json' })
+        stub_request(:get, public_key_id).to_return(body: Oj.dump(key_json.merge({ '@context': ['https://w3id.org/security/v1'] })), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it 'returns the expected account' do
diff --git a/spec/services/add_account_to_collection_service_spec.rb b/spec/services/add_account_to_collection_service_spec.rb
index 98d88d0b8f..3085c597a7 100644
--- a/spec/services/add_account_to_collection_service_spec.rb
+++ b/spec/services/add_account_to_collection_service_spec.rb
@@ -20,6 +20,12 @@ RSpec.describe AddAccountToCollectionService do
         expect(new_item.state).to eq 'accepted'
         expect(new_item.account).to eq account
       end
+
+      it 'federates an `Add` activity', feature: :collections_federation do
+        subject.call(collection, account)
+
+        expect(ActivityPub::AccountRawDistributionWorker).to have_enqueued_sidekiq_job
+      end
     end
 
     context 'when given an account that is not featureable' do
diff --git a/spec/system/log_in_spec.rb b/spec/system/log_in_spec.rb
index af3a99164f..aec9a5627f 100644
--- a/spec/system/log_in_spec.rb
+++ b/spec/system/log_in_spec.rb
@@ -13,16 +13,19 @@ RSpec.describe 'Log in' do
 
   before do
     as_a_registered_user
-    visit new_user_session_path
   end
 
   it 'A valid email and password user is able to log in' do
+    visit new_user_session_path
+
     fill_in_auth_details(email, password)
 
     expect(subject).to have_css('div.app-holder')
   end
 
   it 'A invalid email and password user is not able to log in' do
+    visit new_user_session_path
+
     fill_in_auth_details('invalid_email', 'invalid_password')
 
     expect(subject).to have_css('.flash-message', text: /#{failure_message_invalid}/i)
@@ -32,12 +35,53 @@ RSpec.describe 'Log in' do
     let(:confirmed_at) { nil }
 
     it 'A unconfirmed user is able to log in' do
+      visit new_user_session_path
+
       fill_in_auth_details(email, password)
 
       expect(subject).to have_css('.title', text: I18n.t('auth.setup.title'))
     end
   end
 
+  context 'when the user role requires 2FA' do
+    before do
+      bob.role.update!(require_2fa: true)
+    end
+
+    context 'when the user has not configured 2FA' do
+      it 'they are redirected to 2FA setup' do
+        visit new_user_session_path
+
+        fill_in_auth_details(email, password)
+
+        expect(subject).to have_no_css('div.app-holder')
+        expect(subject).to have_title(I18n.t('settings.two_factor_authentication'))
+      end
+    end
+
+    context 'when the user has configured 2FA' do
+      before do
+        bob.update!(otp_required_for_login: true, otp_secret: User.generate_otp_secret)
+      end
+
+      it 'they are able to log in' do
+        visit new_user_session_path
+
+        fill_in_auth_details(email, password)
+        fill_in_otp_details(bob.current_otp)
+
+        expect(subject).to have_css('div.app-holder')
+      end
+    end
+  end
+
+  private
+
+  def fill_in_otp_details(value)
+    fill_in 'user_otp_attempt', with: value
+    click_on I18n.t('auth.login')
+  end
+
   def failure_message_invalid
     keys = User.authentication_keys.map { |key| User.human_attribute_name(key) }
     I18n.t('devise.failure.invalid', authentication_keys: keys.join('support.array.words_connector'))
diff --git a/spec/system/oauth_spec.rb b/spec/system/oauth_spec.rb
index caed5ea9af..19235eab42 100644
--- a/spec/system/oauth_spec.rb
+++ b/spec/system/oauth_spec.rb
@@ -121,6 +121,46 @@ RSpec.describe 'Using OAuth from an external app' do
           end
         end
       end
+
+      context 'when the user has yet to enable TOTP' do
+        let(:new_otp_secret) { ROTP::Base32.random(User.otp_secret_length) }
+
+        before do
+          allow(User).to receive(:generate_otp_secret).and_return(new_otp_secret)
+          user.role.update!(require_2fa: true)
+        end
+
+        it 'when accepting the authorization request' do
+          subject
+
+          # It presents the user with the 2FA setup page
+          expect(page).to have_content(I18n.t('two_factor_authentication.role_requirement', domain: local_domain_uri.host))
+          click_on I18n.t('otp_authentication.setup')
+
+          # Fill in challenge form
+          fill_in 'form_challenge_current_password', with: user.password
+          click_on I18n.t('challenge.confirm')
+
+          # It presents the user with the TOTP confirmation screen
+          expect(page).to have_title(I18n.t('settings.two_factor_authentication'))
+
+          fill_in 'form_two_factor_confirmation_otp_attempt', with: ROTP::TOTP.new(new_otp_secret).at(Time.now.utc)
+          click_on I18n.t('otp_authentication.enable')
+
+          # It presents the user with recovery codes
+          click_on I18n.t('two_factor_authentication.resume_app_authorization')
+
+          # It presents the user with an authorization page
+          expect(page).to have_content(oauth_authorize_text)
+
+          # It grants the app access to the account
+          expect { click_on oauth_authorize_text }
+            .to change { user_has_grant_with_client_app? }.to(true)
+
+          # Upon authorizing, it redirects to the apps' callback URL
+          expect(page).to redirect_to_callback_url
+        end
+      end
     end
   end
 
diff --git a/streaming/package.json b/streaming/package.json
index cee103bdbd..4f3d4a9a8e 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -31,15 +31,15 @@
     "ws": "^8.12.1"
   },
   "devDependencies": {
-    "@eslint/js": "^9.23.0",
+    "@eslint/js": "^9.39.2",
     "@types/cors": "^2.8.16",
     "@types/express": "^5.0.5",
     "@types/pg": "^8.6.6",
     "@types/ws": "^8.5.9",
-    "globals": "^17.0.0",
+    "globals": "^17.3.0",
     "pino-pretty": "^13.0.0",
     "typescript": "~5.9.0",
-    "typescript-eslint": "^8.28.0"
+    "typescript-eslint": "^8.55.0"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.7",
diff --git a/yarn.lock b/yarn.lock
index 6e28264edc..244252d7da 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2117,16 +2117,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@es-joy/jsdoccomment@npm:~0.76.0":
-  version: 0.76.0
-  resolution: "@es-joy/jsdoccomment@npm:0.76.0"
+"@es-joy/jsdoccomment@npm:~0.78.0":
+  version: 0.78.0
+  resolution: "@es-joy/jsdoccomment@npm:0.78.0"
   dependencies:
     "@types/estree": "npm:^1.0.8"
-    "@typescript-eslint/types": "npm:^8.46.0"
+    "@typescript-eslint/types": "npm:^8.46.4"
     comment-parser: "npm:1.4.1"
     esquery: "npm:^1.6.0"
-    jsdoc-type-pratt-parser: "npm:~6.10.0"
-  checksum: 10c0/8fe4edec7d60562787ea8c77193ebe8737a9e28ec3143d383506b63890d0ffd45a2813e913ad1f00f227cb10e3a1fb913e5a696b33d499dc564272ff1a6f3fdb
+    jsdoc-type-pratt-parser: "npm:~7.0.0"
+  checksum: 10c0/be18b8149303e8e7c9414b0b0453a0fa959c1c8db6f721b75178336e01b65a9f251db98ecfedfb1b3cfa5e717f3e2abdb06a0f8dbe45d3330a62262c5331c327
   languageName: node
   linkType: hard
 
@@ -2319,21 +2319,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint-community/eslint-utils@npm:^4.4.0, @eslint-community/eslint-utils@npm:^4.7.0, @eslint-community/eslint-utils@npm:^4.8.0":
-  version: 4.9.0
-  resolution: "@eslint-community/eslint-utils@npm:4.9.0"
+"@eslint-community/eslint-utils@npm:^4.4.0, @eslint-community/eslint-utils@npm:^4.8.0, @eslint-community/eslint-utils@npm:^4.9.1":
+  version: 4.9.1
+  resolution: "@eslint-community/eslint-utils@npm:4.9.1"
   dependencies:
     eslint-visitor-keys: "npm:^3.4.3"
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
-  checksum: 10c0/8881e22d519326e7dba85ea915ac7a143367c805e6ba1374c987aa2fbdd09195cc51183d2da72c0e2ff388f84363e1b220fd0d19bef10c272c63455162176817
+  checksum: 10c0/dc4ab5e3e364ef27e33666b11f4b86e1a6c1d7cbf16f0c6ff87b1619b3562335e9201a3d6ce806221887ff780ec9d828962a290bb910759fd40a674686503f02
   languageName: node
   linkType: hard
 
-"@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.12.1":
-  version: 4.12.1
-  resolution: "@eslint-community/regexpp@npm:4.12.1"
-  checksum: 10c0/a03d98c246bcb9109aec2c08e4d10c8d010256538dcb3f56610191607214523d4fb1b00aa81df830b6dffb74c5fa0be03642513a289c567949d3e550ca11cdf6
+"@eslint-community/regexpp@npm:^4.12.1, @eslint-community/regexpp@npm:^4.12.2":
+  version: 4.12.2
+  resolution: "@eslint-community/regexpp@npm:4.12.2"
+  checksum: 10c0/fddcbc66851b308478d04e302a4d771d6917a0b3740dc351513c0da9ca2eab8a1adf99f5e0aa7ab8b13fa0df005c81adeee7e63a92f3effd7d367a163b721c2d
   languageName: node
   linkType: hard
 
@@ -2383,10 +2383,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:9.39.1, @eslint/js@npm:^9.23.0":
-  version: 9.39.1
-  resolution: "@eslint/js@npm:9.39.1"
-  checksum: 10c0/6f7f26f8cdb7ad6327bbf9741973b6278eb946f18f70e35406e88194b0d5c522d0547a34a02f2a208eec95c5d1388cdf7ccb20039efd2e4cb6655615247a50f1
+"@eslint/js@npm:9.39.2, @eslint/js@npm:^9.39.2":
+  version: 9.39.2
+  resolution: "@eslint/js@npm:9.39.2"
+  checksum: 10c0/00f51c52b04ac79faebfaa65a9652b2093b9c924e945479f1f3945473f78aee83cbc76c8d70bbffbf06f7024626575b16d97b66eab16182e1d0d39daff2f26f5
   languageName: node
   linkType: hard
 
@@ -2830,7 +2830,7 @@ __metadata:
     "@dnd-kit/core": "npm:^6.1.0"
     "@dnd-kit/sortable": "npm:^10.0.0"
     "@dnd-kit/utilities": "npm:^3.2.2"
-    "@eslint/js": "npm:^9.23.0"
+    "@eslint/js": "npm:^9.39.2"
     "@formatjs/cli": "npm:^6.1.1"
     "@formatjs/intl-pluralrules": "npm:^5.4.4"
     "@gamestdio/websocket": "npm:^0.3.2"
@@ -2894,21 +2894,21 @@ __metadata:
     emojibase-data: "npm:^16.0.3"
     emojibase-regex: "npm:^16.0.0"
     escape-html: "npm:^1.0.3"
-    eslint: "npm:^9.23.0"
+    eslint: "npm:^9.39.2"
     eslint-import-resolver-typescript: "npm:^4.2.5"
     eslint-plugin-formatjs: "npm:^5.3.1"
     eslint-plugin-import: "npm:~2.32.0"
-    eslint-plugin-jsdoc: "npm:^61.1.11"
+    eslint-plugin-jsdoc: "npm:^61.7.1"
     eslint-plugin-jsx-a11y: "npm:~6.10.2"
     eslint-plugin-promise: "npm:~7.2.1"
     eslint-plugin-react: "npm:^7.37.4"
     eslint-plugin-react-hooks: "npm:^7.0.1"
-    eslint-plugin-storybook: "npm:^10.0.2"
+    eslint-plugin-storybook: "npm:^10.2.8"
     fake-indexeddb: "npm:^6.0.1"
     fast-glob: "npm:^3.3.3"
     favico.js: "npm:^0.3.10"
     fuzzysort: "npm:^3.0.0"
-    globals: "npm:^17.0.0"
+    globals: "npm:^17.3.0"
     history: "npm:^4.10.1"
     hoist-non-react-statics: "npm:^3.3.2"
     http-link-header: "npm:^1.1.1"
@@ -2963,7 +2963,7 @@ __metadata:
     tiny-queue: "npm:^0.2.1"
     twitter-text: "npm:3.1.0"
     typescript: "npm:~5.9.0"
-    typescript-eslint: "npm:^8.45.0"
+    typescript-eslint: "npm:^8.55.0"
     typescript-plugin-css-modules: "npm:^5.2.0"
     use-debounce: "npm:^10.0.0"
     vite: "npm:^7.1.1"
@@ -2991,7 +2991,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@mastodon/streaming@workspace:streaming"
   dependencies:
-    "@eslint/js": "npm:^9.23.0"
+    "@eslint/js": "npm:^9.39.2"
     "@types/cors": "npm:^2.8.16"
     "@types/express": "npm:^5.0.5"
     "@types/pg": "npm:^8.6.6"
@@ -3000,7 +3000,7 @@ __metadata:
     cors: "npm:^2.8.5"
     dotenv: "npm:^17.0.0"
     express: "npm:^5.1.0"
-    globals: "npm:^17.0.0"
+    globals: "npm:^17.3.0"
     ioredis: "npm:^5.3.2"
     jsdom: "npm:^28.0.0"
     pg: "npm:^8.5.0"
@@ -3010,7 +3010,7 @@ __metadata:
     pino-pretty: "npm:^13.0.0"
     prom-client: "npm:^15.0.0"
     typescript: "npm:~5.9.0"
-    typescript-eslint: "npm:^8.28.0"
+    typescript-eslint: "npm:^8.55.0"
     utf-8-validate: "npm:^6.0.3"
     uuid: "npm:^13.0.0"
     ws: "npm:^8.12.1"
@@ -3432,10 +3432,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rolldown/pluginutils@npm:1.0.0-rc.2":
-  version: 1.0.0-rc.2
-  resolution: "@rolldown/pluginutils@npm:1.0.0-rc.2"
-  checksum: 10c0/35d3dec35e00ab090d5ff8287e27af98a15da897dc8b034fe0e00d03e0931b9e993603c054be9e8925e2bde040c44c18b48cb8aeea6a261fd1c8f46837038927
+"@rolldown/pluginutils@npm:1.0.0-rc.3":
+  version: 1.0.0-rc.3
+  resolution: "@rolldown/pluginutils@npm:1.0.0-rc.3"
+  checksum: 10c0/3928b6282a30f307d1b075d2f217180ae173ea9e00638ce46ab65f089bd5f7a0b2c488ae1ce530f509387793c656a2910337c4cd68fa9d37d7e439365989e699
   languageName: node
   linkType: hard
 
@@ -4625,139 +4625,138 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:8.48.1":
-  version: 8.48.1
-  resolution: "@typescript-eslint/eslint-plugin@npm:8.48.1"
+"@typescript-eslint/eslint-plugin@npm:8.55.0":
+  version: 8.55.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:8.55.0"
   dependencies:
-    "@eslint-community/regexpp": "npm:^4.10.0"
-    "@typescript-eslint/scope-manager": "npm:8.48.1"
-    "@typescript-eslint/type-utils": "npm:8.48.1"
-    "@typescript-eslint/utils": "npm:8.48.1"
-    "@typescript-eslint/visitor-keys": "npm:8.48.1"
-    graphemer: "npm:^1.4.0"
-    ignore: "npm:^7.0.0"
+    "@eslint-community/regexpp": "npm:^4.12.2"
+    "@typescript-eslint/scope-manager": "npm:8.55.0"
+    "@typescript-eslint/type-utils": "npm:8.55.0"
+    "@typescript-eslint/utils": "npm:8.55.0"
+    "@typescript-eslint/visitor-keys": "npm:8.55.0"
+    ignore: "npm:^7.0.5"
     natural-compare: "npm:^1.4.0"
-    ts-api-utils: "npm:^2.1.0"
+    ts-api-utils: "npm:^2.4.0"
   peerDependencies:
-    "@typescript-eslint/parser": ^8.48.1
+    "@typescript-eslint/parser": ^8.55.0
     eslint: ^8.57.0 || ^9.0.0
     typescript: ">=4.8.4 <6.0.0"
-  checksum: 10c0/aeb4692ac27ded73dce5ddba08d46f15d617651f629cdfc5e874dd4ac767eac0523807f1f4e51f6f80675efff78e5937690f1c58740b8cb92b44b87d757a6a1a
+  checksum: 10c0/e15973dfc822f6a455142433fa393ea2dd9fd4ba443e0d2fb68c6be7cd9a36e13412f061ccfe436a2c90fa070c4538bdd50985d374e85606c98800d372c17eb9
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:8.48.1":
-  version: 8.48.1
-  resolution: "@typescript-eslint/parser@npm:8.48.1"
+"@typescript-eslint/parser@npm:8.55.0":
+  version: 8.55.0
+  resolution: "@typescript-eslint/parser@npm:8.55.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:8.48.1"
-    "@typescript-eslint/types": "npm:8.48.1"
-    "@typescript-eslint/typescript-estree": "npm:8.48.1"
-    "@typescript-eslint/visitor-keys": "npm:8.48.1"
-    debug: "npm:^4.3.4"
+    "@typescript-eslint/scope-manager": "npm:8.55.0"
+    "@typescript-eslint/types": "npm:8.55.0"
+    "@typescript-eslint/typescript-estree": "npm:8.55.0"
+    "@typescript-eslint/visitor-keys": "npm:8.55.0"
+    debug: "npm:^4.4.3"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
     typescript: ">=4.8.4 <6.0.0"
-  checksum: 10c0/54ec22c82cc631f56131bfed9747f8cadf52ab123463a406c5221f258f9533431c4a33ebe21ef178840d50235e69bb370d36aa2fd6a066e7223b38bfa41a1788
+  checksum: 10c0/8b8f8caf64a43b98bff8e7bb99cd62d7c72daeee44e80e0a5f693dd376d9c898997e0b9fd5521604d1445bcb24552f54aed5cae022072f8c354a2baf2a452284
   languageName: node
   linkType: hard
 
-"@typescript-eslint/project-service@npm:8.48.1":
-  version: 8.48.1
-  resolution: "@typescript-eslint/project-service@npm:8.48.1"
+"@typescript-eslint/project-service@npm:8.55.0":
+  version: 8.55.0
+  resolution: "@typescript-eslint/project-service@npm:8.55.0"
   dependencies:
-    "@typescript-eslint/tsconfig-utils": "npm:^8.48.1"
-    "@typescript-eslint/types": "npm:^8.48.1"
-    debug: "npm:^4.3.4"
+    "@typescript-eslint/tsconfig-utils": "npm:^8.55.0"
+    "@typescript-eslint/types": "npm:^8.55.0"
+    debug: "npm:^4.4.3"
   peerDependencies:
     typescript: ">=4.8.4 <6.0.0"
-  checksum: 10c0/0aeeea5e65d0f837bd9a47265f144f14ca72969d259ee929e63e06526b21f4e990e70c7bafdb2ceb3783373df7d9f5bae32c328a4c6403606f01339bc984b3f5
+  checksum: 10c0/f35273a63635d2de84409f68dfcea901ed2cd3f08206abb825d742b929c8fce66e0a6a32524d87ce895a7c4c2549e4388baa08644c0a5244c9708151b0f62f52
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:8.48.1":
-  version: 8.48.1
-  resolution: "@typescript-eslint/scope-manager@npm:8.48.1"
+"@typescript-eslint/scope-manager@npm:8.55.0":
+  version: 8.55.0
+  resolution: "@typescript-eslint/scope-manager@npm:8.55.0"
   dependencies:
-    "@typescript-eslint/types": "npm:8.48.1"
-    "@typescript-eslint/visitor-keys": "npm:8.48.1"
-  checksum: 10c0/16514823784cb598817b87d3d2b4fb618ab8b2378b3401a4c1160a5c914e51e7a925c3c1e7be73e0250e38390f0be70fecb3e0e0bdde7b243d74444933b95d3e
+    "@typescript-eslint/types": "npm:8.55.0"
+    "@typescript-eslint/visitor-keys": "npm:8.55.0"
+  checksum: 10c0/c42bd6b8e4936cac8bee3adbc2f707e3aee5f16af3dd18c1d095f4a1b881471b58de73abc0ad176db98654683a808946902e51d86efff39dc7610d29152c3078
   languageName: node
   linkType: hard
 
-"@typescript-eslint/tsconfig-utils@npm:8.48.1, @typescript-eslint/tsconfig-utils@npm:^8.48.1":
-  version: 8.48.1
-  resolution: "@typescript-eslint/tsconfig-utils@npm:8.48.1"
+"@typescript-eslint/tsconfig-utils@npm:8.55.0, @typescript-eslint/tsconfig-utils@npm:^8.55.0":
+  version: 8.55.0
+  resolution: "@typescript-eslint/tsconfig-utils@npm:8.55.0"
   peerDependencies:
     typescript: ">=4.8.4 <6.0.0"
-  checksum: 10c0/0d540f7ab3018ed1bab8f008c0d30229e0ea12806fdbf1c756572b5cf536a1f2a6c59ca2544c09bcd5b89dcfcf79e5f6be3d765e725492b9c7e4cd64fcecffc6
+  checksum: 10c0/77b9a0d0b1d6ab0ce26c81394bb1aa969649016d2857e5f915a15b88012ac3dccec9fc5ff65535e1cc373434e1462513f7964e416a8d7a695f7277dcd39ec2af
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:8.48.1":
-  version: 8.48.1
-  resolution: "@typescript-eslint/type-utils@npm:8.48.1"
+"@typescript-eslint/type-utils@npm:8.55.0":
+  version: 8.55.0
+  resolution: "@typescript-eslint/type-utils@npm:8.55.0"
   dependencies:
-    "@typescript-eslint/types": "npm:8.48.1"
-    "@typescript-eslint/typescript-estree": "npm:8.48.1"
-    "@typescript-eslint/utils": "npm:8.48.1"
-    debug: "npm:^4.3.4"
-    ts-api-utils: "npm:^2.1.0"
+    "@typescript-eslint/types": "npm:8.55.0"
+    "@typescript-eslint/typescript-estree": "npm:8.55.0"
+    "@typescript-eslint/utils": "npm:8.55.0"
+    debug: "npm:^4.4.3"
+    ts-api-utils: "npm:^2.4.0"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
     typescript: ">=4.8.4 <6.0.0"
-  checksum: 10c0/c98a71f7d374be249ecc7c9f20b0a867a73ad4f64e646a6bf9f2c1a5d74f0dc7bd59e9c94a0842068caa366af39ae0c550ede6d653b5c9418a0a587510bbb6d5
+  checksum: 10c0/4987440d6e1ee2ae8024259796381612ab2fc81821ff93c45400f803726ea4894a25d07afa5f80cdf3081a189d99dc83a3a8dcd94ff9a4cab81461fe28ab9aef
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:8.48.1, @typescript-eslint/types@npm:^8.46.0, @typescript-eslint/types@npm:^8.48.1":
-  version: 8.48.1
-  resolution: "@typescript-eslint/types@npm:8.48.1"
-  checksum: 10c0/366b8140f4c69319f1796b66b33c0c6e16eb6cbe543b9517003104e12ed143b620c1433ccf60d781a629d9433bd509a363c0c9d21fd438c17bb8840733af6caa
+"@typescript-eslint/types@npm:8.55.0, @typescript-eslint/types@npm:^8.46.4, @typescript-eslint/types@npm:^8.55.0":
+  version: 8.55.0
+  resolution: "@typescript-eslint/types@npm:8.55.0"
+  checksum: 10c0/dc572f55966e2f0fee149e5d5e42a91cedcdeac451bff29704eb701f9336f123bbc7d7abcfbda717f9e1ef6b402fa24679908bc6032e67513287403037ef345f
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:8.48.1":
-  version: 8.48.1
-  resolution: "@typescript-eslint/typescript-estree@npm:8.48.1"
+"@typescript-eslint/typescript-estree@npm:8.55.0":
+  version: 8.55.0
+  resolution: "@typescript-eslint/typescript-estree@npm:8.55.0"
   dependencies:
-    "@typescript-eslint/project-service": "npm:8.48.1"
-    "@typescript-eslint/tsconfig-utils": "npm:8.48.1"
-    "@typescript-eslint/types": "npm:8.48.1"
-    "@typescript-eslint/visitor-keys": "npm:8.48.1"
-    debug: "npm:^4.3.4"
-    minimatch: "npm:^9.0.4"
-    semver: "npm:^7.6.0"
+    "@typescript-eslint/project-service": "npm:8.55.0"
+    "@typescript-eslint/tsconfig-utils": "npm:8.55.0"
+    "@typescript-eslint/types": "npm:8.55.0"
+    "@typescript-eslint/visitor-keys": "npm:8.55.0"
+    debug: "npm:^4.4.3"
+    minimatch: "npm:^9.0.5"
+    semver: "npm:^7.7.3"
     tinyglobby: "npm:^0.2.15"
-    ts-api-utils: "npm:^2.1.0"
+    ts-api-utils: "npm:^2.4.0"
   peerDependencies:
     typescript: ">=4.8.4 <6.0.0"
-  checksum: 10c0/72c0802f74222160f6a13ebbd32b0d504142a2427678c87ea78fc32672c65fd522377d43b31a97c944cbd0aefc36b320bf02f04e47c44f2797d6ccd0a8aa30ec
+  checksum: 10c0/2db3ff9489945ad04508b14009eb0f6b2b7c6c2469805327fa09ffa460af354cd181ff2e8153f9008bd60254efb54a004a59ccacbdbc9c963956e2c2c1189dbc
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:8.48.1, @typescript-eslint/utils@npm:^8.27.0, @typescript-eslint/utils@npm:^8.8.1":
-  version: 8.48.1
-  resolution: "@typescript-eslint/utils@npm:8.48.1"
+"@typescript-eslint/utils@npm:8.55.0, @typescript-eslint/utils@npm:^8.27.0, @typescript-eslint/utils@npm:^8.48.0":
+  version: 8.55.0
+  resolution: "@typescript-eslint/utils@npm:8.55.0"
   dependencies:
-    "@eslint-community/eslint-utils": "npm:^4.7.0"
-    "@typescript-eslint/scope-manager": "npm:8.48.1"
-    "@typescript-eslint/types": "npm:8.48.1"
-    "@typescript-eslint/typescript-estree": "npm:8.48.1"
+    "@eslint-community/eslint-utils": "npm:^4.9.1"
+    "@typescript-eslint/scope-manager": "npm:8.55.0"
+    "@typescript-eslint/types": "npm:8.55.0"
+    "@typescript-eslint/typescript-estree": "npm:8.55.0"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
     typescript: ">=4.8.4 <6.0.0"
-  checksum: 10c0/1775ac217b578f52d6c1e85258098f8ef764d04830c6ce11043b434860da80f1a5f7cc1b9f2e0a63de161e83b8d876f7ae8362d7644d5d8e636e60ad5eeff4e2
+  checksum: 10c0/b57b86ac531e433c8057279805e6c903250460bc937cea46ec3b9284181a38f23b7c1ef092e8a1e37179432b39bd587c33db7f031b4243b1207ef37f23e4f24f
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:8.48.1":
-  version: 8.48.1
-  resolution: "@typescript-eslint/visitor-keys@npm:8.48.1"
+"@typescript-eslint/visitor-keys@npm:8.55.0":
+  version: 8.55.0
+  resolution: "@typescript-eslint/visitor-keys@npm:8.55.0"
   dependencies:
-    "@typescript-eslint/types": "npm:8.48.1"
+    "@typescript-eslint/types": "npm:8.55.0"
     eslint-visitor-keys: "npm:^4.2.1"
-  checksum: 10c0/ecf4078ce63c296dd340672b516f42bf452534c75af7e7d6c1a3f32b143ff184cb3a4071d7429a9f870371ff9091a790acce28b85ce3c450bfc60554c79d43ca
+  checksum: 10c0/995c5ca91f7c7c1f3c4fdb4f98654abdff55efa570076b9b012da4cc203ebe7e2aee57ba83208ae51c2aef496c45cb8f6909560349131b779f31ce6f8758da23
   languageName: node
   linkType: hard
 
@@ -4938,18 +4937,18 @@ __metadata:
   linkType: hard
 
 "@vitejs/plugin-react@npm:^5.0.0":
-  version: 5.1.3
-  resolution: "@vitejs/plugin-react@npm:5.1.3"
+  version: 5.1.4
+  resolution: "@vitejs/plugin-react@npm:5.1.4"
   dependencies:
     "@babel/core": "npm:^7.29.0"
     "@babel/plugin-transform-react-jsx-self": "npm:^7.27.1"
     "@babel/plugin-transform-react-jsx-source": "npm:^7.27.1"
-    "@rolldown/pluginutils": "npm:1.0.0-rc.2"
+    "@rolldown/pluginutils": "npm:1.0.0-rc.3"
     "@types/babel__core": "npm:^7.20.5"
     react-refresh: "npm:^0.18.0"
   peerDependencies:
     vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
-  checksum: 10c0/814d950f398f13ab5261593952b0a3a10a8b21220923c99817c99456890e1c0df4f1dd4cb2fc538ce4db4f525695e82ba1771a9e13ae1821283b659a7cfedc12
+  checksum: 10c0/dd7b8f40717ecd4a5ab18f467134ea8135f9a443359333d71e4114aeacfc8b679be9fd36dc12290d076c78883a02e708bfe1f0d93411c06c9659da0879b952e3
   languageName: node
   linkType: hard
 
@@ -7213,18 +7212,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-jsdoc@npm:^61.1.11":
-  version: 61.4.1
-  resolution: "eslint-plugin-jsdoc@npm:61.4.1"
+"eslint-plugin-jsdoc@npm:^61.7.1":
+  version: 61.7.1
+  resolution: "eslint-plugin-jsdoc@npm:61.7.1"
   dependencies:
-    "@es-joy/jsdoccomment": "npm:~0.76.0"
+    "@es-joy/jsdoccomment": "npm:~0.78.0"
     "@es-joy/resolve.exports": "npm:1.2.0"
     are-docs-informative: "npm:^0.0.2"
     comment-parser: "npm:1.4.1"
     debug: "npm:^4.4.3"
     escape-string-regexp: "npm:^4.0.0"
-    espree: "npm:^10.4.0"
-    esquery: "npm:^1.6.0"
+    espree: "npm:^11.0.0"
+    esquery: "npm:^1.7.0"
     html-entities: "npm:^2.6.0"
     object-deep-merge: "npm:^2.0.0"
     parse-imports-exports: "npm:^0.2.4"
@@ -7233,7 +7232,7 @@ __metadata:
     to-valid-identifier: "npm:^1.0.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 10c0/564f89bad71dcdbf6a45c27d16113333a5251f97a60bcc0e7346ea1b19dc1258991e1f585c89a2978e279288be2e180dde58c57f63cd49ac3db6604a5d4c581c
+  checksum: 10c0/d0904b923f68a4e9e6da156316a4e2a972445bf79118bde9618ad80b4ef5927fc2c9dd597b22b776742ef548d65914e75fca190ab3be942385f268a3b83c1087
   languageName: node
   linkType: hard
 
@@ -7316,15 +7315,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-storybook@npm:^10.0.2":
-  version: 10.1.4
-  resolution: "eslint-plugin-storybook@npm:10.1.4"
+"eslint-plugin-storybook@npm:^10.2.8":
+  version: 10.2.8
+  resolution: "eslint-plugin-storybook@npm:10.2.8"
   dependencies:
-    "@typescript-eslint/utils": "npm:^8.8.1"
+    "@typescript-eslint/utils": "npm:^8.48.0"
   peerDependencies:
     eslint: ">=8"
-    storybook: ^10.1.4
-  checksum: 10c0/d68a0244318a386877de12d22ce309725f9f7057002f5182fa50fc965e26ced7d051432d7495046f13ee5803634ce53ef9e58cfe2866c3251f2ff94f8ab50e74
+    storybook: ^10.2.8
+  checksum: 10c0/e4fc59df70cac385b24a7929a8d63d22b2ee6a599b7111b2378da111aeee1ae4629a9fad357086839454b05ec35d6fc8a757e0047f2aa5ebcf38dd966f0be621
   languageName: node
   linkType: hard
 
@@ -7352,9 +7351,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:^9.23.0":
-  version: 9.39.1
-  resolution: "eslint@npm:9.39.1"
+"eslint-visitor-keys@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "eslint-visitor-keys@npm:5.0.0"
+  checksum: 10c0/5ec68b7ae350f6e7813a9ab469f8c64e01e5a954e6e6ee6dc441cc24d315eb342e5fb81ab5fc21f352cf0125096ab4ed93ca892f602a1576ad1eedce591fe64a
+  languageName: node
+  linkType: hard
+
+"eslint@npm:^9.39.2":
+  version: 9.39.2
+  resolution: "eslint@npm:9.39.2"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.8.0"
     "@eslint-community/regexpp": "npm:^4.12.1"
@@ -7362,7 +7368,7 @@ __metadata:
     "@eslint/config-helpers": "npm:^0.4.2"
     "@eslint/core": "npm:^0.17.0"
     "@eslint/eslintrc": "npm:^3.3.1"
-    "@eslint/js": "npm:9.39.1"
+    "@eslint/js": "npm:9.39.2"
     "@eslint/plugin-kit": "npm:^0.4.1"
     "@humanfs/node": "npm:^0.16.6"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
@@ -7397,7 +7403,7 @@ __metadata:
       optional: true
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/59b2480639404ba24578ca480f973683b87b7aac8aa7e349240474a39067804fd13cd8b9cb22fee074170b8c7c563b57bab703ec0f0d3f81ea017e5d2cad299d
+  checksum: 10c0/bb88ca8fd16bb7e1ac3e13804c54d41c583214460c0faa7b3e7c574e69c5600c7122295500fb4b0c06067831111db740931e98da1340329527658e1cf80073d3
   languageName: node
   linkType: hard
 
@@ -7412,6 +7418,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"espree@npm:^11.0.0":
+  version: 11.1.0
+  resolution: "espree@npm:11.1.0"
+  dependencies:
+    acorn: "npm:^8.15.0"
+    acorn-jsx: "npm:^5.3.2"
+    eslint-visitor-keys: "npm:^5.0.0"
+  checksum: 10c0/32228d12896f5aa09f59fad8bf5df228d73310e436c21389876cdd21513b620c087d24b40646cdcff848540d11b078653db0e37ea67ac9c7012a12595d86630c
+  languageName: node
+  linkType: hard
+
 "esprima@npm:~4.0.0":
   version: 4.0.1
   resolution: "esprima@npm:4.0.1"
@@ -7422,12 +7439,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esquery@npm:^1.5.0, esquery@npm:^1.6.0":
-  version: 1.6.0
-  resolution: "esquery@npm:1.6.0"
+"esquery@npm:^1.5.0, esquery@npm:^1.6.0, esquery@npm:^1.7.0":
+  version: 1.7.0
+  resolution: "esquery@npm:1.7.0"
   dependencies:
     estraverse: "npm:^5.1.0"
-  checksum: 10c0/cb9065ec605f9da7a76ca6dadb0619dfb611e37a81e318732977d90fab50a256b95fee2d925fba7c2f3f0523aa16f91587246693bc09bc34d5a59575fe6e93d2
+  checksum: 10c0/77d5173db450b66f3bc685d11af4c90cffeedb340f34a39af96d43509a335ce39c894fd79233df32d38f5e4e219fa0f7076f6ec90bae8320170ba082c0db4793
   languageName: node
   linkType: hard
 
@@ -8071,10 +8088,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globals@npm:^17.0.0":
-  version: 17.0.0
-  resolution: "globals@npm:17.0.0"
-  checksum: 10c0/e3c169fdcb0fc6755707b697afb367bea483eb29992cfc0de1637382eb893146e17f8f96db6d7453e3696b478a7863ae2000e6c71cd2f4061410285106d3847a
+"globals@npm:^17.3.0":
+  version: 17.3.0
+  resolution: "globals@npm:17.3.0"
+  checksum: 10c0/7f21443ecaa60c6e9ff56d9fb6f10a9b5f9514e7f22e5392f715472bb220ce31c865ebf414a32695150e733fb3e1013e6322dbce70fddd1e066f372b8d55a4b8
   languageName: node
   linkType: hard
 
@@ -8130,13 +8147,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"graphemer@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "graphemer@npm:1.4.0"
-  checksum: 10c0/e951259d8cd2e0d196c72ec711add7115d42eb9a8146c8eeda5b8d3ac91e5dd816b9cd68920726d9fd4490368e7ed86e9c423f40db87e2d8dfafa00fa17c3a31
-  languageName: node
-  linkType: hard
-
 "graphql@npm:^16.8.1":
   version: 16.11.0
   resolution: "graphql@npm:16.11.0"
@@ -8418,7 +8428,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ignore@npm:^7.0.0, ignore@npm:^7.0.5":
+"ignore@npm:^7.0.5":
   version: 7.0.5
   resolution: "ignore@npm:7.0.5"
   checksum: 10c0/ae00db89fe873064a093b8999fe4cc284b13ef2a178636211842cceb650b9c3e390d3339191acb145d81ed5379d2074840cf0c33a20bdbd6f32821f79eb4ad5d
@@ -9117,10 +9127,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsdoc-type-pratt-parser@npm:~6.10.0":
-  version: 6.10.0
-  resolution: "jsdoc-type-pratt-parser@npm:6.10.0"
-  checksum: 10c0/8ea395df0cae0e41d4bdba5f8d81b8d3e467fe53d1e4182a5d4e653235a5f17d60ed137343d68dbc74fa10e767f1c58fb85b1f6d5489c2cf16fc7216cc6d3e1a
+"jsdoc-type-pratt-parser@npm:~7.0.0":
+  version: 7.0.0
+  resolution: "jsdoc-type-pratt-parser@npm:7.0.0"
+  checksum: 10c0/3ede53c80dddf940a51dcdc79e3923537650f6fb6e9001fc76023c2d5cb0195cc8b24b7eebf9b3f20a7bc00d5e6b7f70318f0b8cb5972f6aff884152e6698014
   languageName: node
   linkType: hard
 
@@ -9814,7 +9824,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^9.0.4":
+"minimatch@npm:^9.0.4, minimatch@npm:^9.0.5":
   version: 9.0.5
   resolution: "minimatch@npm:9.0.5"
   dependencies:
@@ -10682,8 +10692,8 @@ __metadata:
   linkType: hard
 
 "pino@npm:^10.0.0":
-  version: 10.3.0
-  resolution: "pino@npm:10.3.0"
+  version: 10.3.1
+  resolution: "pino@npm:10.3.1"
   dependencies:
     "@pinojs/redact": "npm:^0.4.0"
     atomic-sleep: "npm:^1.0.0"
@@ -10698,7 +10708,7 @@ __metadata:
     thread-stream: "npm:^4.0.0"
   bin:
     pino: bin.js
-  checksum: 10c0/cfbbc7dfaa2df2aa2dce728d751aa4b5b7ab973b2cd4bfff57868567563ef0c1c021f22932769141d535c72662390e09a0190e44f4413496dbe5e3c672816308
+  checksum: 10c0/ae1c57f2baac85dd5d63a3500746d5ea1cfc4bfcbf356eaec94d42a782eeb80caa4d4614de43a036cf48e2aed46d855a7ff21b126f55a63811def52a894ef937
   languageName: node
   linkType: hard
 
@@ -12465,7 +12475,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.6.0, semver@npm:^7.6.2, semver@npm:^7.7.1, semver@npm:^7.7.3":
+"semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.6.2, semver@npm:^7.7.1, semver@npm:^7.7.3":
   version: 7.7.3
   resolution: "semver@npm:7.7.3"
   bin:
@@ -13648,12 +13658,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-api-utils@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "ts-api-utils@npm:2.1.0"
+"ts-api-utils@npm:^2.4.0":
+  version: 2.4.0
+  resolution: "ts-api-utils@npm:2.4.0"
   peerDependencies:
     typescript: ">=4.8.4"
-  checksum: 10c0/9806a38adea2db0f6aa217ccc6bc9c391ddba338a9fe3080676d0d50ed806d305bb90e8cef0276e793d28c8a929f400abb184ddd7ff83a416959c0f4d2ce754f
+  checksum: 10c0/ed185861aef4e7124366a3f6561113557a57504267d4d452a51e0ba516a9b6e713b56b4aeaab9fa13de9db9ab755c65c8c13a777dba9133c214632cb7b65c083
   languageName: node
   linkType: hard
 
@@ -13821,18 +13831,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript-eslint@npm:^8.28.0, typescript-eslint@npm:^8.45.0":
-  version: 8.48.1
-  resolution: "typescript-eslint@npm:8.48.1"
+"typescript-eslint@npm:^8.55.0":
+  version: 8.55.0
+  resolution: "typescript-eslint@npm:8.55.0"
   dependencies:
-    "@typescript-eslint/eslint-plugin": "npm:8.48.1"
-    "@typescript-eslint/parser": "npm:8.48.1"
-    "@typescript-eslint/typescript-estree": "npm:8.48.1"
-    "@typescript-eslint/utils": "npm:8.48.1"
+    "@typescript-eslint/eslint-plugin": "npm:8.55.0"
+    "@typescript-eslint/parser": "npm:8.55.0"
+    "@typescript-eslint/typescript-estree": "npm:8.55.0"
+    "@typescript-eslint/utils": "npm:8.55.0"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
     typescript: ">=4.8.4 <6.0.0"
-  checksum: 10c0/10b501bf69b14edd09d652b33e4a5dfad0498f2943992a433006933e384cdc5815217b2990801796ddf946d2ef4971d9a16c98c7cfbba41f6aa31b245ad057ac
+  checksum: 10c0/92e3e058a57bb29be7498093fd72f875e010170e1ca19214ae1bd1a1c9454354f71613ac9a6981f1e7e1d9e8b52df8888a1f42d0f2809dd5aeaf27f502787fda
   languageName: node
   linkType: hard