diff --git a/src/actions/compose.ts b/src/actions/compose.ts
index 5ff7ac3cf..50c8afca1 100644
--- a/src/actions/compose.ts
+++ b/src/actions/compose.ts
@@ -379,12 +379,12 @@ const submitCompose = (composeId: string, opts: SubmitComposeOpts = {}) =>
       params.group_id = compose.group_id;
     }
 
-    return dispatch(createStatus(params, idempotencyKey, statusId)).then(function(data) {
+    return dispatch(createStatus(params, idempotencyKey, statusId)).then((data) => {
       if (!statusId && data.visibility === 'direct' && getState().conversations.mounted <= 0 && history) {
         history.push('/messages');
       }
       handleComposeSubmit(dispatch, getState, composeId, data, status, !!statusId);
-    }).catch(function(error) {
+    }).catch((error) => {
       dispatch(submitComposeFail(composeId, error));
     });
   };
diff --git a/src/actions/emoji-reacts.ts b/src/actions/emoji-reacts.ts
index 572414cbf..e73d56ca1 100644
--- a/src/actions/emoji-reacts.ts
+++ b/src/actions/emoji-reacts.ts
@@ -77,10 +77,10 @@ const emojiReact = (status: Status, emoji: string, custom?: string) =>
 
     return api(getState)(`/api/v1/pleroma/statuses/${status.id}/reactions/${emoji}`, {
       method: 'PUT',
-    }).then(function(response) {
+    }).then((response) => {
       dispatch(importFetchedStatus(response.json));
       dispatch(emojiReactSuccess(status, emoji));
-    }).catch(function(error) {
+    }).catch((error) => {
       dispatch(emojiReactFail(status, emoji, error));
     });
   };
diff --git a/src/actions/events.ts b/src/actions/events.ts
index 66029994c..8d01c2ba6 100644
--- a/src/actions/events.ts
+++ b/src/actions/events.ts
@@ -237,7 +237,7 @@ const submitEvent = () =>
           actionLink: `/@${data.account.acct}/events/${data.id}`,
         },
       );
-    }).catch(function(error) {
+    }).catch((error) => {
       dispatch(submitEventFail(error));
     });
   };
@@ -281,7 +281,7 @@ const joinEvent = (id: string, participationMessage?: string) =>
           actionLink: `/@${data.account.acct}/events/${data.id}`,
         },
       );
-    }).catch(function(error) {
+    }).catch((error) => {
       dispatch(joinEventFail(error, status, status?.event?.join_state || null));
     });
   };
@@ -318,7 +318,7 @@ const leaveEvent = (id: string) =>
     }).then(({ json: data }) => {
       dispatch(importFetchedStatus(data));
       dispatch(leaveEventSuccess(data));
-    }).catch(function(error) {
+    }).catch((error) => {
       dispatch(leaveEventFail(error, status));
     });
   };
diff --git a/src/actions/interactions.ts b/src/actions/interactions.ts
index 93849d511..4b5674536 100644
--- a/src/actions/interactions.ts
+++ b/src/actions/interactions.ts
@@ -88,12 +88,12 @@ const messages = defineMessages({
 });
 
 const reblog = (status: StatusEntity) =>
-  function(dispatch: AppDispatch, getState: () => RootState) {
+  (dispatch: AppDispatch, getState: () => RootState) => {
     if (!isLoggedIn(getState)) return;
 
     dispatch(reblogRequest(status));
 
-    api(getState)(`/api/v1/statuses/${status.id}/reblog`, { method: 'POST' }).then(function(response) {
+    api(getState)(`/api/v1/statuses/${status.id}/reblog`, { method: 'POST' }).then((response) => {
       // The reblog API method returns a new status wrapped around the original. In this case we are only
       // interested in how the original is modified, hence passing it skipping the wrapper
       dispatch(importFetchedStatus(response.json.reblog));
@@ -169,9 +169,9 @@ const favourite = (status: StatusEntity) =>
 
     dispatch(favouriteRequest(status));
 
-    api(getState)(`/api/v1/statuses/${status.id}/favourite`, { method: 'POST' }).then(function(response) {
+    api(getState)(`/api/v1/statuses/${status.id}/favourite`, { method: 'POST' }).then(() => {
       dispatch(favouriteSuccess(status));
-    }).catch(function(error) {
+    }).catch((error) => {
       dispatch(favouriteFail(status, error));
     });
   };
@@ -242,9 +242,9 @@ const dislike = (status: StatusEntity) =>
 
     dispatch(dislikeRequest(status));
 
-    api(getState)(`/api/friendica/statuses/${status.id}/dislike`, { method: 'POST' }).then(function() {
+    api(getState)(`/api/friendica/statuses/${status.id}/dislike`, { method: 'POST' }).then(() => {
       dispatch(dislikeSuccess(status));
-    }).catch(function(error) {
+    }).catch((error) => {
       dispatch(dislikeFail(status, error));
     });
   };
@@ -321,7 +321,7 @@ const bookmark = (status: StatusEntity, folderId?: string) =>
     return api(getState)(`/api/v1/statuses/${status.id}/bookmark`, {
       method: 'POST',
       body: folderId ? JSON.stringify({ folder_id: folderId }) : undefined,
-    }).then(function(response) {
+    }).then((response) => {
       dispatch(importFetchedStatus(response.json));
       dispatch(bookmarkSuccess(status, response.json));
 
@@ -339,7 +339,7 @@ const bookmark = (status: StatusEntity, folderId?: string) =>
       }
 
       toast.success(typeof folderId === 'string' ? messages.folderChanged : messages.bookmarkAdded, opts);
-    }).catch(function(error) {
+    }).catch((error) => {
       dispatch(bookmarkFail(status, error));
     });
   };
diff --git a/src/actions/onboarding.ts b/src/actions/onboarding.ts
index 18f75a3d6..a25b2137f 100644
--- a/src/actions/onboarding.ts
+++ b/src/actions/onboarding.ts
@@ -11,7 +11,7 @@ type OnboardingEndAction = {
   type: typeof ONBOARDING_END;
 }
 
-export type OnboardingActions = OnboardingStartAction | OnboardingEndAction
+type OnboardingActions = OnboardingStartAction | OnboardingEndAction
 
 const checkOnboardingStatus = () => (dispatch: React.Dispatch<OnboardingActions>) => {
   const needsOnboarding = localStorage.getItem(ONBOARDING_LOCAL_STORAGE_KEY) === '1';
@@ -32,6 +32,7 @@ const endOnboarding = () => (dispatch: React.Dispatch<OnboardingActions>) => {
 };
 
 export {
+  type OnboardingActions,
   ONBOARDING_END,
   ONBOARDING_START,
   checkOnboardingStatus,
diff --git a/src/api/__mocks__/index.ts b/src/api/__mocks__/index.ts
index 08260cb39..b28d2e252 100644
--- a/src/api/__mocks__/index.ts
+++ b/src/api/__mocks__/index.ts
@@ -5,30 +5,30 @@ import { vi } from 'vitest';
 const api = await vi.importActual('../index') as Record<string, Function>;
 let mocks: Array<Function> = [];
 
-export const __stub = (func: (mock: any) => void) => mocks.push(func);
-export const __clear = (): Function[] => mocks = [];
+const __stub = (func: (mock: any) => void) => mocks.push(func);
+const __clear = (): Function[] => mocks = [];
 
 // const setupMock = (axios: AxiosInstance) => {
 //   const mock = new MockAdapter(axios, { onNoMatch: 'throwException' });
 //   mocks.map(func => func(mock));
 // };
 
-export const staticClient = api.staticClient;
+const staticClient = api.staticClient;
 
-export const getLinks = (response: Response): LinkHeader =>
+const getLinks = (response: Response): LinkHeader =>
   new LinkHeader(response.headers?.get('link') || undefined);
 
-export const getNextLink = (response: Response) => {
+const getNextLink = (response: Response) => {
   const nextLink = new LinkHeader(response.headers?.get('link') || undefined);
   return nextLink.refs.find(link => link.rel === 'next')?.uri;
 };
 
-export const getPrevLink = (response: Response) => {
+const getPrevLink = (response: Response) => {
   const prevLink = new LinkHeader(response.headers?.get('link') || undefined);
   return prevLink.refs.find(link => link.rel === 'prev')?.uri;
 };
 
-export const baseClient = (...params: any[]) => {
+const baseClient = (...params: any[]) => {
   const axios = api.baseClient(...params);
   // setupMock(axios);
   return axios;
@@ -39,3 +39,5 @@ export default (...params: any[]) => {
   // setupMock(axios);
   return axios;
 };
+
+export { __stub, __clear, staticClient, getLinks, getNextLink, getPrevLink, baseClient };
diff --git a/src/components/__mocks__/react-inlinesvg.tsx b/src/components/__mocks__/react-inlinesvg.tsx
index f9a7cd892..f5eea5371 100644
--- a/src/components/__mocks__/react-inlinesvg.tsx
+++ b/src/components/__mocks__/react-inlinesvg.tsx
@@ -12,4 +12,4 @@ const InlineSVG: React.FC<IInlineSVG> = ({ loader }): JSX.Element => {
   }
 };
 
-export default InlineSVG;
+export { InlineSVG as default };
diff --git a/src/components/account-search.tsx b/src/components/account-search.tsx
index 98cb596dd..2f0a807e2 100644
--- a/src/components/account-search.tsx
+++ b/src/components/account-search.tsx
@@ -89,4 +89,4 @@ const AccountSearch: React.FC<IAccountSearch> = ({ onSelected, ...rest }) => {
   );
 };
 
-export default AccountSearch;
+export { AccountSearch as default };
diff --git a/src/components/account.tsx b/src/components/account.tsx
index df7aa9d0d..ad3679eb4 100644
--- a/src/components/account.tsx
+++ b/src/components/account.tsx
@@ -68,7 +68,7 @@ const ProfilePopper: React.FC<IProfilePopper> = ({ condition, wrapper, children
   </>
 );
 
-export interface IAccount {
+interface IAccount {
   account: AccountSchema;
   action?: React.ReactElement;
   actionAlignment?: 'center' | 'top';
@@ -304,4 +304,4 @@ const Account = ({
   );
 };
 
-export default Account;
+export { type IAccount, Account as default };
diff --git a/src/components/animated-number.tsx b/src/components/animated-number.tsx
index 2c49dee9e..6148517f1 100644
--- a/src/components/animated-number.tsx
+++ b/src/components/animated-number.tsx
@@ -102,4 +102,4 @@ const AnimatedNumber: React.FC<IAnimatedNumber> = ({ value, obfuscate, short, ma
   );
 };
 
-export default AnimatedNumber;
\ No newline at end of file
+export { AnimatedNumber as default };
\ No newline at end of file
diff --git a/src/components/announcements/announcement-content.tsx b/src/components/announcements/announcement-content.tsx
index 07908c9b9..108b06452 100644
--- a/src/components/announcements/announcement-content.tsx
+++ b/src/components/announcements/announcement-content.tsx
@@ -87,4 +87,4 @@ const AnnouncementContent: React.FC<IAnnouncementContent> = ({ announcement }) =
   );
 };
 
-export default AnnouncementContent;
+export { AnnouncementContent as default };
diff --git a/src/components/announcements/announcement.tsx b/src/components/announcements/announcement.tsx
index 3b07e8ece..b1467a9cf 100644
--- a/src/components/announcements/announcement.tsx
+++ b/src/components/announcements/announcement.tsx
@@ -69,4 +69,4 @@ const Announcement: React.FC<IAnnouncement> = ({ announcement, emojiMap }) => {
   );
 };
 
-export default Announcement;
+export { Announcement as default };
diff --git a/src/components/announcements/announcements-panel.tsx b/src/components/announcements/announcements-panel.tsx
index 966df4479..cc3676330 100644
--- a/src/components/announcements/announcements-panel.tsx
+++ b/src/components/announcements/announcements-panel.tsx
@@ -60,4 +60,4 @@ const AnnouncementsPanel = () => {
   );
 };
 
-export default AnnouncementsPanel;
+export { AnnouncementsPanel as default };
diff --git a/src/components/announcements/emoji.tsx b/src/components/announcements/emoji.tsx
index 1f6f8ed18..f835a21b6 100644
--- a/src/components/announcements/emoji.tsx
+++ b/src/components/announcements/emoji.tsx
@@ -48,4 +48,4 @@ const Emoji: React.FC<IEmoji> = ({ emoji, emojiMap, hovered }) => {
   }
 };
 
-export default Emoji;
+export { Emoji as default };
diff --git a/src/components/announcements/reaction.tsx b/src/components/announcements/reaction.tsx
index 005d0a88e..9d7c05762 100644
--- a/src/components/announcements/reaction.tsx
+++ b/src/components/announcements/reaction.tsx
@@ -64,4 +64,4 @@ const Reaction: React.FC<IReaction> = ({ announcementId, reaction, emojiMap, sty
   );
 };
 
-export default Reaction;
+export { Reaction as default };
diff --git a/src/components/announcements/reactions-bar.tsx b/src/components/announcements/reactions-bar.tsx
index 694e1ea2f..5488641ba 100644
--- a/src/components/announcements/reactions-bar.tsx
+++ b/src/components/announcements/reactions-bar.tsx
@@ -59,4 +59,4 @@ const ReactionsBar: React.FC<IReactionsBar> = ({ announcementId, reactions, emoj
   );
 };
 
-export default ReactionsBar;
+export { ReactionsBar as default };
diff --git a/src/components/attachment-thumbs.tsx b/src/components/attachment-thumbs.tsx
index abde976a1..1fc8743ae 100644
--- a/src/components/attachment-thumbs.tsx
+++ b/src/components/attachment-thumbs.tsx
@@ -40,4 +40,4 @@ const AttachmentThumbs = (props: IAttachmentThumbs) => {
   );
 };
 
-export default AttachmentThumbs;
+export { AttachmentThumbs as default };
diff --git a/src/components/autosuggest-account-input.tsx b/src/components/autosuggest-account-input.tsx
index 1b7c05499..955aae065 100644
--- a/src/components/autosuggest-account-input.tsx
+++ b/src/components/autosuggest-account-input.tsx
@@ -93,4 +93,4 @@ const AutosuggestAccountInput: React.FC<IAutosuggestAccountInput> = ({
   );
 };
 
-export default AutosuggestAccountInput;
+export { AutosuggestAccountInput as default };
diff --git a/src/components/autosuggest-emoji.tsx b/src/components/autosuggest-emoji.tsx
index 14c6889f3..e4dd3ae17 100644
--- a/src/components/autosuggest-emoji.tsx
+++ b/src/components/autosuggest-emoji.tsx
@@ -40,4 +40,4 @@ const AutosuggestEmoji: React.FC<IAutosuggestEmoji> = ({ emoji }) => {
   );
 };
 
-export default AutosuggestEmoji;
+export { AutosuggestEmoji as default };
diff --git a/src/components/autosuggest-input.tsx b/src/components/autosuggest-input.tsx
index 8956b6b08..eb3e0eee1 100644
--- a/src/components/autosuggest-input.tsx
+++ b/src/components/autosuggest-input.tsx
@@ -13,9 +13,9 @@ import type { Menu, MenuItem } from 'soapbox/components/dropdown-menu';
 import type { InputThemes } from 'soapbox/components/ui/input/input';
 import type { Emoji } from 'soapbox/features/emoji';
 
-export type AutoSuggestion = string | Emoji;
+type AutoSuggestion = string | Emoji;
 
-export interface IAutosuggestInput extends Pick<React.HTMLAttributes<HTMLInputElement>, 'onChange' | 'onKeyUp' | 'onKeyDown'> {
+interface IAutosuggestInput extends Pick<React.HTMLAttributes<HTMLInputElement>, 'onChange' | 'onKeyUp' | 'onKeyDown'> {
   value: string;
   suggestions: ImmutableList<any>;
   disabled?: boolean;
@@ -35,7 +35,7 @@ export interface IAutosuggestInput extends Pick<React.HTMLAttributes<HTMLInputEl
   theme?: InputThemes;
 }
 
-export default class AutosuggestInput extends ImmutablePureComponent<IAutosuggestInput> {
+class AutosuggestInput extends ImmutablePureComponent<IAutosuggestInput> {
 
   static defaultProps = {
     autoFocus: false,
@@ -307,3 +307,5 @@ export default class AutosuggestInput extends ImmutablePureComponent<IAutosugges
   }
 
 }
+
+export { type AutoSuggestion, type IAutosuggestInput, AutosuggestInput as default };
diff --git a/src/components/autosuggest-location.tsx b/src/components/autosuggest-location.tsx
index 01ee28a13..bee2d4400 100644
--- a/src/components/autosuggest-location.tsx
+++ b/src/components/autosuggest-location.tsx
@@ -38,7 +38,4 @@ const AutosuggestLocation: React.FC<IAutosuggestLocation> = ({ id }) => {
   );
 };
 
-export {
-  ADDRESS_ICONS,
-  AutosuggestLocation as default,
-};
+export { ADDRESS_ICONS, AutosuggestLocation as default };
diff --git a/src/components/avatar-stack.tsx b/src/components/avatar-stack.tsx
index e9193d344..70d514f1e 100644
--- a/src/components/avatar-stack.tsx
+++ b/src/components/avatar-stack.tsx
@@ -37,4 +37,4 @@ const AvatarStack: React.FC<IAvatarStack> = ({ accountIds, limit = 3 }) => {
   );
 };
 
-export default AvatarStack;
+export { AvatarStack as default };
diff --git a/src/components/badge.tsx b/src/components/badge.tsx
index e5476ca81..2f7fad676 100644
--- a/src/components/badge.tsx
+++ b/src/components/badge.tsx
@@ -43,4 +43,4 @@ const Badge: React.FC<IBadge> = ({ title, slug, color }) => {
   );
 };
 
-export default Badge;
+export { Badge as default };
diff --git a/src/components/birthday-input.tsx b/src/components/birthday-input.tsx
index 677eac933..8884c8507 100644
--- a/src/components/birthday-input.tsx
+++ b/src/components/birthday-input.tsx
@@ -126,4 +126,4 @@ const BirthdayInput: React.FC<IBirthdayInput> = ({ value, onChange, required })
   );
 };
 
-export default BirthdayInput;
+export { BirthdayInput as default };
diff --git a/src/components/birthday-panel.tsx b/src/components/birthday-panel.tsx
index f1f31d94e..c962b1834 100644
--- a/src/components/birthday-panel.tsx
+++ b/src/components/birthday-panel.tsx
@@ -65,4 +65,4 @@ const BirthdayPanel = ({ limit }: IBirthdayPanel) => {
   );
 };
 
-export default BirthdayPanel;
+export { BirthdayPanel as default };
diff --git a/src/components/blurhash.tsx b/src/components/blurhash.tsx
index c492b0e05..76a058b69 100644
--- a/src/components/blurhash.tsx
+++ b/src/components/blurhash.tsx
@@ -21,7 +21,7 @@ interface IBlurhash {
  * Renders a blurhash in a canvas element.
  * @see {@link https://blurha.sh/}
  */
-const Blurhash: React.FC<IBlurhash> = ({
+const Blurhash: React.FC<IBlurhash> = React.memo(({
   hash,
   width = 32,
   height = width,
@@ -54,6 +54,6 @@ const Blurhash: React.FC<IBlurhash> = ({
   return (
     <canvas {...canvasProps} ref={canvasRef} width={width} height={height} />
   );
-};
+});
 
-export default React.memo(Blurhash);
+export { Blurhash as default };
diff --git a/src/components/copyable-input.tsx b/src/components/copyable-input.tsx
index 90089927c..dfa8af73d 100644
--- a/src/components/copyable-input.tsx
+++ b/src/components/copyable-input.tsx
@@ -51,4 +51,4 @@ const CopyableInput: React.FC<ICopyableInput> = ({ value, type = 'text', onCopy
   );
 };
 
-export default CopyableInput;
+export { CopyableInput as default };
diff --git a/src/components/domain.tsx b/src/components/domain.tsx
index 2b2d25bea..379c74574 100644
--- a/src/components/domain.tsx
+++ b/src/components/domain.tsx
@@ -43,4 +43,4 @@ const Domain: React.FC<IDomain> = ({ domain }) => {
   );
 };
 
-export default Domain;
+export { Domain as default };
diff --git a/src/components/dropdown-menu/dropdown-menu-item.tsx b/src/components/dropdown-menu/dropdown-menu-item.tsx
index 8252a6dd4..61cf054d5 100644
--- a/src/components/dropdown-menu/dropdown-menu-item.tsx
+++ b/src/components/dropdown-menu/dropdown-menu-item.tsx
@@ -4,7 +4,7 @@ import { useHistory } from 'react-router-dom';
 
 import { Counter, Icon } from '../ui';
 
-export interface MenuItem {
+interface MenuItem {
   action?: React.EventHandler<React.KeyboardEvent | React.MouseEvent>;
   active?: boolean;
   count?: number;
@@ -106,4 +106,4 @@ const DropdownMenuItem = ({ index, item, onClick }: IDropdownMenuItem) => {
   );
 };
 
-export default DropdownMenuItem;
+export { type MenuItem, DropdownMenuItem as default };
diff --git a/src/components/dropdown-menu/dropdown-menu.tsx b/src/components/dropdown-menu/dropdown-menu.tsx
index 3c7d02a4c..3c888cf53 100644
--- a/src/components/dropdown-menu/dropdown-menu.tsx
+++ b/src/components/dropdown-menu/dropdown-menu.tsx
@@ -15,7 +15,7 @@ import DropdownMenuItem, { MenuItem } from './dropdown-menu-item';
 
 import type { Status } from 'soapbox/types/entities';
 
-export type Menu = Array<MenuItem | null>;
+type Menu = Array<MenuItem | null>;
 
 interface IDropdownMenu {
   children?: React.ReactElement;
@@ -326,4 +326,4 @@ const DropdownMenu = (props: IDropdownMenu) => {
   );
 };
 
-export default DropdownMenu;
+export { type Menu, DropdownMenu as default };
diff --git a/src/components/dropdown-menu/index.ts b/src/components/dropdown-menu/index.ts
index 014166d01..6adc0efc3 100644
--- a/src/components/dropdown-menu/index.ts
+++ b/src/components/dropdown-menu/index.ts
@@ -1,3 +1,2 @@
-export { default } from './dropdown-menu';
-export type { Menu } from './dropdown-menu';
+export { default, type Menu } from './dropdown-menu';
 export type { MenuItem } from './dropdown-menu-item';
\ No newline at end of file
diff --git a/src/components/event-preview.tsx b/src/components/event-preview.tsx
index 5ef36a4d5..d2e3de706 100644
--- a/src/components/event-preview.tsx
+++ b/src/components/event-preview.tsx
@@ -90,4 +90,4 @@ const EventPreview: React.FC<IEventPreview> = ({ status, className, hideAction,
   );
 };
 
-export default EventPreview;
+export { EventPreview as default };
diff --git a/src/components/extended-video-player.tsx b/src/components/extended-video-player.tsx
index 2b4ad8b0e..b02382f7f 100644
--- a/src/components/extended-video-player.tsx
+++ b/src/components/extended-video-player.tsx
@@ -61,4 +61,4 @@ const ExtendedVideoPlayer: React.FC<IExtendedVideoPlayer> = ({ src, alt, time, c
   );
 };
 
-export default ExtendedVideoPlayer;
+export { ExtendedVideoPlayer as default };
diff --git a/src/components/fork-awesome-icon.tsx b/src/components/fork-awesome-icon.tsx
index 09d5c8edb..be72ffb24 100644
--- a/src/components/fork-awesome-icon.tsx
+++ b/src/components/fork-awesome-icon.tsx
@@ -8,7 +8,7 @@
 import clsx from 'clsx';
 import React from 'react';
 
-export interface IForkAwesomeIcon extends React.HTMLAttributes<HTMLLIElement> {
+interface IForkAwesomeIcon extends React.HTMLAttributes<HTMLLIElement> {
   id: string;
   className?: string;
   fixedWidth?: boolean;
@@ -31,4 +31,4 @@ const ForkAwesomeIcon: React.FC<IForkAwesomeIcon> = ({ id, className, fixedWidth
   );
 };
 
-export default ForkAwesomeIcon;
+export { type IForkAwesomeIcon, ForkAwesomeIcon as default };
diff --git a/src/components/gdpr-banner.tsx b/src/components/gdpr-banner.tsx
index b793c972f..7a53ac3b1 100644
--- a/src/components/gdpr-banner.tsx
+++ b/src/components/gdpr-banner.tsx
@@ -61,4 +61,4 @@ const GdprBanner: React.FC = () => {
   );
 };
 
-export default GdprBanner;
+export { GdprBanner as default };
diff --git a/src/components/group-card.tsx b/src/components/group-card.tsx
index 5ecc7e56e..2e1527716 100644
--- a/src/components/group-card.tsx
+++ b/src/components/group-card.tsx
@@ -51,4 +51,4 @@ const GroupCard: React.FC<IGroupCard> = ({ group }) => (
   </Stack>
 );
 
-export default GroupCard;
+export { GroupCard as default };
diff --git a/src/components/groups/group-avatar.tsx b/src/components/groups/group-avatar.tsx
index 13b40d237..99cad4f71 100644
--- a/src/components/groups/group-avatar.tsx
+++ b/src/components/groups/group-avatar.tsx
@@ -34,4 +34,4 @@ const GroupAvatar = (props: IGroupAvatar) => {
   );
 };
 
-export default GroupAvatar;
\ No newline at end of file
+export { GroupAvatar as default };
\ No newline at end of file
diff --git a/src/components/groups/popover/group-popover.tsx b/src/components/groups/popover/group-popover.tsx
index c73f254d6..c9ecbba68 100644
--- a/src/components/groups/popover/group-popover.tsx
+++ b/src/components/groups/popover/group-popover.tsx
@@ -105,4 +105,4 @@ const GroupPopover = (props: IGroupPopoverContainer) => {
   );
 };
 
-export default GroupPopover;
\ No newline at end of file
+export { GroupPopover as default };
\ No newline at end of file
diff --git a/src/components/hashtag-link.tsx b/src/components/hashtag-link.tsx
index a0f647a87..5aae503bd 100644
--- a/src/components/hashtag-link.tsx
+++ b/src/components/hashtag-link.tsx
@@ -12,4 +12,4 @@ const HashtagLink: React.FC<IHashtagLink> = ({ hashtag }) => (
   </Link>
 );
 
-export default HashtagLink;
\ No newline at end of file
+export { HashtagLink as default };
\ No newline at end of file
diff --git a/src/components/hashtag.tsx b/src/components/hashtag.tsx
index 1963c4f04..9771e59db 100644
--- a/src/components/hashtag.tsx
+++ b/src/components/hashtag.tsx
@@ -52,4 +52,4 @@ const Hashtag: React.FC<IHashtag> = ({ hashtag }) => {
   );
 };
 
-export default Hashtag;
+export { Hashtag as default };
diff --git a/src/components/helmet.tsx b/src/components/helmet.tsx
index b50dcb2e4..7ce54eaca 100644
--- a/src/components/helmet.tsx
+++ b/src/components/helmet.tsx
@@ -52,4 +52,4 @@ const Helmet: React.FC<IHelmet> = ({ children }) => {
   );
 };
 
-export default Helmet;
+export { Helmet as default };
diff --git a/src/components/hover-ref-wrapper.tsx b/src/components/hover-ref-wrapper.tsx
index 8d0aa1ecd..ea242c369 100644
--- a/src/components/hover-ref-wrapper.tsx
+++ b/src/components/hover-ref-wrapper.tsx
@@ -22,7 +22,7 @@ interface IHoverRefWrapper {
 }
 
 /** Makes a profile hover card appear when the wrapped element is hovered. */
-export const HoverRefWrapper: React.FC<IHoverRefWrapper> = ({ accountId, children, inline = false, className }) => {
+const HoverRefWrapper: React.FC<IHoverRefWrapper> = ({ accountId, children, inline = false, className }) => {
   const dispatch = useAppDispatch();
   const ref = useRef<HTMLDivElement>(null);
   const Elem: keyof JSX.IntrinsicElements = inline ? 'span' : 'div';
diff --git a/src/components/hover-status-wrapper.tsx b/src/components/hover-status-wrapper.tsx
index 685dbf3d9..a5e9bc715 100644
--- a/src/components/hover-status-wrapper.tsx
+++ b/src/components/hover-status-wrapper.tsx
@@ -21,7 +21,7 @@ interface IHoverStatusWrapper {
 }
 
 /** Makes a status hover card appear when the wrapped element is hovered. */
-export const HoverStatusWrapper: React.FC<IHoverStatusWrapper> = ({ statusId, children, inline = false, className }) => {
+const HoverStatusWrapper: React.FC<IHoverStatusWrapper> = ({ statusId, children, inline = false, className }) => {
   const dispatch = useDispatch();
   const ref = useRef<HTMLDivElement>(null);
   const Elem: keyof JSX.IntrinsicElements = inline ? 'span' : 'div';
diff --git a/src/components/icon-button.tsx b/src/components/icon-button.tsx
index a209aa73c..fab634aaa 100644
--- a/src/components/icon-button.tsx
+++ b/src/components/icon-button.tsx
@@ -97,4 +97,4 @@ const IconButton: React.FC<IIconButton> = ({
   );
 };
 
-export default IconButton;
+export { IconButton as default };
diff --git a/src/components/icon-with-counter.tsx b/src/components/icon-with-counter.tsx
index 5e268c473..89bce555a 100644
--- a/src/components/icon-with-counter.tsx
+++ b/src/components/icon-with-counter.tsx
@@ -22,4 +22,4 @@ const IconWithCounter: React.FC<IIconWithCounter> = ({ icon, count, countMax, ..
   </div>
 );
 
-export default IconWithCounter;
+export { IconWithCounter as default };
diff --git a/src/components/icon.tsx b/src/components/icon.tsx
index b197424b7..8c5ed7fdf 100644
--- a/src/components/icon.tsx
+++ b/src/components/icon.tsx
@@ -7,7 +7,7 @@ import clsx from 'clsx';
 import React from 'react';
 import InlineSVG from 'react-inlinesvg'; // eslint-disable-line no-restricted-imports
 
-export interface IIcon extends React.HTMLAttributes<HTMLDivElement> {
+interface IIcon extends React.HTMLAttributes<HTMLDivElement> {
   src: string;
   id?: string;
   alt?: string;
@@ -26,4 +26,4 @@ const Icon: React.FC<IIcon> = ({ src, alt, className, ...rest }) => (
   </div>
 );
 
-export default Icon;
+export { type IIcon, Icon as default };
diff --git a/src/components/landing-gradient.tsx b/src/components/landing-gradient.tsx
index ed27fe214..7bf75dc11 100644
--- a/src/components/landing-gradient.tsx
+++ b/src/components/landing-gradient.tsx
@@ -5,4 +5,4 @@ const LandingGradient: React.FC = () => (
   <div className='fixed h-screen w-full bg-gradient-to-tr from-primary-50 via-white to-gradient-end/10 black:hidden dark:from-primary-900/50 dark:via-primary-900 dark:to-primary-800/50' />
 );
 
-export default LandingGradient;
+export { LandingGradient as default };
diff --git a/src/components/link.tsx b/src/components/link.tsx
index 51bb91300..2ce0181f8 100644
--- a/src/components/link.tsx
+++ b/src/components/link.tsx
@@ -8,4 +8,4 @@ const Link = (props: LinkProps) => (
   />
 );
 
-export default Link;
\ No newline at end of file
+export { Link as default };
\ No newline at end of file
diff --git a/src/components/load-gap.tsx b/src/components/load-gap.tsx
index 376100fad..358712384 100644
--- a/src/components/load-gap.tsx
+++ b/src/components/load-gap.tsx
@@ -25,4 +25,4 @@ const LoadGap: React.FC<ILoadGap> = ({ disabled, maxId, onClick }) => {
   );
 };
 
-export default LoadGap;
+export { LoadGap as default };
diff --git a/src/components/load-more.tsx b/src/components/load-more.tsx
index c356751b9..1cedb49b1 100644
--- a/src/components/load-more.tsx
+++ b/src/components/load-more.tsx
@@ -22,4 +22,4 @@ const LoadMore: React.FC<ILoadMore> = ({ onClick, disabled, visible = true, clas
   );
 };
 
-export default LoadMore;
+export { LoadMore as default };
diff --git a/src/components/loading-screen.tsx b/src/components/loading-screen.tsx
index 9717f1c3a..35028658d 100644
--- a/src/components/loading-screen.tsx
+++ b/src/components/loading-screen.tsx
@@ -16,4 +16,4 @@ const LoadingScreen: React.FC = () => (
   </div>
 );
 
-export default LoadingScreen;
+export { LoadingScreen as default };
diff --git a/src/components/location-search.tsx b/src/components/location-search.tsx
index 7a745eda8..8bea96c03 100644
--- a/src/components/location-search.tsx
+++ b/src/components/location-search.tsx
@@ -105,4 +105,4 @@ const LocationSearch: React.FC<ILocationSearch> = ({ onSelected }) => {
   );
 };
 
-export default LocationSearch;
+export { LocationSearch as default };
diff --git a/src/components/markup.tsx b/src/components/markup.tsx
index a1b006393..46a5c5c8e 100644
--- a/src/components/markup.tsx
+++ b/src/components/markup.tsx
@@ -9,4 +9,4 @@ interface IMarkup extends IText {
 /** Styles HTML markup returned by the API, such as in account bios and statuses. */
 const Markup = React.forwardRef<any, IMarkup>((props, ref) => <Text ref={ref} {...props} data-markup />);
 
-export default Markup;
\ No newline at end of file
+export { Markup as default };
\ No newline at end of file
diff --git a/src/components/media-gallery.tsx b/src/components/media-gallery.tsx
index aa831e7e2..dddc3e9bc 100644
--- a/src/components/media-gallery.tsx
+++ b/src/components/media-gallery.tsx
@@ -269,7 +269,7 @@ const Item: React.FC<IItem> = ({
   );
 };
 
-export interface IMediaGallery {
+interface IMediaGallery {
   sensitive?: boolean;
   media: ImmutableList<Attachment>;
   height?: number;
@@ -566,4 +566,7 @@ const MediaGallery: React.FC<IMediaGallery> = (props) => {
   );
 };
 
-export default MediaGallery;
+export {
+  type IMediaGallery,
+  MediaGallery as default,
+};
diff --git a/src/components/mention.tsx b/src/components/mention.tsx
index d8fb2c66a..e33be36e1 100644
--- a/src/components/mention.tsx
+++ b/src/components/mention.tsx
@@ -33,4 +33,4 @@ const Mention: React.FC<IMention> = ({ mention: { acct, username }, disabled })
   );
 };
 
-export default Mention;
\ No newline at end of file
+export { Mention as default };
\ No newline at end of file
diff --git a/src/components/missing-indicator.tsx b/src/components/missing-indicator.tsx
index 69bade6c2..0adb8ec72 100644
--- a/src/components/missing-indicator.tsx
+++ b/src/components/missing-indicator.tsx
@@ -23,4 +23,4 @@ const MissingIndicator = ({ nested = false }: MissingIndicatorProps): JSX.Elemen
   </Card>
 );
 
-export default MissingIndicator;
+export { MissingIndicator as default };
diff --git a/src/components/outline-box.tsx b/src/components/outline-box.tsx
index a46262a5b..3d228df1e 100644
--- a/src/components/outline-box.tsx
+++ b/src/components/outline-box.tsx
@@ -16,4 +16,4 @@ const OutlineBox: React.FC<IOutlineBox> = ({ children, className, ...rest }) =>
   </div>
 );
 
-export default OutlineBox;
+export { OutlineBox as default };
diff --git a/src/components/polls/poll-footer.tsx b/src/components/polls/poll-footer.tsx
index 402216a71..b015460a2 100644
--- a/src/components/polls/poll-footer.tsx
+++ b/src/components/polls/poll-footer.tsx
@@ -95,4 +95,4 @@ const PollFooter: React.FC<IPollFooter> = ({ poll, showResults, selected }): JSX
   );
 };
 
-export default PollFooter;
+export { PollFooter as default };
diff --git a/src/components/polls/poll-option.tsx b/src/components/polls/poll-option.tsx
index f0a5520fc..fbb8985ef 100644
--- a/src/components/polls/poll-option.tsx
+++ b/src/components/polls/poll-option.tsx
@@ -162,4 +162,4 @@ const PollOption: React.FC<IPollOption> = (props): JSX.Element | null => {
   );
 };
 
-export default PollOption;
+export { PollOption as default };
diff --git a/src/components/polls/poll.tsx b/src/components/polls/poll.tsx
index 45336a05c..3f5968613 100644
--- a/src/components/polls/poll.tsx
+++ b/src/components/polls/poll.tsx
@@ -10,7 +10,7 @@ import { Stack, Text } from '../ui';
 import PollFooter from './poll-footer';
 import PollOption from './poll-option';
 
-export type Selected = Record<number, boolean>;
+type Selected = Record<number, boolean>;
 
 interface IPoll {
   id: string;
@@ -97,4 +97,4 @@ const Poll: React.FC<IPoll> = ({ id, status }): JSX.Element | null => {
   );
 };
 
-export default Poll;
+export { type Selected, Poll as default };
diff --git a/src/components/preview-card.tsx b/src/components/preview-card.tsx
index 80ebc8993..1d2525a10 100644
--- a/src/components/preview-card.tsx
+++ b/src/components/preview-card.tsx
@@ -259,4 +259,4 @@ const trim = (text: string, len: number): string => {
   return text.substring(0, cut) + (text.length > len ? '…' : '');
 };
 
-export default PreviewCard;
+export { PreviewCard as default };
diff --git a/src/components/profile-hover-card.tsx b/src/components/profile-hover-card.tsx
index d11bdecab..1872ef73a 100644
--- a/src/components/profile-hover-card.tsx
+++ b/src/components/profile-hover-card.tsx
@@ -49,7 +49,7 @@ interface IProfileHoverCard {
 }
 
 /** Popup profile preview that appears when hovering avatars and display names. */
-export const ProfileHoverCard: React.FC<IProfileHoverCard> = ({ visible = true }) => {
+const ProfileHoverCard: React.FC<IProfileHoverCard> = ({ visible = true }) => {
   const dispatch = useAppDispatch();
   const history = useHistory();
   const intl = useIntl();
@@ -147,4 +147,4 @@ export const ProfileHoverCard: React.FC<IProfileHoverCard> = ({ visible = true }
   );
 };
 
-export default ProfileHoverCard;
+export { ProfileHoverCard as default };
diff --git a/src/components/progress-circle.tsx b/src/components/progress-circle.tsx
index 1adb3f46e..1956aa52c 100644
--- a/src/components/progress-circle.tsx
+++ b/src/components/progress-circle.tsx
@@ -49,4 +49,4 @@ const ProgressCircle: React.FC<IProgressCircle> = ({ progress, radius = 12, stro
   );
 };
 
-export default ProgressCircle;
+export { ProgressCircle as default };
diff --git a/src/components/pull-to-refresh.tsx b/src/components/pull-to-refresh.tsx
index 829441b37..8e06be527 100644
--- a/src/components/pull-to-refresh.tsx
+++ b/src/components/pull-to-refresh.tsx
@@ -41,4 +41,4 @@ const PullToRefresh: React.FC<IPullToRefresh> = ({ children, onRefresh, ...rest
   );
 };
 
-export default PullToRefresh;
+export { PullToRefresh as default };
diff --git a/src/components/quoted-status-indicator.tsx b/src/components/quoted-status-indicator.tsx
index 493db5f19..792047128 100644
--- a/src/components/quoted-status-indicator.tsx
+++ b/src/components/quoted-status-indicator.tsx
@@ -24,4 +24,4 @@ const QuotedStatusIndicator: React.FC<IQuotedStatusIndicator> = ({ statusId }) =
   );
 };
 
-export default QuotedStatusIndicator;
+export { QuotedStatusIndicator as default };
diff --git a/src/components/quoted-status.tsx b/src/components/quoted-status.tsx
index eb8acf4c8..f2f243f64 100644
--- a/src/components/quoted-status.tsx
+++ b/src/components/quoted-status.tsx
@@ -133,4 +133,4 @@ const QuotedStatus: React.FC<IQuotedStatus> = ({ status, onCancel, compose }) =>
   );
 };
 
-export default QuotedStatus;
+export { QuotedStatus as default };
diff --git a/src/components/relative-timestamp.tsx b/src/components/relative-timestamp.tsx
index c9b2780f2..af74b9232 100644
--- a/src/components/relative-timestamp.tsx
+++ b/src/components/relative-timestamp.tsx
@@ -16,7 +16,7 @@ const messages = defineMessages({
   days_remaining: { id: 'time_remaining.days', defaultMessage: '{number, plural, one {# day} other {# days}} left' },
 });
 
-export const dateFormatOptions: FormatDateOptions = {
+const dateFormatOptions: FormatDateOptions = {
   hour12: true,
   year: 'numeric',
   month: 'short',
@@ -66,7 +66,7 @@ const getUnitDelay = (units: string) => {
   }
 };
 
-export const timeAgoString = (intl: IntlShape, date: Date, now: number, year: number) => {
+const timeAgoString = (intl: IntlShape, date: Date, now: number, year: number) => {
   const delta = now - date.getTime();
 
   let relativeTime;
@@ -124,7 +124,7 @@ interface RelativeTimestampState {
 }
 
 /** Displays a timestamp compared to the current time, eg "1m" for one minute ago. */
-class RelativeTimestamp extends React.Component<RelativeTimestampProps, RelativeTimestampState> {
+const RelativeTimestamp = injectIntl(class RelativeTimestamp extends React.Component<RelativeTimestampProps, RelativeTimestampState> {
 
   _timer: NodeJS.Timeout | undefined;
 
@@ -195,6 +195,10 @@ class RelativeTimestamp extends React.Component<RelativeTimestampProps, Relative
     );
   }
 
-}
+});
 
-export default injectIntl(RelativeTimestamp);
+export {
+  dateFormatOptions,
+  timeAgoString,
+  RelativeTimestamp as default,
+};
diff --git a/src/components/safe-embed.tsx b/src/components/safe-embed.tsx
index 3e2668648..762a0291c 100644
--- a/src/components/safe-embed.tsx
+++ b/src/components/safe-embed.tsx
@@ -60,4 +60,4 @@ const SafeEmbed: React.FC<ISafeEmbed> = ({
   );
 };
 
-export default SafeEmbed;
+export { SafeEmbed as default };
diff --git a/src/components/scroll-top-button.tsx b/src/components/scroll-top-button.tsx
index 1418edc38..4e2d815a1 100644
--- a/src/components/scroll-top-button.tsx
+++ b/src/components/scroll-top-button.tsx
@@ -101,4 +101,4 @@ const ScrollTopButton: React.FC<IScrollTopButton> = ({
   );
 };
 
-export default ScrollTopButton;
+export { ScrollTopButton as default };
diff --git a/src/components/scrollable-list.tsx b/src/components/scrollable-list.tsx
index 30f794992..7f6bb23f6 100644
--- a/src/components/scrollable-list.tsx
+++ b/src/components/scrollable-list.tsx
@@ -252,5 +252,4 @@ const ScrollableList = React.forwardRef<VirtuosoHandle, IScrollableList>(({
   );
 });
 
-export default ScrollableList;
-export type { IScrollableList };
+export { type IScrollableList, ScrollableList as default };
diff --git a/src/components/sentry-feedback-form.tsx b/src/components/sentry-feedback-form.tsx
index 1f8ba2a88..a22a06850 100644
--- a/src/components/sentry-feedback-form.tsx
+++ b/src/components/sentry-feedback-form.tsx
@@ -63,4 +63,4 @@ const SentryFeedbackForm: React.FC<ISentryFeedbackForm> = ({ eventId }) => {
   );
 };
 
-export default SentryFeedbackForm;
\ No newline at end of file
+export { SentryFeedbackForm as default };
\ No newline at end of file
diff --git a/src/components/sidebar-menu.tsx b/src/components/sidebar-menu.tsx
index 16ffe9d95..aea61f9a6 100644
--- a/src/components/sidebar-menu.tsx
+++ b/src/components/sidebar-menu.tsx
@@ -345,4 +345,4 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
   );
 };
 
-export default SidebarMenu;
+export { SidebarMenu as default };
diff --git a/src/components/sidebar-navigation-link.tsx b/src/components/sidebar-navigation-link.tsx
index 201bdd43b..4110255ed 100644
--- a/src/components/sidebar-navigation-link.tsx
+++ b/src/components/sidebar-navigation-link.tsx
@@ -73,4 +73,4 @@ const SidebarNavigationLink = React.forwardRef((props: ISidebarNavigationLink, r
   );
 });
 
-export default SidebarNavigationLink;
+export { SidebarNavigationLink as default };
diff --git a/src/components/sidebar-navigation.tsx b/src/components/sidebar-navigation.tsx
index 7c81b3137..85f43e299 100644
--- a/src/components/sidebar-navigation.tsx
+++ b/src/components/sidebar-navigation.tsx
@@ -240,4 +240,4 @@ const SidebarNavigation = () => {
   );
 };
 
-export default SidebarNavigation;
+export { SidebarNavigation as default };
diff --git a/src/components/site-error-boundary.tsx b/src/components/site-error-boundary.tsx
index 54d707f8b..ce2b15059 100644
--- a/src/components/site-error-boundary.tsx
+++ b/src/components/site-error-boundary.tsx
@@ -194,4 +194,4 @@ const SiteErrorBoundaryLink = ({ href, children }: ISiteErrorBoundaryLink) => (
   </>
 );
 
-export default SiteErrorBoundary;
+export { SiteErrorBoundary as default };
diff --git a/src/components/site-logo.tsx b/src/components/site-logo.tsx
index e42d19e52..6c0147408 100644
--- a/src/components/site-logo.tsx
+++ b/src/components/site-logo.tsx
@@ -43,4 +43,4 @@ const SiteLogo: React.FC<ISiteLogo> = ({ className, theme, ...rest }) => {
   );
 };
 
-export default SiteLogo;
+export { SiteLogo as default };
diff --git a/src/components/status-action-bar.tsx b/src/components/status-action-bar.tsx
index dcef511f5..28a304413 100644
--- a/src/components/status-action-bar.tsx
+++ b/src/components/status-action-bar.tsx
@@ -752,4 +752,4 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
   );
 };
 
-export default StatusActionBar;
+export { StatusActionBar as default };
diff --git a/src/components/status-action-button.tsx b/src/components/status-action-button.tsx
index e93fde172..4c4a7d1b3 100644
--- a/src/components/status-action-button.tsx
+++ b/src/components/status-action-button.tsx
@@ -108,4 +108,4 @@ const StatusActionButton = React.forwardRef<HTMLButtonElement, IStatusActionButt
   );
 });
 
-export default StatusActionButton;
+export { StatusActionButton as default };
diff --git a/src/components/status-content.tsx b/src/components/status-content.tsx
index 4f26c137d..107f7b1f5 100644
--- a/src/components/status-content.tsx
+++ b/src/components/status-content.tsx
@@ -40,7 +40,7 @@ interface IStatusContent {
 }
 
 /** Renders the text content of a status */
-const StatusContent: React.FC<IStatusContent> = ({
+const StatusContent: React.FC<IStatusContent> = React.memo(({
   status,
   onClick,
   collapsable = false,
@@ -187,6 +187,6 @@ const StatusContent: React.FC<IStatusContent> = ({
 
     return <>{output}</>;
   }
-};
+});
 
-export default React.memo(StatusContent);
+export { StatusContent as default };
diff --git a/src/components/status-hover-card.tsx b/src/components/status-hover-card.tsx
index 49e26b17e..c24387e41 100644
--- a/src/components/status-hover-card.tsx
+++ b/src/components/status-hover-card.tsx
@@ -19,7 +19,7 @@ interface IStatusHoverCard {
 }
 
 /** Popup status preview that appears when hovering reply to */
-export const StatusHoverCard: React.FC<IStatusHoverCard> = ({ visible = true }) => {
+const StatusHoverCard: React.FC<IStatusHoverCard> = ({ visible = true }) => {
   const dispatch = useAppDispatch();
   const history = useHistory();
 
@@ -93,4 +93,4 @@ export const StatusHoverCard: React.FC<IStatusHoverCard> = ({ visible = true })
   );
 };
 
-export default StatusHoverCard;
+export { StatusHoverCard as default };
diff --git a/src/components/status-list.tsx b/src/components/status-list.tsx
index 863177e42..515f5cc9f 100644
--- a/src/components/status-list.tsx
+++ b/src/components/status-list.tsx
@@ -243,5 +243,4 @@ const StatusList: React.FC<IStatusList> = ({
   );
 };
 
-export default StatusList;
-export type { IStatusList };
+export { type IStatusList, StatusList as default };
diff --git a/src/components/status-media.tsx b/src/components/status-media.tsx
index 8beaebf33..b26df0c60 100644
--- a/src/components/status-media.tsx
+++ b/src/components/status-media.tsx
@@ -135,4 +135,4 @@ const StatusMedia: React.FC<IStatusMedia> = ({
   }
 };
 
-export default StatusMedia;
+export { StatusMedia as default };
diff --git a/src/components/status-reaction-wrapper.tsx b/src/components/status-reaction-wrapper.tsx
index 546ed061a..a5a867b45 100644
--- a/src/components/status-reaction-wrapper.tsx
+++ b/src/components/status-reaction-wrapper.tsx
@@ -118,4 +118,4 @@ const StatusReactionWrapper: React.FC<IStatusReactionWrapper> = ({ statusId, chi
   );
 };
 
-export default StatusReactionWrapper;
+export { StatusReactionWrapper as default };
diff --git a/src/components/status-reply-mentions.tsx b/src/components/status-reply-mentions.tsx
index e3bee8237..621ba9688 100644
--- a/src/components/status-reply-mentions.tsx
+++ b/src/components/status-reply-mentions.tsx
@@ -110,4 +110,4 @@ const StatusReplyMentions: React.FC<IStatusReplyMentions> = ({ status, hoverable
   );
 };
 
-export default StatusReplyMentions;
+export { StatusReplyMentions as default };
diff --git a/src/components/status.tsx b/src/components/status.tsx
index 830e7b9e5..059d01fe2 100644
--- a/src/components/status.tsx
+++ b/src/components/status.tsx
@@ -28,13 +28,13 @@ import { Card, Icon, Stack, Text } from './ui';
 import type { Status as StatusEntity } from 'soapbox/types/entities';
 
 // Defined in components/scrollable-list
-export type ScrollPosition = { height: number; top: number };
+type ScrollPosition = { height: number; top: number };
 
 const messages = defineMessages({
   reblogged_by: { id: 'status.reblogged_by', defaultMessage: '{name} reposted' },
 });
 
-export interface IStatus {
+interface IStatus {
   id?: string;
   avatarSize?: number;
   status: StatusEntity;
@@ -484,4 +484,8 @@ const Status: React.FC<IStatus> = (props) => {
   );
 };
 
-export default Status;
+export {
+  type ScrollPosition,
+  type IStatus,
+  Status as default,
+};
diff --git a/src/components/statuses/sensitive-content-overlay.tsx b/src/components/statuses/sensitive-content-overlay.tsx
index d18dd4d8f..e856a7b52 100644
--- a/src/components/statuses/sensitive-content-overlay.tsx
+++ b/src/components/statuses/sensitive-content-overlay.tsx
@@ -103,4 +103,4 @@ const SensitiveContentOverlay = React.forwardRef<HTMLDivElement, ISensitiveConte
   );
 });
 
-export default SensitiveContentOverlay;
+export { SensitiveContentOverlay as default };
diff --git a/src/components/statuses/status-info.tsx b/src/components/statuses/status-info.tsx
index 57eb3199e..a46b3343b 100644
--- a/src/components/statuses/status-info.tsx
+++ b/src/components/statuses/status-info.tsx
@@ -42,4 +42,4 @@ const StatusInfo = (props: IStatusInfo) => {
   );
 };
 
-export default StatusInfo;
\ No newline at end of file
+export { StatusInfo as default };
\ No newline at end of file
diff --git a/src/components/still-image.tsx b/src/components/still-image.tsx
index c58f5da3b..c1d1f5fe7 100644
--- a/src/components/still-image.tsx
+++ b/src/components/still-image.tsx
@@ -3,7 +3,7 @@ import React, { useRef } from 'react';
 
 import { useSettings } from 'soapbox/hooks';
 
-export interface IStillImage {
+interface IStillImage {
   /** Image alt text. */
   alt?: string;
   /** Extra class names for the outer <div> container. */
@@ -92,4 +92,7 @@ const ExtensionBadge: React.FC<IExtensionBadge> = ({ ext }) => (
   </div>
 );
 
-export default StillImage;
+export {
+  type IStillImage,
+  StillImage as default,
+};
diff --git a/src/components/thumb-navigation-link.tsx b/src/components/thumb-navigation-link.tsx
index 72dba7ebd..d5db818ed 100644
--- a/src/components/thumb-navigation-link.tsx
+++ b/src/components/thumb-navigation-link.tsx
@@ -72,4 +72,4 @@ const ThumbNavigationLink: React.FC<IThumbNavigationLink> = ({ count, countMax,
   );
 };
 
-export default ThumbNavigationLink;
+export { ThumbNavigationLink as default };
diff --git a/src/components/thumb-navigation.tsx b/src/components/thumb-navigation.tsx
index 14873b8e2..44fb625d3 100644
--- a/src/components/thumb-navigation.tsx
+++ b/src/components/thumb-navigation.tsx
@@ -96,4 +96,4 @@ const ThumbNavigation: React.FC = (): JSX.Element => {
   );
 };
 
-export default ThumbNavigation;
+export { ThumbNavigation as default };
diff --git a/src/components/tombstone.tsx b/src/components/tombstone.tsx
index faaa84ee0..228a7c8cc 100644
--- a/src/components/tombstone.tsx
+++ b/src/components/tombstone.tsx
@@ -35,4 +35,4 @@ const Tombstone: React.FC<ITombstone> = ({ id, onMoveUp, onMoveDown }) => {
   );
 };
 
-export default Tombstone;
+export { Tombstone as default };
diff --git a/src/components/translate-button.tsx b/src/components/translate-button.tsx
index 57752ec28..68c7d64c9 100644
--- a/src/components/translate-button.tsx
+++ b/src/components/translate-button.tsx
@@ -76,4 +76,4 @@ const TranslateButton: React.FC<ITranslateButton> = ({ status }) => {
   );
 };
 
-export default TranslateButton;
+export { TranslateButton as default };
diff --git a/src/components/ui/accordion/accordion.tsx b/src/components/ui/accordion/accordion.tsx
index efaa02a69..4e56511e0 100644
--- a/src/components/ui/accordion/accordion.tsx
+++ b/src/components/ui/accordion/accordion.tsx
@@ -92,4 +92,4 @@ const Accordion: React.FC<IAccordion> = ({ headline, children, menu, expanded =
   );
 };
 
-export default Accordion;
+export { Accordion as default };
diff --git a/src/components/ui/banner/banner.tsx b/src/components/ui/banner/banner.tsx
index 94d44ff7f..d5af88779 100644
--- a/src/components/ui/banner/banner.tsx
+++ b/src/components/ui/banner/banner.tsx
@@ -22,4 +22,4 @@ const Banner: React.FC<IBanner> = ({ theme, children, className }) => (
   </div>
 );
 
-export default Banner;
+export { Banner as default };
diff --git a/src/components/ui/card/card.tsx b/src/components/ui/card/card.tsx
index a4bb389a1..bcf3a1c12 100644
--- a/src/components/ui/card/card.tsx
+++ b/src/components/ui/card/card.tsx
@@ -18,7 +18,7 @@ const messages = defineMessages({
   back: { id: 'card.back.label', defaultMessage: 'Back' },
 });
 
-export type CardSizes = keyof typeof sizes
+type CardSizes = keyof typeof sizes
 
 interface ICard {
   /** The type of card. */
@@ -108,4 +108,4 @@ const CardBody: React.FC<ICardBody> = ({ className, children }): JSX.Element =>
   <div data-testid='card-body' className={className}>{children}</div>
 );
 
-export { Card, CardHeader, CardTitle, CardBody };
+export { type CardSizes, Card, CardHeader, CardTitle, CardBody };
diff --git a/src/components/ui/carousel/carousel.tsx b/src/components/ui/carousel/carousel.tsx
index 0bece264c..0f5b781f3 100644
--- a/src/components/ui/carousel/carousel.tsx
+++ b/src/components/ui/carousel/carousel.tsx
@@ -109,4 +109,4 @@ const Carousel: React.FC<ICarousel> = (props): JSX.Element => {
   );
 };
 
-export default Carousel;
\ No newline at end of file
+export { Carousel as default };
\ No newline at end of file
diff --git a/src/components/ui/checkbox/checkbox.tsx b/src/components/ui/checkbox/checkbox.tsx
index 333b946d7..e7d096390 100644
--- a/src/components/ui/checkbox/checkbox.tsx
+++ b/src/components/ui/checkbox/checkbox.tsx
@@ -12,4 +12,4 @@ const Checkbox = React.forwardRef<HTMLInputElement, ICheckbox>((props, ref) => (
   />
 ));
 
-export default Checkbox;
+export { Checkbox as default };
diff --git a/src/components/ui/column/column.tsx b/src/components/ui/column/column.tsx
index 2b5bed45c..9f0b85484 100644
--- a/src/components/ui/column/column.tsx
+++ b/src/components/ui/column/column.tsx
@@ -40,7 +40,7 @@ const ColumnHeader: React.FC<IColumnHeader> = ({ label, backHref, className, act
   );
 };
 
-export interface IColumn {
+interface IColumn {
   /** Route the back button goes to. */
   backHref?: string;
   /** Column title text. */
@@ -120,6 +120,7 @@ const Column: React.FC<IColumn> = React.forwardRef((props, ref: React.ForwardedR
 });
 
 export {
+  type IColumn,
   Column,
   ColumnHeader,
 };
diff --git a/src/components/ui/counter/counter.tsx b/src/components/ui/counter/counter.tsx
index 3b73028c8..6083e0de2 100644
--- a/src/components/ui/counter/counter.tsx
+++ b/src/components/ui/counter/counter.tsx
@@ -16,4 +16,4 @@ const Counter: React.FC<ICounter> = ({ count, countMax }) => (
   </span>
 );
 
-export default Counter;
+export { Counter as default };
diff --git a/src/components/ui/datepicker/datepicker.tsx b/src/components/ui/datepicker/datepicker.tsx
index 18298a4aa..2b3e27e0a 100644
--- a/src/components/ui/datepicker/datepicker.tsx
+++ b/src/components/ui/datepicker/datepicker.tsx
@@ -89,4 +89,4 @@ const Datepicker = ({ onChange }: IDatepicker) => {
   );
 };
 
-export default Datepicker;
+export { Datepicker as default };
diff --git a/src/components/ui/divider/divider.tsx b/src/components/ui/divider/divider.tsx
index 3e7d21f80..db50f4f65 100644
--- a/src/components/ui/divider/divider.tsx
+++ b/src/components/ui/divider/divider.tsx
@@ -26,4 +26,4 @@ const Divider = ({ text, textSize = 'md' }: IDivider) => (
   </div>
 );
 
-export default Divider;
+export { Divider as default };
diff --git a/src/components/ui/emoji-selector/emoji-selector.tsx b/src/components/ui/emoji-selector/emoji-selector.tsx
index 114f94d96..c7f3272f6 100644
--- a/src/components/ui/emoji-selector/emoji-selector.tsx
+++ b/src/components/ui/emoji-selector/emoji-selector.tsx
@@ -144,4 +144,4 @@ const EmojiSelector: React.FC<IEmojiSelector> = ({
   );
 };
 
-export default EmojiSelector;
+export { EmojiSelector as default };
diff --git a/src/components/ui/emoji/emoji.tsx b/src/components/ui/emoji/emoji.tsx
index 68c82fb03..be3aedb1e 100644
--- a/src/components/ui/emoji/emoji.tsx
+++ b/src/components/ui/emoji/emoji.tsx
@@ -31,4 +31,4 @@ const Emoji: React.FC<IEmoji> = (props): JSX.Element | null => {
   );
 };
 
-export default Emoji;
+export { Emoji as default };
diff --git a/src/components/ui/file-input/file-input.tsx b/src/components/ui/file-input/file-input.tsx
index 8fa1615e5..56d71630e 100644
--- a/src/components/ui/file-input/file-input.tsx
+++ b/src/components/ui/file-input/file-input.tsx
@@ -11,4 +11,4 @@ const FileInput = forwardRef<HTMLInputElement, IFileInput>((props, ref) => (
   />
 ));
 
-export default FileInput;
+export { FileInput as default };
diff --git a/src/components/ui/form-actions/form-actions.tsx b/src/components/ui/form-actions/form-actions.tsx
index e74361c35..17da7ba5f 100644
--- a/src/components/ui/form-actions/form-actions.tsx
+++ b/src/components/ui/form-actions/form-actions.tsx
@@ -13,4 +13,4 @@ const FormActions: React.FC<IFormActions> = ({ children }) => (
   </HStack>
 );
 
-export default FormActions;
+export { FormActions as default };
diff --git a/src/components/ui/form-group/form-group.tsx b/src/components/ui/form-group/form-group.tsx
index 66bfaea92..df7e2b33c 100644
--- a/src/components/ui/form-group/form-group.tsx
+++ b/src/components/ui/form-group/form-group.tsx
@@ -111,4 +111,4 @@ const FormGroup: React.FC<IFormGroup> = (props) => {
   );
 };
 
-export default FormGroup;
+export { FormGroup as default };
diff --git a/src/components/ui/form/form.tsx b/src/components/ui/form/form.tsx
index b23b44b38..906d55fc3 100644
--- a/src/components/ui/form/form.tsx
+++ b/src/components/ui/form/form.tsx
@@ -26,4 +26,4 @@ const Form: React.FC<IForm> = ({ onSubmit, children, ...filteredProps }) => {
   );
 };
 
-export default Form;
+export { Form as default };
diff --git a/src/components/ui/hstack/hstack.tsx b/src/components/ui/hstack/hstack.tsx
index 9d39fa8cb..5e1cfc66c 100644
--- a/src/components/ui/hstack/hstack.tsx
+++ b/src/components/ui/hstack/hstack.tsx
@@ -70,4 +70,4 @@ const HStack = forwardRef<HTMLDivElement, IHStack>((props, ref) => {
   );
 });
 
-export default HStack;
+export { HStack as default };
diff --git a/src/components/ui/icon-button/icon-button.tsx b/src/components/ui/icon-button/icon-button.tsx
index 001a3ee0e..851b8b0cb 100644
--- a/src/components/ui/icon-button/icon-button.tsx
+++ b/src/components/ui/icon-button/icon-button.tsx
@@ -46,4 +46,4 @@ const IconButton = React.forwardRef((props: IIconButton, ref: React.ForwardedRef
   );
 });
 
-export default IconButton;
+export { IconButton as default };
diff --git a/src/components/ui/icon/icon.tsx b/src/components/ui/icon/icon.tsx
index 688b4dca6..8cb45d0d1 100644
--- a/src/components/ui/icon/icon.tsx
+++ b/src/components/ui/icon/icon.tsx
@@ -37,4 +37,4 @@ const Icon: React.FC<IIcon> = ({ src, alt, count, size, countMax, ...filteredPro
   </div>
 );
 
-export default Icon;
+export { Icon as default };
diff --git a/src/components/ui/icon/svg-icon.tsx b/src/components/ui/icon/svg-icon.tsx
index dcd93e113..fe880408e 100644
--- a/src/components/ui/icon/svg-icon.tsx
+++ b/src/components/ui/icon/svg-icon.tsx
@@ -41,4 +41,4 @@ const SvgIcon: React.FC<ISvgIcon> = ({ src, alt, size = 24, className, ...filter
   );
 };
 
-export default SvgIcon;
+export { SvgIcon as default };
diff --git a/src/components/ui/layout/layout.tsx b/src/components/ui/layout/layout.tsx
index e3d9575c3..710e3ed7e 100644
--- a/src/components/ui/layout/layout.tsx
+++ b/src/components/ui/layout/layout.tsx
@@ -63,4 +63,4 @@ Layout.Sidebar = Sidebar;
 Layout.Main = Main;
 Layout.Aside = Aside;
 
-export default Layout;
+export { Layout as default };
diff --git a/src/components/ui/modal/modal.tsx b/src/components/ui/modal/modal.tsx
index 8747cc4f0..14891cbe0 100644
--- a/src/components/ui/modal/modal.tsx
+++ b/src/components/ui/modal/modal.tsx
@@ -177,4 +177,4 @@ const Modal = React.forwardRef<HTMLDivElement, IModal>(({
   );
 });
 
-export default Modal;
+export { Modal as default };
diff --git a/src/components/ui/popover/popover.tsx b/src/components/ui/popover/popover.tsx
index 86085be5d..6d68f398e 100644
--- a/src/components/ui/popover/popover.tsx
+++ b/src/components/ui/popover/popover.tsx
@@ -117,4 +117,4 @@ const Popover: React.FC<IPopover> = (props) => {
   );
 };
 
-export default Popover;
\ No newline at end of file
+export { Popover as default };
\ No newline at end of file
diff --git a/src/components/ui/portal/portal.tsx b/src/components/ui/portal/portal.tsx
index 7d175628c..6901c9096 100644
--- a/src/components/ui/portal/portal.tsx
+++ b/src/components/ui/portal/portal.tsx
@@ -27,4 +27,4 @@ const Portal: React.FC<IPortal> = ({ children }) => {
   );
 };
 
-export default Portal;
+export { Portal as default };
diff --git a/src/components/ui/progress-bar/progress-bar.tsx b/src/components/ui/progress-bar/progress-bar.tsx
index 4fffe7937..dd08f4087 100644
--- a/src/components/ui/progress-bar/progress-bar.tsx
+++ b/src/components/ui/progress-bar/progress-bar.tsx
@@ -30,4 +30,4 @@ const ProgressBar: React.FC<IProgressBar> = ({ progress, size = 'md' }) => (
   </div>
 );
 
-export default ProgressBar;
+export { ProgressBar as default };
diff --git a/src/components/ui/radio-button/radio-button.tsx b/src/components/ui/radio-button/radio-button.tsx
index 6a6829c78..654a599a1 100644
--- a/src/components/ui/radio-button/radio-button.tsx
+++ b/src/components/ui/radio-button/radio-button.tsx
@@ -36,4 +36,4 @@ const RadioButton: React.FC<IRadioButton> = ({ name, value, checked, onChange, l
   );
 };
 
-export default RadioButton;
+export { RadioButton as default };
diff --git a/src/components/ui/select/select.tsx b/src/components/ui/select/select.tsx
index b74f8195e..3a163ad9b 100644
--- a/src/components/ui/select/select.tsx
+++ b/src/components/ui/select/select.tsx
@@ -27,4 +27,4 @@ const Select = React.forwardRef<HTMLSelectElement, ISelect>((props, ref) => {
   );
 });
 
-export default Select;
+export { Select as default };
diff --git a/src/components/ui/slider/slider.tsx b/src/components/ui/slider/slider.tsx
index 80f4929dc..4df930ead 100644
--- a/src/components/ui/slider/slider.tsx
+++ b/src/components/ui/slider/slider.tsx
@@ -120,4 +120,4 @@ const getPointerPosition = (el: HTMLElement, event: MouseEvent & TouchEvent): Po
   };
 };
 
-export default Slider;
+export { Slider as default };
diff --git a/src/components/ui/spinner/spinner.tsx b/src/components/ui/spinner/spinner.tsx
index 23341ba76..b81769da2 100644
--- a/src/components/ui/spinner/spinner.tsx
+++ b/src/components/ui/spinner/spinner.tsx
@@ -30,4 +30,4 @@ const Spinner = ({ size = 30, withText = true }: ISpinner) => (
   </Stack>
 );
 
-export default Spinner;
+export { Spinner as default };
diff --git a/src/components/ui/stack/stack.tsx b/src/components/ui/stack/stack.tsx
index e501d5943..7828909fa 100644
--- a/src/components/ui/stack/stack.tsx
+++ b/src/components/ui/stack/stack.tsx
@@ -65,4 +65,4 @@ const Stack = React.forwardRef<HTMLDivElement, IStack>((props, ref: React.Legacy
   );
 });
 
-export default Stack;
+export { Stack as default };
diff --git a/src/components/ui/streamfield/streamfield.tsx b/src/components/ui/streamfield/streamfield.tsx
index 1c218e823..89abed8be 100644
--- a/src/components/ui/streamfield/streamfield.tsx
+++ b/src/components/ui/streamfield/streamfield.tsx
@@ -13,7 +13,7 @@ const messages = defineMessages({
 });
 
 /** Type of the inner Streamfield input component. */
-export type StreamfieldComponent<T> = React.ComponentType<{
+type StreamfieldComponent<T> = React.ComponentType<{
   value: T;
   onChange: (value: T) => void;
   autoFocus: boolean;
@@ -104,4 +104,4 @@ const Streamfield: React.FC<IStreamfield> = ({
   );
 };
 
-export default Streamfield;
+export { type StreamfieldComponent, Streamfield as default };
diff --git a/src/components/ui/tabs/tabs.tsx b/src/components/ui/tabs/tabs.tsx
index 3d435183e..27177d70a 100644
--- a/src/components/ui/tabs/tabs.tsx
+++ b/src/components/ui/tabs/tabs.tsx
@@ -102,7 +102,7 @@ const AnimatedTab: React.FC<IAnimatedTab> = ({ index, ...props }) => {
 };
 
 /** Structure to represent a tab. */
-export type Item = {
+type Item = {
   /** Tab text. */
   text: React.ReactNode;
   /** Tab tooltip text. */
@@ -176,4 +176,7 @@ const Tabs = ({ items, activeItem }: ITabs) => {
   );
 };
 
-export default Tabs;
+export {
+  type Item,
+  Tabs as default,
+};
diff --git a/src/components/ui/tag-input/tag-input.tsx b/src/components/ui/tag-input/tag-input.tsx
index cc7b843d4..f41d646bb 100644
--- a/src/components/ui/tag-input/tag-input.tsx
+++ b/src/components/ui/tag-input/tag-input.tsx
@@ -67,4 +67,4 @@ const TagInput: React.FC<ITagInput> = ({ tags, onChange, placeholder }) => {
   );
 };
 
-export default TagInput;
\ No newline at end of file
+export { TagInput as default };
\ No newline at end of file
diff --git a/src/components/ui/tag-input/tag.tsx b/src/components/ui/tag-input/tag.tsx
index 87e012752..a0d054101 100644
--- a/src/components/ui/tag-input/tag.tsx
+++ b/src/components/ui/tag-input/tag.tsx
@@ -23,4 +23,4 @@ const Tag: React.FC<ITag> = ({ tag, onDelete }) => (
   </div>
 );
 
-export default Tag;
\ No newline at end of file
+export { Tag as default };
\ No newline at end of file
diff --git a/src/components/ui/text/text.tsx b/src/components/ui/text/text.tsx
index 2c7a17e03..0715186ca 100644
--- a/src/components/ui/text/text.tsx
+++ b/src/components/ui/text/text.tsx
@@ -50,7 +50,7 @@ const families = {
   mono: 'font-mono',
 };
 
-export type Sizes = keyof typeof sizes
+type Sizes = keyof typeof sizes
 type Tags = 'abbr' | 'p' | 'span' | 'pre' | 'time' | 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'label' | 'div' | 'blockquote'
 type Directions = 'ltr' | 'rtl'
 
@@ -132,6 +132,7 @@ const Text = React.forwardRef<any, IText>(
 );
 
 export {
+  type Sizes,
+  type IText,
   Text as default,
-  IText,
 };
diff --git a/src/components/ui/textarea/textarea.tsx b/src/components/ui/textarea/textarea.tsx
index 5a12e280b..214118225 100644
--- a/src/components/ui/textarea/textarea.tsx
+++ b/src/components/ui/textarea/textarea.tsx
@@ -118,4 +118,4 @@ const Textarea = React.forwardRef(({
 },
 );
 
-export default Textarea;
+export { Textarea as default };
diff --git a/src/components/ui/toast/toast.tsx b/src/components/ui/toast/toast.tsx
index bd6412da9..a681bb7f2 100644
--- a/src/components/ui/toast/toast.tsx
+++ b/src/components/ui/toast/toast.tsx
@@ -156,4 +156,4 @@ const Toast = (props: IToast) => {
   );
 };
 
-export default Toast;
+export { Toast as default };
diff --git a/src/components/ui/toggle/toggle.tsx b/src/components/ui/toggle/toggle.tsx
index 681633069..445364328 100644
--- a/src/components/ui/toggle/toggle.tsx
+++ b/src/components/ui/toggle/toggle.tsx
@@ -52,4 +52,4 @@ const Toggle: React.FC<IToggle> = ({ id, size = 'md', name, checked = false, onC
   );
 };
 
-export default Toggle;
+export { Toggle as default };
diff --git a/src/components/ui/tooltip/tooltip.tsx b/src/components/ui/tooltip/tooltip.tsx
index 08d270c5d..632e96aa9 100644
--- a/src/components/ui/tooltip/tooltip.tsx
+++ b/src/components/ui/tooltip/tooltip.tsx
@@ -91,4 +91,4 @@ const Tooltip: React.FC<ITooltip> = (props) => {
   );
 };
 
-export default Tooltip;
\ No newline at end of file
+export { Tooltip as default };
\ No newline at end of file
diff --git a/src/components/ui/widget/widget.tsx b/src/components/ui/widget/widget.tsx
index 806e06173..644240cd3 100644
--- a/src/components/ui/widget/widget.tsx
+++ b/src/components/ui/widget/widget.tsx
@@ -62,4 +62,4 @@ const Widget: React.FC<IWidget> = ({
   </Stack>
 );
 
-export default Widget;
+export { Widget as default };
diff --git a/src/components/upload-progress.tsx b/src/components/upload-progress.tsx
index 8f9eb7327..3fe06eece 100644
--- a/src/components/upload-progress.tsx
+++ b/src/components/upload-progress.tsx
@@ -26,4 +26,4 @@ const UploadProgress: React.FC<IUploadProgress> = ({ progress }) => (
   </HStack>
 );
 
-export default UploadProgress;
+export { UploadProgress as default };
diff --git a/src/components/upload.tsx b/src/components/upload.tsx
index cd1d97827..ac97d62c0 100644
--- a/src/components/upload.tsx
+++ b/src/components/upload.tsx
@@ -20,7 +20,7 @@ import Motion from 'soapbox/features/ui/util/optional-motion';
 import { useAppDispatch, useSettings } from 'soapbox/hooks';
 import { Attachment } from 'soapbox/types/entities';
 
-export const MIMETYPE_ICONS: Record<string, string> = {
+const MIMETYPE_ICONS: Record<string, string> = {
   'application/x-freearc': fileZipIcon,
   'application/x-bzip': fileZipIcon,
   'application/x-bzip2': fileZipIcon,
@@ -251,4 +251,7 @@ const Upload: React.FC<IUpload> = ({
   );
 };
 
-export default Upload;
+export {
+  MIMETYPE_ICONS,
+  Upload as default,
+};
diff --git a/src/components/verification-badge.tsx b/src/components/verification-badge.tsx
index d4b3bca3f..98174f76a 100644
--- a/src/components/verification-badge.tsx
+++ b/src/components/verification-badge.tsx
@@ -30,4 +30,4 @@ const VerificationBadge: React.FC<IVerificationBadge> = ({ className }) => {
   );
 };
 
-export default VerificationBadge;
+export { VerificationBadge as default };
diff --git a/src/containers/account-container.tsx b/src/containers/account-container.tsx
index 31500b739..c4865d016 100644
--- a/src/containers/account-container.tsx
+++ b/src/containers/account-container.tsx
@@ -16,4 +16,4 @@ const AccountContainer: React.FC<IAccountContainer> = ({ id, withRelationship, .
   );
 };
 
-export default AccountContainer;
+export { AccountContainer as default };
diff --git a/src/containers/status-container.tsx b/src/containers/status-container.tsx
index b29310f25..9f9e24cf2 100644
--- a/src/containers/status-container.tsx
+++ b/src/containers/status-container.tsx
@@ -32,4 +32,4 @@ const StatusContainer: React.FC<IStatusContainer> = (props) => {
   }
 };
 
-export default StatusContainer;
+export { StatusContainer as default };
diff --git a/src/entity-store/actions.ts b/src/entity-store/actions.ts
index c60f494a3..1bdc7f269 100644
--- a/src/entity-store/actions.ts
+++ b/src/entity-store/actions.ts
@@ -103,6 +103,8 @@ type EntityAction =
   | ReturnType<typeof entitiesTransaction>;
 
 export {
+  type DeleteEntitiesOpts,
+  type EntityAction,
   ENTITIES_IMPORT,
   ENTITIES_DELETE,
   ENTITIES_DISMISS,
@@ -122,5 +124,3 @@ export {
   invalidateEntityList,
   entitiesTransaction,
 };
-
-export type { DeleteEntitiesOpts, EntityAction };
\ No newline at end of file
diff --git a/src/entity-store/reducer.ts b/src/entity-store/reducer.ts
index 0f66a43e0..cf44d7bc5 100644
--- a/src/entity-store/reducer.ts
+++ b/src/entity-store/reducer.ts
@@ -183,5 +183,4 @@ const reducer = (state: Readonly<State> = {}, action: EntityAction): State => {
   }
 };
 
-export default reducer;
-export type { State };
\ No newline at end of file
+export { type State, reducer as default };
\ No newline at end of file
diff --git a/src/features/about/index.tsx b/src/features/about/index.tsx
index 56da0776e..99510e4b9 100644
--- a/src/features/about/index.tsx
+++ b/src/features/about/index.tsx
@@ -75,4 +75,4 @@ const AboutPage: React.FC = () => {
   );
 };
 
-export default AboutPage;
+export { AboutPage as default };
diff --git a/src/features/account-gallery/components/media-item.tsx b/src/features/account-gallery/components/media-item.tsx
index 1b06566b2..63439f5e5 100644
--- a/src/features/account-gallery/components/media-item.tsx
+++ b/src/features/account-gallery/components/media-item.tsx
@@ -131,4 +131,4 @@ const MediaItem: React.FC<IMediaItem> = ({ attachment, onOpenMedia }) => {
   );
 };
 
-export default MediaItem;
+export { MediaItem as default };
diff --git a/src/features/account-gallery/index.tsx b/src/features/account-gallery/index.tsx
index 2156667a3..20f470e5b 100644
--- a/src/features/account-gallery/index.tsx
+++ b/src/features/account-gallery/index.tsx
@@ -143,4 +143,4 @@ const AccountGallery = () => {
   );
 };
 
-export default AccountGallery;
+export { AccountGallery as default };
diff --git a/src/features/account-timeline/components/moved-note.tsx b/src/features/account-timeline/components/moved-note.tsx
index c8924cdbe..9ed0bb715 100644
--- a/src/features/account-timeline/components/moved-note.tsx
+++ b/src/features/account-timeline/components/moved-note.tsx
@@ -38,4 +38,4 @@ const MovedNote: React.FC<IMovedNote> = ({ from, to }) => (
   </div>
 );
 
-export default MovedNote;
+export { MovedNote as default };
diff --git a/src/features/account-timeline/index.tsx b/src/features/account-timeline/index.tsx
index 2af53c917..974a49ba7 100644
--- a/src/features/account-timeline/index.tsx
+++ b/src/features/account-timeline/index.tsx
@@ -101,4 +101,4 @@ const AccountTimeline: React.FC<IAccountTimeline> = ({ params, withReplies = fal
   );
 };
 
-export default AccountTimeline;
+export { AccountTimeline as default };
diff --git a/src/features/account/components/header.tsx b/src/features/account/components/header.tsx
index 6444831ab..87f4f7153 100644
--- a/src/features/account/components/header.tsx
+++ b/src/features/account/components/header.tsx
@@ -654,4 +654,4 @@ const Header: React.FC<IHeader> = ({ account }) => {
   );
 };
 
-export default Header;
+export { Header as default };
diff --git a/src/features/admin/announcements.tsx b/src/features/admin/announcements.tsx
index 18f0e6cb4..92267ee07 100644
--- a/src/features/admin/announcements.tsx
+++ b/src/features/admin/announcements.tsx
@@ -126,4 +126,4 @@ const Announcements: React.FC = () => {
   );
 };
 
-export default Announcements;
+export { Announcements as default };
diff --git a/src/features/admin/components/admin-tabs.tsx b/src/features/admin/components/admin-tabs.tsx
index debba46a0..815291a38 100644
--- a/src/features/admin/components/admin-tabs.tsx
+++ b/src/features/admin/components/admin-tabs.tsx
@@ -37,4 +37,4 @@ const AdminTabs: React.FC = () => {
   return <Tabs items={tabs} activeItem={match.path} />;
 };
 
-export default AdminTabs;
+export { AdminTabs as default };
diff --git a/src/features/admin/components/latest-accounts-panel.tsx b/src/features/admin/components/latest-accounts-panel.tsx
index 0d3ce94c9..4046e7a93 100644
--- a/src/features/admin/components/latest-accounts-panel.tsx
+++ b/src/features/admin/components/latest-accounts-panel.tsx
@@ -50,4 +50,4 @@ const LatestAccountsPanel: React.FC<ILatestAccountsPanel> = ({ limit = 5 }) => {
   );
 };
 
-export default LatestAccountsPanel;
+export { LatestAccountsPanel as default };
diff --git a/src/features/admin/components/registration-mode-picker.tsx b/src/features/admin/components/registration-mode-picker.tsx
index 744809a32..64c0f61bf 100644
--- a/src/features/admin/components/registration-mode-picker.tsx
+++ b/src/features/admin/components/registration-mode-picker.tsx
@@ -71,4 +71,4 @@ const RegistrationModePicker: React.FC = () => {
   );
 };
 
-export default RegistrationModePicker;
+export { RegistrationModePicker as default };
diff --git a/src/features/admin/components/report-status.tsx b/src/features/admin/components/report-status.tsx
index 858a25e7a..2cebfa370 100644
--- a/src/features/admin/components/report-status.tsx
+++ b/src/features/admin/components/report-status.tsx
@@ -62,4 +62,4 @@ const ReportStatus: React.FC<IReportStatus> = ({ status }) => {
   );
 };
 
-export default ReportStatus;
+export { ReportStatus as default };
diff --git a/src/features/admin/components/report.tsx b/src/features/admin/components/report.tsx
index e56181ced..f16f69fdc 100644
--- a/src/features/admin/components/report.tsx
+++ b/src/features/admin/components/report.tsx
@@ -153,4 +153,4 @@ const Report: React.FC<IReport> = ({ id }) => {
   );
 };
 
-export default Report;
+export { Report as default };
diff --git a/src/features/admin/components/unapproved-account.tsx b/src/features/admin/components/unapproved-account.tsx
index 1b9d6d6d3..69ad11224 100644
--- a/src/features/admin/components/unapproved-account.tsx
+++ b/src/features/admin/components/unapproved-account.tsx
@@ -44,4 +44,4 @@ const UnapprovedAccount: React.FC<IUnapprovedAccount> = ({ accountId }) => {
   );
 };
 
-export default UnapprovedAccount;
+export { UnapprovedAccount as default };
diff --git a/src/features/admin/domains.tsx b/src/features/admin/domains.tsx
index e2455f3f8..faa03e3d7 100644
--- a/src/features/admin/domains.tsx
+++ b/src/features/admin/domains.tsx
@@ -145,4 +145,4 @@ const Domains: React.FC = () => {
   );
 };
 
-export default Domains;
+export { Domains as default };
diff --git a/src/features/admin/index.tsx b/src/features/admin/index.tsx
index c8286b393..838bb810e 100644
--- a/src/features/admin/index.tsx
+++ b/src/features/admin/index.tsx
@@ -33,4 +33,4 @@ const Admin: React.FC = () => {
   );
 };
 
-export default Admin;
+export { Admin as default };
diff --git a/src/features/admin/moderation-log.tsx b/src/features/admin/moderation-log.tsx
index 895d871d3..590bf430e 100644
--- a/src/features/admin/moderation-log.tsx
+++ b/src/features/admin/moderation-log.tsx
@@ -69,4 +69,4 @@ const LogItem: React.FC<ILogItem> = ({ log }) => (
   </Stack>
 );
 
-export default ModerationLog;
+export { ModerationLog as default };
diff --git a/src/features/admin/relays.tsx b/src/features/admin/relays.tsx
index e3d06a9ba..3aa288976 100644
--- a/src/features/admin/relays.tsx
+++ b/src/features/admin/relays.tsx
@@ -136,4 +136,4 @@ const Relays: React.FC = () => {
   );
 };
 
-export default Relays;
+export { Relays as default };
diff --git a/src/features/admin/rules.tsx b/src/features/admin/rules.tsx
index e4b9754e5..67bca8494 100644
--- a/src/features/admin/rules.tsx
+++ b/src/features/admin/rules.tsx
@@ -108,4 +108,4 @@ const Rules: React.FC = () => {
   );
 };
 
-export default Rules;
+export { Rules as default };
diff --git a/src/features/admin/tabs/awaiting-approval.tsx b/src/features/admin/tabs/awaiting-approval.tsx
index 1b2d0c6a6..a72f07200 100644
--- a/src/features/admin/tabs/awaiting-approval.tsx
+++ b/src/features/admin/tabs/awaiting-approval.tsx
@@ -44,4 +44,4 @@ const AwaitingApproval: React.FC = () => {
   );
 };
 
-export default AwaitingApproval;
+export { AwaitingApproval as default };
diff --git a/src/features/admin/tabs/dashboard.tsx b/src/features/admin/tabs/dashboard.tsx
index cad486771..d7931f94b 100644
--- a/src/features/admin/tabs/dashboard.tsx
+++ b/src/features/admin/tabs/dashboard.tsx
@@ -187,4 +187,4 @@ const Dashboard: React.FC = () => {
   );
 };
 
-export default Dashboard;
+export { Dashboard as default };
diff --git a/src/features/admin/tabs/reports.tsx b/src/features/admin/tabs/reports.tsx
index 63ea4bd70..60474dddd 100644
--- a/src/features/admin/tabs/reports.tsx
+++ b/src/features/admin/tabs/reports.tsx
@@ -42,4 +42,4 @@ const Reports: React.FC = () => {
   );
 };
 
-export default Reports;
+export { Reports as default };
diff --git a/src/features/admin/user-index.tsx b/src/features/admin/user-index.tsx
index 06dcde6e6..7df016276 100644
--- a/src/features/admin/user-index.tsx
+++ b/src/features/admin/user-index.tsx
@@ -66,4 +66,4 @@ const UserIndex: React.FC = () => {
   );
 };
 
-export default UserIndex;
+export { UserIndex as default };
diff --git a/src/features/aliases/components/account.tsx b/src/features/aliases/components/account.tsx
index 036dde092..e50fb7dcf 100644
--- a/src/features/aliases/components/account.tsx
+++ b/src/features/aliases/components/account.tsx
@@ -51,4 +51,4 @@ const Account: React.FC<IAccount> = ({ accountId, aliases }) => {
   );
 };
 
-export default Account;
+export { Account as default };
diff --git a/src/features/aliases/components/search.tsx b/src/features/aliases/components/search.tsx
index dcb995253..6a833c677 100644
--- a/src/features/aliases/components/search.tsx
+++ b/src/features/aliases/components/search.tsx
@@ -61,4 +61,4 @@ const Search: React.FC = () => {
   );
 };
 
-export default Search;
+export { Search as default };
diff --git a/src/features/aliases/index.tsx b/src/features/aliases/index.tsx
index e4bbb10d2..99f72188a 100644
--- a/src/features/aliases/index.tsx
+++ b/src/features/aliases/index.tsx
@@ -90,4 +90,4 @@ const Aliases = () => {
   );
 };
 
-export default Aliases;
+export { Aliases as default };
diff --git a/src/features/audio/index.tsx b/src/features/audio/index.tsx
index 4d45177ec..07288ce68 100644
--- a/src/features/audio/index.tsx
+++ b/src/features/audio/index.tsx
@@ -564,4 +564,4 @@ const Audio: React.FC<IAudio> = (props) => {
   );
 };
 
-export default Audio;
+export { Audio as default };
diff --git a/src/features/audio/visualizer.ts b/src/features/audio/visualizer.ts
index 541b6210b..8e446a8d0 100644
--- a/src/features/audio/visualizer.ts
+++ b/src/features/audio/visualizer.ts
@@ -13,7 +13,7 @@ const hex2rgba = (hex: string, alpha = 1) => {
   return `rgba(${r}, ${g}, ${b}, ${alpha})`;
 };
 
-export default class Visualizer {
+class Visualizer {
 
   tickSize: number;
   canvas?: HTMLCanvasElement;
@@ -139,3 +139,5 @@ export default class Visualizer {
   }
 
 }
+
+export { Visualizer as default };
diff --git a/src/features/auth-login/components/consumer-button.tsx b/src/features/auth-login/components/consumer-button.tsx
index feac5f75b..d598cac49 100644
--- a/src/features/auth-login/components/consumer-button.tsx
+++ b/src/features/auth-login/components/consumer-button.tsx
@@ -48,4 +48,4 @@ const ConsumerButton: React.FC<IConsumerButton> = ({ provider }) => {
   );
 };
 
-export default ConsumerButton;
+export { ConsumerButton as default };
diff --git a/src/features/auth-login/components/consumers-list.tsx b/src/features/auth-login/components/consumers-list.tsx
index e944c76c3..631b6efac 100644
--- a/src/features/auth-login/components/consumers-list.tsx
+++ b/src/features/auth-login/components/consumers-list.tsx
@@ -32,4 +32,4 @@ const ConsumersList: React.FC<IConsumersList> = () => {
   }
 };
 
-export default ConsumersList;
+export { ConsumersList as default };
diff --git a/src/features/auth-login/components/login-form.tsx b/src/features/auth-login/components/login-form.tsx
index 21e353d31..48c35ef35 100644
--- a/src/features/auth-login/components/login-form.tsx
+++ b/src/features/auth-login/components/login-form.tsx
@@ -82,4 +82,4 @@ const LoginForm: React.FC<ILoginForm> = ({ isLoading, handleSubmit }) => {
   );
 };
 
-export default LoginForm;
+export { LoginForm as default };
diff --git a/src/features/auth-login/components/login-page.tsx b/src/features/auth-login/components/login-page.tsx
index ba2ef7fcd..e2dc25edb 100644
--- a/src/features/auth-login/components/login-page.tsx
+++ b/src/features/auth-login/components/login-page.tsx
@@ -91,4 +91,4 @@ const LoginPage = () => {
   );
 };
 
-export default LoginPage;
+export { LoginPage as default };
diff --git a/src/features/auth-login/components/logout.tsx b/src/features/auth-login/components/logout.tsx
index 6f70e0bdd..bb02f5e80 100644
--- a/src/features/auth-login/components/logout.tsx
+++ b/src/features/auth-login/components/logout.tsx
@@ -23,4 +23,4 @@ const Logout: React.FC = () => {
   }
 };
 
-export default Logout;
+export { Logout as default };
diff --git a/src/features/auth-login/components/otp-auth-form.tsx b/src/features/auth-login/components/otp-auth-form.tsx
index f988a93fe..25e2169fa 100644
--- a/src/features/auth-login/components/otp-auth-form.tsx
+++ b/src/features/auth-login/components/otp-auth-form.tsx
@@ -78,4 +78,4 @@ const OtpAuthForm: React.FC<IOtpAuthForm> = ({ mfa_token }) => {
   );
 };
 
-export default OtpAuthForm;
+export { OtpAuthForm as default };
diff --git a/src/features/auth-login/components/password-reset.tsx b/src/features/auth-login/components/password-reset.tsx
index 42a8c4bc6..543e13814 100644
--- a/src/features/auth-login/components/password-reset.tsx
+++ b/src/features/auth-login/components/password-reset.tsx
@@ -58,4 +58,4 @@ const PasswordReset = () => {
   );
 };
 
-export default PasswordReset;
+export { PasswordReset as default };
diff --git a/src/features/auth-login/components/registration-form.tsx b/src/features/auth-login/components/registration-form.tsx
index 8bf9854fc..3795b3175 100644
--- a/src/features/auth-login/components/registration-form.tsx
+++ b/src/features/auth-login/components/registration-form.tsx
@@ -372,4 +372,4 @@ const RegistrationForm: React.FC<IRegistrationForm> = ({ inviteToken }) => {
   );
 };
 
-export default RegistrationForm;
+export { RegistrationForm as default };
diff --git a/src/features/auth-login/components/registration-page.tsx b/src/features/auth-login/components/registration-page.tsx
index eee006888..99f21319e 100644
--- a/src/features/auth-login/components/registration-page.tsx
+++ b/src/features/auth-login/components/registration-page.tsx
@@ -32,4 +32,4 @@ const RegistrationPage: React.FC = () => {
   );
 };
 
-export default RegistrationPage;
\ No newline at end of file
+export { RegistrationPage as default };
\ No newline at end of file
diff --git a/src/features/auth-token-list/index.tsx b/src/features/auth-token-list/index.tsx
index 40ca864c5..2a4478a41 100644
--- a/src/features/auth-token-list/index.tsx
+++ b/src/features/auth-token-list/index.tsx
@@ -106,4 +106,4 @@ const AuthTokenList: React.FC = () => {
   );
 };
 
-export default AuthTokenList;
+export { AuthTokenList as default };
diff --git a/src/features/backups/index.tsx b/src/features/backups/index.tsx
index 9cac7cb13..7f45a4113 100644
--- a/src/features/backups/index.tsx
+++ b/src/features/backups/index.tsx
@@ -107,4 +107,4 @@ const Backups = () => {
   );
 };
 
-export default Backups;
+export { Backups as default };
diff --git a/src/features/birthdays/account.tsx b/src/features/birthdays/account.tsx
index 33d14cf1b..2863fbe9e 100644
--- a/src/features/birthdays/account.tsx
+++ b/src/features/birthdays/account.tsx
@@ -43,4 +43,4 @@ const Account: React.FC<IAccount> = ({ accountId }) => {
   );
 };
 
-export default Account;
+export { Account as default };
diff --git a/src/features/birthdays/date-picker.ts b/src/features/birthdays/date-picker.ts
index 1944067d7..9a4845be4 100644
--- a/src/features/birthdays/date-picker.ts
+++ b/src/features/birthdays/date-picker.ts
@@ -1,4 +1,4 @@
 import DatePicker from 'react-datepicker';
 import 'react-datepicker/dist/react-datepicker.css';
 
-export default DatePicker;
+export { DatePicker as default };
diff --git a/src/features/blocks/index.tsx b/src/features/blocks/index.tsx
index f5bedf96c..6a00ea0ac 100644
--- a/src/features/blocks/index.tsx
+++ b/src/features/blocks/index.tsx
@@ -48,4 +48,4 @@ const Blocks: React.FC = () => {
   );
 };
 
-export default Blocks;
+export { Blocks as default };
diff --git a/src/features/bookmark-folders/components/new-folder-form.tsx b/src/features/bookmark-folders/components/new-folder-form.tsx
index badd6006f..83466fd42 100644
--- a/src/features/bookmark-folders/components/new-folder-form.tsx
+++ b/src/features/bookmark-folders/components/new-folder-form.tsx
@@ -61,4 +61,4 @@ const NewFolderForm: React.FC = () => {
   );
 };
 
-export default NewFolderForm;
+export { NewFolderForm as default };
diff --git a/src/features/bookmark-folders/index.tsx b/src/features/bookmark-folders/index.tsx
index 0e3427bc7..41defaa78 100644
--- a/src/features/bookmark-folders/index.tsx
+++ b/src/features/bookmark-folders/index.tsx
@@ -69,4 +69,4 @@ const BookmarkFolders: React.FC = () => {
   );
 };
 
-export default BookmarkFolders;
+export { BookmarkFolders as default };
diff --git a/src/features/bookmarks/index.tsx b/src/features/bookmarks/index.tsx
index 5c7f7b41e..7c9b9b761 100644
--- a/src/features/bookmarks/index.tsx
+++ b/src/features/bookmarks/index.tsx
@@ -120,4 +120,4 @@ const Bookmarks: React.FC<IBookmarks> = ({ params }) => {
   );
 };
 
-export default Bookmarks;
+export { Bookmarks as default };
diff --git a/src/features/chats/components/chat-composer.tsx b/src/features/chats/components/chat-composer.tsx
index 62c506f5a..ed63f426f 100644
--- a/src/features/chats/components/chat-composer.tsx
+++ b/src/features/chats/components/chat-composer.tsx
@@ -257,4 +257,4 @@ const ChatComposer = React.forwardRef<HTMLTextAreaElement | null, IChatComposer>
   );
 });
 
-export default ChatComposer;
+export { ChatComposer as default };
diff --git a/src/features/chats/components/chat-list-item.tsx b/src/features/chats/components/chat-list-item.tsx
index 3988cca46..cec30153a 100644
--- a/src/features/chats/components/chat-list-item.tsx
+++ b/src/features/chats/components/chat-list-item.tsx
@@ -157,4 +157,4 @@ const ChatListItem: React.FC<IChatListItemInterface> = ({ chat, onClick }) => {
   );
 };
 
-export default ChatListItem;
+export { ChatListItem as default };
diff --git a/src/features/chats/components/chat-list.tsx b/src/features/chats/components/chat-list.tsx
index 5b0bd8ef4..fde923722 100644
--- a/src/features/chats/components/chat-list.tsx
+++ b/src/features/chats/components/chat-list.tsx
@@ -85,4 +85,4 @@ const ChatList: React.FC<IChatList> = ({ onClickChat, useWindowScroll = false })
   );
 };
 
-export default ChatList;
+export { ChatList as default };
diff --git a/src/features/chats/components/chat-message-list.tsx b/src/features/chats/components/chat-message-list.tsx
index c30766638..d6bad1620 100644
--- a/src/features/chats/components/chat-message-list.tsx
+++ b/src/features/chats/components/chat-message-list.tsx
@@ -263,4 +263,4 @@ const ChatMessageList: React.FC<IChatMessageList> = ({ chat }) => {
   );
 };
 
-export default ChatMessageList;
+export { ChatMessageList as default };
diff --git a/src/features/chats/components/chat-message.tsx b/src/features/chats/components/chat-message.tsx
index a92c1a674..bf712941d 100644
--- a/src/features/chats/components/chat-message.tsx
+++ b/src/features/chats/components/chat-message.tsx
@@ -278,4 +278,4 @@ const ChatMessage = (props: IChatMessage) => {
   );
 };
 
-export default ChatMessage;
+export { ChatMessage as default };
diff --git a/src/features/chats/components/chat-page/chat-page.tsx b/src/features/chats/components/chat-page/chat-page.tsx
index 178607898..ab6bc2de2 100644
--- a/src/features/chats/components/chat-page/chat-page.tsx
+++ b/src/features/chats/components/chat-page/chat-page.tsx
@@ -91,4 +91,4 @@ const ChatPage: React.FC<IChatPage> = ({ chatId }) => {
   );
 };
 
-export default ChatPage;
+export { ChatPage as default };
diff --git a/src/features/chats/components/chat-page/components/blankslate-empty.tsx b/src/features/chats/components/chat-page/components/blankslate-empty.tsx
index 18f177f24..d3fa20962 100644
--- a/src/features/chats/components/chat-page/components/blankslate-empty.tsx
+++ b/src/features/chats/components/chat-page/components/blankslate-empty.tsx
@@ -43,4 +43,4 @@ const BlankslateEmpty: React.FC<IBlankslate> = () => {
   );
 };
 
-export default BlankslateEmpty;
\ No newline at end of file
+export { BlankslateEmpty as default };
\ No newline at end of file
diff --git a/src/features/chats/components/chat-page/components/blankslate-with-chats.tsx b/src/features/chats/components/chat-page/components/blankslate-with-chats.tsx
index 956672a19..524af4f16 100644
--- a/src/features/chats/components/chat-page/components/blankslate-with-chats.tsx
+++ b/src/features/chats/components/chat-page/components/blankslate-with-chats.tsx
@@ -40,4 +40,4 @@ const BlankslateWithChats = () => {
   );
 };
 
-export default BlankslateWithChats;
\ No newline at end of file
+export { BlankslateWithChats as default };
\ No newline at end of file
diff --git a/src/features/chats/components/chat-page/components/chat-page-main.tsx b/src/features/chats/components/chat-page/components/chat-page-main.tsx
index 8be27ebe3..59c4a6d60 100644
--- a/src/features/chats/components/chat-page/components/chat-page-main.tsx
+++ b/src/features/chats/components/chat-page/components/chat-page-main.tsx
@@ -187,4 +187,4 @@ const ChatPageMain = () => {
   );
 };
 
-export default ChatPageMain;
+export { ChatPageMain as default };
diff --git a/src/features/chats/components/chat-page/components/chat-page-new.tsx b/src/features/chats/components/chat-page/components/chat-page-new.tsx
index 0c7fa0a60..f53d4ad1f 100644
--- a/src/features/chats/components/chat-page/components/chat-page-new.tsx
+++ b/src/features/chats/components/chat-page/components/chat-page-new.tsx
@@ -37,4 +37,4 @@ const ChatPageNew: React.FC<IChatPageNew> = () => {
   );
 };
 
-export default ChatPageNew;
+export { ChatPageNew as default };
diff --git a/src/features/chats/components/chat-page/components/chat-page-settings.tsx b/src/features/chats/components/chat-page/components/chat-page-settings.tsx
index 6170074ae..7a7a890c8 100644
--- a/src/features/chats/components/chat-page/components/chat-page-settings.tsx
+++ b/src/features/chats/components/chat-page/components/chat-page-settings.tsx
@@ -90,4 +90,4 @@ const ChatPageSettings = () => {
   );
 };
 
-export default ChatPageSettings;
\ No newline at end of file
+export { ChatPageSettings as default };
\ No newline at end of file
diff --git a/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx b/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx
index da1a86905..0f9e81ff3 100644
--- a/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx
+++ b/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx
@@ -56,4 +56,4 @@ const ChatPageSidebar = () => {
   );
 };
 
-export default ChatPageSidebar;
\ No newline at end of file
+export { ChatPageSidebar as default };
\ No newline at end of file
diff --git a/src/features/chats/components/chat-pane/blankslate.tsx b/src/features/chats/components/chat-pane/blankslate.tsx
index d718ff376..01d4d01cc 100644
--- a/src/features/chats/components/chat-pane/blankslate.tsx
+++ b/src/features/chats/components/chat-pane/blankslate.tsx
@@ -44,4 +44,4 @@ const Blankslate = ({ onSearch }: IBlankslate) => {
   );
 };
 
-export default Blankslate;
+export { Blankslate as default };
diff --git a/src/features/chats/components/chat-pane/chat-pane.tsx b/src/features/chats/components/chat-pane/chat-pane.tsx
index 03e4b0555..fc3f82e4a 100644
--- a/src/features/chats/components/chat-pane/chat-pane.tsx
+++ b/src/features/chats/components/chat-pane/chat-pane.tsx
@@ -91,4 +91,4 @@ const ChatPane = () => {
   );
 };
 
-export default ChatPane;
+export { ChatPane as default };
diff --git a/src/features/chats/components/chat-pending-upload.tsx b/src/features/chats/components/chat-pending-upload.tsx
index 52e1f689f..338bdc362 100644
--- a/src/features/chats/components/chat-pending-upload.tsx
+++ b/src/features/chats/components/chat-pending-upload.tsx
@@ -13,4 +13,4 @@ const ChatPendingUpload: React.FC<IChatPendingUpload> = ({ progress }) => (
   </div>
 );
 
-export default ChatPendingUpload;
\ No newline at end of file
+export { ChatPendingUpload as default };
\ No newline at end of file
diff --git a/src/features/chats/components/chat-search/blankslate.tsx b/src/features/chats/components/chat-search/blankslate.tsx
index f4ffd748b..8c8ee0c17 100644
--- a/src/features/chats/components/chat-search/blankslate.tsx
+++ b/src/features/chats/components/chat-search/blankslate.tsx
@@ -23,4 +23,4 @@ const Blankslate = () => {
   );
 };
 
-export default Blankslate;
\ No newline at end of file
+export { Blankslate as default };
\ No newline at end of file
diff --git a/src/features/chats/components/chat-search/chat-search.tsx b/src/features/chats/components/chat-search/chat-search.tsx
index 6c6b61fbf..8b7f04df1 100644
--- a/src/features/chats/components/chat-search/chat-search.tsx
+++ b/src/features/chats/components/chat-search/chat-search.tsx
@@ -114,4 +114,4 @@ const ChatSearch = (props: IChatSearch) => {
   );
 };
 
-export default ChatSearch;
+export { ChatSearch as default };
diff --git a/src/features/chats/components/chat-search/empty-results-blankslate.tsx b/src/features/chats/components/chat-search/empty-results-blankslate.tsx
index 4a890f699..89e5a0d7b 100644
--- a/src/features/chats/components/chat-search/empty-results-blankslate.tsx
+++ b/src/features/chats/components/chat-search/empty-results-blankslate.tsx
@@ -24,4 +24,4 @@ const EmptyResultsBlankslate = () => {
   );
 };
 
-export default EmptyResultsBlankslate;
\ No newline at end of file
+export { EmptyResultsBlankslate as default };
\ No newline at end of file
diff --git a/src/features/chats/components/chat-search/results.tsx b/src/features/chats/components/chat-search/results.tsx
index 1edec0dde..28bef255d 100644
--- a/src/features/chats/components/chat-search/results.tsx
+++ b/src/features/chats/components/chat-search/results.tsx
@@ -79,4 +79,4 @@ const Results = ({ accountSearchResult, onSelect }: IResults) => {
   );
 };
 
-export default Results;
+export { Results as default };
diff --git a/src/features/chats/components/chat-textarea.tsx b/src/features/chats/components/chat-textarea.tsx
index 7cb79b6cb..f5cbdb037 100644
--- a/src/features/chats/components/chat-textarea.tsx
+++ b/src/features/chats/components/chat-textarea.tsx
@@ -67,4 +67,4 @@ const ChatTextarea: React.FC<IChatTextarea> = React.forwardRef(({
   );
 });
 
-export default ChatTextarea;
+export { ChatTextarea as default };
diff --git a/src/features/chats/components/chat-upload-preview.tsx b/src/features/chats/components/chat-upload-preview.tsx
index 8bbeda372..30d7d5c1e 100644
--- a/src/features/chats/components/chat-upload-preview.tsx
+++ b/src/features/chats/components/chat-upload-preview.tsx
@@ -53,4 +53,4 @@ const ChatUploadPreview: React.FC<IChatUploadPreview> = ({ className, attachment
   }
 };
 
-export default ChatUploadPreview;
\ No newline at end of file
+export { ChatUploadPreview as default };
\ No newline at end of file
diff --git a/src/features/chats/components/chat-upload.tsx b/src/features/chats/components/chat-upload.tsx
index 971171a57..80a192ace 100644
--- a/src/features/chats/components/chat-upload.tsx
+++ b/src/features/chats/components/chat-upload.tsx
@@ -61,4 +61,4 @@ const RemoveButton: React.FC<IRemoveButton> = ({ onClick }) => (
   </button>
 );
 
-export default ChatUpload;
\ No newline at end of file
+export { ChatUpload as default };
\ No newline at end of file
diff --git a/src/features/chats/components/chat-widget/chat-pane-header.tsx b/src/features/chats/components/chat-widget/chat-pane-header.tsx
index 0864434ad..377b0f8f8 100644
--- a/src/features/chats/components/chat-widget/chat-pane-header.tsx
+++ b/src/features/chats/components/chat-widget/chat-pane-header.tsx
@@ -74,4 +74,4 @@ const ChatPaneHeader = (props: IChatPaneHeader) => {
   );
 };
 
-export default ChatPaneHeader;
+export { ChatPaneHeader as default };
diff --git a/src/features/chats/components/chat-widget/chat-settings.tsx b/src/features/chats/components/chat-widget/chat-settings.tsx
index 87d535f98..dff845e10 100644
--- a/src/features/chats/components/chat-widget/chat-settings.tsx
+++ b/src/features/chats/components/chat-widget/chat-settings.tsx
@@ -128,4 +128,4 @@ const ChatSettings = () => {
   );
 };
 
-export default ChatSettings;
+export { ChatSettings as default };
diff --git a/src/features/chats/components/chat-widget/chat-widget.tsx b/src/features/chats/components/chat-widget/chat-widget.tsx
index 2be0e2861..5843d2bcb 100644
--- a/src/features/chats/components/chat-widget/chat-widget.tsx
+++ b/src/features/chats/components/chat-widget/chat-widget.tsx
@@ -22,4 +22,4 @@ const ChatWidget = () => {
   );
 };
 
-export default ChatWidget;
+export { ChatWidget as default };
diff --git a/src/features/chats/components/chat-widget/chat-window.tsx b/src/features/chats/components/chat-widget/chat-window.tsx
index 66f92eee2..26a38d567 100644
--- a/src/features/chats/components/chat-widget/chat-window.tsx
+++ b/src/features/chats/components/chat-widget/chat-window.tsx
@@ -95,4 +95,4 @@ const ChatWindow = () => {
   );
 };
 
-export default ChatWindow;
+export { ChatWindow as default };
diff --git a/src/features/chats/components/chat-widget/headers/chat-search-header.tsx b/src/features/chats/components/chat-widget/headers/chat-search-header.tsx
index 791dced52..b68e3a05e 100644
--- a/src/features/chats/components/chat-widget/headers/chat-search-header.tsx
+++ b/src/features/chats/components/chat-widget/headers/chat-search-header.tsx
@@ -43,4 +43,4 @@ const ChatSearchHeader = () => {
   );
 };
 
-export default ChatSearchHeader;
\ No newline at end of file
+export { ChatSearchHeader as default };
\ No newline at end of file
diff --git a/src/features/chats/components/chat.tsx b/src/features/chats/components/chat.tsx
index 6aee4a3b2..68a14a410 100644
--- a/src/features/chats/components/chat.tsx
+++ b/src/features/chats/components/chat.tsx
@@ -195,4 +195,4 @@ const Chat: React.FC<ChatInterface> = ({ chat, inputRef, className }) => {
   );
 };
 
-export default Chat;
+export { Chat as default };
diff --git a/src/features/chats/index.tsx b/src/features/chats/index.tsx
index c54bab37b..b06cf66e3 100644
--- a/src/features/chats/index.tsx
+++ b/src/features/chats/index.tsx
@@ -16,4 +16,4 @@ const ChatIndex: React.FC<IChatIndex> = ({ params }) => (
   </ChatProvider>
 );
 
-export default ChatIndex;
+export { ChatIndex as default };
diff --git a/src/features/community-timeline/index.tsx b/src/features/community-timeline/index.tsx
index b6c6400a2..5d546f1d5 100644
--- a/src/features/community-timeline/index.tsx
+++ b/src/features/community-timeline/index.tsx
@@ -53,4 +53,4 @@ const CommunityTimeline = () => {
   );
 };
 
-export default CommunityTimeline;
+export { CommunityTimeline as default };
diff --git a/src/features/compose/components/autosuggest-account.tsx b/src/features/compose/components/autosuggest-account.tsx
index d3b3a295f..6c82112ff 100644
--- a/src/features/compose/components/autosuggest-account.tsx
+++ b/src/features/compose/components/autosuggest-account.tsx
@@ -19,4 +19,4 @@ const AutosuggestAccount: React.FC<IAutosuggestAccount> = ({ id }) => {
 
 };
 
-export default AutosuggestAccount;
+export { AutosuggestAccount as default };
diff --git a/src/features/compose/components/compose-form-button.tsx b/src/features/compose/components/compose-form-button.tsx
index 0d4f47f00..cf25463a5 100644
--- a/src/features/compose/components/compose-form-button.tsx
+++ b/src/features/compose/components/compose-form-button.tsx
@@ -34,4 +34,4 @@ const ComposeFormButton: React.FC<IComposeFormButton> = ({
   </div>
 );
 
-export default ComposeFormButton;
+export { ComposeFormButton as default };
diff --git a/src/features/compose/components/compose-form.tsx b/src/features/compose/components/compose-form.tsx
index 800a403d8..4aa39a789 100644
--- a/src/features/compose/components/compose-form.tsx
+++ b/src/features/compose/components/compose-form.tsx
@@ -313,4 +313,4 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
   );
 };
 
-export default ComposeForm;
+export { ComposeForm as default };
diff --git a/src/features/compose/components/markdown-button.tsx b/src/features/compose/components/markdown-button.tsx
index daedd132b..103ef1129 100644
--- a/src/features/compose/components/markdown-button.tsx
+++ b/src/features/compose/components/markdown-button.tsx
@@ -34,4 +34,4 @@ const MarkdownButton: React.FC<IMarkdownButton> = ({ composeId }) => {
 
 };
 
-export default MarkdownButton;
+export { MarkdownButton as default };
diff --git a/src/features/compose/components/poll-button.tsx b/src/features/compose/components/poll-button.tsx
index c2a31c642..4459e2d2a 100644
--- a/src/features/compose/components/poll-button.tsx
+++ b/src/features/compose/components/poll-button.tsx
@@ -48,4 +48,4 @@ const PollButton: React.FC<IPollButton> = ({ composeId, disabled }) => {
   );
 };
 
-export default PollButton;
+export { PollButton as default };
diff --git a/src/features/compose/components/polls/duration-selector.tsx b/src/features/compose/components/polls/duration-selector.tsx
index 72b5de8bd..1e5b7a3ed 100644
--- a/src/features/compose/components/polls/duration-selector.tsx
+++ b/src/features/compose/components/polls/duration-selector.tsx
@@ -82,4 +82,4 @@ const DurationSelector = ({ onDurationChange }: IDurationSelector) => {
   );
 };
 
-export default DurationSelector;
+export { DurationSelector as default };
diff --git a/src/features/compose/components/polls/poll-form.tsx b/src/features/compose/components/polls/poll-form.tsx
index ed45cbbad..44dab7dff 100644
--- a/src/features/compose/components/polls/poll-form.tsx
+++ b/src/features/compose/components/polls/poll-form.tsx
@@ -208,4 +208,4 @@ const PollForm: React.FC<IPollForm> = ({ composeId }) => {
   );
 };
 
-export default PollForm;
+export { PollForm as default };
diff --git a/src/features/compose/components/privacy-dropdown.tsx b/src/features/compose/components/privacy-dropdown.tsx
index 787b68bdf..fe1ba2a33 100644
--- a/src/features/compose/components/privacy-dropdown.tsx
+++ b/src/features/compose/components/privacy-dropdown.tsx
@@ -303,4 +303,4 @@ const PrivacyDropdown: React.FC<IPrivacyDropdown> = ({
   );
 };
 
-export default PrivacyDropdown;
+export { PrivacyDropdown as default };
diff --git a/src/features/compose/components/reply-group-indicator.tsx b/src/features/compose/components/reply-group-indicator.tsx
index eb73a21b3..75038d9b3 100644
--- a/src/features/compose/components/reply-group-indicator.tsx
+++ b/src/features/compose/components/reply-group-indicator.tsx
@@ -39,4 +39,4 @@ const ReplyGroupIndicator = (props: IReplyGroupIndicator) => {
   );
 };
 
-export default ReplyGroupIndicator;
\ No newline at end of file
+export { ReplyGroupIndicator as default };
\ No newline at end of file
diff --git a/src/features/compose/components/reply-indicator.tsx b/src/features/compose/components/reply-indicator.tsx
index 4ed3db70e..5fc009666 100644
--- a/src/features/compose/components/reply-indicator.tsx
+++ b/src/features/compose/components/reply-indicator.tsx
@@ -63,4 +63,4 @@ const ReplyIndicator: React.FC<IReplyIndicator> = ({ className, status, hideActi
   );
 };
 
-export default ReplyIndicator;
+export { ReplyIndicator as default };
diff --git a/src/features/compose/components/reply-mentions.tsx b/src/features/compose/components/reply-mentions.tsx
index c0542c551..b54b17df7 100644
--- a/src/features/compose/components/reply-mentions.tsx
+++ b/src/features/compose/components/reply-mentions.tsx
@@ -78,4 +78,4 @@ const ReplyMentions: React.FC<IReplyMentions> = ({ composeId }) => {
   );
 };
 
-export default ReplyMentions;
+export { ReplyMentions as default };
diff --git a/src/features/compose/components/schedule-button.tsx b/src/features/compose/components/schedule-button.tsx
index cf4e8bbbf..c9e6b272f 100644
--- a/src/features/compose/components/schedule-button.tsx
+++ b/src/features/compose/components/schedule-button.tsx
@@ -48,4 +48,4 @@ const ScheduleButton: React.FC<IScheduleButton> = ({ composeId, disabled }) => {
   );
 };
 
-export default ScheduleButton;
+export { ScheduleButton as default };
diff --git a/src/features/compose/components/schedule-form.tsx b/src/features/compose/components/schedule-form.tsx
index d883b9715..62eaccca1 100644
--- a/src/features/compose/components/schedule-form.tsx
+++ b/src/features/compose/components/schedule-form.tsx
@@ -8,7 +8,7 @@ import { HStack, Input, Stack, Text } from 'soapbox/components/ui';
 import { DatePicker } from 'soapbox/features/ui/util/async-components';
 import { useAppDispatch, useCompose } from 'soapbox/hooks';
 
-export const isCurrentOrFutureDate = (date: Date) =>
+const isCurrentOrFutureDate = (date: Date) =>
   date && new Date().setHours(0, 0, 0, 0) <= new Date(date).setHours(0, 0, 0, 0);
 
 const isFiveMinutesFromNow = (time: Date) => {
@@ -23,7 +23,7 @@ const messages = defineMessages({
   remove: { id: 'schedule.remove', defaultMessage: 'Remove schedule' },
 });
 
-export interface IScheduleForm {
+interface IScheduleForm {
   composeId: string;
 }
 
@@ -81,4 +81,8 @@ const ScheduleForm: React.FC<IScheduleForm> = ({ composeId }) => {
   );
 };
 
-export default ScheduleForm;
+export {
+  isCurrentOrFutureDate,
+  type IScheduleForm,
+  ScheduleForm as default,
+};
diff --git a/src/features/compose/components/search-results.tsx b/src/features/compose/components/search-results.tsx
index 1c3b8cfed..d787b9899 100644
--- a/src/features/compose/components/search-results.tsx
+++ b/src/features/compose/components/search-results.tsx
@@ -237,4 +237,4 @@ const SearchResults = () => {
   );
 };
 
-export default SearchResults;
+export { SearchResults as default };
diff --git a/src/features/compose/components/search.tsx b/src/features/compose/components/search.tsx
index 4faaf45b3..23f1b4804 100644
--- a/src/features/compose/components/search.tsx
+++ b/src/features/compose/components/search.tsx
@@ -182,4 +182,4 @@ const Search = (props: ISearch) => {
   );
 };
 
-export default Search;
+export { Search as default };
diff --git a/src/features/compose/components/spoiler-button.tsx b/src/features/compose/components/spoiler-button.tsx
index 235209a83..854d840c6 100644
--- a/src/features/compose/components/spoiler-button.tsx
+++ b/src/features/compose/components/spoiler-button.tsx
@@ -34,4 +34,4 @@ const SpoilerButton: React.FC<ISpoilerButton> = ({ composeId }) => {
   );
 };
 
-export default SpoilerButton;
+export { SpoilerButton as default };
diff --git a/src/features/compose/components/spoiler-input.tsx b/src/features/compose/components/spoiler-input.tsx
index 183f58812..22476efb3 100644
--- a/src/features/compose/components/spoiler-input.tsx
+++ b/src/features/compose/components/spoiler-input.tsx
@@ -77,4 +77,4 @@ const SpoilerInput = React.forwardRef<AutosuggestInput, ISpoilerInput>(({
   );
 });
 
-export default SpoilerInput;
+export { SpoilerInput as default };
diff --git a/src/features/compose/components/text-character-counter.tsx b/src/features/compose/components/text-character-counter.tsx
index bdb61c999..ce696b753 100644
--- a/src/features/compose/components/text-character-counter.tsx
+++ b/src/features/compose/components/text-character-counter.tsx
@@ -23,4 +23,4 @@ const TextCharacterCounter: React.FC<ITextCharacterCounter> = ({ text, max }) =>
   return checkRemainingText(diff);
 };
 
-export default TextCharacterCounter;
+export { TextCharacterCounter as default };
diff --git a/src/features/compose/components/upload-button.tsx b/src/features/compose/components/upload-button.tsx
index 71c01ef62..3524e7de6 100644
--- a/src/features/compose/components/upload-button.tsx
+++ b/src/features/compose/components/upload-button.tsx
@@ -8,10 +8,10 @@ const messages = defineMessages({
   upload: { id: 'upload_button.label', defaultMessage: 'Add media attachment' },
 });
 
-export const onlyImages = (types: string[] | undefined): boolean =>
+const onlyImages = (types: string[] | undefined): boolean =>
   types?.every((type) => type.startsWith('image/')) ?? false;
 
-export interface IUploadButton {
+interface IUploadButton {
   disabled?: boolean;
   unavailable?: boolean;
   onSelectFile: (files: FileList, intl: IntlShape) => void;
@@ -85,4 +85,8 @@ const UploadButton: React.FC<IUploadButton> = ({
   );
 };
 
-export default UploadButton;
+export {
+  onlyImages,
+  type IUploadButton,
+  UploadButton as default,
+};
diff --git a/src/features/compose/components/upload-form.tsx b/src/features/compose/components/upload-form.tsx
index ac6ea3d8d..85dd8a4c9 100644
--- a/src/features/compose/components/upload-form.tsx
+++ b/src/features/compose/components/upload-form.tsx
@@ -58,4 +58,4 @@ const UploadForm: React.FC<IUploadForm> = ({ composeId, onSubmit }) => {
   );
 };
 
-export default UploadForm;
+export { UploadForm as default };
diff --git a/src/features/compose/components/upload-progress.tsx b/src/features/compose/components/upload-progress.tsx
index a3b9c0758..317a43d2c 100644
--- a/src/features/compose/components/upload-progress.tsx
+++ b/src/features/compose/components/upload-progress.tsx
@@ -23,4 +23,4 @@ const ComposeUploadProgress: React.FC<IComposeUploadProgress> = ({ composeId })
   );
 };
 
-export default ComposeUploadProgress;
+export { ComposeUploadProgress as default };
diff --git a/src/features/compose/components/upload.tsx b/src/features/compose/components/upload.tsx
index 5ba440996..0e26af0b6 100644
--- a/src/features/compose/components/upload.tsx
+++ b/src/features/compose/components/upload.tsx
@@ -50,4 +50,4 @@ const UploadCompose: React.FC<IUploadCompose> = ({ composeId, id, onSubmit, onDr
   );
 };
 
-export default UploadCompose;
+export { UploadCompose as default };
diff --git a/src/features/compose/components/visual-character-counter.tsx b/src/features/compose/components/visual-character-counter.tsx
index 647b3e8c3..1b4bb90ad 100644
--- a/src/features/compose/components/visual-character-counter.tsx
+++ b/src/features/compose/components/visual-character-counter.tsx
@@ -32,4 +32,4 @@ const VisualCharacterCounter: React.FC<IVisualCharacterCounter> = ({ text, max }
   );
 };
 
-export default VisualCharacterCounter;
+export { VisualCharacterCounter as default };
diff --git a/src/features/compose/components/warning.tsx b/src/features/compose/components/warning.tsx
index 8b8911466..490677cca 100644
--- a/src/features/compose/components/warning.tsx
+++ b/src/features/compose/components/warning.tsx
@@ -18,4 +18,4 @@ const Warning: React.FC<IWarning> = ({ message }) => (
   </Motion>
 );
 
-export default Warning;
+export { Warning as default };
diff --git a/src/features/compose/containers/quoted-status-container.tsx b/src/features/compose/containers/quoted-status-container.tsx
index 879d73267..1af3e83c0 100644
--- a/src/features/compose/containers/quoted-status-container.tsx
+++ b/src/features/compose/containers/quoted-status-container.tsx
@@ -35,4 +35,4 @@ const QuotedStatusContainer: React.FC<IQuotedStatusContainer> = ({ composeId })
   );
 };
 
-export default QuotedStatusContainer;
+export { QuotedStatusContainer as default };
diff --git a/src/features/compose/containers/reply-indicator-container.ts b/src/features/compose/containers/reply-indicator-container.ts
index b77c4a8d0..ff8612d59 100644
--- a/src/features/compose/containers/reply-indicator-container.ts
+++ b/src/features/compose/containers/reply-indicator-container.ts
@@ -32,4 +32,6 @@ const mapDispatchToProps = (dispatch: AppDispatch) => ({
 
 });
 
-export default connect(makeMapStateToProps, mapDispatchToProps)(ReplyIndicator);
+const ReplyIndicatorContainer = connect(makeMapStateToProps, mapDispatchToProps)(ReplyIndicator);
+
+export { ReplyIndicatorContainer as default };
diff --git a/src/features/compose/containers/upload-button-container.ts b/src/features/compose/containers/upload-button-container.ts
index 6b2307c93..8742eb813 100644
--- a/src/features/compose/containers/upload-button-container.ts
+++ b/src/features/compose/containers/upload-button-container.ts
@@ -20,4 +20,6 @@ const mapDispatchToProps = (dispatch: AppDispatch, { composeId }: { composeId: s
 
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(UploadButton);
+const UploadButtonContainer = connect(mapStateToProps, mapDispatchToProps)(UploadButton);
+
+export { UploadButtonContainer as default };
diff --git a/src/features/compose/containers/warning-container.tsx b/src/features/compose/containers/warning-container.tsx
index 22a8b1571..fa12776a2 100644
--- a/src/features/compose/containers/warning-container.tsx
+++ b/src/features/compose/containers/warning-container.tsx
@@ -69,4 +69,4 @@ const WarningWrapper: React.FC<IWarningWrapper> = ({ composeId }) => {
   return null;
 };
 
-export default WarningWrapper;
+export { WarningWrapper as default };
diff --git a/src/features/compose/editor/index.tsx b/src/features/compose/editor/index.tsx
index eeb6c1f02..9daf19b9d 100644
--- a/src/features/compose/editor/index.tsx
+++ b/src/features/compose/editor/index.tsx
@@ -174,4 +174,4 @@ const ComposeEditor = React.forwardRef<LexicalEditor, IComposeEditor>(({
   );
 });
 
-export default ComposeEditor;
+export { ComposeEditor as default };
diff --git a/src/features/compose/editor/plugins/autosuggest-plugin.tsx b/src/features/compose/editor/plugins/autosuggest-plugin.tsx
index 368af53b2..fe95564a6 100644
--- a/src/features/compose/editor/plugins/autosuggest-plugin.tsx
+++ b/src/features/compose/editor/plugins/autosuggest-plugin.tsx
@@ -553,4 +553,4 @@ const AutosuggestPlugin = ({
   );
 };
 
-export default AutosuggestPlugin;
+export { AutosuggestPlugin as default };
diff --git a/src/features/compose/editor/plugins/focus-plugin.tsx b/src/features/compose/editor/plugins/focus-plugin.tsx
index 8a076f199..d35ba2d0f 100644
--- a/src/features/compose/editor/plugins/focus-plugin.tsx
+++ b/src/features/compose/editor/plugins/focus-plugin.tsx
@@ -6,7 +6,7 @@ interface IFocusPlugin {
   autoFocus?: boolean;
 }
 
-export const FOCUS_EDITOR_COMMAND: LexicalCommand<void> = createCommand();
+const FOCUS_EDITOR_COMMAND: LexicalCommand<void> = createCommand();
 
 const FocusPlugin: React.FC<IFocusPlugin> = ({ autoFocus }) => {
   const [editor] = useLexicalComposerContext();
@@ -33,4 +33,7 @@ const FocusPlugin: React.FC<IFocusPlugin> = ({ autoFocus }) => {
   return null;
 };
 
-export default FocusPlugin;
+export {
+  FOCUS_EDITOR_COMMAND,
+  FocusPlugin as default,
+};
diff --git a/src/features/compose/editor/plugins/link-plugin.tsx b/src/features/compose/editor/plugins/link-plugin.tsx
index f4e8efe6b..27e6368ae 100644
--- a/src/features/compose/editor/plugins/link-plugin.tsx
+++ b/src/features/compose/editor/plugins/link-plugin.tsx
@@ -12,7 +12,7 @@ const urlRegExp = new RegExp(
   /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=+$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=+$,\w]+@)[A-Za-z0-9.-]+)((?:\/[+~%/.\w-_]*)?\??(?:[-+=&;%@.\w_]*)#?(?:[\w]*))?)/,
 );
 
-export const validateUrl = (url: string): boolean => {
+const validateUrl = (url: string): boolean => {
   // TODO Fix UI for link insertion; it should never default to an invalid URL such as https://.
   // Maybe show a dialog where they user can type the URL before inserting it.
   return url === 'https://' || urlRegExp.test(url);
@@ -20,4 +20,7 @@ export const validateUrl = (url: string): boolean => {
 
 const LinkPlugin = (): JSX.Element => <LexicalLinkPlugin validateUrl={validateUrl} />;
 
-export default LinkPlugin;
+export {
+  validateUrl,
+  LinkPlugin as default,
+};
diff --git a/src/features/compose/editor/plugins/ref-plugin.tsx b/src/features/compose/editor/plugins/ref-plugin.tsx
index b13cea3e1..361d58388 100644
--- a/src/features/compose/editor/plugins/ref-plugin.tsx
+++ b/src/features/compose/editor/plugins/ref-plugin.tsx
@@ -15,4 +15,4 @@ const RefPlugin = React.forwardRef<LexicalEditor>((_props, ref) => {
   return null;
 });
 
-export default RefPlugin;
+export { RefPlugin as default };
diff --git a/src/features/compose/editor/plugins/state-plugin.tsx b/src/features/compose/editor/plugins/state-plugin.tsx
index cb53a1104..1b1ac53b3 100644
--- a/src/features/compose/editor/plugins/state-plugin.tsx
+++ b/src/features/compose/editor/plugins/state-plugin.tsx
@@ -61,4 +61,4 @@ const StatePlugin: React.FC<IStatePlugin> = ({ composeId }) => {
   return null;
 };
 
-export default StatePlugin;
+export { StatePlugin as default };
diff --git a/src/features/compose/editor/plugins/submit-plugin.tsx b/src/features/compose/editor/plugins/submit-plugin.tsx
index ea7dde176..c41d3ed59 100644
--- a/src/features/compose/editor/plugins/submit-plugin.tsx
+++ b/src/features/compose/editor/plugins/submit-plugin.tsx
@@ -25,4 +25,4 @@ const SubmitPlugin: React.FC<ISubmitPlugin> = ({ composeId, handleSubmit }) => {
   return null;
 };
 
-export default SubmitPlugin;
+export { SubmitPlugin as default };
diff --git a/src/features/compose/util/counter.ts b/src/features/compose/util/counter.ts
index dbf491298..675996015 100644
--- a/src/features/compose/util/counter.ts
+++ b/src/features/compose/util/counter.ts
@@ -2,7 +2,9 @@ import { urlRegex } from './url-regex';
 
 const urlPlaceholder = 'xxxxxxxxxxxxxxxxxxxxxxx';
 
-export const countableText = (inputText: string) =>
+const countableText = (inputText: string) =>
   inputText
     .replace(urlRegex, urlPlaceholder)
     .replace(/(^|[^/\w])@(([a-z0-9_]+)@[a-z0-9.-]+[a-z0-9]+)/ig, '$1@$3');
+
+export { countableText };
diff --git a/src/features/compose/util/url-regex.ts b/src/features/compose/util/url-regex.ts
index fccabb1e5..c10c04aa8 100644
--- a/src/features/compose/util/url-regex.ts
+++ b/src/features/compose/util/url-regex.ts
@@ -1,6 +1,6 @@
 const regexen: { [x: string]: string | RegExp } = {};
 
-const regexSupplant = function(regex: string | RegExp, flags = '') {
+const regexSupplant = (regex: string | RegExp, flags = '') => {
   if (typeof regex !== 'string') {
     if (regex.global && flags.indexOf('g') < 0) {
       flags += 'g';
@@ -14,7 +14,7 @@ const regexSupplant = function(regex: string | RegExp, flags = '') {
 
     regex = regex.source;
   }
-  return new RegExp(regex.replace(/#\{(\w+)\}/g, function(match, name) {
+  return new RegExp(regex.replace(/#\{(\w+)\}/g, (match, name) => {
     let newRegex = regexen[name] || '';
     if (typeof newRegex !== 'string') {
       newRegex = newRegex.source;
@@ -23,13 +23,10 @@ const regexSupplant = function(regex: string | RegExp, flags = '') {
   }), flags);
 };
 
-const stringSupplant = function(str: string, values: { [x: string]: any }) {
-  return str.replace(/#\{(\w+)\}/g, function(match, name) {
-    return values[name] || '';
-  });
-};
+const stringSupplant = (str: string, values: { [x: string]: any }) =>
+  str.replace(/#\{(\w+)\}/g, (match, name) => values[name] || '');
 
-export const urlRegex = (function() {
+const urlRegex = (() => {
   regexen.spaces_group = /\x09-\x0D\x20\x85\xA0\u1680\u180E\u2000-\u200A\u2028\u2029\u202F\u205F\u3000/; // eslint-disable-line no-control-regex
   regexen.invalid_chars_group = /\uFFFE\uFEFF\uFFFF\u202A-\u202E/;
   // eslint-disable-next-line no-useless-escape
@@ -194,4 +191,6 @@ export const urlRegex = (function() {
     ')',
     'gi');
   return regexen.validUrl;
-}());
+})();
+
+export { urlRegex };
diff --git a/src/features/conversations/components/conversation.tsx b/src/features/conversations/components/conversation.tsx
index 20cbf4d98..952c148b5 100644
--- a/src/features/conversations/components/conversation.tsx
+++ b/src/features/conversations/components/conversation.tsx
@@ -59,4 +59,4 @@ const Conversation: React.FC<IConversation> = ({ conversationId, onMoveUp, onMov
   );
 };
 
-export default Conversation;
+export { Conversation as default };
diff --git a/src/features/conversations/components/conversations-list.tsx b/src/features/conversations/components/conversations-list.tsx
index 65c2ef3e1..e6e073967 100644
--- a/src/features/conversations/components/conversations-list.tsx
+++ b/src/features/conversations/components/conversations-list.tsx
@@ -72,4 +72,4 @@ const ConversationsList: React.FC = () => {
   );
 };
 
-export default ConversationsList;
+export { ConversationsList as default };
diff --git a/src/features/conversations/index.tsx b/src/features/conversations/index.tsx
index 1f6774ab9..4fa7b1fbd 100644
--- a/src/features/conversations/index.tsx
+++ b/src/features/conversations/index.tsx
@@ -46,4 +46,4 @@ const ConversationsTimeline = () => {
   );
 };
 
-export default ConversationsTimeline;
+export { ConversationsTimeline as default };
diff --git a/src/features/crypto-donate/components/crypto-address.tsx b/src/features/crypto-donate/components/crypto-address.tsx
index 0c07387eb..51ad27854 100644
--- a/src/features/crypto-donate/components/crypto-address.tsx
+++ b/src/features/crypto-donate/components/crypto-address.tsx
@@ -10,7 +10,7 @@ import { getTitle } from '../utils/coin-db';
 
 import CryptoIcon from './crypto-icon';
 
-export interface ICryptoAddress {
+interface ICryptoAddress {
   address: string;
   ticker: string;
   note?: string;
@@ -62,4 +62,7 @@ const CryptoAddress: React.FC<ICryptoAddress> = (props): JSX.Element => {
   );
 };
 
-export default CryptoAddress;
+export {
+  type ICryptoAddress,
+  CryptoAddress as default,
+};
diff --git a/src/features/crypto-donate/components/crypto-donate-panel.tsx b/src/features/crypto-donate/components/crypto-donate-panel.tsx
index a31d6feeb..f688d7e3c 100644
--- a/src/features/crypto-donate/components/crypto-donate-panel.tsx
+++ b/src/features/crypto-donate/components/crypto-donate-panel.tsx
@@ -49,4 +49,4 @@ const CryptoDonatePanel: React.FC<ICryptoDonatePanel> = ({ limit = 3 }): JSX.Ele
   );
 };
 
-export default CryptoDonatePanel;
+export { CryptoDonatePanel as default };
diff --git a/src/features/crypto-donate/components/crypto-icon.tsx b/src/features/crypto-donate/components/crypto-icon.tsx
index e5fa8d2b1..2c7e79b20 100644
--- a/src/features/crypto-donate/components/crypto-icon.tsx
+++ b/src/features/crypto-donate/components/crypto-icon.tsx
@@ -25,4 +25,4 @@ const CryptoIcon: React.FC<ICryptoIcon> = ({ ticker, title, className, imgClassN
   </div>
 );
 
-export default CryptoIcon;
+export { CryptoIcon as default };
diff --git a/src/features/crypto-donate/components/detailed-crypto-address.tsx b/src/features/crypto-donate/components/detailed-crypto-address.tsx
index a1cf9c2bc..d828e7c3e 100644
--- a/src/features/crypto-donate/components/detailed-crypto-address.tsx
+++ b/src/features/crypto-donate/components/detailed-crypto-address.tsx
@@ -45,4 +45,4 @@ const DetailedCryptoAddress: React.FC<IDetailedCryptoAddress> = ({ address, tick
   );
 };
 
-export default DetailedCryptoAddress;
+export { DetailedCryptoAddress as default };
diff --git a/src/features/crypto-donate/components/lightning-address.tsx b/src/features/crypto-donate/components/lightning-address.tsx
index aa52d61f3..41addb999 100644
--- a/src/features/crypto-donate/components/lightning-address.tsx
+++ b/src/features/crypto-donate/components/lightning-address.tsx
@@ -4,7 +4,7 @@ import { FormattedMessage } from 'react-intl';
 import CopyableInput from 'soapbox/components/copyable-input';
 import { Text, Stack, HStack, Emoji } from 'soapbox/components/ui';
 
-export interface ILightningAddress {
+interface ILightningAddress {
   address: string;
 }
 
@@ -29,4 +29,7 @@ const LightningAddress: React.FC<ILightningAddress> = (props): JSX.Element => {
   );
 };
 
-export default LightningAddress;
+export {
+  type ILightningAddress,
+  LightningAddress as default,
+};
diff --git a/src/features/crypto-donate/components/site-wallet.tsx b/src/features/crypto-donate/components/site-wallet.tsx
index 0494ecf46..a35a086eb 100644
--- a/src/features/crypto-donate/components/site-wallet.tsx
+++ b/src/features/crypto-donate/components/site-wallet.tsx
@@ -27,4 +27,4 @@ const SiteWallet: React.FC<ISiteWallet> = ({ limit }): JSX.Element => {
   );
 };
 
-export default SiteWallet;
+export { SiteWallet as default };
diff --git a/src/features/crypto-donate/index.tsx b/src/features/crypto-donate/index.tsx
index f2affe4bd..1bf6e1cd1 100644
--- a/src/features/crypto-donate/index.tsx
+++ b/src/features/crypto-donate/index.tsx
@@ -37,4 +37,4 @@ const CryptoDonate: React.FC = (): JSX.Element => {
   );
 };
 
-export default CryptoDonate;
+export { CryptoDonate as default };
diff --git a/src/features/crypto-donate/utils/block-explorer.ts b/src/features/crypto-donate/utils/block-explorer.ts
index b0f7a6965..5cfba45b6 100644
--- a/src/features/crypto-donate/utils/block-explorer.ts
+++ b/src/features/crypto-donate/utils/block-explorer.ts
@@ -2,8 +2,10 @@ import blockExplorers from './block-explorers.json';
 
 type BlockExplorers = Record<string, string | null>;
 
-export const getExplorerUrl = (ticker: string, address: string): string | null => {
+const getExplorerUrl = (ticker: string, address: string): string | null => {
   const template = (blockExplorers as BlockExplorers)[ticker];
   if (!template) return null;
   return template.replace('{address}', address);
 };
+
+export { getExplorerUrl };
diff --git a/src/features/crypto-donate/utils/coin-db.ts b/src/features/crypto-donate/utils/coin-db.ts
index 1949a62cf..e08155dea 100644
--- a/src/features/crypto-donate/utils/coin-db.ts
+++ b/src/features/crypto-donate/utils/coin-db.ts
@@ -4,10 +4,11 @@ import manifestMap from './manifest-map';
 
 // All this does is converts the result from manifest_map.js into an ImmutableMap
 const coinDB = fromJS(manifestMap);
-export default coinDB;
 
 /** Get title from CoinDB based on ticker symbol */
-export const getTitle = (ticker: string): string => {
+const getTitle = (ticker: string): string => {
   const title = coinDB.getIn([ticker, 'name']);
   return typeof title === 'string' ? title : '';
 };
+
+export { getTitle, coinDB as default };
diff --git a/src/features/crypto-donate/utils/manifest-map.ts b/src/features/crypto-donate/utils/manifest-map.ts
index e7a8fdeeb..239e373f2 100644
--- a/src/features/crypto-donate/utils/manifest-map.ts
+++ b/src/features/crypto-donate/utils/manifest-map.ts
@@ -8,6 +8,6 @@ const manifestMap = (fromJS(manifest) as ImmutableList<ImmutableMap<string, stri
   (acc: ImmutableMap<string, ImmutableMap<string, string>>, entry: ImmutableMap<string, string>) =>
     acc.set(entry.get('symbol')!.toLowerCase(), entry),
   ImmutableMap(),
-);
+).toJS();
 
-export default manifestMap.toJS();
+export { manifestMap as default };
diff --git a/src/features/delete-account/index.tsx b/src/features/delete-account/index.tsx
index 62216d377..16240fce3 100644
--- a/src/features/delete-account/index.tsx
+++ b/src/features/delete-account/index.tsx
@@ -79,4 +79,4 @@ const DeleteAccount = () => {
   );
 };
 
-export default DeleteAccount;
+export { DeleteAccount as default };
diff --git a/src/features/developers/apps/create.tsx b/src/features/developers/apps/create.tsx
index 7a1a942ec..e57bfc9f4 100644
--- a/src/features/developers/apps/create.tsx
+++ b/src/features/developers/apps/create.tsx
@@ -193,4 +193,4 @@ const CreateApp: React.FC = () => {
   );
 };
 
-export default CreateApp;
+export { CreateApp as default };
diff --git a/src/features/developers/components/indicator.tsx b/src/features/developers/components/indicator.tsx
index fc95329dd..1fc90ab96 100644
--- a/src/features/developers/components/indicator.tsx
+++ b/src/features/developers/components/indicator.tsx
@@ -19,4 +19,4 @@ const Indicator: React.FC<IIndicator> = ({ state = 'inactive', size = 'sm' }) =>
   />
 );
 
-export default Indicator;
+export { Indicator as default };
diff --git a/src/features/developers/developers-challenge.tsx b/src/features/developers/developers-challenge.tsx
index ee83ba809..fe0f66d6b 100644
--- a/src/features/developers/developers-challenge.tsx
+++ b/src/features/developers/developers-challenge.tsx
@@ -74,4 +74,4 @@ const DevelopersChallenge = () => {
   );
 };
 
-export default DevelopersChallenge;
+export { DevelopersChallenge as default };
diff --git a/src/features/developers/developers-menu.tsx b/src/features/developers/developers-menu.tsx
index 185f289b2..a26ad71de 100644
--- a/src/features/developers/developers-menu.tsx
+++ b/src/features/developers/developers-menu.tsx
@@ -131,4 +131,4 @@ const Developers: React.FC = () => {
   );
 };
 
-export default Developers;
+export { Developers as default };
diff --git a/src/features/developers/index.tsx b/src/features/developers/index.tsx
index 378207e46..39e0a7ce0 100644
--- a/src/features/developers/index.tsx
+++ b/src/features/developers/index.tsx
@@ -12,4 +12,4 @@ const Developers: React.FC = () => {
   return isDeveloper ? <DevelopersMenu /> : <DevelopersChallenge />;
 };
 
-export default Developers;
+export { Developers as default };
diff --git a/src/features/developers/service-worker-info.tsx b/src/features/developers/service-worker-info.tsx
index 362189c3e..38770d745 100644
--- a/src/features/developers/service-worker-info.tsx
+++ b/src/features/developers/service-worker-info.tsx
@@ -137,4 +137,4 @@ const ServiceWorkerInfo: React.FC<IServiceWorkerInfo> = () => {
   );
 };
 
-export default ServiceWorkerInfo;
\ No newline at end of file
+export { ServiceWorkerInfo as default };
\ No newline at end of file
diff --git a/src/features/developers/settings-store.tsx b/src/features/developers/settings-store.tsx
index 7115f8303..a212ceab3 100644
--- a/src/features/developers/settings-store.tsx
+++ b/src/features/developers/settings-store.tsx
@@ -114,4 +114,4 @@ const SettingsStore: React.FC = () => {
   );
 };
 
-export default SettingsStore;
+export { SettingsStore as default };
diff --git a/src/features/direct-timeline/index.tsx b/src/features/direct-timeline/index.tsx
index ba8ba1cb0..309b04668 100644
--- a/src/features/direct-timeline/index.tsx
+++ b/src/features/direct-timeline/index.tsx
@@ -52,4 +52,4 @@ const DirectTimeline = () => {
   );
 };
 
-export default DirectTimeline;
+export { DirectTimeline as default };
diff --git a/src/features/directory/components/account-card.tsx b/src/features/directory/components/account-card.tsx
index 3e28821b1..3d4dbb4ef 100644
--- a/src/features/directory/components/account-card.tsx
+++ b/src/features/directory/components/account-card.tsx
@@ -100,4 +100,4 @@ const AccountCard: React.FC<IAccountCard> = ({ id }) => {
   );
 };
 
-export default AccountCard;
+export { AccountCard as default };
diff --git a/src/features/directory/index.tsx b/src/features/directory/index.tsx
index 45cdfdc65..a68437cbb 100644
--- a/src/features/directory/index.tsx
+++ b/src/features/directory/index.tsx
@@ -104,4 +104,4 @@ const Directory = () => {
   );
 };
 
-export default Directory;
+export { Directory as default };
diff --git a/src/features/domain-blocks/index.tsx b/src/features/domain-blocks/index.tsx
index cf8978ad9..078c79435 100644
--- a/src/features/domain-blocks/index.tsx
+++ b/src/features/domain-blocks/index.tsx
@@ -55,4 +55,4 @@ const DomainBlocks: React.FC = () => {
   );
 };
 
-export default DomainBlocks;
+export { DomainBlocks as default };
diff --git a/src/features/draft-statuses/builder.tsx b/src/features/draft-statuses/builder.tsx
index 1e24c8c39..8f888be24 100644
--- a/src/features/draft-statuses/builder.tsx
+++ b/src/features/draft-statuses/builder.tsx
@@ -19,7 +19,7 @@ const buildPoll = (draftStatus: DraftStatus) => {
   }
 };
 
-export const buildStatus = (state: RootState, draftStatus: DraftStatus) => {
+const buildStatus = (state: RootState, draftStatus: DraftStatus) => {
   const me = state.me as string;
   const account = state.entities[Entities.ACCOUNTS]?.store[me];
 
@@ -41,3 +41,5 @@ export const buildStatus = (state: RootState, draftStatus: DraftStatus) => {
 
   return calculateStatus(normalizeStatus(status));
 };
+
+export { buildStatus };
diff --git a/src/features/draft-statuses/components/draft-status-action-bar.tsx b/src/features/draft-statuses/components/draft-status-action-bar.tsx
index 7558700ac..053f4a775 100644
--- a/src/features/draft-statuses/components/draft-status-action-bar.tsx
+++ b/src/features/draft-statuses/components/draft-status-action-bar.tsx
@@ -62,4 +62,4 @@ const DraftStatusActionBar: React.FC<IDraftStatusActionBar> = ({ source, status
   );
 };
 
-export default DraftStatusActionBar;
+export { DraftStatusActionBar as default };
diff --git a/src/features/draft-statuses/components/draft-status.tsx b/src/features/draft-statuses/components/draft-status.tsx
index 92531d24a..608ff9cf5 100644
--- a/src/features/draft-statuses/components/draft-status.tsx
+++ b/src/features/draft-statuses/components/draft-status.tsx
@@ -85,4 +85,4 @@ const DraftStatus: React.FC<IDraftStatus> = ({ draftStatus, ...other }) => {
   );
 };
 
-export default DraftStatus;
+export { DraftStatus as default };
diff --git a/src/features/draft-statuses/index.tsx b/src/features/draft-statuses/index.tsx
index 60fd1bd7a..5bf7ec85f 100644
--- a/src/features/draft-statuses/index.tsx
+++ b/src/features/draft-statuses/index.tsx
@@ -37,4 +37,4 @@ const DraftStatuses = () => {
   );
 };
 
-export default DraftStatuses;
+export { DraftStatuses as default };
diff --git a/src/features/edit-email/index.tsx b/src/features/edit-email/index.tsx
index 2c783ddb9..686f0af36 100644
--- a/src/features/edit-email/index.tsx
+++ b/src/features/edit-email/index.tsx
@@ -79,4 +79,4 @@ const EditEmail = () => {
   );
 };
 
-export default EditEmail;
+export { EditEmail as default };
diff --git a/src/features/edit-password/index.tsx b/src/features/edit-password/index.tsx
index 4d77b07d1..f22eb1570 100644
--- a/src/features/edit-password/index.tsx
+++ b/src/features/edit-password/index.tsx
@@ -94,4 +94,4 @@ const EditPassword = () => {
   );
 };
 
-export default EditPassword;
+export { EditPassword as default };
diff --git a/src/features/edit-profile/components/avatar-picker.tsx b/src/features/edit-profile/components/avatar-picker.tsx
index a973ec302..c45e8f500 100644
--- a/src/features/edit-profile/components/avatar-picker.tsx
+++ b/src/features/edit-profile/components/avatar-picker.tsx
@@ -61,4 +61,4 @@ const AvatarPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ classNam
   );
 });
 
-export default AvatarPicker;
+export { AvatarPicker as default };
diff --git a/src/features/edit-profile/components/header-picker.tsx b/src/features/edit-profile/components/header-picker.tsx
index fd60e79c6..bcf942142 100644
--- a/src/features/edit-profile/components/header-picker.tsx
+++ b/src/features/edit-profile/components/header-picker.tsx
@@ -86,4 +86,4 @@ const HeaderPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onC
   );
 });
 
-export default HeaderPicker;
+export { HeaderPicker as default };
diff --git a/src/features/edit-profile/index.tsx b/src/features/edit-profile/index.tsx
index 14f9cc1f5..45a73355f 100644
--- a/src/features/edit-profile/index.tsx
+++ b/src/features/edit-profile/index.tsx
@@ -425,4 +425,4 @@ const EditProfile: React.FC = () => {
   );
 };
 
-export default EditProfile;
+export { EditProfile as default };
diff --git a/src/features/embedded-status/index.tsx b/src/features/embedded-status/index.tsx
index ed97170cf..794c3c1c9 100644
--- a/src/features/embedded-status/index.tsx
+++ b/src/features/embedded-status/index.tsx
@@ -74,4 +74,4 @@ const EmbeddedStatus: React.FC<IEmbeddedStatus> = ({ params }) => {
   );
 };
 
-export default EmbeddedStatus;
+export { EmbeddedStatus as default };
diff --git a/src/features/emoji/components/emoji-picker-dropdown.tsx b/src/features/emoji/components/emoji-picker-dropdown.tsx
index c64620043..989c94bc1 100644
--- a/src/features/emoji/components/emoji-picker-dropdown.tsx
+++ b/src/features/emoji/components/emoji-picker-dropdown.tsx
@@ -13,7 +13,7 @@ import { EmojiPicker } from '../../ui/util/async-components';
 
 import type { Emoji, CustomEmoji, NativeEmoji } from 'soapbox/features/emoji';
 
-export const messages = defineMessages({
+const messages = defineMessages({
   emoji: { id: 'emoji_button.label', defaultMessage: 'Insert emoji' },
   emoji_pick: { id: 'emoji_button.pick', defaultMessage: 'Pick an emoji…' },
   emoji_oh_no: { id: 'emoji_button.oh_no', defaultMessage: 'Oh no!' },
@@ -40,7 +40,7 @@ export const messages = defineMessages({
   skins_6: { id: 'emoji_button.skins_6', defaultMessage: 'Dark' },
 });
 
-export interface IEmojiPickerDropdown {
+interface IEmojiPickerDropdown {
   onPickEmoji?: (emoji: Emoji) => void;
   condensed?: boolean;
   withCustom?: boolean;
@@ -71,7 +71,7 @@ const DEFAULTS = [
   'ok_hand',
 ];
 
-export const getFrequentlyUsedEmojis = createSelector([
+const getFrequentlyUsedEmojis = createSelector([
   (state: RootState) => state.settings.get('frequentlyUsedEmojis', ImmutableMap()),
 ], (emojiCounters: ImmutableMap<string, number>) => {
   let emojis = emojiCounters
@@ -235,4 +235,9 @@ const EmojiPickerDropdown: React.FC<IEmojiPickerDropdown> = ({
   );
 };
 
-export default EmojiPickerDropdown;
+export {
+  messages,
+  type IEmojiPickerDropdown,
+  getFrequentlyUsedEmojis,
+  EmojiPickerDropdown as default,
+};
diff --git a/src/features/emoji/components/emoji-picker.tsx b/src/features/emoji/components/emoji-picker.tsx
index aa8b3fe62..82449986e 100644
--- a/src/features/emoji/components/emoji-picker.tsx
+++ b/src/features/emoji/components/emoji-picker.tsx
@@ -21,4 +21,4 @@ const Picker: React.FC<any> = (props) => {
   return <div ref={ref} />;
 };
 
-export default Picker;
+export { Picker as default };
diff --git a/src/features/emoji/containers/emoji-picker-dropdown-container.tsx b/src/features/emoji/containers/emoji-picker-dropdown-container.tsx
index 51ade8de2..ccfd0cc18 100644
--- a/src/features/emoji/containers/emoji-picker-dropdown-container.tsx
+++ b/src/features/emoji/containers/emoji-picker-dropdown-container.tsx
@@ -9,7 +9,7 @@ import { useClickOutside } from 'soapbox/hooks';
 
 import EmojiPickerDropdown, { IEmojiPickerDropdown } from '../components/emoji-picker-dropdown';
 
-export const messages = defineMessages({
+const messages = defineMessages({
   emoji: { id: 'emoji_button.label', defaultMessage: 'Insert emoji' },
 });
 
@@ -74,4 +74,7 @@ const EmojiPickerDropdownContainer = (
   );
 };
 
-export default EmojiPickerDropdownContainer;
+export {
+  messages,
+  EmojiPickerDropdownContainer as default,
+};
diff --git a/src/features/emoji/data.ts b/src/features/emoji/data.ts
index 1d840e03f..db8db115b 100644
--- a/src/features/emoji/data.ts
+++ b/src/features/emoji/data.ts
@@ -1,17 +1,17 @@
 import data from '@emoji-mart/data/sets/14/twitter.json';
 
-export interface NativeEmoji {
+interface NativeEmoji {
   unified: string;
   native: string;
   x: number;
   y: number;
 }
 
-export interface CustomEmoji {
+interface CustomEmoji {
   src: string;
 }
 
-export interface Emoji<T> {
+interface Emoji<T> {
   id: string;
   name: string;
   keywords: string[];
@@ -19,25 +19,25 @@ export interface Emoji<T> {
   version?: number;
 }
 
-export interface EmojiCategory {
+interface EmojiCategory {
   id: string;
   emojis: string[];
 }
 
-export interface EmojiMap {
+interface EmojiMap {
   [s: string]: Emoji<NativeEmoji>;
 }
 
-export interface EmojiAlias {
+interface EmojiAlias {
   [s: string]: string;
 }
 
-export interface EmojiSheet {
+interface EmojiSheet {
   cols: number;
   rows: number;
 }
 
-export interface EmojiData {
+interface EmojiData {
   categories: EmojiCategory[];
   emojis: EmojiMap;
   aliases: EmojiAlias;
@@ -47,6 +47,18 @@ export interface EmojiData {
 const emojiData = data as EmojiData;
 const { categories, emojis, aliases, sheet } = emojiData;
 
-export { categories, emojis, aliases, sheet };
-
-export default emojiData;
+export {
+  type NativeEmoji,
+  type CustomEmoji,
+  type Emoji,
+  type EmojiCategory,
+  type EmojiMap,
+  type EmojiAlias,
+  type EmojiSheet,
+  type EmojiData,
+  categories,
+  emojis,
+  aliases,
+  sheet,
+  emojiData as default,
+};
diff --git a/src/features/emoji/index.ts b/src/features/emoji/index.ts
index 6d23b8afd..4f75c87e1 100644
--- a/src/features/emoji/index.ts
+++ b/src/features/emoji/index.ts
@@ -18,14 +18,14 @@ import type { Emoji as EmojiMart, CustomEmoji as EmojiMartCustom } from 'soapbox
  * and one type that is used everywhere that the above two are converted into
  */
 
-export interface CustomEmoji {
+interface CustomEmoji {
   id: string;
   colons: string;
   custom: true;
   imageUrl: string;
 }
 
-export interface NativeEmoji {
+interface NativeEmoji {
   id: string;
   colons: string;
   custom?: false;
@@ -33,12 +33,12 @@ export interface NativeEmoji {
   native: string;
 }
 
-export type Emoji = CustomEmoji | NativeEmoji;
+type Emoji = CustomEmoji | NativeEmoji;
 
-export const isCustomEmoji = (emoji: Emoji): emoji is CustomEmoji =>
+const isCustomEmoji = (emoji: Emoji): emoji is CustomEmoji =>
   (emoji as CustomEmoji).imageUrl !== undefined;
 
-export const isNativeEmoji = (emoji: Emoji): emoji is NativeEmoji =>
+const isNativeEmoji = (emoji: Emoji): emoji is NativeEmoji =>
   (emoji as NativeEmoji).native !== undefined;
 
 const isAlphaNumeric = (c: string) => {
@@ -79,7 +79,7 @@ const convertEmoji = (str: string, customEmojis: any) => {
   return str;
 };
 
-export const emojifyText = (str: string, customEmojis = {}) => {
+const emojifyText = (str: string, customEmojis = {}) => {
   let buf = '';
   let stack = '';
   let open = false;
@@ -144,7 +144,7 @@ export const emojifyText = (str: string, customEmojis = {}) => {
   return buf;
 };
 
-export const parseHTML = (str: string): { text: boolean; data: string }[] => {
+const parseHTML = (str: string): { text: boolean; data: string }[] => {
   const tokens = [];
   let buf = '';
   let stack = '';
@@ -198,15 +198,13 @@ const emojify = (str: string, customEmojis = {}) =>
     })
     .join('');
 
-export default emojify;
-
-export const buildCustomEmojis = (customEmojis: any) => {
+const buildCustomEmojis = (customEmojis: any) => {
   const emojis: EmojiMart<EmojiMartCustom>[] = [];
 
   customEmojis.forEach((emoji: any) => {
     const shortcode = emoji.get('shortcode');
-    const url       = emoji.get('static_url');
-    const name      = shortcode.replace(':', '');
+    const url = emoji.get('static_url');
+    const name = shortcode.replace(':', '');
 
     emojis.push({
       id: name,
@@ -218,3 +216,15 @@ export const buildCustomEmojis = (customEmojis: any) => {
 
   return emojis;
 };
+
+export {
+  type CustomEmoji,
+  type NativeEmoji,
+  type Emoji,
+  isCustomEmoji,
+  isNativeEmoji,
+  emojifyText,
+  parseHTML,
+  buildCustomEmojis,
+  emojify as default,
+};
diff --git a/src/features/emoji/mapping.ts b/src/features/emoji/mapping.ts
index bc769618d..5d5ba507a 100644
--- a/src/features/emoji/mapping.ts
+++ b/src/features/emoji/mapping.ts
@@ -79,7 +79,7 @@ const stripcodes = (unified: string, native: string) => {
   }
 };
 
-export const generateMappings = (data: EmojiData): UnicodeMap => {
+const generateMappings = (data: EmojiData): UnicodeMap => {
   const result: UnicodeMap = {};
   const emojis = Object.values(data.emojis ?? {});
 
@@ -103,4 +103,4 @@ export const generateMappings = (data: EmojiData): UnicodeMap => {
 
 const unicodeMapping = generateMappings(data);
 
-export default unicodeMapping;
+export { generateMappings, unicodeMapping as default };
diff --git a/src/features/emoji/search.ts b/src/features/emoji/search.ts
index 5e1143e35..f386c3b72 100644
--- a/src/features/emoji/search.ts
+++ b/src/features/emoji/search.ts
@@ -17,12 +17,12 @@ for (const [key, emoji] of sortedEmojis) {
   index.add('n' + key, `${emoji.id} ${emoji.name} ${emoji.keywords.join(' ')}`);
 }
 
-export interface searchOptions {
+interface searchOptions {
   maxResults?: number;
   custom?: any;
 }
 
-export const addCustomToPool = (customEmojis: any[]) => {
+const addCustomToPool = (customEmojis: any[]) => {
   // @ts-ignore
   for (const key in index.register) {
     if (key[0] === 'c') {
@@ -71,4 +71,8 @@ const search = (
     }
   }).filter(Boolean) as Emoji[];
 
-export default search;
+export {
+  type searchOptions,
+  addCustomToPool,
+  search as default,
+};
diff --git a/src/features/event/components/event-action-button.tsx b/src/features/event/components/event-action-button.tsx
index 413942eed..b946ec47f 100644
--- a/src/features/event/components/event-action-button.tsx
+++ b/src/features/event/components/event-action-button.tsx
@@ -98,4 +98,4 @@ const EventActionButton: React.FC<IEventAction> = ({ status, theme = 'secondary'
   );
 };
 
-export default EventActionButton;
+export { EventActionButton as default };
diff --git a/src/features/event/components/event-date.tsx b/src/features/event/components/event-date.tsx
index 978f49213..f2951703e 100644
--- a/src/features/event/components/event-date.tsx
+++ b/src/features/event/components/event-date.tsx
@@ -56,4 +56,4 @@ const EventDate: React.FC<IEventDate> = ({ status }) => {
   );
 };
 
-export default EventDate;
+export { EventDate as default };
diff --git a/src/features/event/components/event-header.tsx b/src/features/event/components/event-header.tsx
index 6529b4af1..6214fcdf2 100644
--- a/src/features/event/components/event-header.tsx
+++ b/src/features/event/components/event-header.tsx
@@ -476,4 +476,4 @@ const EventHeader: React.FC<IEventHeader> = ({ status }) => {
   );
 };
 
-export default EventHeader;
+export { EventHeader as default };
diff --git a/src/features/event/event-discussion.tsx b/src/features/event/event-discussion.tsx
index 2c762b8ad..5f845dbda 100644
--- a/src/features/event/event-discussion.tsx
+++ b/src/features/event/event-discussion.tsx
@@ -176,4 +176,4 @@ const EventDiscussion: React.FC<IEventDiscussion> = (props) => {
   );
 };
 
-export default EventDiscussion;
+export { EventDiscussion as default };
diff --git a/src/features/event/event-information.tsx b/src/features/event/event-information.tsx
index d739220d3..618ae704e 100644
--- a/src/features/event/event-information.tsx
+++ b/src/features/event/event-information.tsx
@@ -201,4 +201,4 @@ const EventInformation: React.FC<IEventInformation> = ({ params }) => {
   );
 };
 
-export default EventInformation;
+export { EventInformation as default };
diff --git a/src/features/events/components/event-carousel.tsx b/src/features/events/components/event-carousel.tsx
index e6e25f604..9c7fab129 100644
--- a/src/features/events/components/event-carousel.tsx
+++ b/src/features/events/components/event-carousel.tsx
@@ -80,4 +80,4 @@ const EventCarousel: React.FC<IEventCarousel> = ({ statusIds, isLoading, emptyMe
   );
 };
 
-export default EventCarousel;
+export { EventCarousel as default };
diff --git a/src/features/events/index.tsx b/src/features/events/index.tsx
index 831712ccf..cac3e9df1 100644
--- a/src/features/events/index.tsx
+++ b/src/features/events/index.tsx
@@ -65,4 +65,4 @@ const Events = () => {
   );
 };
 
-export default Events;
+export { Events as default };
diff --git a/src/features/export-data/components/csv-exporter.tsx b/src/features/export-data/components/csv-exporter.tsx
index 4210c0a33..4590baf80 100644
--- a/src/features/export-data/components/csv-exporter.tsx
+++ b/src/features/export-data/components/csv-exporter.tsx
@@ -43,4 +43,4 @@ const CSVExporter: React.FC<ICSVExporter> = ({ messages, action }) => {
   );
 };
 
-export default CSVExporter;
+export { CSVExporter as default };
diff --git a/src/features/export-data/index.tsx b/src/features/export-data/index.tsx
index 27273c339..64037b40e 100644
--- a/src/features/export-data/index.tsx
+++ b/src/features/export-data/index.tsx
@@ -45,4 +45,4 @@ const ExportData = () => {
   );
 };
 
-export default ExportData;
+export { ExportData as default };
diff --git a/src/features/external-login/components/external-login-form.tsx b/src/features/external-login/components/external-login-form.tsx
index f910826c3..414333095 100644
--- a/src/features/external-login/components/external-login-form.tsx
+++ b/src/features/external-login/components/external-login-form.tsx
@@ -94,4 +94,4 @@ const ExternalLoginForm: React.FC = () => {
   );
 };
 
-export default ExternalLoginForm;
+export { ExternalLoginForm as default };
diff --git a/src/features/external-login/index.tsx b/src/features/external-login/index.tsx
index 5fe72045b..f6e57a617 100644
--- a/src/features/external-login/index.tsx
+++ b/src/features/external-login/index.tsx
@@ -12,4 +12,4 @@ const ExternalLoginPage: React.FC = () => (
   </BigCard>
 );
 
-export default ExternalLoginPage;
+export { ExternalLoginPage as default };
diff --git a/src/features/favourited-statuses/index.tsx b/src/features/favourited-statuses/index.tsx
index a9a2aa0a1..db1291042 100644
--- a/src/features/favourited-statuses/index.tsx
+++ b/src/features/favourited-statuses/index.tsx
@@ -98,4 +98,4 @@ const Favourites: React.FC<IFavourites> = ({ params }) => {
   );
 };
 
-export default Favourites;
\ No newline at end of file
+export { Favourites as default };
\ No newline at end of file
diff --git a/src/features/federation-restrictions/components/instance-restrictions.tsx b/src/features/federation-restrictions/components/instance-restrictions.tsx
index 183f6a21b..2aa74b64e 100644
--- a/src/features/federation-restrictions/components/instance-restrictions.tsx
+++ b/src/features/federation-restrictions/components/instance-restrictions.tsx
@@ -153,4 +153,4 @@ const InstanceRestrictions: React.FC<IInstanceRestrictions> = ({ remoteInstance
   );
 };
 
-export default InstanceRestrictions;
+export { InstanceRestrictions as default };
diff --git a/src/features/federation-restrictions/components/restricted-instance.tsx b/src/features/federation-restrictions/components/restricted-instance.tsx
index 07e017521..68a5b564b 100644
--- a/src/features/federation-restrictions/components/restricted-instance.tsx
+++ b/src/features/federation-restrictions/components/restricted-instance.tsx
@@ -43,4 +43,4 @@ const RestrictedInstance: React.FC<IRestrictedInstance> = ({ host }) => {
   );
 };
 
-export default RestrictedInstance;
+export { RestrictedInstance as default };
diff --git a/src/features/federation-restrictions/index.tsx b/src/features/federation-restrictions/index.tsx
index 47f5a218b..9b368ac4a 100644
--- a/src/features/federation-restrictions/index.tsx
+++ b/src/features/federation-restrictions/index.tsx
@@ -55,4 +55,4 @@ const FederationRestrictions = () => {
   );
 };
 
-export default FederationRestrictions;
+export { FederationRestrictions as default };
diff --git a/src/features/feed-suggestions/feed-suggestions.tsx b/src/features/feed-suggestions/feed-suggestions.tsx
index f3e0da2b9..30217947a 100644
--- a/src/features/feed-suggestions/feed-suggestions.tsx
+++ b/src/features/feed-suggestions/feed-suggestions.tsx
@@ -118,4 +118,4 @@ const FeedSuggestions: React.FC<IFeedSuggesetions> = ({ statusId, onMoveUp, onMo
   );
 };
 
-export default FeedSuggestions;
+export { FeedSuggestions as default };
diff --git a/src/features/filters/edit-filter.tsx b/src/features/filters/edit-filter.tsx
index 09ea0a4a8..3b45b295b 100644
--- a/src/features/filters/edit-filter.tsx
+++ b/src/features/filters/edit-filter.tsx
@@ -276,4 +276,4 @@ const EditFilter: React.FC<IEditFilter> = ({ params }) => {
   );
 };
 
-export default EditFilter;
+export { EditFilter as default };
diff --git a/src/features/filters/index.tsx b/src/features/filters/index.tsx
index a4ae793b1..cc296697f 100644
--- a/src/features/filters/index.tsx
+++ b/src/features/filters/index.tsx
@@ -117,4 +117,4 @@ const Filters = () => {
   );
 };
 
-export default Filters;
+export { Filters as default };
diff --git a/src/features/follow-recommendations/index.tsx b/src/features/follow-recommendations/index.tsx
index c2b204aac..26859ad9e 100644
--- a/src/features/follow-recommendations/index.tsx
+++ b/src/features/follow-recommendations/index.tsx
@@ -65,4 +65,4 @@ const FollowRecommendations: React.FC = () => {
   );
 };
 
-export default FollowRecommendations;
+export { FollowRecommendations as default };
diff --git a/src/features/follow-requests/components/account-authorize.tsx b/src/features/follow-requests/components/account-authorize.tsx
index c6bc74a07..7e2019ae3 100644
--- a/src/features/follow-requests/components/account-authorize.tsx
+++ b/src/features/follow-requests/components/account-authorize.tsx
@@ -35,4 +35,4 @@ const AccountAuthorize: React.FC<IAccountAuthorize> = ({ id }) => {
   );
 };
 
-export default AccountAuthorize;
+export { AccountAuthorize as default };
diff --git a/src/features/follow-requests/index.tsx b/src/features/follow-requests/index.tsx
index f89681a01..8c3c965f5 100644
--- a/src/features/follow-requests/index.tsx
+++ b/src/features/follow-requests/index.tsx
@@ -54,4 +54,4 @@ const FollowRequests: React.FC = () => {
   );
 };
 
-export default FollowRequests;
+export { FollowRequests as default };
diff --git a/src/features/followed-tags/index.tsx b/src/features/followed-tags/index.tsx
index 6745f5fc0..e04f84a02 100644
--- a/src/features/followed-tags/index.tsx
+++ b/src/features/followed-tags/index.tsx
@@ -49,4 +49,4 @@ const FollowedTags = () => {
   );
 };
 
-export default FollowedTags;
+export { FollowedTags as default };
diff --git a/src/features/followers/index.tsx b/src/features/followers/index.tsx
index 8847beb11..6cec69f9c 100644
--- a/src/features/followers/index.tsx
+++ b/src/features/followers/index.tsx
@@ -67,4 +67,4 @@ const Followers: React.FC<IFollowers> = ({ params }) => {
   );
 };
 
-export default Followers;
\ No newline at end of file
+export { Followers as default };
\ No newline at end of file
diff --git a/src/features/following/index.tsx b/src/features/following/index.tsx
index f5c4c3475..cbd841cec 100644
--- a/src/features/following/index.tsx
+++ b/src/features/following/index.tsx
@@ -67,4 +67,4 @@ const Following: React.FC<IFollowing> = ({ params }) => {
   );
 };
 
-export default Following;
\ No newline at end of file
+export { Following as default };
\ No newline at end of file
diff --git a/src/features/forms/index.tsx b/src/features/forms/index.tsx
index 6907f8205..3de78ddc4 100644
--- a/src/features/forms/index.tsx
+++ b/src/features/forms/index.tsx
@@ -14,7 +14,7 @@ interface IInputContainer {
   children: React.ReactNode;
 }
 
-export const InputContainer: React.FC<IInputContainer> = (props) => {
+const InputContainer: React.FC<IInputContainer> = (props) => {
   const containerClass = clsx('input', {
     'with_label': props.label,
     'required': props.required,
@@ -36,7 +36,7 @@ interface ILabelInputContainer {
   children: React.ReactNode;
 }
 
-export const LabelInputContainer: React.FC<ILabelInputContainer> = ({ label, hint, children }) => {
+const LabelInputContainer: React.FC<ILabelInputContainer> = ({ label, hint, children }) => {
   const [id] = useState(uuidv4());
   const childrenWithProps = React.Children.map(children, child => (
     // @ts-ignore: not sure how to get the right type here
@@ -58,7 +58,7 @@ interface ILabelInput {
   label?: React.ReactNode;
 }
 
-export const LabelInput: React.FC<ILabelInput> = ({ label, ...props }) => (
+const LabelInput: React.FC<ILabelInput> = ({ label, ...props }) => (
   <LabelInputContainer label={label}>
     <input {...props} />
   </LabelInputContainer>
@@ -68,7 +68,7 @@ interface ILabelTextarea {
   label?: React.ReactNode;
 }
 
-export const LabelTextarea: React.FC<ILabelTextarea> = ({ label, ...props }) => (
+const LabelTextarea: React.FC<ILabelTextarea> = ({ label, ...props }) => (
   <LabelInputContainer label={label}>
     <textarea {...props} />
   </LabelInputContainer>
@@ -92,7 +92,7 @@ interface ISimpleInput {
   required?: boolean;
 }
 
-export const SimpleInput: React.FC<ISimpleInput> = (props) => {
+const SimpleInput: React.FC<ISimpleInput> = (props) => {
   const { hint, error, ...rest } = props;
   const Input = props.label ? LabelInput : 'input';
 
@@ -113,7 +113,7 @@ interface ICheckbox {
   required?: boolean;
 }
 
-export const Checkbox: React.FC<ICheckbox> = (props) => (
+const Checkbox: React.FC<ICheckbox> = (props) => (
   <SimpleInput type='checkbox' {...props} />
 );
 
@@ -126,7 +126,7 @@ interface ISelectDropdown {
   onChange?: React.ChangeEventHandler;
 }
 
-export const SelectDropdown: React.FC<ISelectDropdown> = (props) => {
+const SelectDropdown: React.FC<ISelectDropdown> = (props) => {
   const { label, hint, items, ...rest } = props;
 
   const optionElems = Object.keys(items).map(item => (
@@ -156,11 +156,11 @@ interface ITextInput {
   required?: boolean;
 }
 
-export const TextInput: React.FC<ITextInput> = props => (
+const TextInput: React.FC<ITextInput> = props => (
   <SimpleInput type='text' {...props} />
 );
 
-export const FileChooser : React.FC = (props) => (
+const FileChooser : React.FC = (props) => (
   <SimpleInput type='file' {...props} />
 );
 
@@ -176,10 +176,23 @@ interface IFileChooserLogo {
   onChange: React.ChangeEventHandler<HTMLInputElement>;
 }
 
-export const FileChooserLogo: React.FC<IFileChooserLogo> = props => (
+const FileChooserLogo: React.FC<IFileChooserLogo> = props => (
   <SimpleInput type='file' {...props} />
 );
 
 FileChooserLogo.defaultProps = {
   accept: ['image/svg', 'image/png'],
 };
+
+export {
+  InputContainer,
+  LabelInputContainer,
+  LabelInput,
+  LabelTextarea,
+  SimpleInput,
+  Checkbox,
+  SelectDropdown,
+  TextInput,
+  FileChooser,
+  FileChooserLogo,
+};
diff --git a/src/features/generic-not-found/index.tsx b/src/features/generic-not-found/index.tsx
index 0ec9241e3..1536dab28 100644
--- a/src/features/generic-not-found/index.tsx
+++ b/src/features/generic-not-found/index.tsx
@@ -6,4 +6,4 @@ const GenericNotFound = () => (
   <MissingIndicator />
 );
 
-export default GenericNotFound;
+export { GenericNotFound as default };
diff --git a/src/features/group/components/group-action-button.tsx b/src/features/group/components/group-action-button.tsx
index 3779f683e..5d7a98525 100644
--- a/src/features/group/components/group-action-button.tsx
+++ b/src/features/group/components/group-action-button.tsx
@@ -132,4 +132,4 @@ const GroupActionButton = ({ group }: IGroupActionButton) => {
   );
 };
 
-export default GroupActionButton;
\ No newline at end of file
+export { GroupActionButton as default };
\ No newline at end of file
diff --git a/src/features/group/components/group-header-image.tsx b/src/features/group/components/group-header-image.tsx
index 79146b072..dd219706f 100644
--- a/src/features/group/components/group-header-image.tsx
+++ b/src/features/group/components/group-header-image.tsx
@@ -47,4 +47,4 @@ const GroupHeaderImage: React.FC<IGroupHeaderImage> = ({ className, group }) =>
   );
 };
 
-export default GroupHeaderImage;
+export { GroupHeaderImage as default };
diff --git a/src/features/group/components/group-header.tsx b/src/features/group/components/group-header.tsx
index de70bc237..b8b2828e5 100644
--- a/src/features/group/components/group-header.tsx
+++ b/src/features/group/components/group-header.tsx
@@ -170,4 +170,4 @@ const GroupHeader: React.FC<IGroupHeader> = ({ group }) => {
   );
 };
 
-export default GroupHeader;
+export { GroupHeader as default };
diff --git a/src/features/group/components/group-member-count.tsx b/src/features/group/components/group-member-count.tsx
index 528fc2c1b..066f0fecb 100644
--- a/src/features/group/components/group-member-count.tsx
+++ b/src/features/group/components/group-member-count.tsx
@@ -26,4 +26,4 @@ const GroupMemberCount = ({ group }: IGroupMemberCount) => (
   </Link>
 );
 
-export default GroupMemberCount;
\ No newline at end of file
+export { GroupMemberCount as default };
\ No newline at end of file
diff --git a/src/features/group/components/group-member-list-item.tsx b/src/features/group/components/group-member-list-item.tsx
index 576276261..1a51aad4d 100644
--- a/src/features/group/components/group-member-list-item.tsx
+++ b/src/features/group/components/group-member-list-item.tsx
@@ -197,4 +197,4 @@ const GroupMemberListItem = (props: IGroupMemberListItem) => {
   );
 };
 
-export default GroupMemberListItem;
+export { GroupMemberListItem as default };
diff --git a/src/features/group/components/group-options-button.tsx b/src/features/group/components/group-options-button.tsx
index 34af4897d..0b4ec83c8 100644
--- a/src/features/group/components/group-options-button.tsx
+++ b/src/features/group/components/group-options-button.tsx
@@ -99,4 +99,4 @@ const GroupOptionsButton = ({ group }: IGroupActionButton) => {
   );
 };
 
-export default GroupOptionsButton;
\ No newline at end of file
+export { GroupOptionsButton as default };
\ No newline at end of file
diff --git a/src/features/group/components/group-privacy.tsx b/src/features/group/components/group-privacy.tsx
index 019a5bbcf..f7dff3047 100644
--- a/src/features/group/components/group-privacy.tsx
+++ b/src/features/group/components/group-privacy.tsx
@@ -65,4 +65,4 @@ const GroupPrivacy = ({ group }: IGroupPolicy) => (
   </Popover>
 );
 
-export default GroupPrivacy;
\ No newline at end of file
+export { GroupPrivacy as default };
\ No newline at end of file
diff --git a/src/features/group/components/group-relationship.tsx b/src/features/group/components/group-relationship.tsx
index ff6e5ee5c..3acbf4649 100644
--- a/src/features/group/components/group-relationship.tsx
+++ b/src/features/group/components/group-relationship.tsx
@@ -42,4 +42,4 @@ const GroupRelationship = ({ group }: IGroupRelationship) => {
   );
 };
 
-export default GroupRelationship;
\ No newline at end of file
+export { GroupRelationship as default };
\ No newline at end of file
diff --git a/src/features/group/edit-group.tsx b/src/features/group/edit-group.tsx
index 03cc5b34b..c107d249f 100644
--- a/src/features/group/edit-group.tsx
+++ b/src/features/group/edit-group.tsx
@@ -118,4 +118,4 @@ const EditGroup: React.FC<IEditGroup> = ({ params: { groupId } }) => {
   );
 };
 
-export default EditGroup;
+export { EditGroup as default };
diff --git a/src/features/group/group-blocked-members.tsx b/src/features/group/group-blocked-members.tsx
index 70434dbe2..f67f3deca 100644
--- a/src/features/group/group-blocked-members.tsx
+++ b/src/features/group/group-blocked-members.tsx
@@ -96,4 +96,4 @@ const GroupBlockedMembers: React.FC<IGroupBlockedMembers> = ({ params }) => {
   );
 };
 
-export default GroupBlockedMembers;
+export { GroupBlockedMembers as default };
diff --git a/src/features/group/group-gallery.tsx b/src/features/group/group-gallery.tsx
index a2fd17532..5a882934c 100644
--- a/src/features/group/group-gallery.tsx
+++ b/src/features/group/group-gallery.tsx
@@ -90,4 +90,4 @@ const GroupGallery: React.FC<IGroupGallery> = (props) => {
   );
 };
 
-export default GroupGallery;
+export { GroupGallery as default };
diff --git a/src/features/group/group-members.tsx b/src/features/group/group-members.tsx
index 8be907b72..16411823b 100644
--- a/src/features/group/group-members.tsx
+++ b/src/features/group/group-members.tsx
@@ -67,4 +67,4 @@ const GroupMembers: React.FC<IGroupMembers> = (props) => {
   );
 };
 
-export default GroupMembers;
+export { GroupMembers as default };
diff --git a/src/features/group/group-membership-requests.tsx b/src/features/group/group-membership-requests.tsx
index d2c45a351..52ee117cb 100644
--- a/src/features/group/group-membership-requests.tsx
+++ b/src/features/group/group-membership-requests.tsx
@@ -126,4 +126,4 @@ const GroupMembershipRequests: React.FC<IGroupMembershipRequests> = ({ params })
   );
 };
 
-export default GroupMembershipRequests;
+export { GroupMembershipRequests as default };
diff --git a/src/features/group/group-timeline.tsx b/src/features/group/group-timeline.tsx
index 31c75346f..489610909 100644
--- a/src/features/group/group-timeline.tsx
+++ b/src/features/group/group-timeline.tsx
@@ -109,4 +109,4 @@ const GroupTimeline: React.FC<IGroupTimeline> = (props) => {
   );
 };
 
-export default GroupTimeline;
+export { GroupTimeline as default };
diff --git a/src/features/group/manage-group.tsx b/src/features/group/manage-group.tsx
index 0e72868cc..c7eb6cd87 100644
--- a/src/features/group/manage-group.tsx
+++ b/src/features/group/manage-group.tsx
@@ -116,4 +116,4 @@ const ManageGroup: React.FC<IManageGroup> = ({ params }) => {
   );
 };
 
-export default ManageGroup;
+export { ManageGroup as default };
diff --git a/src/features/groups/components/discover/group-list-item.tsx b/src/features/groups/components/discover/group-list-item.tsx
index 3a1e1b142..c24b084f1 100644
--- a/src/features/groups/components/discover/group-list-item.tsx
+++ b/src/features/groups/components/discover/group-list-item.tsx
@@ -78,4 +78,4 @@ const GroupListItem = (props: IGroupListItem) => {
   );
 };
 
-export default GroupListItem;
+export { GroupListItem as default };
diff --git a/src/features/groups/index.tsx b/src/features/groups/index.tsx
index e09de8985..0e371bf36 100644
--- a/src/features/groups/index.tsx
+++ b/src/features/groups/index.tsx
@@ -93,4 +93,4 @@ const Groups: React.FC = () => {
   );
 };
 
-export default Groups;
+export { Groups as default };
diff --git a/src/features/hashtag-timeline/index.tsx b/src/features/hashtag-timeline/index.tsx
index b00a27c14..397cbb916 100644
--- a/src/features/hashtag-timeline/index.tsx
+++ b/src/features/hashtag-timeline/index.tsx
@@ -15,7 +15,7 @@ interface IHashtagTimeline {
   };
 }
 
-export const HashtagTimeline: React.FC<IHashtagTimeline> = ({ params }) => {
+const HashtagTimeline: React.FC<IHashtagTimeline> = ({ params }) => {
   const id = params?.id || '';
 
   const features = useFeatures();
@@ -75,4 +75,4 @@ export const HashtagTimeline: React.FC<IHashtagTimeline> = ({ params }) => {
   );
 };
 
-export default HashtagTimeline;
+export { HashtagTimeline as default };
diff --git a/src/features/home-timeline/index.tsx b/src/features/home-timeline/index.tsx
index f9dd488d8..87805b245 100644
--- a/src/features/home-timeline/index.tsx
+++ b/src/features/home-timeline/index.tsx
@@ -107,4 +107,4 @@ const HomeTimeline: React.FC = () => {
   );
 };
 
-export default HomeTimeline;
+export { HomeTimeline as default };
diff --git a/src/features/import-data/components/csv-importer.tsx b/src/features/import-data/components/csv-importer.tsx
index 77661233f..f6c88bab4 100644
--- a/src/features/import-data/components/csv-importer.tsx
+++ b/src/features/import-data/components/csv-importer.tsx
@@ -62,4 +62,4 @@ const CSVImporter: React.FC<ICSVImporter> = ({ messages, action }) => {
   );
 };
 
-export default CSVImporter;
+export { CSVImporter as default };
diff --git a/src/features/import-data/index.tsx b/src/features/import-data/index.tsx
index 812fb20fb..6f2e9f1fc 100644
--- a/src/features/import-data/index.tsx
+++ b/src/features/import-data/index.tsx
@@ -45,4 +45,4 @@ const ImportData = () => {
   );
 };
 
-export default ImportData;
+export { ImportData as default };
diff --git a/src/features/intentional-error/index.tsx b/src/features/intentional-error/index.tsx
index fc0eca529..a75d7b835 100644
--- a/src/features/intentional-error/index.tsx
+++ b/src/features/intentional-error/index.tsx
@@ -8,4 +8,4 @@ const IntentionalError: React.FC = () => {
   throw new Error('This error is intentional.');
 };
 
-export default IntentionalError;
+export { IntentionalError as default };
diff --git a/src/features/landing-timeline/index.tsx b/src/features/landing-timeline/index.tsx
index aa08a5783..868644e50 100644
--- a/src/features/landing-timeline/index.tsx
+++ b/src/features/landing-timeline/index.tsx
@@ -67,4 +67,4 @@ const LandingTimeline = () => {
   );
 };
 
-export default LandingTimeline;
+export { LandingTimeline as default };
diff --git a/src/features/list-adder/components/list.tsx b/src/features/list-adder/components/list.tsx
index a6f12ce53..9e34fbb60 100644
--- a/src/features/list-adder/components/list.tsx
+++ b/src/features/list-adder/components/list.tsx
@@ -46,4 +46,4 @@ const List: React.FC<IList> = ({ listId }) => {
   );
 };
 
-export default List;
+export { List as default };
diff --git a/src/features/list-adder/index.tsx b/src/features/list-adder/index.tsx
index 555ad2724..cddf45f10 100644
--- a/src/features/list-adder/index.tsx
+++ b/src/features/list-adder/index.tsx
@@ -78,4 +78,4 @@ const ListAdder: React.FC<IListAdder> = ({ accountId, onClose }) => {
   );
 };
 
-export default ListAdder;
+export { ListAdder as default };
diff --git a/src/features/list-editor/components/account.tsx b/src/features/list-editor/components/account.tsx
index 4a28a3c41..ba08724de 100644
--- a/src/features/list-editor/components/account.tsx
+++ b/src/features/list-editor/components/account.tsx
@@ -43,4 +43,4 @@ const Account: React.FC<IAccount> = ({ accountId }) => {
   );
 };
 
-export default Account;
+export { Account as default };
diff --git a/src/features/list-editor/components/edit-list-form.tsx b/src/features/list-editor/components/edit-list-form.tsx
index 21da2e0d3..9907cddd7 100644
--- a/src/features/list-editor/components/edit-list-form.tsx
+++ b/src/features/list-editor/components/edit-list-form.tsx
@@ -50,4 +50,4 @@ const ListForm = () => {
   );
 };
 
-export default ListForm;
+export { ListForm as default };
diff --git a/src/features/list-editor/components/search.tsx b/src/features/list-editor/components/search.tsx
index 2c6e0a066..58b434cc6 100644
--- a/src/features/list-editor/components/search.tsx
+++ b/src/features/list-editor/components/search.tsx
@@ -55,4 +55,4 @@ const Search = () => {
   );
 };
 
-export default Search;
+export { Search as default };
diff --git a/src/features/list-editor/index.tsx b/src/features/list-editor/index.tsx
index a1fd5f43c..e367f6d03 100644
--- a/src/features/list-editor/index.tsx
+++ b/src/features/list-editor/index.tsx
@@ -74,4 +74,4 @@ const ListEditor: React.FC<IListEditor> = ({ listId, onClose }) => {
   );
 };
 
-export default ListEditor;
+export { ListEditor as default };
diff --git a/src/features/list-timeline/index.tsx b/src/features/list-timeline/index.tsx
index 22ccb8d38..e0cef0ac8 100644
--- a/src/features/list-timeline/index.tsx
+++ b/src/features/list-timeline/index.tsx
@@ -113,4 +113,4 @@ const ListTimeline: React.FC = () => {
   );
 };
 
-export default ListTimeline;
+export { ListTimeline as default };
diff --git a/src/features/lists/components/new-list-form.tsx b/src/features/lists/components/new-list-form.tsx
index b648f4c14..4fe826317 100644
--- a/src/features/lists/components/new-list-form.tsx
+++ b/src/features/lists/components/new-list-form.tsx
@@ -57,4 +57,4 @@ const NewListForm: React.FC = () => {
   );
 };
 
-export default NewListForm;
+export { NewListForm as default };
diff --git a/src/features/lists/index.tsx b/src/features/lists/index.tsx
index 70caae268..9370ab2f3 100644
--- a/src/features/lists/index.tsx
+++ b/src/features/lists/index.tsx
@@ -74,4 +74,4 @@ const Lists: React.FC = () => {
   );
 };
 
-export default Lists;
+export { Lists as default };
diff --git a/src/features/migration/index.tsx b/src/features/migration/index.tsx
index b563308cf..c65d9dd4d 100644
--- a/src/features/migration/index.tsx
+++ b/src/features/migration/index.tsx
@@ -123,4 +123,4 @@ const Migration = () => {
   );
 };
 
-export default Migration;
+export { Migration as default };
diff --git a/src/features/mutes/index.tsx b/src/features/mutes/index.tsx
index 38782db56..4b5fb63fa 100644
--- a/src/features/mutes/index.tsx
+++ b/src/features/mutes/index.tsx
@@ -48,4 +48,4 @@ const Mutes: React.FC = () => {
   );
 };
 
-export default Mutes;
+export { Mutes as default };
diff --git a/src/features/new-status/index.tsx b/src/features/new-status/index.tsx
index e5b4aacd2..8dad18c91 100644
--- a/src/features/new-status/index.tsx
+++ b/src/features/new-status/index.tsx
@@ -16,4 +16,4 @@ const NewStatus = () => {
   );
 };
 
-export default NewStatus;
+export { NewStatus as default };
diff --git a/src/features/notifications/components/filter-bar.tsx b/src/features/notifications/components/filter-bar.tsx
index d4ec1948e..3d44126b8 100644
--- a/src/features/notifications/components/filter-bar.tsx
+++ b/src/features/notifications/components/filter-bar.tsx
@@ -97,4 +97,4 @@ const NotificationFilterBar = () => {
   return <Tabs items={items} activeItem={selectedFilter} />;
 };
 
-export default NotificationFilterBar;
+export { NotificationFilterBar as default };
diff --git a/src/features/notifications/components/notification.tsx b/src/features/notifications/components/notification.tsx
index 596b755d8..6184d358e 100644
--- a/src/features/notifications/components/notification.tsx
+++ b/src/features/notifications/components/notification.tsx
@@ -395,4 +395,4 @@ const Notification: React.FC<INotification> = (props) => {
   );
 };
 
-export default Notification;
+export { Notification as default };
diff --git a/src/features/notifications/components/setting-toggle.tsx b/src/features/notifications/components/setting-toggle.tsx
index 0e5054839..d589c3a4b 100644
--- a/src/features/notifications/components/setting-toggle.tsx
+++ b/src/features/notifications/components/setting-toggle.tsx
@@ -31,4 +31,4 @@ const SettingToggle: React.FC<ISettingToggle> = ({ id, settings, settingPath, on
   );
 };
 
-export default SettingToggle;
+export { SettingToggle as default };
diff --git a/src/features/notifications/index.tsx b/src/features/notifications/index.tsx
index c301f732f..941abc368 100644
--- a/src/features/notifications/index.tsx
+++ b/src/features/notifications/index.tsx
@@ -176,4 +176,4 @@ const Notifications = () => {
   );
 };
 
-export default Notifications;
+export { Notifications as default };
diff --git a/src/features/onboarding/onboarding-wizard.tsx b/src/features/onboarding/onboarding-wizard.tsx
index 3c6e5c64c..c4389f46f 100644
--- a/src/features/onboarding/onboarding-wizard.tsx
+++ b/src/features/onboarding/onboarding-wizard.tsx
@@ -116,4 +116,4 @@ const OnboardingWizard = () => {
   );
 };
 
-export default OnboardingWizard;
+export { OnboardingWizard as default };
diff --git a/src/features/onboarding/steps/avatar-selection-step.tsx b/src/features/onboarding/steps/avatar-selection-step.tsx
index 7022a5cbb..c20b3cadd 100644
--- a/src/features/onboarding/steps/avatar-selection-step.tsx
+++ b/src/features/onboarding/steps/avatar-selection-step.tsx
@@ -114,4 +114,4 @@ const AvatarSelectionStep = ({ onNext }: { onNext: () => void }) => {
   );
 };
 
-export default AvatarSelectionStep;
+export { AvatarSelectionStep as default };
diff --git a/src/features/onboarding/steps/bio-step.tsx b/src/features/onboarding/steps/bio-step.tsx
index 65cf3e0b5..4245c0e9c 100644
--- a/src/features/onboarding/steps/bio-step.tsx
+++ b/src/features/onboarding/steps/bio-step.tsx
@@ -88,4 +88,4 @@ const BioStep = ({ onNext }: { onNext: () => void }) => {
   );
 };
 
-export default BioStep;
+export { BioStep as default };
diff --git a/src/features/onboarding/steps/completed-step.tsx b/src/features/onboarding/steps/completed-step.tsx
index 2d8e780d6..3fe380e1c 100644
--- a/src/features/onboarding/steps/completed-step.tsx
+++ b/src/features/onboarding/steps/completed-step.tsx
@@ -36,4 +36,4 @@ const CompletedStep = ({ onComplete }: { onComplete: () => void }) => (
   </Card>
 );
 
-export default CompletedStep;
+export { CompletedStep as default };
diff --git a/src/features/onboarding/steps/cover-photo-selection-step.tsx b/src/features/onboarding/steps/cover-photo-selection-step.tsx
index 87f01ad51..e94f6e1fc 100644
--- a/src/features/onboarding/steps/cover-photo-selection-step.tsx
+++ b/src/features/onboarding/steps/cover-photo-selection-step.tsx
@@ -137,4 +137,4 @@ const CoverPhotoSelectionStep = ({ onNext }: { onNext: () => void }) => {
   );
 };
 
-export default CoverPhotoSelectionStep;
+export { CoverPhotoSelectionStep as default };
diff --git a/src/features/onboarding/steps/display-name-step.tsx b/src/features/onboarding/steps/display-name-step.tsx
index c70a80dad..3d94645d2 100644
--- a/src/features/onboarding/steps/display-name-step.tsx
+++ b/src/features/onboarding/steps/display-name-step.tsx
@@ -96,4 +96,4 @@ const DisplayNameStep = ({ onNext }: { onNext: () => void }) => {
   );
 };
 
-export default DisplayNameStep;
+export { DisplayNameStep as default };
diff --git a/src/features/onboarding/steps/fediverse-step.tsx b/src/features/onboarding/steps/fediverse-step.tsx
index c66f34eb7..50a0cb1ad 100644
--- a/src/features/onboarding/steps/fediverse-step.tsx
+++ b/src/features/onboarding/steps/fediverse-step.tsx
@@ -85,4 +85,4 @@ const FediverseStep = ({ onNext }: { onNext: () => void }) => {
   );
 };
 
-export default FediverseStep;
+export { FediverseStep as default };
diff --git a/src/features/onboarding/steps/suggested-accounts-step.tsx b/src/features/onboarding/steps/suggested-accounts-step.tsx
index 372b82316..0a17aa977 100644
--- a/src/features/onboarding/steps/suggested-accounts-step.tsx
+++ b/src/features/onboarding/steps/suggested-accounts-step.tsx
@@ -90,4 +90,4 @@ const SuggestedAccountsStep = ({ onNext }: { onNext: () => void }) => {
   );
 };
 
-export default SuggestedAccountsStep;
+export { SuggestedAccountsStep as default };
diff --git a/src/features/pinned-statuses/index.tsx b/src/features/pinned-statuses/index.tsx
index e027f2bdf..4863a56c0 100644
--- a/src/features/pinned-statuses/index.tsx
+++ b/src/features/pinned-statuses/index.tsx
@@ -48,4 +48,4 @@ const PinnedStatuses = () => {
   );
 };
 
-export default PinnedStatuses;
+export { PinnedStatuses as default };
diff --git a/src/features/placeholder/components/placeholder-account.tsx b/src/features/placeholder/components/placeholder-account.tsx
index c887903fd..7a5c6e5de 100644
--- a/src/features/placeholder/components/placeholder-account.tsx
+++ b/src/features/placeholder/components/placeholder-account.tsx
@@ -6,7 +6,7 @@ import PlaceholderAvatar from './placeholder-avatar';
 import PlaceholderDisplayName from './placeholder-display-name';
 
 /** Fake account to display while data is loading. */
-const PlaceholderAccount: React.FC = () => (
+const PlaceholderAccount: React.FC = React.memo(() => (
   <HStack space={3} alignItems='center'>
     <div className='shrink-0'>
       <PlaceholderAvatar size={42} />
@@ -16,6 +16,6 @@ const PlaceholderAccount: React.FC = () => (
       <PlaceholderDisplayName minLength={3} maxLength={25} />
     </div>
   </HStack>
-);
+));
 
-export default React.memo(PlaceholderAccount);
+export { PlaceholderAccount as default };
diff --git a/src/features/placeholder/components/placeholder-avatar.tsx b/src/features/placeholder/components/placeholder-avatar.tsx
index a246aa98e..902c07a1c 100644
--- a/src/features/placeholder/components/placeholder-avatar.tsx
+++ b/src/features/placeholder/components/placeholder-avatar.tsx
@@ -39,4 +39,4 @@ const PlaceholderAvatar: React.FC<IPlaceholderAvatar> = ({ size, withText = fals
   );
 };
 
-export default PlaceholderAvatar;
+export { PlaceholderAvatar as default };
diff --git a/src/features/placeholder/components/placeholder-card.tsx b/src/features/placeholder/components/placeholder-card.tsx
index 9b88d8429..f4945a45c 100644
--- a/src/features/placeholder/components/placeholder-card.tsx
+++ b/src/features/placeholder/components/placeholder-card.tsx
@@ -4,7 +4,7 @@ import React from 'react';
 import { randomIntFromInterval, generateText } from '../utils';
 
 /** Fake link preview to display while data is loading. */
-const PlaceholderCard: React.FC = () => (
+const PlaceholderCard: React.FC = React.memo(() => (
   <div className={clsx('status-card', {
     'animate-pulse': true,
   })}
@@ -17,6 +17,6 @@ const PlaceholderCard: React.FC = () => (
       <p>{generateText(randomIntFromInterval(5, 15))}</p>
     </div>
   </div>
-);
+));
 
-export default React.memo(PlaceholderCard);
+export { PlaceholderCard as default };
diff --git a/src/features/placeholder/components/placeholder-chat-message.tsx b/src/features/placeholder/components/placeholder-chat-message.tsx
index c11431be9..0aba7744f 100644
--- a/src/features/placeholder/components/placeholder-chat-message.tsx
+++ b/src/features/placeholder/components/placeholder-chat-message.tsx
@@ -67,4 +67,4 @@ const PlaceholderChatMessage = ({ isMyMessage = false }: { isMyMessage?: boolean
   );
 };
 
-export default PlaceholderChatMessage;
+export { PlaceholderChatMessage as default };
diff --git a/src/features/placeholder/components/placeholder-chat.tsx b/src/features/placeholder/components/placeholder-chat.tsx
index b685aba16..a08695e41 100644
--- a/src/features/placeholder/components/placeholder-chat.tsx
+++ b/src/features/placeholder/components/placeholder-chat.tsx
@@ -18,4 +18,4 @@ const PlaceholderChat = () => (
   </div>
 );
 
-export default PlaceholderChat;
+export { PlaceholderChat as default };
diff --git a/src/features/placeholder/components/placeholder-display-name.tsx b/src/features/placeholder/components/placeholder-display-name.tsx
index 88731af8c..f196cd5df 100644
--- a/src/features/placeholder/components/placeholder-display-name.tsx
+++ b/src/features/placeholder/components/placeholder-display-name.tsx
@@ -9,7 +9,7 @@ interface IPlaceholderDisplayName {
 }
 
 /** Fake display name to show when data is loading. */
-const PlaceholderDisplayName: React.FC<IPlaceholderDisplayName> = ({ minLength, maxLength, withSuffix = true }) => {
+const PlaceholderDisplayName: React.FC<IPlaceholderDisplayName> = React.memo(({ minLength, maxLength, withSuffix = true }) => {
   const length = randomIntFromInterval(maxLength, minLength);
   const acctLength = randomIntFromInterval(maxLength, minLength);
 
@@ -19,6 +19,6 @@ const PlaceholderDisplayName: React.FC<IPlaceholderDisplayName> = ({ minLength,
       {withSuffix && <p>{generateText(acctLength)}</p>}
     </div>
   );
-};
+});
 
-export default React.memo(PlaceholderDisplayName);
+export { PlaceholderDisplayName as default };
diff --git a/src/features/placeholder/components/placeholder-event-header.tsx b/src/features/placeholder/components/placeholder-event-header.tsx
index c01272944..9c885ee42 100644
--- a/src/features/placeholder/components/placeholder-event-header.tsx
+++ b/src/features/placeholder/components/placeholder-event-header.tsx
@@ -23,4 +23,4 @@ const PlaceholderEventHeader = () => {
   );
 };
 
-export default PlaceholderEventHeader;
+export { PlaceholderEventHeader as default };
diff --git a/src/features/placeholder/components/placeholder-event-preview.tsx b/src/features/placeholder/components/placeholder-event-preview.tsx
index 09ae4e9ca..a8d0ff472 100644
--- a/src/features/placeholder/components/placeholder-event-preview.tsx
+++ b/src/features/placeholder/components/placeholder-event-preview.tsx
@@ -24,4 +24,4 @@ const PlaceholderEventPreview = () => {
   );
 };
 
-export default PlaceholderEventPreview;
+export { PlaceholderEventPreview as default };
diff --git a/src/features/placeholder/components/placeholder-group-card.tsx b/src/features/placeholder/components/placeholder-group-card.tsx
index b8b221ab4..3bf09994a 100644
--- a/src/features/placeholder/components/placeholder-group-card.tsx
+++ b/src/features/placeholder/components/placeholder-group-card.tsx
@@ -32,4 +32,4 @@ const PlaceholderGroupCard = () => {
   );
 };
 
-export default PlaceholderGroupCard;
+export { PlaceholderGroupCard as default };
diff --git a/src/features/placeholder/components/placeholder-group-search.tsx b/src/features/placeholder/components/placeholder-group-search.tsx
index 3b3bd3870..ac025c40b 100644
--- a/src/features/placeholder/components/placeholder-group-search.tsx
+++ b/src/features/placeholder/components/placeholder-group-search.tsx
@@ -4,7 +4,7 @@ import { HStack, Stack, Text } from 'soapbox/components/ui';
 
 import { generateText, randomIntFromInterval } from '../utils';
 
-export default ({ withJoinAction = true }: { withJoinAction?: boolean }) => {
+const PlaceholderGroupSearch = ({ withJoinAction = true }: { withJoinAction?: boolean }) => {
   const groupNameLength = randomIntFromInterval(12, 20);
 
   return (
@@ -43,3 +43,5 @@ export default ({ withJoinAction = true }: { withJoinAction?: boolean }) => {
     </HStack>
   );
 };
+
+export { PlaceholderGroupSearch as default };
diff --git a/src/features/placeholder/components/placeholder-hashtag.tsx b/src/features/placeholder/components/placeholder-hashtag.tsx
index 8830b1e90..9b2a02b63 100644
--- a/src/features/placeholder/components/placeholder-hashtag.tsx
+++ b/src/features/placeholder/components/placeholder-hashtag.tsx
@@ -13,4 +13,4 @@ const PlaceholderHashtag: React.FC = () => {
   );
 };
 
-export default PlaceholderHashtag;
+export { PlaceholderHashtag as default };
diff --git a/src/features/placeholder/components/placeholder-media-gallery.tsx b/src/features/placeholder/components/placeholder-media-gallery.tsx
index 09dc505e7..2990145a7 100644
--- a/src/features/placeholder/components/placeholder-media-gallery.tsx
+++ b/src/features/placeholder/components/placeholder-media-gallery.tsx
@@ -90,4 +90,4 @@ const PlaceholderMediaGallery: React.FC<IPlaceholderMediaGallery> = ({ media, de
   );
 };
 
-export default PlaceholderMediaGallery;
+export { PlaceholderMediaGallery as default };
diff --git a/src/features/placeholder/components/placeholder-notification.tsx b/src/features/placeholder/components/placeholder-notification.tsx
index 2cc4368fe..ce83a2ed7 100644
--- a/src/features/placeholder/components/placeholder-notification.tsx
+++ b/src/features/placeholder/components/placeholder-notification.tsx
@@ -7,7 +7,7 @@ import PlaceholderDisplayName from './placeholder-display-name';
 import PlaceholderStatusContent from './placeholder-status-content';
 
 /** Fake notification to display while data is loading. */
-const PlaceholderNotification = () => (
+const PlaceholderNotification = React.memo(() => (
   <div className='bg-white p-4 black:bg-black dark:bg-primary-900'>
     <div className='w-full animate-pulse'>
       <div className='mb-2'>
@@ -31,6 +31,6 @@ const PlaceholderNotification = () => (
       </div>
     </div>
   </div>
-);
+));
 
-export default React.memo(PlaceholderNotification);
+export { PlaceholderNotification as default };
diff --git a/src/features/placeholder/components/placeholder-sidebar-suggestions.tsx b/src/features/placeholder/components/placeholder-sidebar-suggestions.tsx
index 9cc1c4448..e5b3e5ab5 100644
--- a/src/features/placeholder/components/placeholder-sidebar-suggestions.tsx
+++ b/src/features/placeholder/components/placeholder-sidebar-suggestions.tsx
@@ -4,7 +4,7 @@ import { HStack, Stack } from 'soapbox/components/ui';
 
 import { randomIntFromInterval, generateText } from '../utils';
 
-export default ({ limit }: { limit: number }) => {
+const PlaceholderSidebarSuggestions = ({ limit }: { limit: number }) => {
   const length = randomIntFromInterval(15, 3);
   const acctLength = randomIntFromInterval(15, 3);
 
@@ -26,4 +26,6 @@ export default ({ limit }: { limit: number }) => {
       ))}
     </>
   );
-};
\ No newline at end of file
+};
+
+export { PlaceholderSidebarSuggestions as default };
diff --git a/src/features/placeholder/components/placeholder-sidebar-trends.tsx b/src/features/placeholder/components/placeholder-sidebar-trends.tsx
index 44e728284..a8ca202d4 100644
--- a/src/features/placeholder/components/placeholder-sidebar-trends.tsx
+++ b/src/features/placeholder/components/placeholder-sidebar-trends.tsx
@@ -4,7 +4,7 @@ import { Stack } from 'soapbox/components/ui';
 
 import { randomIntFromInterval, generateText } from '../utils';
 
-export default ({ limit }: { limit: number }) => {
+const PlaceholderSidebarTrends = ({ limit }: { limit: number }) => {
   const trend = randomIntFromInterval(6, 3);
   const stat = randomIntFromInterval(10, 3);
 
@@ -18,4 +18,6 @@ export default ({ limit }: { limit: number }) => {
       ))}
     </>
   );
-};
\ No newline at end of file
+};
+
+export { PlaceholderSidebarTrends as default };
diff --git a/src/features/placeholder/components/placeholder-status-content.tsx b/src/features/placeholder/components/placeholder-status-content.tsx
index 5b785ba93..3297669cc 100644
--- a/src/features/placeholder/components/placeholder-status-content.tsx
+++ b/src/features/placeholder/components/placeholder-status-content.tsx
@@ -18,4 +18,4 @@ const PlaceholderStatusContent: React.FC<IPlaceholderStatusContent> = ({ minLeng
   );
 };
 
-export default PlaceholderStatusContent;
+export { PlaceholderStatusContent as default };
diff --git a/src/features/placeholder/components/placeholder-status.tsx b/src/features/placeholder/components/placeholder-status.tsx
index c6d7221ad..3c5da4f17 100644
--- a/src/features/placeholder/components/placeholder-status.tsx
+++ b/src/features/placeholder/components/placeholder-status.tsx
@@ -12,7 +12,7 @@ interface IPlaceholderStatus {
 }
 
 /** Fake status to display while data is loading. */
-const PlaceholderStatus: React.FC<IPlaceholderStatus> = ({ variant }) => (
+const PlaceholderStatus: React.FC<IPlaceholderStatus> = React.memo(({ variant }) => (
   <div
     className={clsx({
       'status-placeholder bg-white black:bg-black dark:bg-primary-900': true,
@@ -38,6 +38,6 @@ const PlaceholderStatus: React.FC<IPlaceholderStatus> = ({ variant }) => (
       </div>
     </div>
   </div>
-);
+));
 
-export default React.memo(PlaceholderStatus);
+export { PlaceholderStatus as default };
diff --git a/src/features/placeholder/utils.ts b/src/features/placeholder/utils.ts
index 80fb18826..fd8c55028 100644
--- a/src/features/placeholder/utils.ts
+++ b/src/features/placeholder/utils.ts
@@ -1,6 +1,6 @@
-export const PLACEHOLDER_CHAR = '█';
+const PLACEHOLDER_CHAR = '█';
 
-export const generateText = (length: number) => {
+const generateText = (length: number) => {
   let text = '';
 
   for (let i = 0; i < length; i++) {
@@ -11,4 +11,10 @@ export const generateText = (length: number) => {
 };
 
 // https://stackoverflow.com/a/7228322/8811886
-export const randomIntFromInterval = (min: number, max: number) => Math.floor(Math.random() * (max - min + 1) + min);
+const randomIntFromInterval = (min: number, max: number) => Math.floor(Math.random() * (max - min + 1) + min);
+
+export {
+  PLACEHOLDER_CHAR,
+  generateText,
+  randomIntFromInterval,
+};
diff --git a/src/features/public-timeline/index.tsx b/src/features/public-timeline/index.tsx
index f0fdbfd6d..bbdfd4a10 100644
--- a/src/features/public-timeline/index.tsx
+++ b/src/features/public-timeline/index.tsx
@@ -98,4 +98,4 @@ const CommunityTimeline = () => {
   );
 };
 
-export default CommunityTimeline;
+export { CommunityTimeline as default };
diff --git a/src/features/quotes/index.tsx b/src/features/quotes/index.tsx
index 60ea8a550..2d7187c9b 100644
--- a/src/features/quotes/index.tsx
+++ b/src/features/quotes/index.tsx
@@ -53,4 +53,4 @@ const Quotes: React.FC = () => {
   );
 };
 
-export default Quotes;
+export { Quotes as default };
diff --git a/src/features/register-invite/index.tsx b/src/features/register-invite/index.tsx
index 9b9d9ccba..601f7b8da 100644
--- a/src/features/register-invite/index.tsx
+++ b/src/features/register-invite/index.tsx
@@ -37,4 +37,4 @@ const RegisterInvite: React.FC = () => {
   );
 };
 
-export default RegisterInvite;
+export { RegisterInvite as default };
diff --git a/src/features/remote-timeline/components/pinned-hosts-picker.tsx b/src/features/remote-timeline/components/pinned-hosts-picker.tsx
index 16cd45481..0dbb5b5f7 100644
--- a/src/features/remote-timeline/components/pinned-hosts-picker.tsx
+++ b/src/features/remote-timeline/components/pinned-hosts-picker.tsx
@@ -30,4 +30,4 @@ const PinnedHostsPicker: React.FC<IPinnedHostsPicker> = ({ host: activeHost }) =
   );
 };
 
-export default PinnedHostsPicker;
+export { PinnedHostsPicker as default };
diff --git a/src/features/remote-timeline/index.tsx b/src/features/remote-timeline/index.tsx
index ca996bb13..391ae6fa3 100644
--- a/src/features/remote-timeline/index.tsx
+++ b/src/features/remote-timeline/index.tsx
@@ -82,4 +82,4 @@ const RemoteTimeline: React.FC<IRemoteTimeline> = ({ params }) => {
   );
 };
 
-export default RemoteTimeline;
+export { RemoteTimeline as default };
diff --git a/src/features/reply-mentions/account.tsx b/src/features/reply-mentions/account.tsx
index 2d00d6af7..f549cb641 100644
--- a/src/features/reply-mentions/account.tsx
+++ b/src/features/reply-mentions/account.tsx
@@ -53,4 +53,4 @@ const Account: React.FC<IAccount> = ({ composeId, accountId, author }) => {
   );
 };
 
-export default Account;
+export { Account as default };
diff --git a/src/features/report/components/status-check-box.tsx b/src/features/report/components/status-check-box.tsx
index 39f812713..289dc0ab4 100644
--- a/src/features/report/components/status-check-box.tsx
+++ b/src/features/report/components/status-check-box.tsx
@@ -85,4 +85,4 @@ const StatusCheckBox: React.FC<IStatusCheckBox> = ({ id, disabled }) => {
   );
 };
 
-export default StatusCheckBox;
+export { StatusCheckBox as default };
diff --git a/src/features/scheduled-statuses/builder.tsx b/src/features/scheduled-statuses/builder.tsx
index 95ab0d878..f45d483a3 100644
--- a/src/features/scheduled-statuses/builder.tsx
+++ b/src/features/scheduled-statuses/builder.tsx
@@ -7,7 +7,7 @@ import { calculateStatus } from 'soapbox/reducers/statuses';
 import type { ScheduledStatus } from 'soapbox/reducers/scheduled-statuses';
 import type { RootState } from 'soapbox/store';
 
-export const buildStatus = (state: RootState, scheduledStatus: ScheduledStatus) => {
+const buildStatus = (state: RootState, scheduledStatus: ScheduledStatus) => {
   const me = state.me as string;
   const account = state.entities[Entities.ACCOUNTS]?.store[me];
 
@@ -27,3 +27,5 @@ export const buildStatus = (state: RootState, scheduledStatus: ScheduledStatus)
 
   return calculateStatus(normalizeStatus(status));
 };
+
+export { buildStatus };
diff --git a/src/features/scheduled-statuses/components/scheduled-status-action-bar.tsx b/src/features/scheduled-statuses/components/scheduled-status-action-bar.tsx
index 8462c45ff..5ca1e0789 100644
--- a/src/features/scheduled-statuses/components/scheduled-status-action-bar.tsx
+++ b/src/features/scheduled-statuses/components/scheduled-status-action-bar.tsx
@@ -52,4 +52,4 @@ const ScheduledStatusActionBar: React.FC<IScheduledStatusActionBar> = ({ status
   );
 };
 
-export default ScheduledStatusActionBar;
+export { ScheduledStatusActionBar as default };
diff --git a/src/features/scheduled-statuses/components/scheduled-status.tsx b/src/features/scheduled-statuses/components/scheduled-status.tsx
index 09e59ad16..a2c707fcf 100644
--- a/src/features/scheduled-statuses/components/scheduled-status.tsx
+++ b/src/features/scheduled-statuses/components/scheduled-status.tsx
@@ -67,4 +67,4 @@ const ScheduledStatus: React.FC<IScheduledStatus> = ({ statusId, ...other }) =>
   );
 };
 
-export default ScheduledStatus;
+export { ScheduledStatus as default };
diff --git a/src/features/scheduled-statuses/index.tsx b/src/features/scheduled-statuses/index.tsx
index e3197fc56..272e4abe1 100644
--- a/src/features/scheduled-statuses/index.tsx
+++ b/src/features/scheduled-statuses/index.tsx
@@ -47,4 +47,4 @@ const ScheduledStatuses = () => {
   );
 };
 
-export default ScheduledStatuses;
+export { ScheduledStatuses as default };
diff --git a/src/features/search/index.tsx b/src/features/search/index.tsx
index a61700b2b..f839262e7 100644
--- a/src/features/search/index.tsx
+++ b/src/features/search/index.tsx
@@ -22,4 +22,4 @@ const SearchPage = () => {
   );
 };
 
-export default SearchPage;
+export { SearchPage as default };
diff --git a/src/features/security/mfa-form.tsx b/src/features/security/mfa-form.tsx
index 346617da8..a1b488da6 100644
--- a/src/features/security/mfa-form.tsx
+++ b/src/features/security/mfa-form.tsx
@@ -50,4 +50,4 @@ const MfaForm: React.FC = () => {
   );
 };
 
-export default MfaForm;
+export { MfaForm as default };
diff --git a/src/features/security/mfa/disable-otp-form.tsx b/src/features/security/mfa/disable-otp-form.tsx
index 0769891da..565242a79 100644
--- a/src/features/security/mfa/disable-otp-form.tsx
+++ b/src/features/security/mfa/disable-otp-form.tsx
@@ -77,4 +77,4 @@ const DisableOtpForm: React.FC = () => {
   );
 };
 
-export default DisableOtpForm;
\ No newline at end of file
+export { DisableOtpForm as default };
\ No newline at end of file
diff --git a/src/features/security/mfa/enable-otp-form.tsx b/src/features/security/mfa/enable-otp-form.tsx
index 7999ace94..e3da775cb 100644
--- a/src/features/security/mfa/enable-otp-form.tsx
+++ b/src/features/security/mfa/enable-otp-form.tsx
@@ -83,4 +83,4 @@ const EnableOtpForm: React.FC<IEnableOtpForm> = ({ displayOtpForm, handleSetupPr
   );
 };
 
-export default EnableOtpForm;
+export { EnableOtpForm as default };
diff --git a/src/features/security/mfa/otp-confirm-form.tsx b/src/features/security/mfa/otp-confirm-form.tsx
index c22a8d8df..d1acfd3da 100644
--- a/src/features/security/mfa/otp-confirm-form.tsx
+++ b/src/features/security/mfa/otp-confirm-form.tsx
@@ -134,4 +134,4 @@ const OtpConfirmForm: React.FC = () => {
   );
 };
 
-export default OtpConfirmForm;
+export { OtpConfirmForm as default };
diff --git a/src/features/server-info/index.tsx b/src/features/server-info/index.tsx
index bc0b03e9b..8f916b7a7 100644
--- a/src/features/server-info/index.tsx
+++ b/src/features/server-info/index.tsx
@@ -35,4 +35,4 @@ const ServerInfo = () => {
   );
 };
 
-export default ServerInfo;
+export { ServerInfo as default };
diff --git a/src/features/settings/components/messages-settings.tsx b/src/features/settings/components/messages-settings.tsx
index 2e7293542..29c8c733d 100644
--- a/src/features/settings/components/messages-settings.tsx
+++ b/src/features/settings/components/messages-settings.tsx
@@ -37,4 +37,4 @@ const MessagesSettings = () => {
   );
 };
 
-export default MessagesSettings;
\ No newline at end of file
+export { MessagesSettings as default };
\ No newline at end of file
diff --git a/src/features/settings/index.tsx b/src/features/settings/index.tsx
index 37e987e14..70918d6ca 100644
--- a/src/features/settings/index.tsx
+++ b/src/features/settings/index.tsx
@@ -170,4 +170,4 @@ const Settings = () => {
   );
 };
 
-export default Settings;
+export { Settings as default };
diff --git a/src/features/share/index.tsx b/src/features/share/index.tsx
index fdb5caa3d..97682463f 100644
--- a/src/features/share/index.tsx
+++ b/src/features/share/index.tsx
@@ -27,4 +27,4 @@ const Share = () => {
   );
 };
 
-export default Share;
+export { Share as default };
diff --git a/src/features/soapbox-config/components/color-picker.tsx b/src/features/soapbox-config/components/color-picker.tsx
index 518fb872c..8122a465d 100644
--- a/src/features/soapbox-config/components/color-picker.tsx
+++ b/src/features/soapbox-config/components/color-picker.tsx
@@ -46,4 +46,4 @@ const ColorPicker: React.FC<IColorPicker> = ({ style, value, onClose, onChange }
   );
 };
 
-export default ColorPicker;
+export { ColorPicker as default };
diff --git a/src/features/soapbox-config/components/color-with-picker.tsx b/src/features/soapbox-config/components/color-with-picker.tsx
index 099491e69..aea8ce9ec 100644
--- a/src/features/soapbox-config/components/color-with-picker.tsx
+++ b/src/features/soapbox-config/components/color-with-picker.tsx
@@ -56,4 +56,4 @@ const ColorWithPicker: React.FC<IColorWithPicker> = ({ value, onChange, classNam
   );
 };
 
-export default ColorWithPicker;
+export { ColorWithPicker as default };
diff --git a/src/features/soapbox-config/components/crypto-address-input.tsx b/src/features/soapbox-config/components/crypto-address-input.tsx
index 0388a9731..a0c6ef8ac 100644
--- a/src/features/soapbox-config/components/crypto-address-input.tsx
+++ b/src/features/soapbox-config/components/crypto-address-input.tsx
@@ -46,4 +46,4 @@ const CryptoAddressInput: StreamfieldComponent<CryptoAddress> = ({ value, onChan
   );
 };
 
-export default CryptoAddressInput;
+export { CryptoAddressInput as default };
diff --git a/src/features/soapbox-config/components/footer-link-input.tsx b/src/features/soapbox-config/components/footer-link-input.tsx
index f604aa4a4..b7e632468 100644
--- a/src/features/soapbox-config/components/footer-link-input.tsx
+++ b/src/features/soapbox-config/components/footer-link-input.tsx
@@ -38,4 +38,4 @@ const PromoPanelInput: StreamfieldComponent<FooterItem> = ({ value, onChange })
   );
 };
 
-export default PromoPanelInput;
+export { PromoPanelInput as default };
diff --git a/src/features/soapbox-config/components/icon-picker-dropdown.tsx b/src/features/soapbox-config/components/icon-picker-dropdown.tsx
index 915700a2a..cd1e2684c 100644
--- a/src/features/soapbox-config/components/icon-picker-dropdown.tsx
+++ b/src/features/soapbox-config/components/icon-picker-dropdown.tsx
@@ -82,4 +82,4 @@ const IconPickerDropdown: React.FC<IIconPickerDropdown> = ({ value, onPickIcon }
   );
 };
 
-export default IconPickerDropdown;
+export { IconPickerDropdown as default };
diff --git a/src/features/soapbox-config/components/icon-picker-menu.tsx b/src/features/soapbox-config/components/icon-picker-menu.tsx
index 8287e1fc1..9e9bf1600 100644
--- a/src/features/soapbox-config/components/icon-picker-menu.tsx
+++ b/src/features/soapbox-config/components/icon-picker-menu.tsx
@@ -93,4 +93,4 @@ const IconPickerMenu: React.FC<IIconPickerMenu> = ({ icons, onClose, onPick, sty
   );
 };
 
-export default IconPickerMenu;
+export { IconPickerMenu as default };
diff --git a/src/features/soapbox-config/components/icon-picker.tsx b/src/features/soapbox-config/components/icon-picker.tsx
index 226d935e0..059be171a 100644
--- a/src/features/soapbox-config/components/icon-picker.tsx
+++ b/src/features/soapbox-config/components/icon-picker.tsx
@@ -13,4 +13,4 @@ const IconPicker: React.FC<IIconPicker> = ({ value, onChange }) => (
   </div>
 );
 
-export default IconPicker;
+export { IconPicker as default };
diff --git a/src/features/soapbox-config/components/promo-panel-input.tsx b/src/features/soapbox-config/components/promo-panel-input.tsx
index a225f4b6b..ea984ecb6 100644
--- a/src/features/soapbox-config/components/promo-panel-input.tsx
+++ b/src/features/soapbox-config/components/promo-panel-input.tsx
@@ -50,4 +50,4 @@ const PromoPanelInput: StreamfieldComponent<PromoPanelItem> = ({ value, onChange
   );
 };
 
-export default PromoPanelInput;
+export { PromoPanelInput as default };
diff --git a/src/features/soapbox-config/components/site-preview.tsx b/src/features/soapbox-config/components/site-preview.tsx
index 82e201e4f..e1ca0198d 100644
--- a/src/features/soapbox-config/components/site-preview.tsx
+++ b/src/features/soapbox-config/components/site-preview.tsx
@@ -55,4 +55,4 @@ const SitePreview: React.FC<ISitePreview> = ({ soapbox }) => {
 
 };
 
-export default SitePreview;
+export { SitePreview as default };
diff --git a/src/features/soapbox-config/index.tsx b/src/features/soapbox-config/index.tsx
index b724e9dad..e5e249080 100644
--- a/src/features/soapbox-config/index.tsx
+++ b/src/features/soapbox-config/index.tsx
@@ -404,4 +404,4 @@ const SoapboxConfig: React.FC = () => {
   );
 };
 
-export default SoapboxConfig;
+export { SoapboxConfig as default };
diff --git a/src/features/status/components/detailed-status.tsx b/src/features/status/components/detailed-status.tsx
index 6efda27ac..298ecede9 100644
--- a/src/features/status/components/detailed-status.tsx
+++ b/src/features/status/components/detailed-status.tsx
@@ -188,4 +188,4 @@ const DetailedStatus: React.FC<IDetailedStatus> = ({
   );
 };
 
-export default DetailedStatus;
+export { DetailedStatus as default };
diff --git a/src/features/status/components/status-interaction-bar.tsx b/src/features/status/components/status-interaction-bar.tsx
index f0610efe3..0b1768e8c 100644
--- a/src/features/status/components/status-interaction-bar.tsx
+++ b/src/features/status/components/status-interaction-bar.tsx
@@ -245,4 +245,4 @@ const InteractionCounter: React.FC<IInteractionCounter> = ({ count, children, on
   );
 };
 
-export default StatusInteractionBar;
+export { StatusInteractionBar as default };
diff --git a/src/features/status/components/thread-login-cta.tsx b/src/features/status/components/thread-login-cta.tsx
index 34fcf8366..5dd0e015a 100644
--- a/src/features/status/components/thread-login-cta.tsx
+++ b/src/features/status/components/thread-login-cta.tsx
@@ -36,4 +36,4 @@ const ThreadLoginCta: React.FC = () => {
   );
 };
 
-export default ThreadLoginCta;
+export { ThreadLoginCta as default };
diff --git a/src/features/status/components/thread-status.tsx b/src/features/status/components/thread-status.tsx
index 6b23efd6c..3d107c7cb 100644
--- a/src/features/status/components/thread-status.tsx
+++ b/src/features/status/components/thread-status.tsx
@@ -51,4 +51,4 @@ const ThreadStatus: React.FC<IThreadStatus> = (props): JSX.Element => {
   );
 };
 
-export default ThreadStatus;
+export { ThreadStatus as default };
diff --git a/src/features/status/components/thread.tsx b/src/features/status/components/thread.tsx
index 20bbc9dd7..5d0641fdc 100644
--- a/src/features/status/components/thread.tsx
+++ b/src/features/status/components/thread.tsx
@@ -41,7 +41,7 @@ const getAncestorsIds = createSelector([
   return ancestorsIds;
 });
 
-export const getDescendantsIds = createSelector([
+const getDescendantsIds = createSelector([
   (_: RootState, statusId: string) => statusId,
   (state: RootState) => state.contexts.replies,
 ], (statusId, contextReplies) => {
@@ -413,4 +413,4 @@ const Thread = (props: IThread) => {
   );
 };
 
-export default Thread;
+export { getDescendantsIds, Thread as default };
diff --git a/src/features/status/containers/quoted-status-container.tsx b/src/features/status/containers/quoted-status-container.tsx
index 524035341..27fe3107c 100644
--- a/src/features/status/containers/quoted-status-container.tsx
+++ b/src/features/status/containers/quoted-status-container.tsx
@@ -30,4 +30,4 @@ const QuotedStatusContainer: React.FC<IQuotedStatusContainer> = ({ statusId }) =
   );
 };
 
-export default QuotedStatusContainer;
+export { QuotedStatusContainer as default };
diff --git a/src/features/status/index.tsx b/src/features/status/index.tsx
index a0c71d0af..4c390bc5f 100644
--- a/src/features/status/index.tsx
+++ b/src/features/status/index.tsx
@@ -110,4 +110,4 @@ const StatusDetails: React.FC<IStatusDetails> = (props) => {
   );
 };
 
-export default StatusDetails;
+export { StatusDetails as default };
diff --git a/src/features/test-timeline/index.tsx b/src/features/test-timeline/index.tsx
index 21a455019..308f78e22 100644
--- a/src/features/test-timeline/index.tsx
+++ b/src/features/test-timeline/index.tsx
@@ -49,4 +49,4 @@ const TestTimeline: React.FC = () => {
   );
 };
 
-export default TestTimeline;
+export { TestTimeline as default };
diff --git a/src/features/theme-editor/components/color.tsx b/src/features/theme-editor/components/color.tsx
index a0b8cda63..3909ec276 100644
--- a/src/features/theme-editor/components/color.tsx
+++ b/src/features/theme-editor/components/color.tsx
@@ -25,4 +25,4 @@ const Color: React.FC<IColor> = ({ color, onChange }) => {
   );
 };
 
-export default Color;
\ No newline at end of file
+export { Color as default };
\ No newline at end of file
diff --git a/src/features/theme-editor/index.tsx b/src/features/theme-editor/index.tsx
index 12dfc7d5a..175acf7fa 100644
--- a/src/features/theme-editor/index.tsx
+++ b/src/features/theme-editor/index.tsx
@@ -274,4 +274,4 @@ const ColorListItem: React.FC<IColorListItem> = ({ label, value, onChange }) =>
   );
 };
 
-export default ThemeEditor;
\ No newline at end of file
+export { ThemeEditor as default };
\ No newline at end of file
diff --git a/src/features/ui/components/action-button.tsx b/src/features/ui/components/action-button.tsx
index 6d9502d5b..b91956516 100644
--- a/src/features/ui/components/action-button.tsx
+++ b/src/features/ui/components/action-button.tsx
@@ -260,4 +260,4 @@ const ActionButton: React.FC<IActionButton> = ({ account, actionType, small }) =
   return null;
 };
 
-export default ActionButton;
+export { ActionButton as default };
diff --git a/src/features/ui/components/background-shapes.tsx b/src/features/ui/components/background-shapes.tsx
index f256ad987..276228eb8 100644
--- a/src/features/ui/components/background-shapes.tsx
+++ b/src/features/ui/components/background-shapes.tsx
@@ -13,4 +13,4 @@ const BackgroundShapes: React.FC<IBackgroundShapes> = ({ position = 'fixed' }) =
   </div>
 );
 
-export default BackgroundShapes;
+export { BackgroundShapes as default };
diff --git a/src/features/ui/components/column-forbidden.tsx b/src/features/ui/components/column-forbidden.tsx
index 5fd504c04..b7f64f0a8 100644
--- a/src/features/ui/components/column-forbidden.tsx
+++ b/src/features/ui/components/column-forbidden.tsx
@@ -20,4 +20,4 @@ const ColumnForbidden = () => {
   );
 };
 
-export default ColumnForbidden;
+export { ColumnForbidden as default };
diff --git a/src/features/ui/components/column-loading.tsx b/src/features/ui/components/column-loading.tsx
index 994ec1457..791d2c320 100644
--- a/src/features/ui/components/column-loading.tsx
+++ b/src/features/ui/components/column-loading.tsx
@@ -10,4 +10,4 @@ const ColumnLoading = () => (
   </Card>
 );
 
-export default ColumnLoading;
+export { ColumnLoading as default };
diff --git a/src/features/ui/components/columns-area.tsx b/src/features/ui/components/columns-area.tsx
index 5bfb62722..e64ee449f 100644
--- a/src/features/ui/components/columns-area.tsx
+++ b/src/features/ui/components/columns-area.tsx
@@ -28,4 +28,4 @@ const ColumnsArea: React.FC<IColumnsArea> = (props) => {
   );
 };
 
-export default ColumnsArea;
+export { ColumnsArea as default };
diff --git a/src/features/ui/components/compose-button.tsx b/src/features/ui/components/compose-button.tsx
index 9e230293b..ea002b795 100644
--- a/src/features/ui/components/compose-button.tsx
+++ b/src/features/ui/components/compose-button.tsx
@@ -66,4 +66,4 @@ const GroupComposeButton = () => {
   );
 };
 
-export default ComposeButton;
+export { ComposeButton as default };
diff --git a/src/features/ui/components/cta-banner.tsx b/src/features/ui/components/cta-banner.tsx
index cecd4fbbd..42c9dcbf4 100644
--- a/src/features/ui/components/cta-banner.tsx
+++ b/src/features/ui/components/cta-banner.tsx
@@ -41,4 +41,4 @@ const CtaBanner = () => {
   );
 };
 
-export default CtaBanner;
+export { CtaBanner as default };
diff --git a/src/features/ui/components/error-column.tsx b/src/features/ui/components/error-column.tsx
index 6c91fa144..0adc87536 100644
--- a/src/features/ui/components/error-column.tsx
+++ b/src/features/ui/components/error-column.tsx
@@ -42,4 +42,4 @@ const ErrorColumn: React.FC<IErrorColumn> = ({ error, onRetry = () => location.r
   );
 };
 
-export default ErrorColumn;
+export { ErrorColumn as default };
diff --git a/src/features/ui/components/floating-action-button.tsx b/src/features/ui/components/floating-action-button.tsx
index db52a990e..80bd0d830 100644
--- a/src/features/ui/components/floating-action-button.tsx
+++ b/src/features/ui/components/floating-action-button.tsx
@@ -82,4 +82,4 @@ const GroupFAB: React.FC = () => {
   );
 };
 
-export default FloatingActionButton;
+export { FloatingActionButton as default };
diff --git a/src/features/ui/components/group-media-panel.tsx b/src/features/ui/components/group-media-panel.tsx
index 927ef72d8..4dbc6f2be 100644
--- a/src/features/ui/components/group-media-panel.tsx
+++ b/src/features/ui/components/group-media-panel.tsx
@@ -91,4 +91,4 @@ const GroupMediaPanel: React.FC<IGroupMediaPanel> = ({ group }) => {
   );
 };
 
-export default GroupMediaPanel;
+export { GroupMediaPanel as default };
diff --git a/src/features/ui/components/image-loader.tsx b/src/features/ui/components/image-loader.tsx
index 6e38db38e..ccc83527b 100644
--- a/src/features/ui/components/image-loader.tsx
+++ b/src/features/ui/components/image-loader.tsx
@@ -157,4 +157,4 @@ class ImageLoader extends React.PureComponent<IImageLoader> {
 
 }
 
-export default ImageLoader;
+export { ImageLoader as default };
diff --git a/src/features/ui/components/instance-info-panel.tsx b/src/features/ui/components/instance-info-panel.tsx
index 26a52df84..78426b768 100644
--- a/src/features/ui/components/instance-info-panel.tsx
+++ b/src/features/ui/components/instance-info-panel.tsx
@@ -47,4 +47,4 @@ const InstanceInfoPanel: React.FC<IInstanceInfoPanel> = ({ host }) => {
   );
 };
 
-export default InstanceInfoPanel;
+export { InstanceInfoPanel as default };
diff --git a/src/features/ui/components/instance-moderation-panel.tsx b/src/features/ui/components/instance-moderation-panel.tsx
index 59d1ef527..8dc16b8d5 100644
--- a/src/features/ui/components/instance-moderation-panel.tsx
+++ b/src/features/ui/components/instance-moderation-panel.tsx
@@ -51,4 +51,4 @@ const InstanceModerationPanel: React.FC<IInstanceModerationPanel> = ({ host }) =
   );
 };
 
-export default InstanceModerationPanel;
+export { InstanceModerationPanel as default };
diff --git a/src/features/ui/components/link-footer.tsx b/src/features/ui/components/link-footer.tsx
index 01ac4788a..c367617ab 100644
--- a/src/features/ui/components/link-footer.tsx
+++ b/src/features/ui/components/link-footer.tsx
@@ -31,4 +31,4 @@ const LinkFooter: React.FC = (): JSX.Element => {
   );
 };
 
-export default LinkFooter;
+export { LinkFooter as default };
diff --git a/src/features/ui/components/modal-loading.tsx b/src/features/ui/components/modal-loading.tsx
index 61bccffb3..2034b7649 100644
--- a/src/features/ui/components/modal-loading.tsx
+++ b/src/features/ui/components/modal-loading.tsx
@@ -8,4 +8,4 @@ const ModalLoading = () => (
   </Modal>
 );
 
-export default ModalLoading;
+export { ModalLoading as default };
diff --git a/src/features/ui/components/modal-root.tsx b/src/features/ui/components/modal-root.tsx
index bbc08604e..30fb15e30 100644
--- a/src/features/ui/components/modal-root.tsx
+++ b/src/features/ui/components/modal-root.tsx
@@ -86,7 +86,7 @@ const MODAL_COMPONENTS: Record<string, React.LazyExoticComponent<any>> = {
   'VIDEO': VideoModal,
 };
 
-export type ModalType = keyof typeof MODAL_COMPONENTS | null;
+type ModalType = keyof typeof MODAL_COMPONENTS | null;
 
 interface IModalRoot {
   type: ModalType;
@@ -94,7 +94,7 @@ interface IModalRoot {
   onClose: (type?: ModalType) => void;
 }
 
-export default class ModalRoot extends React.PureComponent<IModalRoot> {
+class ModalRoot extends React.PureComponent<IModalRoot> {
 
   getSnapshotBeforeUpdate() {
     return { visible: !!this.props.type };
@@ -131,3 +131,5 @@ export default class ModalRoot extends React.PureComponent<IModalRoot> {
   }
 
 }
+
+export { type ModalType, ModalRoot as default };
diff --git a/src/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx b/src/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx
index 76ea614d9..e1a6801ec 100644
--- a/src/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx
+++ b/src/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx
@@ -182,4 +182,4 @@ const AccountModerationModal: React.FC<IAccountModerationModal> = ({ onClose, ac
   );
 };
 
-export default AccountModerationModal;
+export { AccountModerationModal as default };
diff --git a/src/features/ui/components/modals/account-moderation-modal/badge-input.tsx b/src/features/ui/components/modals/account-moderation-modal/badge-input.tsx
index 3bfaf44ef..12363b29e 100644
--- a/src/features/ui/components/modals/account-moderation-modal/badge-input.tsx
+++ b/src/features/ui/components/modals/account-moderation-modal/badge-input.tsx
@@ -34,4 +34,4 @@ const BadgeInput: React.FC<IBadgeInput> = ({ badges, onChange }) => {
   );
 };
 
-export default BadgeInput;
\ No newline at end of file
+export { BadgeInput as default };
\ No newline at end of file
diff --git a/src/features/ui/components/modals/account-moderation-modal/staff-role-picker.tsx b/src/features/ui/components/modals/account-moderation-modal/staff-role-picker.tsx
index 8ee5bb6ea..8055cd1e4 100644
--- a/src/features/ui/components/modals/account-moderation-modal/staff-role-picker.tsx
+++ b/src/features/ui/components/modals/account-moderation-modal/staff-role-picker.tsx
@@ -83,4 +83,4 @@ const StaffRolePicker: React.FC<IStaffRolePicker> = ({ account }) => {
   );
 };
 
-export default StaffRolePicker;
\ No newline at end of file
+export { StaffRolePicker as default };
\ No newline at end of file
diff --git a/src/features/ui/components/modals/actions-modal.tsx b/src/features/ui/components/modals/actions-modal.tsx
index 89aa9bc08..2641cf2e9 100644
--- a/src/features/ui/components/modals/actions-modal.tsx
+++ b/src/features/ui/components/modals/actions-modal.tsx
@@ -81,4 +81,4 @@ const ActionsModal: React.FC<IActionsModal> = ({ status, actions, onClick, onClo
   );
 };
 
-export default ActionsModal;
+export { ActionsModal as default };
diff --git a/src/features/ui/components/modals/birthdays-modal.tsx b/src/features/ui/components/modals/birthdays-modal.tsx
index d6d17781a..7fb4995d2 100644
--- a/src/features/ui/components/modals/birthdays-modal.tsx
+++ b/src/features/ui/components/modals/birthdays-modal.tsx
@@ -48,4 +48,4 @@ const BirthdaysModal = ({ onClose }: IBirthdaysModal) => {
   );
 };
 
-export default BirthdaysModal;
+export { BirthdaysModal as default };
diff --git a/src/features/ui/components/modals/boost-modal.tsx b/src/features/ui/components/modals/boost-modal.tsx
index bc4d73177..2281dc1c4 100644
--- a/src/features/ui/components/modals/boost-modal.tsx
+++ b/src/features/ui/components/modals/boost-modal.tsx
@@ -45,4 +45,4 @@ const BoostModal: React.FC<IBoostModal> = ({ status, onReblog, onClose }) => {
   );
 };
 
-export default BoostModal;
+export { BoostModal as default };
diff --git a/src/features/ui/components/modals/compare-history-modal.tsx b/src/features/ui/components/modals/compare-history-modal.tsx
index 62086e674..f342e13f4 100644
--- a/src/features/ui/components/modals/compare-history-modal.tsx
+++ b/src/features/ui/components/modals/compare-history-modal.tsx
@@ -98,4 +98,4 @@ const CompareHistoryModal: React.FC<ICompareHistoryModal> = ({ onClose, statusId
   );
 };
 
-export default CompareHistoryModal;
+export { CompareHistoryModal as default };
diff --git a/src/features/ui/components/modals/component-modal.tsx b/src/features/ui/components/modals/component-modal.tsx
index 782417f9c..bd37e6a9b 100644
--- a/src/features/ui/components/modals/component-modal.tsx
+++ b/src/features/ui/components/modals/component-modal.tsx
@@ -16,4 +16,4 @@ const ComponentModal: React.FC<IComponentModal> = ({ onClose, component: Compone
   </Modal>
 );
 
-export default ComponentModal;
+export { ComponentModal as default };
diff --git a/src/features/ui/components/modals/compose-event-modal/compose-event-modal.tsx b/src/features/ui/components/modals/compose-event-modal/compose-event-modal.tsx
index 8f20ce69c..6fed4bbaf 100644
--- a/src/features/ui/components/modals/compose-event-modal/compose-event-modal.tsx
+++ b/src/features/ui/components/modals/compose-event-modal/compose-event-modal.tsx
@@ -335,4 +335,4 @@ const ComposeEventModal: React.FC<IComposeEventModal> = ({ onClose }) => {
   );
 };
 
-export default ComposeEventModal;
+export { ComposeEventModal as default };
diff --git a/src/features/ui/components/modals/compose-event-modal/upload-button.tsx b/src/features/ui/components/modals/compose-event-modal/upload-button.tsx
index ab377d62f..67ab999b4 100644
--- a/src/features/ui/components/modals/compose-event-modal/upload-button.tsx
+++ b/src/features/ui/components/modals/compose-event-modal/upload-button.tsx
@@ -48,4 +48,4 @@ const UploadButton: React.FC<IUploadButton> = ({ disabled, onSelectFile }) => {
   );
 };
 
-export default UploadButton;
+export { UploadButton as default };
diff --git a/src/features/ui/components/modals/compose-modal.tsx b/src/features/ui/components/modals/compose-modal.tsx
index 2bdb4b4ec..d92e2d4a0 100644
--- a/src/features/ui/components/modals/compose-modal.tsx
+++ b/src/features/ui/components/modals/compose-modal.tsx
@@ -94,4 +94,4 @@ const ComposeModal: React.FC<IComposeModal> = ({ onClose, composeId = 'compose-m
   );
 };
 
-export default ComposeModal;
+export { ComposeModal as default };
diff --git a/src/features/ui/components/modals/confirmation-modal.tsx b/src/features/ui/components/modals/confirmation-modal.tsx
index 20d62114a..faf3b1e8d 100644
--- a/src/features/ui/components/modals/confirmation-modal.tsx
+++ b/src/features/ui/components/modals/confirmation-modal.tsx
@@ -85,4 +85,4 @@ const ConfirmationModal: React.FC<IConfirmationModal> = ({
   );
 };
 
-export default ConfirmationModal;
+export { ConfirmationModal as default };
diff --git a/src/features/ui/components/modals/crypto-donate-modal.tsx b/src/features/ui/components/modals/crypto-donate-modal.tsx
index c1724ee78..b665fe375 100644
--- a/src/features/ui/components/modals/crypto-donate-modal.tsx
+++ b/src/features/ui/components/modals/crypto-donate-modal.tsx
@@ -17,4 +17,4 @@ const CryptoDonateModal: React.FC<ICryptoAddress & { onClose: () => void }> = ({
 
 };
 
-export default CryptoDonateModal;
+export { CryptoDonateModal as default };
diff --git a/src/features/ui/components/modals/dislikes-modal.tsx b/src/features/ui/components/modals/dislikes-modal.tsx
index 7689d7047..d8e3cde8a 100644
--- a/src/features/ui/components/modals/dislikes-modal.tsx
+++ b/src/features/ui/components/modals/dislikes-modal.tsx
@@ -60,4 +60,4 @@ const DislikesModal: React.FC<IDislikesModal> = ({ onClose, statusId }) => {
   );
 };
 
-export default DislikesModal;
+export { DislikesModal as default };
diff --git a/src/features/ui/components/modals/edit-announcement-modal.tsx b/src/features/ui/components/modals/edit-announcement-modal.tsx
index 3188b4e2b..9d23afffe 100644
--- a/src/features/ui/components/modals/edit-announcement-modal.tsx
+++ b/src/features/ui/components/modals/edit-announcement-modal.tsx
@@ -138,4 +138,4 @@ const EditAnnouncementModal: React.FC<IEditAnnouncementModal> = ({ onClose, anno
   );
 };
 
-export default EditAnnouncementModal;
+export { EditAnnouncementModal as default };
diff --git a/src/features/ui/components/modals/edit-bookmark-folder-modal.tsx b/src/features/ui/components/modals/edit-bookmark-folder-modal.tsx
index e2a407829..5b27be6fd 100644
--- a/src/features/ui/components/modals/edit-bookmark-folder-modal.tsx
+++ b/src/features/ui/components/modals/edit-bookmark-folder-modal.tsx
@@ -159,4 +159,4 @@ const EditBookmarkFolderModal: React.FC<IEditBookmarkFolderModal> = ({ folderId,
   );
 };
 
-export default EditBookmarkFolderModal;
+export { EditBookmarkFolderModal as default };
diff --git a/src/features/ui/components/modals/edit-domain-modal.tsx b/src/features/ui/components/modals/edit-domain-modal.tsx
index c0e3b5e29..fce647c89 100644
--- a/src/features/ui/components/modals/edit-domain-modal.tsx
+++ b/src/features/ui/components/modals/edit-domain-modal.tsx
@@ -99,4 +99,4 @@ const EditDomainModal: React.FC<IEditDomainModal> = ({ onClose, domainId }) => {
   );
 };
 
-export default EditDomainModal;
+export { EditDomainModal as default };
diff --git a/src/features/ui/components/modals/edit-federation-modal.tsx b/src/features/ui/components/modals/edit-federation-modal.tsx
index a2ae29037..77a8a6950 100644
--- a/src/features/ui/components/modals/edit-federation-modal.tsx
+++ b/src/features/ui/components/modals/edit-federation-modal.tsx
@@ -127,4 +127,4 @@ const EditFederationModal: React.FC<IEditFederationModal> = ({ host, onClose })
   );
 };
 
-export default EditFederationModal;
+export { EditFederationModal as default };
diff --git a/src/features/ui/components/modals/edit-rule-modal.tsx b/src/features/ui/components/modals/edit-rule-modal.tsx
index fe1862da5..e080aa17c 100644
--- a/src/features/ui/components/modals/edit-rule-modal.tsx
+++ b/src/features/ui/components/modals/edit-rule-modal.tsx
@@ -89,4 +89,4 @@ const EditRuleModal: React.FC<IEditRuleModal> = ({ onClose, rule }) => {
   );
 };
 
-export default EditRuleModal;
+export { EditRuleModal as default };
diff --git a/src/features/ui/components/modals/embed-modal.tsx b/src/features/ui/components/modals/embed-modal.tsx
index 5ba385238..1f536d74d 100644
--- a/src/features/ui/components/modals/embed-modal.tsx
+++ b/src/features/ui/components/modals/embed-modal.tsx
@@ -54,4 +54,4 @@ const EmbedModal: React.FC<IEmbedModal> = ({ url, onError }) => {
   );
 };
 
-export default EmbedModal;
+export { EmbedModal as default };
diff --git a/src/features/ui/components/modals/event-map-modal.tsx b/src/features/ui/components/modals/event-map-modal.tsx
index 2a16a84f3..c42195de6 100644
--- a/src/features/ui/components/modals/event-map-modal.tsx
+++ b/src/features/ui/components/modals/event-map-modal.tsx
@@ -72,4 +72,4 @@ const EventMapModal: React.FC<IEventMapModal> = ({ onClose, statusId }) => {
   );
 };
 
-export default EventMapModal;
+export { EventMapModal as default };
diff --git a/src/features/ui/components/modals/event-participants-modal.tsx b/src/features/ui/components/modals/event-participants-modal.tsx
index 85324546d..3ea6cf708 100644
--- a/src/features/ui/components/modals/event-participants-modal.tsx
+++ b/src/features/ui/components/modals/event-participants-modal.tsx
@@ -60,4 +60,4 @@ const EventParticipantsModal: React.FC<IEventParticipantsModal> = ({ onClose, st
   );
 };
 
-export default EventParticipantsModal;
+export { EventParticipantsModal as default };
diff --git a/src/features/ui/components/modals/familiar-followers-modal.tsx b/src/features/ui/components/modals/familiar-followers-modal.tsx
index a3287a9c5..d461354b0 100644
--- a/src/features/ui/components/modals/familiar-followers-modal.tsx
+++ b/src/features/ui/components/modals/familiar-followers-modal.tsx
@@ -55,4 +55,4 @@ const FamiliarFollowersModal = ({ accountId, onClose }: IFamiliarFollowersModal)
   );
 };
 
-export default FamiliarFollowersModal;
+export { FamiliarFollowersModal as default };
diff --git a/src/features/ui/components/modals/favourites-modal.tsx b/src/features/ui/components/modals/favourites-modal.tsx
index d2b9b9ea7..89d4bab5a 100644
--- a/src/features/ui/components/modals/favourites-modal.tsx
+++ b/src/features/ui/components/modals/favourites-modal.tsx
@@ -71,4 +71,4 @@ const FavouritesModal: React.FC<IFavouritesModal> = ({ onClose, statusId }) => {
   );
 };
 
-export default FavouritesModal;
+export { FavouritesModal as default };
diff --git a/src/features/ui/components/modals/hotkeys-modal.tsx b/src/features/ui/components/modals/hotkeys-modal.tsx
index 770ab84c3..2b4dc192f 100644
--- a/src/features/ui/components/modals/hotkeys-modal.tsx
+++ b/src/features/ui/components/modals/hotkeys-modal.tsx
@@ -174,4 +174,4 @@ const HotkeysModal: React.FC<IHotkeysModal> = ({ onClose }) => {
   );
 };
 
-export default HotkeysModal;
+export { HotkeysModal as default };
diff --git a/src/features/ui/components/modals/join-event-modal.tsx b/src/features/ui/components/modals/join-event-modal.tsx
index eff0adeba..77cc2a41b 100644
--- a/src/features/ui/components/modals/join-event-modal.tsx
+++ b/src/features/ui/components/modals/join-event-modal.tsx
@@ -66,4 +66,4 @@ const JoinEventModal: React.FC<IJoinEventModal> = ({ statusId }) => {
   );
 };
 
-export default JoinEventModal;
+export { JoinEventModal as default };
diff --git a/src/features/ui/components/modals/landing-page-modal.tsx b/src/features/ui/components/modals/landing-page-modal.tsx
index cdb3c9bb8..ebf044f27 100644
--- a/src/features/ui/components/modals/landing-page-modal.tsx
+++ b/src/features/ui/components/modals/landing-page-modal.tsx
@@ -68,4 +68,4 @@ const LandingPageModal: React.FC<ILandingPageModal> = ({ onClose }) => {
   );
 };
 
-export default LandingPageModal;
+export { LandingPageModal as default };
diff --git a/src/features/ui/components/modals/manage-group-modal/create-group-modal.tsx b/src/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
index 5532bfc89..a34847a7b 100644
--- a/src/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
+++ b/src/features/ui/components/modals/manage-group-modal/create-group-modal.tsx
@@ -120,4 +120,4 @@ const CreateGroupModal: React.FC<ICreateGroupModal> = ({ onClose }) => {
   );
 };
 
-export default CreateGroupModal;
+export { CreateGroupModal as default };
diff --git a/src/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx b/src/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
index d9a700ebb..63398bf2a 100644
--- a/src/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
+++ b/src/features/ui/components/modals/manage-group-modal/steps/confirmation-step.tsx
@@ -138,4 +138,4 @@ const InfoListItem: React.FC<IInfoListItem> = ({ number, children }) => (
   </HStack>
 );
 
-export default ConfirmationStep;
+export { ConfirmationStep as default };
diff --git a/src/features/ui/components/modals/manage-group-modal/steps/details-step.tsx b/src/features/ui/components/modals/manage-group-modal/steps/details-step.tsx
index 00aa28eb3..2f5c1376e 100644
--- a/src/features/ui/components/modals/manage-group-modal/steps/details-step.tsx
+++ b/src/features/ui/components/modals/manage-group-modal/steps/details-step.tsx
@@ -90,4 +90,4 @@ const DetailsStep: React.FC<IDetailsStep> = ({ params, onChange }) => {
   );
 };
 
-export default DetailsStep;
+export { DetailsStep as default };
diff --git a/src/features/ui/components/modals/manage-group-modal/steps/privacy-step.tsx b/src/features/ui/components/modals/manage-group-modal/steps/privacy-step.tsx
index 96d168c01..b0b8002a8 100644
--- a/src/features/ui/components/modals/manage-group-modal/steps/privacy-step.tsx
+++ b/src/features/ui/components/modals/manage-group-modal/steps/privacy-step.tsx
@@ -55,4 +55,4 @@ const PrivacyStep: React.FC<IPrivacyStep> = ({ params, onChange }) => {
   );
 };
 
-export default PrivacyStep;
+export { PrivacyStep as default };
diff --git a/src/features/ui/components/modals/media-modal.tsx b/src/features/ui/components/modals/media-modal.tsx
index a04eb7ac4..7260c5ae7 100644
--- a/src/features/ui/components/modals/media-modal.tsx
+++ b/src/features/ui/components/modals/media-modal.tsx
@@ -346,4 +346,4 @@ const MediaModal: React.FC<IMediaModal> = (props) => {
   );
 };
 
-export default MediaModal;
+export { MediaModal as default };
diff --git a/src/features/ui/components/modals/mentions-modal.tsx b/src/features/ui/components/modals/mentions-modal.tsx
index 4d16afc75..a848c83be 100644
--- a/src/features/ui/components/modals/mentions-modal.tsx
+++ b/src/features/ui/components/modals/mentions-modal.tsx
@@ -61,4 +61,4 @@ const MentionsModal: React.FC<IMentionsModal> = ({ onClose, statusId }) => {
   );
 };
 
-export default MentionsModal;
+export { MentionsModal as default };
diff --git a/src/features/ui/components/modals/missing-description-modal.tsx b/src/features/ui/components/modals/missing-description-modal.tsx
index 35c1aad8d..6d3d3180a 100644
--- a/src/features/ui/components/modals/missing-description-modal.tsx
+++ b/src/features/ui/components/modals/missing-description-modal.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { injectIntl, FormattedMessage, IntlShape, defineMessages } from 'react-intl';
+import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
 import { Modal } from 'soapbox/components/ui';
 
@@ -12,22 +12,25 @@ const messages = defineMessages({
 interface IMissingDescriptionModal {
   onClose: () => void;
   onContinue: () => void;
-  intl: IntlShape;
 }
 
-const MissingDescriptionModal: React.FC<IMissingDescriptionModal> = ({ onClose, onContinue, intl }) => (
-  <Modal
-    title={intl.formatMessage(messages.modalTitle)}
-    confirmationAction={onContinue}
-    confirmationText={intl.formatMessage(messages.post)}
-    confirmationTheme='danger'
-    cancelText={intl.formatMessage(messages.cancel)}
-    cancelAction={onClose}
-  >
-    <p className='text-gray-600 dark:text-gray-300'>
-      <FormattedMessage id='missing_description_modal.description' defaultMessage='Continue anyway?' />
-    </p>
-  </Modal>
-);
+const MissingDescriptionModal: React.FC<IMissingDescriptionModal> = ({ onClose, onContinue }) => {
+  const intl = useIntl();
 
-export default injectIntl(MissingDescriptionModal);
+  return (
+    <Modal
+      title={intl.formatMessage(messages.modalTitle)}
+      confirmationAction={onContinue}
+      confirmationText={intl.formatMessage(messages.post)}
+      confirmationTheme='danger'
+      cancelText={intl.formatMessage(messages.cancel)}
+      cancelAction={onClose}
+    >
+      <p className='text-gray-600 dark:text-gray-300'>
+        <FormattedMessage id='missing_description_modal.description' defaultMessage='Continue anyway?' />
+      </p>
+    </Modal>
+  );
+};
+
+export { MissingDescriptionModal as default };
diff --git a/src/features/ui/components/modals/mute-modal.tsx b/src/features/ui/components/modals/mute-modal.tsx
index aa2209fd0..de2d1c58b 100644
--- a/src/features/ui/components/modals/mute-modal.tsx
+++ b/src/features/ui/components/modals/mute-modal.tsx
@@ -105,4 +105,4 @@ const MuteModal = () => {
   );
 };
 
-export default MuteModal;
+export { MuteModal as default };
diff --git a/src/features/ui/components/modals/reactions-modal.tsx b/src/features/ui/components/modals/reactions-modal.tsx
index b6ccc053c..86f39f48a 100644
--- a/src/features/ui/components/modals/reactions-modal.tsx
+++ b/src/features/ui/components/modals/reactions-modal.tsx
@@ -121,4 +121,4 @@ const ReactionsModal: React.FC<IReactionsModal> = ({ onClose, statusId, reaction
   );
 };
 
-export default ReactionsModal;
+export { ReactionsModal as default };
diff --git a/src/features/ui/components/modals/reblogs-modal.tsx b/src/features/ui/components/modals/reblogs-modal.tsx
index 5107fa881..a79cc9c8a 100644
--- a/src/features/ui/components/modals/reblogs-modal.tsx
+++ b/src/features/ui/components/modals/reblogs-modal.tsx
@@ -72,4 +72,4 @@ const ReblogsModal: React.FC<IReblogsModal> = ({ onClose, statusId }) => {
   );
 };
 
-export default ReblogsModal;
+export { ReblogsModal as default };
diff --git a/src/features/ui/components/modals/reply-mentions-modal.tsx b/src/features/ui/components/modals/reply-mentions-modal.tsx
index c24cf343c..b1d8aac15 100644
--- a/src/features/ui/components/modals/reply-mentions-modal.tsx
+++ b/src/features/ui/components/modals/reply-mentions-modal.tsx
@@ -43,4 +43,4 @@ const ReplyMentionsModal: React.FC<IReplyMentionsModal> = ({ composeId, onClose
   );
 };
 
-export default ReplyMentionsModal;
+export { ReplyMentionsModal as default };
diff --git a/src/features/ui/components/modals/report-modal/report-modal.tsx b/src/features/ui/components/modals/report-modal/report-modal.tsx
index d9a54f738..cca1b8615 100644
--- a/src/features/ui/components/modals/report-modal/report-modal.tsx
+++ b/src/features/ui/components/modals/report-modal/report-modal.tsx
@@ -234,4 +234,4 @@ const ReportModal = ({ onClose }: IReportModal) => {
   );
 };
 
-export default ReportModal;
+export { ReportModal as default };
diff --git a/src/features/ui/components/modals/report-modal/steps/confirmation-step.tsx b/src/features/ui/components/modals/report-modal/steps/confirmation-step.tsx
index f8af8e7bf..18484f0fb 100644
--- a/src/features/ui/components/modals/report-modal/steps/confirmation-step.tsx
+++ b/src/features/ui/components/modals/report-modal/steps/confirmation-step.tsx
@@ -56,4 +56,4 @@ const ConfirmationStep: React.FC<IConfirmationStep> = () => {
   );
 };
 
-export default ConfirmationStep;
+export { ConfirmationStep as default };
diff --git a/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx b/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx
index d4250b551..ae2417bec 100644
--- a/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx
+++ b/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx
@@ -125,4 +125,4 @@ const OtherActionsStep = ({ account }: IOtherActionsStep) => {
   );
 };
 
-export default OtherActionsStep;
+export { OtherActionsStep as default };
diff --git a/src/features/ui/components/modals/report-modal/steps/reason-step.tsx b/src/features/ui/components/modals/report-modal/steps/reason-step.tsx
index c72c3ab9c..28f4c6e3f 100644
--- a/src/features/ui/components/modals/report-modal/steps/reason-step.tsx
+++ b/src/features/ui/components/modals/report-modal/steps/reason-step.tsx
@@ -147,4 +147,4 @@ const ReasonStep: React.FC<IReasonStep> = () => {
   );
 };
 
-export default ReasonStep;
+export { ReasonStep as default };
diff --git a/src/features/ui/components/modals/select-bookmark-folder-modal.tsx b/src/features/ui/components/modals/select-bookmark-folder-modal.tsx
index 8fe50938d..397eeff05 100644
--- a/src/features/ui/components/modals/select-bookmark-folder-modal.tsx
+++ b/src/features/ui/components/modals/select-bookmark-folder-modal.tsx
@@ -94,4 +94,4 @@ const SelectBookmarkFolderModal: React.FC<ISelectBookmarkFolderModal> = ({ statu
   );
 };
 
-export default SelectBookmarkFolderModal;
+export { SelectBookmarkFolderModal as default };
diff --git a/src/features/ui/components/modals/unauthorized-modal.tsx b/src/features/ui/components/modals/unauthorized-modal.tsx
index 8d3ee2954..a57fe0c64 100644
--- a/src/features/ui/components/modals/unauthorized-modal.tsx
+++ b/src/features/ui/components/modals/unauthorized-modal.tsx
@@ -156,4 +156,4 @@ const UnauthorizedModal: React.FC<IUnauthorizedModal> = ({ action, onClose, acco
   );
 };
 
-export default UnauthorizedModal;
+export { UnauthorizedModal as default };
diff --git a/src/features/ui/components/modals/video-modal.tsx b/src/features/ui/components/modals/video-modal.tsx
index 0f13c8d81..9461c2c7b 100644
--- a/src/features/ui/components/modals/video-modal.tsx
+++ b/src/features/ui/components/modals/video-modal.tsx
@@ -47,4 +47,4 @@ const VideoModal: React.FC<IVideoModal> = ({ status, account, media, time, onClo
   );
 };
 
-export default VideoModal;
+export { VideoModal as default };
diff --git a/src/features/ui/components/navbar.tsx b/src/features/ui/components/navbar.tsx
index b0572d061..624245952 100644
--- a/src/features/ui/components/navbar.tsx
+++ b/src/features/ui/components/navbar.tsx
@@ -167,4 +167,4 @@ const Navbar = () => {
   );
 };
 
-export default Navbar;
+export { Navbar as default };
diff --git a/src/features/ui/components/panels/account-note-panel.tsx b/src/features/ui/components/panels/account-note-panel.tsx
index 5a28136c8..b889cbc5e 100644
--- a/src/features/ui/components/panels/account-note-panel.tsx
+++ b/src/features/ui/components/panels/account-note-panel.tsx
@@ -78,4 +78,4 @@ const AccountNotePanel: React.FC<IAccountNotePanel> = ({ account }) => {
   );
 };
 
-export default AccountNotePanel;
+export { AccountNotePanel as default };
diff --git a/src/features/ui/components/panels/my-groups-panel.tsx b/src/features/ui/components/panels/my-groups-panel.tsx
index d9a95a314..2f956c762 100644
--- a/src/features/ui/components/panels/my-groups-panel.tsx
+++ b/src/features/ui/components/panels/my-groups-panel.tsx
@@ -30,4 +30,4 @@ const MyGroupsPanel = () => {
   );
 };
 
-export default MyGroupsPanel;
+export { MyGroupsPanel as default };
diff --git a/src/features/ui/components/panels/new-event-panel.tsx b/src/features/ui/components/panels/new-event-panel.tsx
index bf444ffc6..3d9ce4d11 100644
--- a/src/features/ui/components/panels/new-event-panel.tsx
+++ b/src/features/ui/components/panels/new-event-panel.tsx
@@ -36,4 +36,4 @@ const NewEventPanel = () => {
   );
 };
 
-export default NewEventPanel;
+export { NewEventPanel as default };
diff --git a/src/features/ui/components/panels/new-group-panel.tsx b/src/features/ui/components/panels/new-group-panel.tsx
index 387f3abf0..364423dac 100644
--- a/src/features/ui/components/panels/new-group-panel.tsx
+++ b/src/features/ui/components/panels/new-group-panel.tsx
@@ -40,4 +40,4 @@ const NewGroupPanel = () => {
   );
 };
 
-export default NewGroupPanel;
+export { NewGroupPanel as default };
diff --git a/src/features/ui/components/panels/sign-up-panel.tsx b/src/features/ui/components/panels/sign-up-panel.tsx
index 04694854e..86d10c795 100644
--- a/src/features/ui/components/panels/sign-up-panel.tsx
+++ b/src/features/ui/components/panels/sign-up-panel.tsx
@@ -34,4 +34,4 @@ const SignUpPanel = () => {
   );
 };
 
-export default SignUpPanel;
+export { SignUpPanel as default };
diff --git a/src/features/ui/components/pending-status.tsx b/src/features/ui/components/pending-status.tsx
index 64e13b5d6..bff3d0ac1 100644
--- a/src/features/ui/components/pending-status.tsx
+++ b/src/features/ui/components/pending-status.tsx
@@ -101,4 +101,4 @@ const PendingStatus: React.FC<IPendingStatus> = ({ idempotencyKey, className, mu
   );
 };
 
-export default PendingStatus;
+export { PendingStatus as default };
diff --git a/src/features/ui/components/pinned-accounts-panel.tsx b/src/features/ui/components/pinned-accounts-panel.tsx
index c6de3a667..dec710536 100644
--- a/src/features/ui/components/pinned-accounts-panel.tsx
+++ b/src/features/ui/components/pinned-accounts-panel.tsx
@@ -50,4 +50,4 @@ const PinnedAccountsPanel: React.FC<IPinnedAccountsPanel> = ({ account, limit })
   );
 };
 
-export default PinnedAccountsPanel;
+export { PinnedAccountsPanel as default };
diff --git a/src/features/ui/components/poll-preview.tsx b/src/features/ui/components/poll-preview.tsx
index f22018df0..ddf6139a3 100644
--- a/src/features/ui/components/poll-preview.tsx
+++ b/src/features/ui/components/poll-preview.tsx
@@ -31,4 +31,4 @@ const PollPreview: React.FC<IPollPreview> = ({ poll }) => {
   );
 };
 
-export default PollPreview;
+export { PollPreview as default };
diff --git a/src/features/ui/components/profile-dropdown.tsx b/src/features/ui/components/profile-dropdown.tsx
index ae393906b..888e3bd27 100644
--- a/src/features/ui/components/profile-dropdown.tsx
+++ b/src/features/ui/components/profile-dropdown.tsx
@@ -179,4 +179,4 @@ const MenuItem: React.FC<MenuItemProps> = ({ className, menuItem }) => {
   }
 };
 
-export default ProfileDropdown;
+export { ProfileDropdown as default };
diff --git a/src/features/ui/components/profile-familiar-followers.tsx b/src/features/ui/components/profile-familiar-followers.tsx
index c80e46b04..2c8aadb77 100644
--- a/src/features/ui/components/profile-familiar-followers.tsx
+++ b/src/features/ui/components/profile-familiar-followers.tsx
@@ -88,4 +88,4 @@ const ProfileFamiliarFollowers: React.FC<IProfileFamiliarFollowers> = ({ account
   );
 };
 
-export default ProfileFamiliarFollowers;
+export { ProfileFamiliarFollowers as default };
diff --git a/src/features/ui/components/profile-field.tsx b/src/features/ui/components/profile-field.tsx
index 7f4e43728..5e42d2753 100644
--- a/src/features/ui/components/profile-field.tsx
+++ b/src/features/ui/components/profile-field.tsx
@@ -68,4 +68,4 @@ const ProfileField: React.FC<IProfileField> = ({ field }) => {
   );
 };
 
-export default ProfileField;
+export { ProfileField as default };
diff --git a/src/features/ui/components/profile-fields-panel.tsx b/src/features/ui/components/profile-fields-panel.tsx
index f321c688e..3a91f09da 100644
--- a/src/features/ui/components/profile-fields-panel.tsx
+++ b/src/features/ui/components/profile-fields-panel.tsx
@@ -22,4 +22,4 @@ const ProfileFieldsPanel: React.FC<IProfileFieldsPanel> = ({ account }) => (
   </Widget>
 );
 
-export default ProfileFieldsPanel;
+export { ProfileFieldsPanel as default };
diff --git a/src/features/ui/components/profile-info-panel.tsx b/src/features/ui/components/profile-info-panel.tsx
index b5a8bb226..6a62256fe 100644
--- a/src/features/ui/components/profile-info-panel.tsx
+++ b/src/features/ui/components/profile-info-panel.tsx
@@ -205,4 +205,4 @@ const ProfileInfoPanel: React.FC<IProfileInfoPanel> = ({ account, username }) =>
   );
 };
 
-export default ProfileInfoPanel;
+export { ProfileInfoPanel as default };
diff --git a/src/features/ui/components/profile-media-panel.tsx b/src/features/ui/components/profile-media-panel.tsx
index d63b849f3..1aafd0c81 100644
--- a/src/features/ui/components/profile-media-panel.tsx
+++ b/src/features/ui/components/profile-media-panel.tsx
@@ -86,4 +86,4 @@ const ProfileMediaPanel: React.FC<IProfileMediaPanel> = ({ account }) => {
   );
 };
 
-export default ProfileMediaPanel;
+export { ProfileMediaPanel as default };
diff --git a/src/features/ui/components/profile-stats.tsx b/src/features/ui/components/profile-stats.tsx
index 2594be0e2..9caf30e4b 100644
--- a/src/features/ui/components/profile-stats.tsx
+++ b/src/features/ui/components/profile-stats.tsx
@@ -58,4 +58,4 @@ const ProfileStats: React.FC<IProfileStats> = ({ account, onClickHandler }) => {
   );
 };
 
-export default ProfileStats;
+export { ProfileStats as default };
diff --git a/src/features/ui/components/promo-panel.tsx b/src/features/ui/components/promo-panel.tsx
index 3472067c6..2dc2d477c 100644
--- a/src/features/ui/components/promo-panel.tsx
+++ b/src/features/ui/components/promo-panel.tsx
@@ -29,4 +29,4 @@ const PromoPanel: React.FC = () => {
   );
 };
 
-export default PromoPanel;
+export { PromoPanel as default };
diff --git a/src/features/ui/components/subscription-button.tsx b/src/features/ui/components/subscription-button.tsx
index cdd2ec5bb..f6a77f66e 100644
--- a/src/features/ui/components/subscription-button.tsx
+++ b/src/features/ui/components/subscription-button.tsx
@@ -104,4 +104,4 @@ const SubscriptionButton = ({ account }: ISubscriptionButton) => {
   return null;
 };
 
-export default SubscriptionButton;
+export { SubscriptionButton as default };
diff --git a/src/features/ui/components/theme-selector.tsx b/src/features/ui/components/theme-selector.tsx
index e1648437e..0ed0605c8 100644
--- a/src/features/ui/components/theme-selector.tsx
+++ b/src/features/ui/components/theme-selector.tsx
@@ -64,4 +64,4 @@ const ThemeSelector: React.FC<IThemeSelector> = ({ value, onChange }) => {
   );
 };
 
-export default ThemeSelector;
+export { ThemeSelector as default };
diff --git a/src/features/ui/components/theme-toggle.tsx b/src/features/ui/components/theme-toggle.tsx
index 8137caeb6..b787b1a83 100644
--- a/src/features/ui/components/theme-toggle.tsx
+++ b/src/features/ui/components/theme-toggle.tsx
@@ -22,4 +22,4 @@ const ThemeToggle: React.FC = () => {
   );
 };
 
-export default ThemeToggle;
+export { ThemeToggle as default };
diff --git a/src/features/ui/components/timeline.tsx b/src/features/ui/components/timeline.tsx
index e578cec99..e18c4c0cc 100644
--- a/src/features/ui/components/timeline.tsx
+++ b/src/features/ui/components/timeline.tsx
@@ -77,4 +77,4 @@ const Timeline: React.FC<ITimeline> = ({
   );
 };
 
-export default Timeline;
+export { Timeline as default };
diff --git a/src/features/ui/components/trends-panel.tsx b/src/features/ui/components/trends-panel.tsx
index 9e87cc8c2..d50e0c14c 100644
--- a/src/features/ui/components/trends-panel.tsx
+++ b/src/features/ui/components/trends-panel.tsx
@@ -56,4 +56,4 @@ const TrendsPanel = ({ limit }: ITrendsPanel) => {
   );
 };
 
-export default TrendsPanel;
+export { TrendsPanel as default };
diff --git a/src/features/ui/components/user-panel.tsx b/src/features/ui/components/user-panel.tsx
index e21dc482d..0841d6dc2 100644
--- a/src/features/ui/components/user-panel.tsx
+++ b/src/features/ui/components/user-panel.tsx
@@ -111,4 +111,4 @@ const UserPanel: React.FC<IUserPanel> = ({ accountId, action, badges, domain })
   );
 };
 
-export default UserPanel;
+export { UserPanel as default };
diff --git a/src/features/ui/components/who-to-follow-panel.tsx b/src/features/ui/components/who-to-follow-panel.tsx
index 8b6486a08..4ba2c16d0 100644
--- a/src/features/ui/components/who-to-follow-panel.tsx
+++ b/src/features/ui/components/who-to-follow-panel.tsx
@@ -62,4 +62,4 @@ const WhoToFollowPanel = ({ limit }: IWhoToFollowPanel) => {
   );
 };
 
-export default WhoToFollowPanel;
+export { WhoToFollowPanel as default };
diff --git a/src/features/ui/components/zoomable-image.tsx b/src/features/ui/components/zoomable-image.tsx
index 571daae6a..a5850f231 100644
--- a/src/features/ui/components/zoomable-image.tsx
+++ b/src/features/ui/components/zoomable-image.tsx
@@ -147,4 +147,4 @@ class ZoomableImage extends React.PureComponent<IZoomableImage> {
 
 }
 
-export default ZoomableImage;
\ No newline at end of file
+export { ZoomableImage as default };
\ No newline at end of file
diff --git a/src/features/ui/containers/modal-container.ts b/src/features/ui/containers/modal-container.ts
index 294cf9031..0c0445df2 100644
--- a/src/features/ui/containers/modal-container.ts
+++ b/src/features/ui/containers/modal-container.ts
@@ -41,4 +41,6 @@ const mapDispatchToProps = (dispatch: AppDispatch) => ({
   },
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(ModalRoot);
+const ModalContainer = connect(mapStateToProps, mapDispatchToProps)(ModalRoot);
+
+export { ModalContainer as default };
diff --git a/src/features/ui/index.tsx b/src/features/ui/index.tsx
index e2431c087..d8e9ce7b5 100644
--- a/src/features/ui/index.tsx
+++ b/src/features/ui/index.tsx
@@ -514,4 +514,4 @@ const UI: React.FC<IUI> = ({ children }) => {
   );
 };
 
-export default UI;
+export { UI as default };
diff --git a/src/features/ui/util/fullscreen.ts b/src/features/ui/util/fullscreen.ts
index 1a9590d7a..389dd0817 100644
--- a/src/features/ui/util/fullscreen.ts
+++ b/src/features/ui/util/fullscreen.ts
@@ -1,7 +1,7 @@
 // APIs for normalizing fullscreen operations. Note that Edge uses
 // the WebKit-prefixed APIs currently (as of Edge 16).
 
-export const isFullscreen = (): boolean => Boolean(
+const isFullscreen = (): boolean => Boolean(
   document.fullscreenElement ||
     // @ts-ignore
     document.webkitFullscreenElement ||
@@ -9,7 +9,7 @@ export const isFullscreen = (): boolean => Boolean(
     document.mozFullScreenElement,
 );
 
-export const exitFullscreen = (): void => {
+const exitFullscreen = (): void => {
   if (document.exitFullscreen) {
     document.exitFullscreen();
   } else if ('webkitExitFullscreen' in document) {
@@ -21,7 +21,7 @@ export const exitFullscreen = (): void => {
   }
 };
 
-export const requestFullscreen = (el: Element): void => {
+const requestFullscreen = (el: Element): void => {
   if (el.requestFullscreen) {
     el.requestFullscreen();
   } else if ('webkitRequestFullscreen' in el) {
@@ -31,4 +31,6 @@ export const requestFullscreen = (el: Element): void => {
     // @ts-ignore
     el.mozRequestFullScreen();
   }
-};
\ No newline at end of file
+};
+
+export { isFullscreen, exitFullscreen, requestFullscreen };
diff --git a/src/features/ui/util/pending-status-builder.ts b/src/features/ui/util/pending-status-builder.ts
index 23ade1e41..b6a61466a 100644
--- a/src/features/ui/util/pending-status-builder.ts
+++ b/src/features/ui/util/pending-status-builder.ts
@@ -27,7 +27,7 @@ const buildPoll = (pendingStatus: PendingStatus) => {
   }
 };
 
-export const buildStatus = (state: RootState, pendingStatus: PendingStatus, idempotencyKey: string) => {
+const buildStatus = (state: RootState, pendingStatus: PendingStatus, idempotencyKey: string) => {
   const me = state.me as string;
   const account = getAccount(state, me);
   const inReplyToId = pendingStatus.in_reply_to_id;
@@ -48,3 +48,5 @@ export const buildStatus = (state: RootState, pendingStatus: PendingStatus, idem
 
   return calculateStatus(normalizeStatus(status));
 };
+
+export { buildStatus };
diff --git a/src/features/video/index.tsx b/src/features/video/index.tsx
index 734dda49a..d96a2ac57 100644
--- a/src/features/video/index.tsx
+++ b/src/features/video/index.tsx
@@ -23,7 +23,7 @@ const messages = defineMessages({
   exit_fullscreen: { id: 'video.exit_fullscreen', defaultMessage: 'Exit full screen' },
 });
 
-export const formatTime = (secondsNum: number): string => {
+const formatTime = (secondsNum: number): string => {
   let hours:   number | string = Math.floor(secondsNum / 3600);
   let minutes: number | string = Math.floor((secondsNum - (hours * 3600)) / 60);
   let seconds: number | string = secondsNum - (hours * 3600) - (minutes * 60);
@@ -35,7 +35,7 @@ export const formatTime = (secondsNum: number): string => {
   return (hours === '00' ? '' : `${hours}:`) + `${minutes}:${seconds}`;
 };
 
-export const findElementPosition = (el: HTMLElement) => {
+const findElementPosition = (el: HTMLElement) => {
   let box;
 
   if (el.getBoundingClientRect && el.parentNode) {
@@ -66,7 +66,7 @@ export const findElementPosition = (el: HTMLElement) => {
   };
 };
 
-export const getPointerPosition = (el: HTMLElement, event: MouseEvent & TouchEvent): Position => {
+const getPointerPosition = (el: HTMLElement, event: MouseEvent & TouchEvent): Position => {
   const box = findElementPosition(el);
   const boxW = el.offsetWidth;
   const boxH = el.offsetHeight;
@@ -87,7 +87,7 @@ export const getPointerPosition = (el: HTMLElement, event: MouseEvent & TouchEve
   };
 };
 
-export const fileNameFromURL = (str: string) => {
+const fileNameFromURL = (str: string) => {
   const url      = new URL(str);
   const pathname = url.pathname;
   const index    = pathname.lastIndexOf('/');
@@ -575,4 +575,10 @@ const Video: React.FC<IVideo> = ({
   );
 };
 
-export default Video;
+export {
+  formatTime,
+  findElementPosition,
+  getPointerPosition,
+  fileNameFromURL,
+  Video as default,
+};
diff --git a/src/hooks/forms/useImageField.ts b/src/hooks/forms/useImageField.ts
index 005ac4911..cc5fefc66 100644
--- a/src/hooks/forms/useImageField.ts
+++ b/src/hooks/forms/useImageField.ts
@@ -37,5 +37,4 @@ const useImageField = (opts: UseImageFieldOpts = {}) => {
   };
 };
 
-export { useImageField };
-export type { UseImageFieldOpts };
+export { type UseImageFieldOpts, useImageField };
diff --git a/src/hooks/useApi.ts b/src/hooks/useApi.ts
index 2e22df997..05bae2ea7 100644
--- a/src/hooks/useApi.ts
+++ b/src/hooks/useApi.ts
@@ -3,7 +3,9 @@ import api from 'soapbox/api';
 import { useGetState } from './useGetState';
 
 /** Use stateful Axios client with auth from Redux. */
-export const useApi = () => {
+const useApi = () => {
   const getState = useGetState();
   return api(getState);
 };
+
+export { useApi };
diff --git a/src/hooks/useAppDispatch.ts b/src/hooks/useAppDispatch.ts
index fa28aa0d2..6e75d3f41 100644
--- a/src/hooks/useAppDispatch.ts
+++ b/src/hooks/useAppDispatch.ts
@@ -2,4 +2,6 @@ import { useDispatch } from 'react-redux';
 
 import type { AppDispatch } from 'soapbox/store';
 
-export const useAppDispatch = () => useDispatch<AppDispatch>();
\ No newline at end of file
+const useAppDispatch = () => useDispatch<AppDispatch>();
+
+export { useAppDispatch };
diff --git a/src/hooks/useAppSelector.ts b/src/hooks/useAppSelector.ts
index 4394afb21..c2fd3be69 100644
--- a/src/hooks/useAppSelector.ts
+++ b/src/hooks/useAppSelector.ts
@@ -2,4 +2,6 @@ import { TypedUseSelectorHook, useSelector } from 'react-redux';
 
 import type { RootState } from 'soapbox/store';
 
-export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
+const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
+
+export { useAppSelector };
diff --git a/src/hooks/useClickOutside.ts b/src/hooks/useClickOutside.ts
index 0bb7f387d..0ab963b44 100644
--- a/src/hooks/useClickOutside.ts
+++ b/src/hooks/useClickOutside.ts
@@ -2,7 +2,7 @@ import { ExtendedRefs } from '@floating-ui/react';
 import { useCallback, useEffect } from 'react';
 
 /** Trigger `callback` when a Floating UI element is clicked outside from. */
-export const useClickOutside = <T extends HTMLElement>(
+const useClickOutside = <T extends HTMLElement>(
   refs: ExtendedRefs<T>,
   callback: (e: MouseEvent) => void,
 ) => {
@@ -26,4 +26,6 @@ export const useClickOutside = <T extends HTMLElement>(
       window.removeEventListener('click', handleWindowClick);
     };
   }, []);
-};
\ No newline at end of file
+};
+
+export { useClickOutside };
\ No newline at end of file
diff --git a/src/hooks/useCompose.ts b/src/hooks/useCompose.ts
index 5f3669712..21a6c6a97 100644
--- a/src/hooks/useCompose.ts
+++ b/src/hooks/useCompose.ts
@@ -3,5 +3,7 @@ import { useAppSelector } from './useAppSelector';
 import type { ReducerCompose } from 'soapbox/reducers/compose';
 
 /** Get compose for given key with fallback to 'default' */
-export const useCompose = <ID extends string>(composeId: ID extends 'default' ? never : ID): ReturnType<typeof ReducerCompose> =>
+const useCompose = <ID extends string>(composeId: ID extends 'default' ? never : ID): ReturnType<typeof ReducerCompose> =>
   useAppSelector((state) => state.compose.get(composeId, state.compose.get('default')!));
+
+export { useCompose };
diff --git a/src/hooks/useFeatures.ts b/src/hooks/useFeatures.ts
index bd0929bf5..5f88743ab 100644
--- a/src/hooks/useFeatures.ts
+++ b/src/hooks/useFeatures.ts
@@ -3,7 +3,9 @@ import { getFeatures, Features } from 'soapbox/utils/features';
 import { useInstance } from './useInstance';
 
 /** Get features for the current instance. */
-export const useFeatures = (): Features => {
+const useFeatures = (): Features => {
   const instance = useInstance();
   return getFeatures(instance);
 };
+
+export { useFeatures };
diff --git a/src/hooks/useInstance.ts b/src/hooks/useInstance.ts
index 6eebb3893..ee30c64e8 100644
--- a/src/hooks/useInstance.ts
+++ b/src/hooks/useInstance.ts
@@ -1,4 +1,6 @@
 import { useAppSelector } from './useAppSelector';
 
 /** Get the Instance for the current backend. */
-export const useInstance = () => useAppSelector((state) => state.instance);
+const useInstance = () => useAppSelector((state) => state.instance);
+
+export { useInstance };
diff --git a/src/hooks/usePrevious.ts b/src/hooks/usePrevious.ts
index 89282d6f7..443e60d00 100644
--- a/src/hooks/usePrevious.ts
+++ b/src/hooks/usePrevious.ts
@@ -2,7 +2,7 @@ import { useRef, useEffect } from 'react';
 
 /** Get the last version of this value. */
 // https://usehooks.com/usePrevious/
-export const usePrevious = <T>(value: T): T | undefined => {
+const usePrevious = <T>(value: T): T | undefined => {
   const ref = useRef<T>();
 
   useEffect(() => {
@@ -10,4 +10,6 @@ export const usePrevious = <T>(value: T): T | undefined => {
   }, [value]);
 
   return ref.current;
-};
\ No newline at end of file
+};
+
+export { usePrevious };
diff --git a/src/hooks/useRegistrationStatus.ts b/src/hooks/useRegistrationStatus.ts
index 736c2d8cd..4b9867a23 100644
--- a/src/hooks/useRegistrationStatus.ts
+++ b/src/hooks/useRegistrationStatus.ts
@@ -1,7 +1,7 @@
 import { useFeatures } from './useFeatures';
 import { useInstance } from './useInstance';
 
-export const useRegistrationStatus = () => {
+const useRegistrationStatus = () => {
   const instance = useInstance();
   const features = useFeatures();
 
@@ -9,4 +9,6 @@ export const useRegistrationStatus = () => {
     /** Registrations are open. */
     isOpen: features.accountCreation && instance.registrations.enabled,
   };
-};
\ No newline at end of file
+};
+
+export { useRegistrationStatus };
\ No newline at end of file
diff --git a/src/hooks/useSettings.ts b/src/hooks/useSettings.ts
index eda0153c6..208cd6d89 100644
--- a/src/hooks/useSettings.ts
+++ b/src/hooks/useSettings.ts
@@ -6,7 +6,9 @@ import { settingsSchema } from 'soapbox/schemas/soapbox/settings';
 import { useAppSelector } from './useAppSelector';
 
 /** Get the user settings from the store */
-export const useSettings = () => {
+const useSettings = () => {
   const data = useAppSelector((state) => getSettings(state));
   return useMemo(() => settingsSchema.parse(data.toJS()), [data]);
 };
+
+export { useSettings };
diff --git a/src/hooks/useSoapboxConfig.ts b/src/hooks/useSoapboxConfig.ts
index b01ee347f..3487560b8 100644
--- a/src/hooks/useSoapboxConfig.ts
+++ b/src/hooks/useSoapboxConfig.ts
@@ -5,4 +5,6 @@ import { useAppSelector } from './useAppSelector';
 import type { SoapboxConfig } from 'soapbox/types/soapbox';
 
 /** Get the Soapbox config from the store */
-export const useSoapboxConfig = (): SoapboxConfig => useAppSelector((state) => getSoapboxConfig(state));
+const useSoapboxConfig = (): SoapboxConfig => useAppSelector((state) => getSoapboxConfig(state));
+
+export { useSoapboxConfig };
diff --git a/src/hooks/useSystemTheme.ts b/src/hooks/useSystemTheme.ts
index d4d24c9ee..a427fc3c0 100644
--- a/src/hooks/useSystemTheme.ts
+++ b/src/hooks/useSystemTheme.ts
@@ -3,7 +3,7 @@ import { useState, useEffect } from 'react';
 type SystemTheme = 'light' | 'dark';
 
 /** Get the system color scheme of the system. */
-export const useSystemTheme = (): SystemTheme => {
+const useSystemTheme = (): SystemTheme => {
   const query = window.matchMedia('(prefers-color-scheme: dark)');
   const [dark, setDark] = useState(query.matches);
 
@@ -31,3 +31,5 @@ export const useSystemTheme = (): SystemTheme => {
 
   return dark ? 'dark' : 'light';
 };
+
+export { useSystemTheme };
diff --git a/src/init/soapbox-head.tsx b/src/init/soapbox-head.tsx
index 6944b4b80..eaf6b6287 100644
--- a/src/init/soapbox-head.tsx
+++ b/src/init/soapbox-head.tsx
@@ -59,4 +59,4 @@ const SoapboxHead: React.FC<ISoapboxHead> = ({ children }) => {
   );
 };
 
-export default SoapboxHead;
+export { SoapboxHead as default };
diff --git a/src/init/soapbox-load.tsx b/src/init/soapbox-load.tsx
index cc9b883f1..4079f5503 100644
--- a/src/init/soapbox-load.tsx
+++ b/src/init/soapbox-load.tsx
@@ -82,4 +82,4 @@ const SoapboxLoad: React.FC<ISoapboxLoad> = ({ children }) => {
   );
 };
 
-export default SoapboxLoad;
+export { SoapboxLoad as default };
diff --git a/src/init/soapbox-mount.tsx b/src/init/soapbox-mount.tsx
index fa3aa5e79..ab7b1b613 100644
--- a/src/init/soapbox-mount.tsx
+++ b/src/init/soapbox-mount.tsx
@@ -95,4 +95,4 @@ const SoapboxMount = () => {
   );
 };
 
-export default SoapboxMount;
+export { SoapboxMount as default };
diff --git a/src/init/soapbox.tsx b/src/init/soapbox.tsx
index 2cad01db2..3313e4f5c 100644
--- a/src/init/soapbox.tsx
+++ b/src/init/soapbox.tsx
@@ -38,4 +38,4 @@ const Soapbox: React.FC = () => (
   </Provider>
 );
 
-export default Soapbox;
+export { Soapbox as default };
diff --git a/src/messages.ts b/src/messages.ts
index f995da3f4..29991810e 100644
--- a/src/messages.ts
+++ b/src/messages.ts
@@ -101,5 +101,4 @@ const messages = locales.reduce((acc, locale) => {
   return acc;
 }, {} as Record<string, () => Promise<MessageJson>>);
 
-export default messages;
-export { locales };
\ No newline at end of file
+export { locales, messages as default };
\ No newline at end of file
diff --git a/src/middleware/errors.ts b/src/middleware/errors.ts
index b26208dfa..05fc23fb2 100644
--- a/src/middleware/errors.ts
+++ b/src/middleware/errors.ts
@@ -29,4 +29,4 @@ const errorsMiddleware = (): Middleware =>
     return next(action);
   };
 
-export default errorsMiddleware;
+export { errorsMiddleware as default };
diff --git a/src/normalizers/account.ts b/src/normalizers/account.ts
index 77218d564..81ceed945 100644
--- a/src/normalizers/account.ts
+++ b/src/normalizers/account.ts
@@ -19,7 +19,7 @@ import { mergeDefined, makeEmojiMap } from 'soapbox/utils/normalizers';
 import type { Emoji, Field, EmbeddedEntity, Relationship } from 'soapbox/types/entities';
 
 // https://docs.joinmastodon.org/entities/account/
-export const AccountRecord = ImmutableRecord({
+const AccountRecord = ImmutableRecord({
   accepts_chat_messages: false,
   acct: '',
   avatar: '',
@@ -65,7 +65,7 @@ export const AccountRecord = ImmutableRecord({
 });
 
 // https://docs.joinmastodon.org/entities/field/
-export const FieldRecord = ImmutableRecord({
+const FieldRecord = ImmutableRecord({
   name: '',
   value: '',
   verified_at: null as Date | null,
@@ -211,7 +211,7 @@ const getDomainFromURL = (account: ImmutableMap<string, any>): string => {
   }
 };
 
-export const guessFqn = (account: ImmutableMap<string, any>): string => {
+const guessFqn = (account: ImmutableMap<string, any>): string => {
   const acct = account.get('acct', '');
   const [user, domain] = acct.split('@');
 
@@ -273,7 +273,7 @@ const fixNote = (account: ImmutableMap<string, any>) => {
   }
 };
 
-export const normalizeAccount = (account: Record<string, any>) => AccountRecord(
+const normalizeAccount = (account: Record<string, any>) => AccountRecord(
   ImmutableMap(fromJS(account)).withMutations(account => {
     normalizePleromaLegacyFields(account);
     normalizeEmojis(account);
@@ -297,3 +297,5 @@ export const normalizeAccount = (account: Record<string, any>) => AccountRecord(
     addInternalFields(account);
   }),
 );
+
+export { AccountRecord, FieldRecord, guessFqn, normalizeAccount };
diff --git a/src/normalizers/admin-account.ts b/src/normalizers/admin-account.ts
index 3b3c3cc87..a64ee04e2 100644
--- a/src/normalizers/admin-account.ts
+++ b/src/normalizers/admin-account.ts
@@ -12,7 +12,7 @@ import {
 import type { ReducerAccount } from 'soapbox/reducers/accounts';
 import type { Account, EmbeddedEntity } from 'soapbox/types/entities';
 
-export const AdminAccountRecord = ImmutableRecord({
+const AdminAccountRecord = ImmutableRecord({
   account: null as EmbeddedEntity<Account | ReducerAccount>,
   approved: false,
   confirmed: false,
@@ -46,8 +46,10 @@ const normalizePleromaAccount = (account: ImmutableMap<string, any>) => {
   return account;
 };
 
-export const normalizeAdminAccount = (account: Record<string, any>) => AdminAccountRecord(
+const normalizeAdminAccount = (account: Record<string, any>) => AdminAccountRecord(
   ImmutableMap(fromJS(account)).withMutations((account: ImmutableMap<string, any>) => {
     normalizePleromaAccount(account);
   }),
 );
+
+export { AdminAccountRecord, normalizeAdminAccount };
diff --git a/src/normalizers/admin-report.ts b/src/normalizers/admin-report.ts
index 82ba71be6..044604725 100644
--- a/src/normalizers/admin-report.ts
+++ b/src/normalizers/admin-report.ts
@@ -12,7 +12,7 @@ import {
 import type { ReducerAccount } from 'soapbox/reducers/accounts';
 import type { Account, EmbeddedEntity, Status } from 'soapbox/types/entities';
 
-export const AdminReportRecord = ImmutableRecord({
+const AdminReportRecord = ImmutableRecord({
   account: null as EmbeddedEntity<Account | ReducerAccount>,
   action_taken: false,
   action_taken_by_account: null as EmbeddedEntity<Account | ReducerAccount> | null,
@@ -42,8 +42,10 @@ const normalizePleromaReport = (report: ImmutableMap<string, any>) => {
   return report;
 };
 
-export const normalizeAdminReport = (report: Record<string, any>) => AdminReportRecord(
+const normalizeAdminReport = (report: Record<string, any>) => AdminReportRecord(
   ImmutableMap(fromJS(report)).withMutations((report: ImmutableMap<string, any>) => {
     normalizePleromaReport(report);
   }),
 );
+
+export { AdminReportRecord, normalizeAdminReport };
diff --git a/src/normalizers/attachment.ts b/src/normalizers/attachment.ts
index f4847f7ed..3b6ff6a35 100644
--- a/src/normalizers/attachment.ts
+++ b/src/normalizers/attachment.ts
@@ -12,7 +12,7 @@ import {
 import { mergeDefined } from 'soapbox/utils/normalizers';
 
 // https://docs.joinmastodon.org/entities/attachment/
-export const AttachmentRecord = ImmutableRecord({
+const AttachmentRecord = ImmutableRecord({
   blurhash: undefined,
   description: '',
   id: '',
@@ -52,9 +52,11 @@ const normalizeMeta = (attachment: ImmutableMap<string, any>) => {
   return attachment.set('meta', meta);
 };
 
-export const normalizeAttachment = (attachment: Record<string, any>) => AttachmentRecord(
+const normalizeAttachment = (attachment: Record<string, any>) => AttachmentRecord(
   ImmutableMap(fromJS(attachment)).withMutations((attachment: ImmutableMap<string, any>) => {
     normalizeUrls(attachment);
     normalizeMeta(attachment);
   }),
 );
+
+export { AttachmentRecord, normalizeAttachment };
diff --git a/src/normalizers/chat-message.ts b/src/normalizers/chat-message.ts
index ff002878c..3c7778a41 100644
--- a/src/normalizers/chat-message.ts
+++ b/src/normalizers/chat-message.ts
@@ -9,7 +9,7 @@ import { normalizeAttachment } from 'soapbox/normalizers/attachment';
 
 import type { Attachment, Card, Emoji } from 'soapbox/types/entities';
 
-export const ChatMessageRecord = ImmutableRecord({
+const ChatMessageRecord = ImmutableRecord({
   account_id: '',
   media_attachments: ImmutableList<Attachment>(),
   card: null as Card | null,
@@ -46,9 +46,11 @@ const fixContent = (chatMessage: ImmutableMap<string, any>) => {
   }
 };
 
-export const normalizeChatMessage = (chatMessage: Record<string, any>) => ChatMessageRecord(
+const normalizeChatMessage = (chatMessage: Record<string, any>) => ChatMessageRecord(
   ImmutableMap(fromJS(chatMessage)).withMutations(chatMessage => {
     normalizeMedia(chatMessage);
     fixContent(chatMessage);
   }),
 );
+
+export { ChatMessageRecord, normalizeChatMessage };
diff --git a/src/normalizers/chat.ts b/src/normalizers/chat.ts
index cada15241..82b0e57b0 100644
--- a/src/normalizers/chat.ts
+++ b/src/normalizers/chat.ts
@@ -2,7 +2,7 @@ import { Map as ImmutableMap, Record as ImmutableRecord, fromJS } from 'immutabl
 
 import type { Account, EmbeddedEntity } from 'soapbox/types/entities';
 
-export const ChatRecord = ImmutableRecord({
+const ChatRecord = ImmutableRecord({
   account: null as EmbeddedEntity<Account>,
   id: '',
   unread: 0,
@@ -10,6 +10,8 @@ export const ChatRecord = ImmutableRecord({
   updated_at: '',
 });
 
-export const normalizeChat = (chat: Record<string, any>) => ChatRecord(
+const normalizeChat = (chat: Record<string, any>) => ChatRecord(
   ImmutableMap(fromJS(chat)),
 );
+
+export { ChatRecord, normalizeChat };
diff --git a/src/normalizers/emoji.ts b/src/normalizers/emoji.ts
index 3311d721d..4d29abfc6 100644
--- a/src/normalizers/emoji.ts
+++ b/src/normalizers/emoji.ts
@@ -6,7 +6,7 @@
 import { Record as ImmutableRecord, Map as ImmutableMap, fromJS } from 'immutable';
 
 // https://docs.joinmastodon.org/entities/emoji/
-export const EmojiRecord = ImmutableRecord({
+const EmojiRecord = ImmutableRecord({
   category: '',
   shortcode: '',
   static_url: '',
@@ -14,6 +14,8 @@ export const EmojiRecord = ImmutableRecord({
   visible_in_picker: true,
 });
 
-export const normalizeEmoji = (emoji: Record<string, any>) => EmojiRecord(
+const normalizeEmoji = (emoji: Record<string, any>) => EmojiRecord(
   ImmutableMap(fromJS(emoji)),
 );
+
+export { EmojiRecord, normalizeEmoji };
diff --git a/src/normalizers/filter-keyword.ts b/src/normalizers/filter-keyword.ts
index b81fd4b63..a06a7ddfe 100644
--- a/src/normalizers/filter-keyword.ts
+++ b/src/normalizers/filter-keyword.ts
@@ -6,13 +6,15 @@
 import { Map as ImmutableMap, Record as ImmutableRecord, fromJS } from 'immutable';
 
 // https://docs.joinmastodon.org/entities/FilterKeyword/
-export const FilterKeywordRecord = ImmutableRecord({
+const FilterKeywordRecord = ImmutableRecord({
   id: '',
   keyword: '',
   whole_word: false,
 });
 
-export const normalizeFilterKeyword = (filterKeyword: Record<string, any>) =>
+const normalizeFilterKeyword = (filterKeyword: Record<string, any>) =>
   FilterKeywordRecord(
     ImmutableMap(fromJS(filterKeyword)),
   );
+
+export { FilterKeywordRecord, normalizeFilterKeyword };
diff --git a/src/normalizers/filter-result.ts b/src/normalizers/filter-result.ts
index 08ed3499f..8443acb2f 100644
--- a/src/normalizers/filter-result.ts
+++ b/src/normalizers/filter-result.ts
@@ -10,13 +10,14 @@ import { normalizeFilter } from './filter';
 import type { Filter } from 'soapbox/types/entities';
 
 // https://docs.joinmastodon.org/entities/FilterResult/
-export const FilterResultRecord = ImmutableRecord({
+const FilterResultRecord = ImmutableRecord({
   filter: null as Filter | null,
   keyword_matches: ImmutableList<string>(),
   status_matches: ImmutableList<string>(),
 });
 
-export const normalizeFilterResult = (filterResult: Record<string, any>) =>
-  FilterResultRecord(
-    ImmutableMap(fromJS(filterResult)).update('filter', (filter: any) => normalizeFilter(filter) as any),
-  );
+const normalizeFilterResult = (filterResult: Record<string, any>) => FilterResultRecord(
+  ImmutableMap(fromJS(filterResult)).update('filter', (filter: any) => normalizeFilter(filter) as any),
+);
+
+export { FilterResultRecord, normalizeFilterResult };
\ No newline at end of file
diff --git a/src/normalizers/filter-status.ts b/src/normalizers/filter-status.ts
index d827d76af..73e42b3d7 100644
--- a/src/normalizers/filter-status.ts
+++ b/src/normalizers/filter-status.ts
@@ -6,12 +6,13 @@
 import { Map as ImmutableMap, Record as ImmutableRecord, fromJS } from 'immutable';
 
 // https://docs.joinmastodon.org/entities/FilterStatus/
-export const FilterStatusRecord = ImmutableRecord({
+const FilterStatusRecord = ImmutableRecord({
   id: '',
   status_id: '',
 });
 
-export const normalizeFilterStatus = (filterStatus: Record<string, any>) =>
-  FilterStatusRecord(
-    ImmutableMap(fromJS(filterStatus)),
-  );
+const normalizeFilterStatus = (filterStatus: Record<string, any>) => FilterStatusRecord(
+  ImmutableMap(fromJS(filterStatus)),
+);
+
+export { FilterStatusRecord, normalizeFilterStatus };
diff --git a/src/normalizers/filter.ts b/src/normalizers/filter.ts
index d3eaab237..2d648a398 100644
--- a/src/normalizers/filter.ts
+++ b/src/normalizers/filter.ts
@@ -10,11 +10,11 @@ import { FilterKeyword, FilterStatus } from 'soapbox/types/entities';
 import { normalizeFilterKeyword } from './filter-keyword';
 import { normalizeFilterStatus } from './filter-status';
 
-export type ContextType = 'home' | 'public' | 'notifications' | 'thread' | 'account';
-export type FilterActionType = 'warn' | 'hide';
+type ContextType = 'home' | 'public' | 'notifications' | 'thread' | 'account';
+type FilterActionType = 'warn' | 'hide';
 
 // https://docs.joinmastodon.org/entities/filter/
-export const FilterRecord = ImmutableRecord({
+const FilterRecord = ImmutableRecord({
   id: '',
   title: '',
   context: ImmutableList<ContextType>(),
@@ -43,7 +43,7 @@ const normalizeStatuses = (filter: ImmutableMap<string, any>) =>
     statuses.map(normalizeFilterStatus),
   );
 
-export const normalizeFilter = (filter: Record<string, any>) =>
+const normalizeFilter = (filter: Record<string, any>) =>
   FilterRecord(
     ImmutableMap(fromJS(filter)).withMutations(filter => {
       if (filter.has('phrase')) normalizeFilterV1(filter);
@@ -51,3 +51,10 @@ export const normalizeFilter = (filter: Record<string, any>) =>
       normalizeStatuses(filter);
     }),
   );
+
+export {
+  type ContextType,
+  type FilterActionType,
+  FilterRecord,
+  normalizeFilter,
+};
diff --git a/src/normalizers/group-relationship.ts b/src/normalizers/group-relationship.ts
index 3c0c0e457..c391db1aa 100644
--- a/src/normalizers/group-relationship.ts
+++ b/src/normalizers/group-relationship.ts
@@ -10,7 +10,7 @@ import {
 
 import { GroupRoles } from 'soapbox/schemas/group-member';
 
-export const GroupRelationshipRecord = ImmutableRecord({
+const GroupRelationshipRecord = ImmutableRecord({
   id: '',
   blocked_by: false,
   member: false,
@@ -21,6 +21,8 @@ export const GroupRelationshipRecord = ImmutableRecord({
   pending_requests: false,
 });
 
-export const normalizeGroupRelationship = (relationship: Record<string, any>) => GroupRelationshipRecord(
+const normalizeGroupRelationship = (relationship: Record<string, any>) => GroupRelationshipRecord(
   ImmutableMap(fromJS(relationship)),
 );
+
+export { GroupRelationshipRecord, normalizeGroupRelationship };
diff --git a/src/normalizers/group.ts b/src/normalizers/group.ts
index 671a37186..038d652d9 100644
--- a/src/normalizers/group.ts
+++ b/src/normalizers/group.ts
@@ -17,7 +17,7 @@ import { makeEmojiMap } from 'soapbox/utils/normalizers';
 
 import type { Emoji, GroupRelationship } from 'soapbox/types/entities';
 
-export const GroupRecord = ImmutableRecord({
+const GroupRecord = ImmutableRecord({
   avatar: '',
   avatar_static: '',
   created_at: '',
@@ -119,7 +119,7 @@ const getDomainFromURL = (group: ImmutableMap<string, any>): string => {
   }
 };
 
-export const guessFqn = (group: ImmutableMap<string, any>): string => {
+const guessFqn = (group: ImmutableMap<string, any>): string => {
   const acct = group.get('acct', '');
   const [user, domain] = acct.split('@');
 
@@ -149,7 +149,7 @@ const fixNote = (group: ImmutableMap<string, any>) => {
   }
 };
 
-export const normalizeGroup = (group: Record<string, any>) => GroupRecord(
+const normalizeGroup = (group: Record<string, any>) => GroupRecord(
   ImmutableMap(fromJS(group)).withMutations(group => {
     normalizeEmojis(group);
     normalizeAvatar(group);
@@ -161,3 +161,9 @@ export const normalizeGroup = (group: Record<string, any>) => GroupRecord(
     addInternalFields(group);
   }),
 );
+
+export {
+  GroupRecord,
+  guessFqn,
+  normalizeGroup,
+};
diff --git a/src/normalizers/history.ts b/src/normalizers/history.ts
index 96baf0721..aaaf5569d 100644
--- a/src/normalizers/history.ts
+++ b/src/normalizers/history.ts
@@ -10,11 +10,12 @@ import {
 } from 'immutable';
 
 // https://docs.joinmastodon.org/entities/history/
-export const HistoryRecord = ImmutableRecord({
+const HistoryRecord = ImmutableRecord({
   accounts: '',
   day: '',
   uses: '',
 });
-export const normalizeHistory = (history: Record<string, any>) => HistoryRecord(
-  ImmutableMap(fromJS(history)),
-);
+
+const normalizeHistory = (history: Record<string, any>) => HistoryRecord(ImmutableMap(fromJS(history)));
+
+export { HistoryRecord, normalizeHistory };
diff --git a/src/normalizers/list.ts b/src/normalizers/list.ts
index 3aea8764d..c235d1478 100644
--- a/src/normalizers/list.ts
+++ b/src/normalizers/list.ts
@@ -6,10 +6,12 @@
 import { Record as ImmutableRecord, Map as ImmutableMap, fromJS } from 'immutable';
 
 // https://docs.joinmastodon.org/entities/list/
-export const ListRecord = ImmutableRecord({
+const ListRecord = ImmutableRecord({
   id: '',
   title: '',
   replies_policy: null as 'followed' | 'list' | 'none' | null,
 });
 
-export const normalizeList = (list: Record<string, any>) => ListRecord(ImmutableMap(fromJS(list)));
+const normalizeList = (list: Record<string, any>) => ListRecord(ImmutableMap(fromJS(list)));
+
+export { ListRecord, normalizeList };
diff --git a/src/normalizers/location.ts b/src/normalizers/location.ts
index 2866b3b34..1a00757f9 100644
--- a/src/normalizers/location.ts
+++ b/src/normalizers/location.ts
@@ -1,11 +1,11 @@
 import { Map as ImmutableMap, Record as ImmutableRecord, fromJS } from 'immutable';
 
-export const GeographicLocationRecord = ImmutableRecord({
+const GeographicLocationRecord = ImmutableRecord({
   coordinates: null as [number, number] | null,
   srid: '',
 });
 
-export const LocationRecord = ImmutableRecord({
+const LocationRecord = ImmutableRecord({
   url: '',
   description: '',
   country: '',
@@ -28,7 +28,9 @@ const normalizeGeographicLocation = (location: ImmutableMap<string, any>) => {
   return location;
 };
 
-export const normalizeLocation = (location: Record<string, any>) => LocationRecord(ImmutableMap(fromJS(location))
+const normalizeLocation = (location: Record<string, any>) => LocationRecord(ImmutableMap(fromJS(location))
   .withMutations((location: ImmutableMap<string, any>) => {
     normalizeGeographicLocation(location);
   }));
+
+export { GeographicLocationRecord, LocationRecord, normalizeLocation };
diff --git a/src/normalizers/mention.ts b/src/normalizers/mention.ts
index 5ff35ce16..7a979cf1b 100644
--- a/src/normalizers/mention.ts
+++ b/src/normalizers/mention.ts
@@ -8,14 +8,15 @@ import { Record as ImmutableRecord } from 'immutable';
 import { normalizeAccount } from 'soapbox/normalizers/account';
 
 // https://docs.joinmastodon.org/entities/mention/
-export const MentionRecord = ImmutableRecord({
+const MentionRecord = ImmutableRecord({
   id: '',
   acct: '',
   username: '',
   url: '',
 });
 
-export const normalizeMention = (mention: Record<string, any>) => {
+const normalizeMention = (mention: Record<string, any>) =>
   // Simply normalize it as an account then cast it as a mention ¯\_(ツ)_/¯
-  return MentionRecord(normalizeAccount(mention));
-};
+  MentionRecord(normalizeAccount(mention));
+
+export { MentionRecord, normalizeMention };
diff --git a/src/normalizers/notification.ts b/src/normalizers/notification.ts
index 1944c3eef..87e7a16d1 100644
--- a/src/normalizers/notification.ts
+++ b/src/normalizers/notification.ts
@@ -13,7 +13,7 @@ import {
 import type { Account, Status, EmbeddedEntity } from 'soapbox/types/entities';
 
 // https://docs.joinmastodon.org/entities/notification/
-export const NotificationRecord = ImmutableRecord({
+const NotificationRecord = ImmutableRecord({
   account: null as EmbeddedEntity<Account>,
   accounts: null as ImmutableList<EmbeddedEntity<Account>> | null,
   chat_message: null as ImmutableMap<string, any> | string | null, // pleroma:chat_mention
@@ -34,9 +34,11 @@ const normalizeType = (notification: ImmutableMap<string, any>) => {
   return notification;
 };
 
-export const normalizeNotification = (notification: Record<string, any>) => NotificationRecord(
+const normalizeNotification = (notification: Record<string, any>) => NotificationRecord(
   ImmutableMap(fromJS(notification))
     .withMutations((notification: ImmutableMap<string, any>) => {
       normalizeType(notification);
     }),
 );
+
+export { NotificationRecord, normalizeNotification };
diff --git a/src/normalizers/soapbox/soapbox-config.ts b/src/normalizers/soapbox/soapbox-config.ts
index 9e69cb4da..df9e6ea86 100644
--- a/src/normalizers/soapbox/soapbox-config.ts
+++ b/src/normalizers/soapbox/soapbox-config.ts
@@ -44,29 +44,29 @@ const DEFAULT_COLORS = ImmutableMap<string, any>({
   'greentext': '#789922',
 });
 
-export const PromoPanelItemRecord = ImmutableRecord({
+const PromoPanelItemRecord = ImmutableRecord({
   icon: '',
   text: '',
   url: '',
   textLocales: ImmutableMap<string, string>(),
 });
 
-export const PromoPanelRecord = ImmutableRecord({
+const PromoPanelRecord = ImmutableRecord({
   items: ImmutableList<PromoPanelItem>(),
 });
 
-export const FooterItemRecord = ImmutableRecord({
+const FooterItemRecord = ImmutableRecord({
   title: '',
   url: '',
 });
 
-export const CryptoAddressRecord = ImmutableRecord({
+const CryptoAddressRecord = ImmutableRecord({
   address: '',
   note: '',
   ticker: '',
 });
 
-export const SoapboxConfigRecord = ImmutableRecord({
+const SoapboxConfigRecord = ImmutableRecord({
   appleAppId: null,
   authProvider: '',
   logo: '',
@@ -214,7 +214,7 @@ const normalizeRedirectRootNoLogin = (soapboxConfig: SoapboxConfigMap): SoapboxC
   }
 };
 
-export const normalizeSoapboxConfig = (soapboxConfig: Record<string, any>) => SoapboxConfigRecord(
+const normalizeSoapboxConfig = (soapboxConfig: Record<string, any>) => SoapboxConfigRecord(
   ImmutableMap(fromJS(soapboxConfig)).withMutations(soapboxConfig => {
     normalizeBrandColor(soapboxConfig);
     normalizeAccentColor(soapboxConfig);
@@ -227,3 +227,12 @@ export const normalizeSoapboxConfig = (soapboxConfig: Record<string, any>) => So
     normalizeRedirectRootNoLogin(soapboxConfig);
   }),
 );
+
+export {
+  PromoPanelItemRecord,
+  PromoPanelRecord,
+  FooterItemRecord,
+  CryptoAddressRecord,
+  SoapboxConfigRecord,
+  normalizeSoapboxConfig,
+};
diff --git a/src/normalizers/status-edit.ts b/src/normalizers/status-edit.ts
index 10c0a47ed..d04b28cb9 100644
--- a/src/normalizers/status-edit.ts
+++ b/src/normalizers/status-edit.ts
@@ -20,7 +20,7 @@ import { makeEmojiMap } from 'soapbox/utils/normalizers';
 import type { ReducerAccount } from 'soapbox/reducers/accounts';
 import type { Account, Attachment, Emoji, EmbeddedEntity, Poll } from 'soapbox/types/entities';
 
-export const StatusEditRecord = ImmutableRecord({
+const StatusEditRecord = ImmutableRecord({
   account: null as EmbeddedEntity<Account | ReducerAccount>,
   content: '',
   created_at: new Date(),
@@ -67,7 +67,7 @@ const normalizeContent = (statusEdit: ImmutableMap<string, any>) => {
     .set('spoilerHtml', spoilerHtml);
 };
 
-export const normalizeStatusEdit = (statusEdit: Record<string, any>) => StatusEditRecord(
+const normalizeStatusEdit = (statusEdit: Record<string, any>) => StatusEditRecord(
   ImmutableMap(fromJS(statusEdit)).withMutations(statusEdit => {
     normalizeAttachments(statusEdit);
     normalizeEmojis(statusEdit);
@@ -75,3 +75,5 @@ export const normalizeStatusEdit = (statusEdit: Record<string, any>) => StatusEd
     normalizeContent(statusEdit);
   }),
 );
+
+export { StatusEditRecord, normalizeStatusEdit };
diff --git a/src/normalizers/status.ts b/src/normalizers/status.ts
index 8d9f246ad..0f655c283 100644
--- a/src/normalizers/status.ts
+++ b/src/normalizers/status.ts
@@ -19,13 +19,13 @@ import { maybeFromJS } from 'soapbox/utils/normalizers';
 
 import type { Account, Attachment, Card, Emoji, Group, Mention, Poll, EmbeddedEntity, EmojiReaction } from 'soapbox/types/entities';
 
-export type StatusApprovalStatus = 'pending' | 'approval' | 'rejected';
-export type StatusVisibility = 'public' | 'unlisted' | 'private' | 'direct' | 'group';
+type StatusApprovalStatus = 'pending' | 'approval' | 'rejected';
+type StatusVisibility = 'public' | 'unlisted' | 'private' | 'direct' | 'group';
 
-export type EventJoinMode = 'free' | 'restricted' | 'invite';
-export type EventJoinState = 'pending' | 'reject' | 'accept';
+type EventJoinMode = 'free' | 'restricted' | 'invite';
+type EventJoinState = 'pending' | 'reject' | 'accept';
 
-export const EventRecord = ImmutableRecord({
+const EventRecord = ImmutableRecord({
   name: '',
   start_time: null as string | null,
   end_time: null as string | null,
@@ -42,7 +42,7 @@ interface Tombstone {
 }
 
 // https://docs.joinmastodon.org/entities/status/
-export const StatusRecord = ImmutableRecord({
+const StatusRecord = ImmutableRecord({
   account: null as unknown as Account,
   accounts: null as ImmutableList<Account> | null,
   application: null as ImmutableMap<string, any> | null,
@@ -282,7 +282,7 @@ const parseGroup = (status: ImmutableMap<string, any>) => {
   }
 };
 
-export const normalizeStatus = (status: Record<string, any>) => StatusRecord(
+const normalizeStatus = (status: Record<string, any>) => StatusRecord(
   ImmutableMap(fromJS(status)).withMutations(status => {
     normalizeAttachments(status);
     normalizeMentions(status);
@@ -304,3 +304,13 @@ export const normalizeStatus = (status: Record<string, any>) => StatusRecord(
     parseGroup(status);
   }),
 );
+
+export {
+  type StatusApprovalStatus,
+  type StatusVisibility,
+  type EventJoinMode,
+  type EventJoinState,
+  EventRecord,
+  StatusRecord,
+  normalizeStatus,
+};
diff --git a/src/normalizers/tag.ts b/src/normalizers/tag.ts
index 85d0f893e..8fdfdc40c 100644
--- a/src/normalizers/tag.ts
+++ b/src/normalizers/tag.ts
@@ -15,7 +15,7 @@ import { normalizeHistory } from './history';
 import type { History } from 'soapbox/types/entities';
 
 // https://docs.joinmastodon.org/entities/tag/
-export const TagRecord = ImmutableRecord({
+const TagRecord = ImmutableRecord({
   name: '',
   url: '',
   history: null as ImmutableList<History> | null,
@@ -30,8 +30,10 @@ const normalizeHistoryList = (tag: ImmutableMap<string, any>) => {
   }
 };
 
-export const normalizeTag = (tag: Record<string, any>) => TagRecord(
+const normalizeTag = (tag: Record<string, any>) => TagRecord(
   ImmutableMap(fromJS(tag)).withMutations(tag => {
     normalizeHistoryList(tag);
   }),
 );
+
+export { TagRecord, normalizeTag };
diff --git a/src/pages/admin-page.tsx b/src/pages/admin-page.tsx
index 3a157733f..90daa9ac2 100644
--- a/src/pages/admin-page.tsx
+++ b/src/pages/admin-page.tsx
@@ -24,4 +24,4 @@ const AdminPage: React.FC<IAdminPage> = ({ children }) => (
   </>
 );
 
-export default AdminPage;
+export { AdminPage as default };
diff --git a/src/pages/chats-page.tsx b/src/pages/chats-page.tsx
index 6a97d08c7..753118373 100644
--- a/src/pages/chats-page.tsx
+++ b/src/pages/chats-page.tsx
@@ -11,4 +11,4 @@ const ChatsPage: React.FC<IChatsPage> = ({ children }) => (
   </div>
 );
 
-export default ChatsPage;
+export { ChatsPage as default };
diff --git a/src/pages/default-page.tsx b/src/pages/default-page.tsx
index dc273d956..391840d9d 100644
--- a/src/pages/default-page.tsx
+++ b/src/pages/default-page.tsx
@@ -45,4 +45,4 @@ const DefaultPage: React.FC<IDefaultPage> = ({ children }) => {
   );
 };
 
-export default DefaultPage;
+export { DefaultPage as default };
diff --git a/src/pages/empty-page.tsx b/src/pages/empty-page.tsx
index 3ace91fc6..93f2a8483 100644
--- a/src/pages/empty-page.tsx
+++ b/src/pages/empty-page.tsx
@@ -16,4 +16,4 @@ const EmptyPage: React.FC<IEmptyPage> = ({ children }) => (
   </>
 );
 
-export default EmptyPage;
+export { EmptyPage as default };
diff --git a/src/pages/event-page.tsx b/src/pages/event-page.tsx
index b5249c744..24fcc8100 100644
--- a/src/pages/event-page.tsx
+++ b/src/pages/event-page.tsx
@@ -96,4 +96,4 @@ const EventPage: React.FC<IEventPage> = ({ params, children }) => {
   );
 };
 
-export default EventPage;
+export { EventPage as default };
diff --git a/src/pages/events-page.tsx b/src/pages/events-page.tsx
index eb31ecca9..710a19913 100644
--- a/src/pages/events-page.tsx
+++ b/src/pages/events-page.tsx
@@ -37,4 +37,4 @@ const EventsPage: React.FC<IEventsPage> = ({ children }) => {
   );
 };
 
-export default EventsPage;
+export { EventsPage as default };
diff --git a/src/pages/group-page.tsx b/src/pages/group-page.tsx
index 3273ec1da..05d47dcd0 100644
--- a/src/pages/group-page.tsx
+++ b/src/pages/group-page.tsx
@@ -169,4 +169,4 @@ const GroupPage: React.FC<IGroupPage> = ({ params, children }) => {
   );
 };
 
-export default GroupPage;
+export { GroupPage as default };
diff --git a/src/pages/groups-page.tsx b/src/pages/groups-page.tsx
index 26db8c562..af75027d1 100644
--- a/src/pages/groups-page.tsx
+++ b/src/pages/groups-page.tsx
@@ -28,4 +28,4 @@ const GroupsPage: React.FC<IGroupsPage> = ({ children }) => (
   </>
 );
 
-export default GroupsPage;
+export { GroupsPage as default };
diff --git a/src/pages/home-page.tsx b/src/pages/home-page.tsx
index 2a9b12217..0fae3b5d6 100644
--- a/src/pages/home-page.tsx
+++ b/src/pages/home-page.tsx
@@ -110,4 +110,4 @@ const HomePage: React.FC<IHomePage> = ({ children }) => {
   );
 };
 
-export default HomePage;
+export { HomePage as default };
diff --git a/src/pages/landing-page.tsx b/src/pages/landing-page.tsx
index e64cbce9a..cd5994aa6 100644
--- a/src/pages/landing-page.tsx
+++ b/src/pages/landing-page.tsx
@@ -41,4 +41,4 @@ const LandingPage: React.FC<ILandingPage> = ({ children }) => {
   );
 };
 
-export default LandingPage;
+export { LandingPage as default };
diff --git a/src/pages/manage-groups-page.tsx b/src/pages/manage-groups-page.tsx
index 1214259a8..1c95514bb 100644
--- a/src/pages/manage-groups-page.tsx
+++ b/src/pages/manage-groups-page.tsx
@@ -23,4 +23,4 @@ const ManageGroupsPage: React.FC<IGroupsPage> = ({ children }) => (
   </>
 );
 
-export default ManageGroupsPage;
+export { ManageGroupsPage as default };
diff --git a/src/pages/profile-page.tsx b/src/pages/profile-page.tsx
index 5a0001e69..9753b3c1d 100644
--- a/src/pages/profile-page.tsx
+++ b/src/pages/profile-page.tsx
@@ -129,4 +129,4 @@ const ProfilePage: React.FC<IProfilePage> = ({ params, children }) => {
   );
 };
 
-export default ProfilePage;
+export { ProfilePage as default };
diff --git a/src/pages/remote-instance-page.tsx b/src/pages/remote-instance-page.tsx
index 0f15624a8..4fe0a2430 100644
--- a/src/pages/remote-instance-page.tsx
+++ b/src/pages/remote-instance-page.tsx
@@ -43,4 +43,4 @@ const RemoteInstancePage: React.FC<IRemoteInstancePage> = ({ children, params })
   );
 };
 
-export default RemoteInstancePage;
+export { RemoteInstancePage as default };
diff --git a/src/pages/search-page.tsx b/src/pages/search-page.tsx
index 041560a0f..3b19e5761 100644
--- a/src/pages/search-page.tsx
+++ b/src/pages/search-page.tsx
@@ -49,4 +49,4 @@ const SearchPage: React.FC<ISearchPage> = ({ children }) => {
   );
 };
 
-export default SearchPage;
+export { SearchPage as default };
diff --git a/src/pages/status-page.tsx b/src/pages/status-page.tsx
index cc184e9de..5464050c8 100644
--- a/src/pages/status-page.tsx
+++ b/src/pages/status-page.tsx
@@ -45,4 +45,4 @@ const StatusPage: React.FC<IStatusPage> = ({ children }) => {
   );
 };
 
-export default StatusPage;
+export { StatusPage as default };
diff --git a/src/queries/accounts.ts b/src/queries/accounts.ts
index 85cd0b639..e282fe7f8 100644
--- a/src/queries/accounts.ts
+++ b/src/queries/accounts.ts
@@ -4,7 +4,7 @@ import { patchMeSuccess } from 'soapbox/actions/me';
 import { useApi, useAppDispatch, useOwnAccount } from 'soapbox/hooks';
 import toast from 'soapbox/toast';
 
-export type IAccount = {
+type IAccount = {
   acct: string;
   avatar: string;
   avatar_static: string;
@@ -59,4 +59,4 @@ const useUpdateCredentials = () => {
   });
 };
 
-export { useUpdateCredentials };
\ No newline at end of file
+export { type IAccount, useUpdateCredentials };
\ No newline at end of file
diff --git a/src/queries/chats.ts b/src/queries/chats.ts
index 639b78733..bbfa5fd4d 100644
--- a/src/queries/chats.ts
+++ b/src/queries/chats.ts
@@ -16,7 +16,7 @@ import { useFetchRelationships } from './relationships';
 
 import type { Account } from 'soapbox/schemas';
 
-export interface IChat {
+interface IChat {
   account: Account;
   created_at: string;
   id: string;
@@ -278,4 +278,4 @@ const useChatActions = (chatId: string) => {
   };
 };
 
-export { ChatKeys, useChat, useChatActions, useChats, useChatMessages };
+export { type IChat, ChatKeys, useChat, useChatActions, useChats, useChatMessages };
diff --git a/src/queries/embed.ts b/src/queries/embed.ts
index 82fc84df4..246f46ec4 100644
--- a/src/queries/embed.ts
+++ b/src/queries/embed.ts
@@ -32,4 +32,4 @@ const useEmbed = (url: string) => {
   });
 };
 
-export default useEmbed;
+export { useEmbed as default };
diff --git a/src/queries/search.ts b/src/queries/search.ts
index 577a7b38e..6188d8f17 100644
--- a/src/queries/search.ts
+++ b/src/queries/search.ts
@@ -53,4 +53,4 @@ const useAccountSearch = (q: string) => {
   };
 };
 
-export default useAccountSearch;
+export { useAccountSearch as default };
diff --git a/src/queries/trends.ts b/src/queries/trends.ts
index 12e639ec7..ffaa7bcab 100644
--- a/src/queries/trends.ts
+++ b/src/queries/trends.ts
@@ -29,4 +29,4 @@ const useTrends = () => {
   return result;
 };
 
-export default useTrends;
+export { useTrends as default };
diff --git a/src/ready.ts b/src/ready.ts
index 7c9339a8d..0887ac806 100644
--- a/src/ready.ts
+++ b/src/ready.ts
@@ -6,4 +6,4 @@ const ready = (loaded: () => void): void => {
   }
 };
 
-export default ready;
\ No newline at end of file
+export { ready as default };
\ No newline at end of file
diff --git a/src/reducers/accounts-meta.ts b/src/reducers/accounts-meta.ts
index 8c8ec1c12..828fd5c3d 100644
--- a/src/reducers/accounts-meta.ts
+++ b/src/reducers/accounts-meta.ts
@@ -50,4 +50,4 @@ const accounts_meta = (state: Readonly<State> = {}, action: AnyAction): State =>
   }
 };
 
-export default accounts_meta;
+export { accounts_meta as default };
diff --git a/src/reducers/accounts.ts b/src/reducers/accounts.ts
index 4cc5f4212..65d9a661a 100644
--- a/src/reducers/accounts.ts
+++ b/src/reducers/accounts.ts
@@ -38,7 +38,7 @@ import type { APIEntity } from 'soapbox/types/entities';
 type AccountRecord = ReturnType<typeof normalizeAccount>;
 type AccountMap = ImmutableMap<string, any>;
 
-export interface ReducerAccount extends AccountRecord {
+interface ReducerAccount extends AccountRecord {
   moved: string | null;
 }
 
@@ -246,4 +246,7 @@ const accounts = (state: State = initialState, action: AnyAction): State => {
   }
 };
 
-export default accounts;
+export {
+  type ReducerAccount,
+  accounts as default,
+};
diff --git a/src/reducers/admin-user-index.ts b/src/reducers/admin-user-index.ts
index 3bf3b5660..d9983bead 100644
--- a/src/reducers/admin-user-index.ts
+++ b/src/reducers/admin-user-index.ts
@@ -67,4 +67,4 @@ const admin_user_index = (state: State = ReducerRecord(), action: AnyAction): St
   }
 };
 
-export default admin_user_index;
+export { admin_user_index as default };
diff --git a/src/reducers/admin.ts b/src/reducers/admin.ts
index 2dbac74be..c359f7c7e 100644
--- a/src/reducers/admin.ts
+++ b/src/reducers/admin.ts
@@ -42,11 +42,11 @@ type State = ReturnType<typeof ReducerRecord>;
 type AdminAccountRecord = ReturnType<typeof normalizeAdminAccount>;
 type AdminReportRecord = ReturnType<typeof normalizeAdminReport>;
 
-export interface ReducerAdminAccount extends AdminAccountRecord {
+interface ReducerAdminAccount extends AdminAccountRecord {
   account: string | null;
 }
 
-export interface ReducerAdminReport extends AdminReportRecord {
+interface ReducerAdminReport extends AdminReportRecord {
   account: string | null;
   target_account: string | null;
   action_taken_by_account: string | null;
@@ -204,4 +204,8 @@ const admin = (state: State = ReducerRecord(), action: AnyAction): State => {
   }
 };
 
-export default admin;
+export {
+  type ReducerAdminAccount,
+  type ReducerAdminReport,
+  admin as default,
+};
diff --git a/src/reducers/aliases.ts b/src/reducers/aliases.ts
index 4aef5f753..f84e3f609 100644
--- a/src/reducers/aliases.ts
+++ b/src/reducers/aliases.ts
@@ -46,4 +46,4 @@ const aliasesReducer = (state = ReducerRecord(), action: AnyAction) => {
   }
 };
 
-export default aliasesReducer;
+export { aliasesReducer as default };
diff --git a/src/reducers/auth.ts b/src/reducers/auth.ts
index 9b9a3cd00..ea7413253 100644
--- a/src/reducers/auth.ts
+++ b/src/reducers/auth.ts
@@ -20,7 +20,7 @@ import { ME_FETCH_SKIP } from '../actions/me';
 import type { AnyAction } from 'redux';
 import type { APIEntity, Account as AccountEntity } from 'soapbox/types/entities';
 
-export const AuthAppRecord = ImmutableRecord({
+const AuthAppRecord = ImmutableRecord({
   access_token: null as string | null,
   client_id: null as string | null,
   client_secret: null as string | null,
@@ -32,7 +32,7 @@ export const AuthAppRecord = ImmutableRecord({
   website: null as string | null,
 });
 
-export const AuthTokenRecord = ImmutableRecord({
+const AuthTokenRecord = ImmutableRecord({
   access_token: '',
   account: null as string | null,
   created_at: 0,
@@ -44,13 +44,13 @@ export const AuthTokenRecord = ImmutableRecord({
   token_type: '',
 });
 
-export const AuthUserRecord = ImmutableRecord({
+const AuthUserRecord = ImmutableRecord({
   access_token: '',
   id: '',
   url: '',
 });
 
-export const ReducerRecord = ImmutableRecord({
+const ReducerRecord = ImmutableRecord({
   app: AuthAppRecord(),
   tokens: ImmutableMap<string, AuthToken>(),
   users: ImmutableMap<string, AuthUser>(),
@@ -88,7 +88,7 @@ const getLocalState = () => {
 };
 
 const sessionUser = getSessionUser();
-export const localState = getLocalState();fromJS(JSON.parse(localStorage.getItem(STORAGE_KEY)!));
+const localState = getLocalState();fromJS(JSON.parse(localStorage.getItem(STORAGE_KEY)!));
 
 // Checks if the user has an ID and access token
 const validUser = (user?: AuthUser) => {
@@ -368,4 +368,11 @@ const auth = (oldState: State = initialState, action: AnyAction) => {
   return state;
 };
 
-export default auth;
+export {
+  AuthAppRecord,
+  AuthTokenRecord,
+  AuthUserRecord,
+  ReducerRecord,
+  localState,
+  auth as default,
+};
diff --git a/src/reducers/backups.tsx b/src/reducers/backups.tsx
index 286d63ec2..6016468b7 100644
--- a/src/reducers/backups.tsx
+++ b/src/reducers/backups.tsx
@@ -8,7 +8,7 @@ import {
 import type { AnyAction } from 'redux';
 import type { APIEntity } from 'soapbox/types/entities';
 
-export const BackupRecord = ImmutableRecord({
+const BackupRecord = ImmutableRecord({
   id: null as number | null,
   content_type: '',
   url: '',
@@ -17,7 +17,7 @@ export const BackupRecord = ImmutableRecord({
   inserted_at: '',
 });
 
-export type Backup = ReturnType<typeof BackupRecord>;
+type Backup = ReturnType<typeof BackupRecord>;
 type State = ImmutableMap<string, Backup>;
 
 const initialState: State = ImmutableMap();
@@ -38,4 +38,8 @@ const backups = (state = initialState, action: AnyAction) => {
   }
 };
 
-export default backups;
+export {
+  BackupRecord,
+  type Backup,
+  backups as default,
+};
diff --git a/src/reducers/compose-event.ts b/src/reducers/compose-event.ts
index ed887c7f3..f7ebc53d3 100644
--- a/src/reducers/compose-event.ts
+++ b/src/reducers/compose-event.ts
@@ -27,7 +27,7 @@ import type {
   Location as LocationEntity,
 } from 'soapbox/types/entities';
 
-export const ReducerRecord = ImmutableRecord({
+const ReducerRecord = ImmutableRecord({
   name: '',
   status: '',
   location: null as LocationEntity | null,
@@ -106,4 +106,7 @@ const compose_event = (state = ReducerRecord(), action: AnyAction): State => {
   }
 };
 
-export default compose_event;
+export {
+  ReducerRecord,
+  compose_event as default,
+};
diff --git a/src/reducers/compose.ts b/src/reducers/compose.ts
index 1583c085e..75fcad4a2 100644
--- a/src/reducers/compose.ts
+++ b/src/reducers/compose.ts
@@ -80,7 +80,7 @@ const PollRecord = ImmutableRecord({
   multiple: false,
 });
 
-export const ReducerCompose = ImmutableRecord({
+const ReducerCompose = ImmutableRecord({
   caretPosition: null as number | null,
   content_type: 'text/plain',
   draft_id: null as string | null,
@@ -114,7 +114,7 @@ export const ReducerCompose = ImmutableRecord({
 });
 
 type State = ImmutableMap<string, Compose>;
-export type Compose = ReturnType<typeof ReducerCompose>;
+type Compose = ReturnType<typeof ReducerCompose>;
 type Poll = ReturnType<typeof PollRecord>;
 
 const statusToTextMentions = (status: Status, account: Account) => {
@@ -128,7 +128,7 @@ const statusToTextMentions = (status: Status, account: Account) => {
     .join('');
 };
 
-export const statusToMentionsArray = (status: Status, account: Account, rebloggedBy?: Account) => {
+const statusToMentionsArray = (status: Status, account: Account, rebloggedBy?: Account) => {
   const author = status.getIn(['account', 'acct']) as string;
   const mentions = status.get('mentions')?.map((m) => m.acct) || [];
 
@@ -138,7 +138,7 @@ export const statusToMentionsArray = (status: Status, account: Account, reblogge
     .delete(account.acct) as ImmutableOrderedSet<string>;
 };
 
-export const statusToMentionsAccountIdsArray = (status: StatusEntity, account: Account, parentRebloggedBy?: string | null) => {
+const statusToMentionsAccountIdsArray = (status: StatusEntity, account: Account, parentRebloggedBy?: string | null) => {
   const mentions = status.mentions.map((m) => m.id);
 
   return ImmutableOrderedSet<string>([status.account.id])
@@ -275,7 +275,7 @@ const updateSetting = (compose: Compose, path: string[], value: string) => {
 const updateCompose = (state: State, key: string, updater: (compose: Compose) => Compose) =>
   state.update(key, state.get('default')!, updater);
 
-export const initialState: State = ImmutableMap({
+const initialState: State = ImmutableMap({
   default: ReducerCompose({ idempotencyKey: uuid(), resetFileKey: getResetFileKey() }),
 });
 
@@ -554,4 +554,11 @@ const compose = (state = initialState, action: ComposeAction | EventsAction | Me
   }
 };
 
-export default compose;
+export {
+  ReducerCompose,
+  type Compose,
+  statusToMentionsArray,
+  statusToMentionsAccountIdsArray,
+  initialState,
+  compose as default,
+};
diff --git a/src/reducers/contexts.ts b/src/reducers/contexts.ts
index 0eb40bb6d..55b2c7b07 100644
--- a/src/reducers/contexts.ts
+++ b/src/reducers/contexts.ts
@@ -20,7 +20,7 @@ import { TIMELINE_DELETE } from '../actions/timelines';
 import type { AnyAction } from 'redux';
 import type { Status } from 'soapbox/schemas';
 
-export const ReducerRecord = ImmutableRecord({
+const ReducerRecord = ImmutableRecord({
   inReplyTos: ImmutableMap<string, string>(),
   replies: ImmutableMap<string, ImmutableOrderedSet<string>>(),
 });
@@ -216,4 +216,7 @@ const replies = (state = ReducerRecord(), action: AnyAction) => {
   }
 };
 
-export default replies;
+export {
+  ReducerRecord,
+  replies as default,
+};
diff --git a/src/reducers/conversations.ts b/src/reducers/conversations.ts
index a2a3754cc..ae010a272 100644
--- a/src/reducers/conversations.ts
+++ b/src/reducers/conversations.ts
@@ -117,4 +117,4 @@ const conversations = (state = ReducerRecord(), action: AnyAction) => {
   }
 };
 
-export default conversations;
+export { conversations as default };
diff --git a/src/reducers/custom-emojis.ts b/src/reducers/custom-emojis.ts
index c17cf2335..a624889e7 100644
--- a/src/reducers/custom-emojis.ts
+++ b/src/reducers/custom-emojis.ts
@@ -37,4 +37,4 @@ const custom_emojis = (state = initialState, action: AnyAction) => {
   return state;
 };
 
-export default custom_emojis;
+export { custom_emojis as default };
diff --git a/src/reducers/domain-lists.ts b/src/reducers/domain-lists.ts
index 15ad7e76d..dd3234465 100644
--- a/src/reducers/domain-lists.ts
+++ b/src/reducers/domain-lists.ts
@@ -32,4 +32,4 @@ const domainLists = (state: State = ReducerRecord(), action: AnyAction) => {
   }
 };
 
-export default domainLists;
+export { domainLists as default };
diff --git a/src/reducers/draft-statuses.ts b/src/reducers/draft-statuses.ts
index 17c94aff5..7d6c3ede5 100644
--- a/src/reducers/draft-statuses.ts
+++ b/src/reducers/draft-statuses.ts
@@ -26,7 +26,7 @@ const DraftStatusRecord = ImmutableRecord({
   to: ImmutableOrderedSet<string>(),
 });
 
-export type DraftStatus = ReturnType<typeof DraftStatusRecord>;
+type DraftStatus = ReturnType<typeof DraftStatusRecord>;
 type State = ImmutableMap<string, DraftStatus>;
 
 const initialState: State = ImmutableMap();
@@ -62,4 +62,7 @@ const scheduled_statuses = (state: State = initialState, action: AnyAction) => {
   }
 };
 
-export default scheduled_statuses;
+export {
+  type DraftStatus,
+  scheduled_statuses as default,
+};
diff --git a/src/reducers/dropdown-menu.ts b/src/reducers/dropdown-menu.ts
index 33de7efe9..47d1d5b28 100644
--- a/src/reducers/dropdown-menu.ts
+++ b/src/reducers/dropdown-menu.ts
@@ -24,4 +24,4 @@ const dropdownMenu = (state: State = ReducerRecord(), action: AnyAction) => {
   }
 };
 
-export default dropdownMenu;
+export { dropdownMenu as default };
diff --git a/src/reducers/filters.ts b/src/reducers/filters.ts
index 37cffd399..ff0d64e4e 100644
--- a/src/reducers/filters.ts
+++ b/src/reducers/filters.ts
@@ -21,4 +21,4 @@ const filters = (state: State = ImmutableList(), action: AnyAction): State => {
   }
 };
 
-export default filters;
+export { filters as default };
diff --git a/src/reducers/followed-tags.ts b/src/reducers/followed-tags.ts
index 952e679a9..2246d84c8 100644
--- a/src/reducers/followed-tags.ts
+++ b/src/reducers/followed-tags.ts
@@ -46,4 +46,4 @@ const followed_tags = (state = ReducerRecord(), action: AnyAction) => {
   }
 };
 
-export default followed_tags;
+export { followed_tags as default };
diff --git a/src/reducers/history.ts b/src/reducers/history.ts
index 5b771a87e..2f72b399a 100644
--- a/src/reducers/history.ts
+++ b/src/reducers/history.ts
@@ -35,4 +35,4 @@ const history = (state: State = initialState, action: AnyAction) => {
   }
 };
 
-export default history;
\ No newline at end of file
+export { history as default };
\ No newline at end of file
diff --git a/src/reducers/index.ts b/src/reducers/index.ts
index 7d92534b6..f2f91e430 100644
--- a/src/reducers/index.ts
+++ b/src/reducers/index.ts
@@ -109,7 +109,7 @@ const reducers = {
 };
 
 // Build a default state from all reducers: it has the key and `undefined`
-export const StateRecord = ImmutableRecord(
+const StateRecord = ImmutableRecord(
   Object.keys(reducers).reduce((params: Record<string, any>, reducer) => {
     params[reducer] = undefined;
     return params;
@@ -143,4 +143,7 @@ const rootReducer: typeof appReducer = (state, action) => {
   }
 };
 
-export default rootReducer;
+export {
+  StateRecord,
+  rootReducer as default,
+};
diff --git a/src/reducers/instance.ts b/src/reducers/instance.ts
index d79fefb37..b3b471f11 100644
--- a/src/reducers/instance.ts
+++ b/src/reducers/instance.ts
@@ -5,7 +5,7 @@ import { ADMIN_CONFIG_UPDATE_REQUEST, ADMIN_CONFIG_UPDATE_SUCCESS } from 'soapbo
 import { PLEROMA_PRELOAD_IMPORT } from 'soapbox/actions/preload';
 import { type Instance, instanceSchema } from 'soapbox/schemas';
 import KVStore from 'soapbox/storage/kv-store';
-import { ConfigDB } from 'soapbox/utils/config-db';
+import ConfigDB from 'soapbox/utils/config-db';
 
 import {
   fetchInstance,
@@ -123,4 +123,4 @@ const instance = (state = initialState, action: AnyAction) => {
   }
 };
 
-export default instance;
+export { instance as default };
diff --git a/src/reducers/list-adder.ts b/src/reducers/list-adder.ts
index d29f999f7..7716f4db0 100644
--- a/src/reducers/list-adder.ts
+++ b/src/reducers/list-adder.ts
@@ -53,4 +53,4 @@ const listAdderReducer = (state: State = ReducerRecord(), action: AnyAction) =>
   }
 };
 
-export default listAdderReducer;
+export { listAdderReducer as default };
diff --git a/src/reducers/list-editor.ts b/src/reducers/list-editor.ts
index c4e7556f6..9dbdcb99e 100644
--- a/src/reducers/list-editor.ts
+++ b/src/reducers/list-editor.ts
@@ -104,4 +104,4 @@ const listEditorReducer = (state: State = ReducerRecord(), action: AnyAction) =>
   }
 };
 
-export default listEditorReducer;
+export { listEditorReducer as default };
diff --git a/src/reducers/lists.ts b/src/reducers/lists.ts
index 5fbb2200a..66f8fb76d 100644
--- a/src/reducers/lists.ts
+++ b/src/reducers/lists.ts
@@ -46,4 +46,4 @@ const lists = (state: State = initialState, action: AnyAction) => {
   }
 };
 
-export default lists;
+export { lists as default };
diff --git a/src/reducers/locations.ts b/src/reducers/locations.ts
index 8f5548e22..a12f823ca 100644
--- a/src/reducers/locations.ts
+++ b/src/reducers/locations.ts
@@ -26,4 +26,4 @@ const locations = (state: State = initialState, action: AnyAction): State => {
   }
 };
 
-export default locations;
+export { locations as default };
diff --git a/src/reducers/me.ts b/src/reducers/me.ts
index 1941c6d8b..e0fee28a6 100644
--- a/src/reducers/me.ts
+++ b/src/reducers/me.ts
@@ -41,4 +41,4 @@ const me = (state: Me = initialState, action: AnyAction): Me => {
   }
 };
 
-export default me;
+export { me as default };
diff --git a/src/reducers/meta.ts b/src/reducers/meta.ts
index 4df569104..a2e46340c 100644
--- a/src/reducers/meta.ts
+++ b/src/reducers/meta.ts
@@ -26,4 +26,4 @@ const meta = (state = ReducerRecord(), action: AnyAction) => {
   }
 };
 
-export default meta;
+export { meta as default };
diff --git a/src/reducers/modals.ts b/src/reducers/modals.ts
index 769d3bc5c..b30675cdc 100644
--- a/src/reducers/modals.ts
+++ b/src/reducers/modals.ts
@@ -32,4 +32,4 @@ const modal = (state: State = ImmutableList<Modal>(), action: AnyAction) => {
   }
 };
 
-export default modal;
+export { modal as default };
diff --git a/src/reducers/mutes.ts b/src/reducers/mutes.ts
index 6289d5d51..7e0e9e0f9 100644
--- a/src/reducers/mutes.ts
+++ b/src/reducers/mutes.ts
@@ -38,4 +38,4 @@ const mutes = (state: State = ReducerRecord(), action: AnyAction) => {
   }
 };
 
-export default mutes;
+export { mutes as default };
diff --git a/src/reducers/notifications.ts b/src/reducers/notifications.ts
index e5ed3fe0d..5c65311da 100644
--- a/src/reducers/notifications.ts
+++ b/src/reducers/notifications.ts
@@ -124,7 +124,7 @@ const importNotification = (state: State, notification: APIEntity) => {
   });
 };
 
-export const processRawNotifications = (notifications: APIEntity[]) => (
+const processRawNotifications = (notifications: APIEntity[]) => (
   ImmutableOrderedMap(
     notifications
       .map(normalizeNotification)
@@ -241,4 +241,7 @@ const notifications = (state: State = ReducerRecord(), action: AnyAction) => {
   }
 };
 
-export default notifications;
+export {
+  processRawNotifications,
+  notifications as default,
+};
diff --git a/src/reducers/onboarding.ts b/src/reducers/onboarding.ts
index 93112e182..d3fd3e360 100644
--- a/src/reducers/onboarding.ts
+++ b/src/reducers/onboarding.ts
@@ -21,4 +21,4 @@ const onboarding = (state: OnboardingState = initialState, action: OnboardingAct
   }
 };
 
-export default onboarding;
+export { onboarding as default };
diff --git a/src/reducers/pending-statuses.ts b/src/reducers/pending-statuses.ts
index 2bb128856..1971edfe7 100644
--- a/src/reducers/pending-statuses.ts
+++ b/src/reducers/pending-statuses.ts
@@ -22,7 +22,7 @@ const PendingStatusRecord = ImmutableRecord({
   visibility: 'public' as StatusVisibility,
 });
 
-export type PendingStatus = ReturnType<typeof PendingStatusRecord>;
+type PendingStatus = ReturnType<typeof PendingStatusRecord>;
 type State = ImmutableMap<string, PendingStatus>;
 
 const initialState: State = ImmutableMap();
@@ -44,4 +44,7 @@ const pending_statuses = (state = initialState, action: AnyAction) => {
   }
 };
 
-export default pending_statuses;
+export {
+  type PendingStatus,
+  pending_statuses as default,
+};
diff --git a/src/reducers/polls.ts b/src/reducers/polls.ts
index 17e7dbad0..50e94e05f 100644
--- a/src/reducers/polls.ts
+++ b/src/reducers/polls.ts
@@ -37,4 +37,4 @@ const polls = (state: State = initialState, action: AnyAction): State => {
   }
 };
 
-export default polls;
+export { polls as default };
diff --git a/src/reducers/profile-hover-card.ts b/src/reducers/profile-hover-card.ts
index 402fdf7d2..60b27b039 100644
--- a/src/reducers/profile-hover-card.ts
+++ b/src/reducers/profile-hover-card.ts
@@ -35,4 +35,4 @@ const profileHoverCard = (state: State = ReducerRecord(), action: AnyAction) =>
   }
 };
 
-export default profileHoverCard;
+export { profileHoverCard as default };
diff --git a/src/reducers/push-notifications.ts b/src/reducers/push-notifications.ts
index 0e500f666..35e2511f7 100644
--- a/src/reducers/push-notifications.ts
+++ b/src/reducers/push-notifications.ts
@@ -46,4 +46,4 @@ const push_subscriptions = (state = ReducerRecord(), action: AnyAction) => {
   }
 };
 
-export default push_subscriptions;
+export { push_subscriptions as default };
diff --git a/src/reducers/relationships.ts b/src/reducers/relationships.ts
index 89808bedb..fce2e1f64 100644
--- a/src/reducers/relationships.ts
+++ b/src/reducers/relationships.ts
@@ -93,4 +93,4 @@ const relationships = (state: State = ImmutableMap<string, Relationship>(), acti
   }
 };
 
-export default relationships;
+export { relationships as default };
diff --git a/src/reducers/reports.ts b/src/reducers/reports.ts
index 2ba7190da..32417126b 100644
--- a/src/reducers/reports.ts
+++ b/src/reducers/reports.ts
@@ -101,4 +101,4 @@ const reports = (state: State = ReducerRecord(), action: AnyAction) => {
   }
 };
 
-export default reports;
+export { reports as default };
diff --git a/src/reducers/scheduled-statuses.ts b/src/reducers/scheduled-statuses.ts
index 0c5e45274..cc99cdd47 100644
--- a/src/reducers/scheduled-statuses.ts
+++ b/src/reducers/scheduled-statuses.ts
@@ -25,7 +25,7 @@ const ScheduledStatusRecord = ImmutableRecord({
   poll: null as ImmutableMap<string, any> | null,
 });
 
-export type ScheduledStatus = ReturnType<typeof ScheduledStatusRecord>;
+type ScheduledStatus = ReturnType<typeof ScheduledStatusRecord>;
 type State = ImmutableMap<string, ScheduledStatus>;
 
 const initialState: State = ImmutableMap();
@@ -56,4 +56,7 @@ const scheduled_statuses = (state: State = initialState, action: AnyAction) => {
   }
 };
 
-export default scheduled_statuses;
+export {
+  ScheduledStatus,
+  scheduled_statuses as default,
+};
diff --git a/src/reducers/search.ts b/src/reducers/search.ts
index 0f218c6d4..2148308e7 100644
--- a/src/reducers/search.ts
+++ b/src/reducers/search.ts
@@ -52,7 +52,7 @@ const ReducerRecord = ImmutableRecord({
 
 type State = ReturnType<typeof ReducerRecord>;
 type APIEntities = Array<APIEntity>;
-export type SearchFilter = 'accounts' | 'statuses' | 'groups' | 'hashtags';
+type SearchFilter = 'accounts' | 'statuses' | 'groups' | 'hashtags';
 
 const toIds = (items: APIEntities = []) => ImmutableOrderedSet(items.map(item => item.id));
 
@@ -148,4 +148,7 @@ const search = (state = ReducerRecord(), action: AnyAction) => {
   }
 };
 
-export default search;
+export {
+  type SearchFilter,
+  search as default,
+};
diff --git a/src/reducers/security.ts b/src/reducers/security.ts
index 8edb0538d..37a200f40 100644
--- a/src/reducers/security.ts
+++ b/src/reducers/security.ts
@@ -29,7 +29,7 @@ const ReducerRecord = ImmutableRecord({
 
 type State = ReturnType<typeof ReducerRecord>;
 
-export type Token = ReturnType<typeof TokenRecord>;
+type Token = ReturnType<typeof TokenRecord>;
 
 const deleteToken = (state: State, tokenId: number) => state.update('tokens', tokens => tokens.filterNot(token => token.id === tokenId));
 
@@ -56,4 +56,7 @@ const security = (state = ReducerRecord(), action: AnyAction) => {
   }
 };
 
-export default security;
+export {
+  type Token,
+  security as default,
+};
diff --git a/src/reducers/settings.ts b/src/reducers/settings.ts
index 922925f60..f92de981d 100644
--- a/src/reducers/settings.ts
+++ b/src/reducers/settings.ts
@@ -54,4 +54,4 @@ const settings = (
   }
 };
 
-export default settings;
+export { settings as default };
diff --git a/src/reducers/sidebar.ts b/src/reducers/sidebar.ts
index 6dd4f5173..fc180087b 100644
--- a/src/reducers/sidebar.ts
+++ b/src/reducers/sidebar.ts
@@ -21,4 +21,4 @@ const sidebar = (state: State = initialState, action: AnyAction): State => {
   }
 };
 
-export default sidebar;
+export { sidebar as default };
diff --git a/src/reducers/soapbox.ts b/src/reducers/soapbox.ts
index 3121a6aec..f2ac74893 100644
--- a/src/reducers/soapbox.ts
+++ b/src/reducers/soapbox.ts
@@ -2,7 +2,7 @@ import { List as ImmutableList, Map as ImmutableMap, fromJS } from 'immutable';
 
 import { PLEROMA_PRELOAD_IMPORT } from 'soapbox/actions/preload';
 import KVStore from 'soapbox/storage/kv-store';
-import { ConfigDB } from 'soapbox/utils/config-db';
+import ConfigDB from 'soapbox/utils/config-db';
 
 import { ADMIN_CONFIG_UPDATE_SUCCESS } from '../actions/admin';
 import {
@@ -68,4 +68,4 @@ const soapbox = (state = initialState, action: Record<string, any>) => {
   }
 };
 
-export default soapbox;
+export { soapbox as default };
diff --git a/src/reducers/status-hover-card.ts b/src/reducers/status-hover-card.ts
index 2007840e7..7aae664dd 100644
--- a/src/reducers/status-hover-card.ts
+++ b/src/reducers/status-hover-card.ts
@@ -8,7 +8,7 @@ import {
 
 import type { AnyAction } from 'redux';
 
-export const ReducerRecord = ImmutableRecord({
+const ReducerRecord = ImmutableRecord({
   ref: null as React.MutableRefObject<HTMLDivElement> | null,
   statusId: '',
   hovered: false,
@@ -35,4 +35,7 @@ const statusHoverCard = (state: State = ReducerRecord(), action: AnyAction) => {
   }
 };
 
-export default statusHoverCard;
+export {
+  ReducerRecord,
+  statusHoverCard as default,
+};
diff --git a/src/reducers/status-lists.ts b/src/reducers/status-lists.ts
index 3ab59a408..c04b0ec05 100644
--- a/src/reducers/status-lists.ts
+++ b/src/reducers/status-lists.ts
@@ -69,7 +69,7 @@ import {
 import type { AnyAction } from 'redux';
 import type { APIEntity, Status as StatusEntity } from 'soapbox/types/entities';
 
-export const StatusListRecord = ImmutableRecord({
+const StatusListRecord = ImmutableRecord({
   next: null as string | null,
   loaded: false,
   isLoading: null as boolean | null,
@@ -238,4 +238,7 @@ const statusLists = (state = initialState, action: AnyAction) => {
   }
 };
 
-export default statusLists;
+export {
+  StatusListRecord,
+  statusLists as default,
+};
diff --git a/src/reducers/statuses.ts b/src/reducers/statuses.ts
index a0c56f42e..48d0bb384 100644
--- a/src/reducers/statuses.ts
+++ b/src/reducers/statuses.ts
@@ -56,7 +56,7 @@ type APIEntities = Array<APIEntity>;
 
 type State = ImmutableMap<string, ReducerStatus>;
 
-export interface ReducerStatus extends StatusRecord {
+interface ReducerStatus extends StatusRecord {
   reblog: string | null;
   poll: string | null;
   quote: string | null;
@@ -97,7 +97,7 @@ const buildSearchContent = (status: StatusRecord): string => {
 
 // Only calculate these values when status first encountered
 // Otherwise keep the ones already in the reducer
-export const calculateStatus = (
+const calculateStatus = (
   status: StatusRecord,
   oldStatus?: StatusRecord,
 ): StatusRecord => {
@@ -332,4 +332,8 @@ const statuses = (state = initialState, action: AnyAction): State => {
   }
 };
 
-export default statuses;
+export {
+  type ReducerStatus,
+  calculateStatus,
+  statuses as default,
+};
diff --git a/src/reducers/suggestions.ts b/src/reducers/suggestions.ts
index c5882e924..72e21849b 100644
--- a/src/reducers/suggestions.ts
+++ b/src/reducers/suggestions.ts
@@ -79,4 +79,4 @@ const suggestionsReducer = (state: State = ReducerRecord(), action: AnyAction) =
   }
 };
 
-export default suggestionsReducer;
+export { suggestionsReducer as default };
diff --git a/src/reducers/tags.ts b/src/reducers/tags.ts
index 9f1cb124a..a7e568a72 100644
--- a/src/reducers/tags.ts
+++ b/src/reducers/tags.ts
@@ -29,4 +29,4 @@ const tags = (state = initialState, action: AnyAction) => {
   }
 };
 
-export default tags;
+export { tags as default };
diff --git a/src/reducers/timelines.ts b/src/reducers/timelines.ts
index 45c823ae7..99c5f99fa 100644
--- a/src/reducers/timelines.ts
+++ b/src/reducers/timelines.ts
@@ -372,4 +372,4 @@ const timelines = (state: State = initialState, action: AnyAction) => {
   }
 };
 
-export default timelines;
+export { timelines as default };
diff --git a/src/reducers/trending-statuses.ts b/src/reducers/trending-statuses.ts
index dcc59cc9e..88dca6686 100644
--- a/src/reducers/trending-statuses.ts
+++ b/src/reducers/trending-statuses.ts
@@ -35,4 +35,4 @@ const trending_statuses = (state: State = ReducerRecord(), action: AnyAction) =>
   }
 };
 
-export default trending_statuses;
+export { trending_statuses as default };
diff --git a/src/reducers/trends.ts b/src/reducers/trends.ts
index 19d0c0369..fd1b38580 100644
--- a/src/reducers/trends.ts
+++ b/src/reducers/trends.ts
@@ -34,4 +34,4 @@ const trendsReducer = (state: State = ReducerRecord(), action: AnyAction) => {
   }
 };
 
-export default trendsReducer;
+export { trendsReducer as default };
diff --git a/src/reducers/user-lists.ts b/src/reducers/user-lists.ts
index 3168ebcba..e15762930 100644
--- a/src/reducers/user-lists.ts
+++ b/src/reducers/user-lists.ts
@@ -56,13 +56,13 @@ import {
 
 import type { APIEntity } from 'soapbox/types/entities';
 
-export const ListRecord = ImmutableRecord({
+const ListRecord = ImmutableRecord({
   next: null as string | null,
   items: ImmutableOrderedSet<string>(),
   isLoading: false,
 });
 
-export const ReactionRecord = ImmutableRecord({
+const ReactionRecord = ImmutableRecord({
   accounts: ImmutableOrderedSet<string>(),
   count: 0,
   name: '',
@@ -75,7 +75,7 @@ const ReactionListRecord = ImmutableRecord({
   isLoading: false,
 });
 
-export const ParticipationRequestRecord = ImmutableRecord({
+const ParticipationRequestRecord = ImmutableRecord({
   account: '',
   participation_message: null as string | null,
 });
@@ -86,7 +86,7 @@ const ParticipationRequestListRecord = ImmutableRecord({
   isLoading: false,
 });
 
-export const ReducerRecord = ImmutableRecord({
+const ReducerRecord = ImmutableRecord({
   followers: ImmutableMap<string, List>(),
   following: ImmutableMap<string, List>(),
   reblogged_by: ImmutableMap<string, List>(),
@@ -106,7 +106,7 @@ export const ReducerRecord = ImmutableRecord({
 });
 
 type State = ReturnType<typeof ReducerRecord>;
-export type List = ReturnType<typeof ListRecord>;
+type List = ReturnType<typeof ListRecord>;
 type Reaction = ReturnType<typeof ReactionRecord>;
 type ReactionList = ReturnType<typeof ReactionListRecord>;
 type ParticipationRequest = ReturnType<typeof ParticipationRequestRecord>;
@@ -230,4 +230,11 @@ const userLists = (state = ReducerRecord(), action: AnyAction) => {
   }
 };
 
-export default userLists;
+export {
+  ListRecord,
+  type List,
+  ReactionRecord,
+  ParticipationRequest,
+  ReducerRecord,
+  userLists as default,
+};
diff --git a/src/selectors/index.ts b/src/selectors/index.ts
index 7df148ebe..8a603516a 100644
--- a/src/selectors/index.ts
+++ b/src/selectors/index.ts
@@ -270,7 +270,7 @@ const getRemoteInstanceFavicon = (state: RootState, host: string) => {
   return account?.pleroma?.favicon;
 };
 
-export type HostFederation = {
+type HostFederation = {
   [key in keyof MRFSimple]: boolean;
 };
 
@@ -298,7 +298,7 @@ const RemoteInstanceRecord = ImmutableRecord({
   federation: null as unknown as HostFederation,
 });
 
-export type RemoteInstance = ReturnType<typeof RemoteInstanceRecord>;
+type RemoteInstance = ReturnType<typeof RemoteInstanceRecord>;
 
 const makeGetRemoteInstance = () =>
   createSelector([
@@ -327,6 +327,8 @@ const makeGetStatusIds = () => createSelector([
 );
 
 export {
+  type HostFederation,
+  type RemoteInstance,
   selectAccount,
   selectAccounts,
   selectOwnAccount,
diff --git a/src/settings.ts b/src/settings.ts
index db00490da..2bdfd0904 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -1,4 +1,4 @@
-export default class Settings {
+class Settings {
 
   keyBase: string | null = null;
 
@@ -55,4 +55,5 @@ const tagHistory = new Settings('soapbox_tag_history');
 export {
   pushNotificationsSetting,
   tagHistory,
+  Settings as default,
 };
diff --git a/src/toast.tsx b/src/toast.tsx
index 3c2c9092e..d6956cc12 100644
--- a/src/toast.tsx
+++ b/src/toast.tsx
@@ -5,10 +5,10 @@ import { defineMessages, MessageDescriptor } from 'react-intl';
 import { Toast } from './components/ui';
 import { httpErrorMessages } from './utils/errors';
 
-export type ToastText = string | MessageDescriptor
-export type ToastType = 'success' | 'error' | 'info'
+type ToastText = string | MessageDescriptor
+type ToastType = 'success' | 'error' | 'info'
 
-export interface IToastOptions {
+interface IToastOptions {
   action?(): void;
   actionLink?: string;
   actionLabel?: ToastText;
@@ -71,9 +71,15 @@ const showAlertForError = (networkError: { response: Response & { json: any } })
   }
 };
 
+export {
+  type ToastText,
+  type IToastOptions,
+  type ToastType,
+};
+
 export default {
   info,
   success,
   error,
   showAlertForError,
-};
\ No newline at end of file
+};
diff --git a/src/types/colors.ts b/src/types/colors.ts
index 00b192783..0866b8fb1 100644
--- a/src/types/colors.ts
+++ b/src/types/colors.ts
@@ -1,10 +1,12 @@
-export type Rgb = { r: number; g: number; b: number };
-export type Hsl = { h: number; s: number; l: number };
+type Rgb = { r: number; g: number; b: number };
+type Hsl = { h: number; s: number; l: number };
 
-export type TailwindColorObject = {
+type TailwindColorObject = {
   [key: number]: string;
 };
 
-export type TailwindColorPalette = {
+type TailwindColorPalette = {
   [key: string]: TailwindColorObject | string;
 }
+
+export type { Rgb, Hsl, TailwindColorObject, TailwindColorPalette };
diff --git a/src/utils/config-db.ts b/src/utils/config-db.ts
index b32a3fea6..40538ceb4 100644
--- a/src/utils/config-db.ts
+++ b/src/utils/config-db.ts
@@ -8,8 +8,8 @@ import trimStart from 'lodash/trimStart';
 
 import { type MRFSimple, mrfSimpleSchema } from 'soapbox/schemas/pleroma';
 
-export type Config = ImmutableMap<string, any>;
-export type Policy = Record<string, any>;
+type Config = ImmutableMap<string, any>;
+type Policy = Record<string, any>;
 
 const find = (
   configs: ImmutableList<Config>,
@@ -57,7 +57,4 @@ const ConfigDB = {
   fromSimplePolicy,
 };
 
-export {
-  ConfigDB,
-  ConfigDB as default,
-};
+export { type Config, type Policy, ConfigDB as default };
diff --git a/src/utils/copy.ts b/src/utils/copy.ts
index 57aa2de8c..37c25f83c 100644
--- a/src/utils/copy.ts
+++ b/src/utils/copy.ts
@@ -28,4 +28,4 @@ const copy = (text: string, onSuccess?: () => void) => {
   }
 };
 
-export default copy;
+export { copy as default };
diff --git a/src/utils/favicon-service.ts b/src/utils/favicon-service.ts
index ef372dd40..a8ba1de38 100644
--- a/src/utils/favicon-service.ts
+++ b/src/utils/favicon-service.ts
@@ -96,4 +96,4 @@ const createFaviconService = () => {
 
 const FaviconService = createFaviconService();
 
-export default FaviconService;
+export { FaviconService as default };
diff --git a/src/utils/features.ts b/src/utils/features.ts
index c9250928e..439a5c39c 100644
--- a/src/utils/features.ts
+++ b/src/utils/features.ts
@@ -867,7 +867,7 @@ const getInstanceFeatures = (instance: Instance) => {
 };
 
 /** Features available from a backend */
-export type Features = ReturnType<typeof getInstanceFeatures>;
+type Features = ReturnType<typeof getInstanceFeatures>;
 
 /** Detect backend features to conditionally render elements */
 const getFeatures = createSelector([
@@ -932,6 +932,7 @@ export {
   GLITCH,
   REBASED,
   UNRELEASED,
+  type Features,
   getFeatures,
   parseVersion,
 };
diff --git a/src/utils/normalizers.ts b/src/utils/normalizers.ts
index 97d13b323..64caf9dd1 100644
--- a/src/utils/normalizers.ts
+++ b/src/utils/normalizers.ts
@@ -11,7 +11,7 @@ const makeEmojiMap = (emojis: any) => emojis.reduce((obj: any, emoji: any) => {
 /** Normalize entity ID */
 const normalizeId = (id: any): string | null => z.string().nullable().catch(null).parse(id);
 
-export type Normalizer<V, R> = (value: V) => R;
+type Normalizer<V, R> = (value: V) => R;
 
 /**
  * Allows using any legacy normalizer function as a zod schema.
@@ -34,6 +34,7 @@ const maybeFromJS = (value: any): unknown => {
 };
 
 export {
+  type Normalizer,
   mergeDefined,
   makeEmojiMap,
   normalizeId,
diff --git a/src/utils/queries.ts b/src/utils/queries.ts
index b55743681..b787b5160 100644
--- a/src/utils/queries.ts
+++ b/src/utils/queries.ts
@@ -2,7 +2,7 @@ import { queryClient } from 'soapbox/queries/client';
 
 import type { InfiniteData, QueryKey } from '@tanstack/react-query';
 
-export interface PaginatedResult<T> {
+interface PaginatedResult<T> {
   result: T[];
   hasMore: boolean;
   link?: string;
@@ -105,6 +105,7 @@ const sortQueryData = <T>(queryKey: QueryKey, comparator: (a: T, b: T) => number
 };
 
 export {
+  type PaginatedResult,
   flattenPages,
   updatePageItem,
   appendPageItem,
diff --git a/tailwind.config.ts b/tailwind.config.ts
index a630ab7a6..72e6de089 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -114,4 +114,4 @@ const config: Config = {
   ],
 };
 
-export default config;
\ No newline at end of file
+export { config as default };
\ No newline at end of file
diff --git a/vite.config.ts b/vite.config.ts
index f5ab87ad4..d5ecaab5e 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -12,7 +12,7 @@ import { VitePWA } from 'vite-plugin-pwa';
 import vitePluginRequire from 'vite-plugin-require';
 import { viteStaticCopy } from 'vite-plugin-static-copy';
 
-export default defineConfig(({ command }) => ({
+const config =  defineConfig(({ command }) => ({
   build: {
     assetsDir: 'packs',
     assetsInlineLimit: 0,
@@ -123,3 +123,5 @@ const readFileContents = (path: string) => {
     return '';
   }
 };
+
+export { config as default };