From c618747baace06b4c0eafb8b9251786ff5c234e5 Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Tue, 31 Mar 2026 17:20:27 -0700
Subject: [PATCH 01/32] :arrow_up: Upgrade tailwind (#1016)

* wip: define css themes

* wip: update components module

* update browser index.css

* update modules

* run npx @tailwindcss/upgrade on components

* run npx @tailwindcss/upgrade on browser

* fix margin resolution issues

* upgrade docs

* run npx @tailwindcss/upgrade on docs

* fix prettier config

* run format

* run more format

* run more format

* fix text resolution

* fix animations

* fix file explorer header

* swap deprecated tailwind utilities

* fix MASSIVE logo in docs
---
 .prettierignore                               |    1 +
 apps/desktop/package.json                     |   10 +-
 apps/desktop/postcss.config.js                |    6 -
 apps/desktop/src/Home.tsx                     |   10 +-
 .../src/components/ConfiguredServer.tsx       |   13 +-
 .../src/components/RemoveAllTokensSection.tsx |    2 +-
 .../CreateOrUpdateSavedServerForm.tsx         |    4 +-
 apps/desktop/src/splash-screen.html           |    5 -
 apps/desktop/tailwind.config.ts               |    7 -
 apps/desktop/vite.config.ts                   |    2 +
 apps/docs/components/DownloadLinks.tsx        |    6 +-
 apps/docs/components/Feedback.tsx             |   18 +-
 apps/docs/components/Footer.tsx               |   12 +-
 apps/docs/components/HelpDocsCTA.tsx          |    2 +-
 apps/docs/components/Hero.tsx                 |   24 +-
 apps/docs/components/InlineIconButton.tsx     |    2 +-
 apps/docs/components/LandingPage.tsx          |    4 +-
 apps/docs/components/MobileApp.tsx            |   28 +-
 apps/docs/components/NavBar.tsx               |    4 +-
 apps/docs/components/StumpLogo.tsx            |    4 +-
 apps/docs/globals.css                         |   10 +-
 apps/docs/package.json                        |    7 +-
 .../docs/pages/guides/access-control/oidc.mdx |   12 +-
 .../pages/guides/access-control/users.mdx     |    2 -
 apps/docs/pages/guides/basics/thumbnails.mdx  |    4 +-
 apps/docs/pages/guides/features/email.mdx     |    2 -
 apps/docs/postcss.config.js                   |    4 +-
 apps/expo/package.json                        |    4 +-
 apps/web/package.json                         |    9 +-
 apps/web/postcss.config.js                    |    6 -
 apps/web/src/index.html                       |    5 -
 apps/web/tailwind.config.ts                   |    7 -
 apps/web/vite.config.ts                       |    4 +-
 eslint.config.mjs                             |    2 +-
 package.json                                  |    3 +-
 packages/browser/package.json                 |    2 +-
 packages/browser/src/AppLayout.tsx            |    4 +-
 .../components/BackgroundFetchIndicator.tsx   |    2 +-
 packages/browser/src/components/BadgeList.tsx |    6 +-
 .../src/components/DirectoryPickerModal.tsx   |   14 +-
 .../browser/src/components/ErrorFallback.tsx  |    4 +-
 .../src/components/GenericEmptyState.tsx      |    2 +-
 .../src/components/HorizontalCardList.tsx     |    8 +-
 packages/browser/src/components/LinkBadge.tsx |    2 +-
 .../components/MultiRowHorizontalCardList.tsx |   10 +-
 .../src/components/PagePopoverForm.tsx        |    2 +-
 .../browser/src/components/Pagination.tsx     |   10 +-
 packages/browser/src/components/ReadMore.tsx  |    6 +-
 .../src/components/ServerStatusOverlay.tsx    |   10 +-
 .../src/components/TableOrGridLayout.tsx      |    2 +-
 packages/browser/src/components/UserMenu.tsx  |    8 +-
 .../browser/src/components/book/BookCard.tsx  |   16 +-
 .../src/components/book/BookSearch.tsx        |    2 +-
 .../src/components/book/BookSearchOverlay.tsx |    4 +-
 .../book/metadata/MediaMetadataEditor.tsx     |    2 +-
 .../components/book/table/BookLinksCell.tsx   |    2 +-
 .../components/book/table/CoverImageCell.tsx  |    6 +-
 .../src/components/book/table/columns.tsx     |    4 +-
 .../bookClub/books/BookClubBookItem.tsx       |   10 +-
 .../bookClub/books/BookClubBooks.tsx          |   10 +-
 .../createOrUpdateForm/BasicInformation.tsx   |    2 +-
 .../createOrUpdateForm/MembershipOptions.tsx  |    2 +-
 .../createOrUpdateForm/RoleMappingForm.tsx    |    4 +-
 .../components/container/ContentContainer.tsx |    2 +-
 .../components/container/DynamicCardGrid.tsx  |    2 +-
 .../components/container/GridSizeSlider.tsx   |    2 +-
 .../components/container/SceneContainer.tsx   |    2 +-
 .../src/components/entity/EntityCard.tsx      |   16 +-
 .../entity/EntityCardSizeSlider.tsx           |    2 +-
 .../src/components/explorer/FileExplorer.tsx  |    2 +-
 .../explorer/FileExplorerFooter.tsx           |    6 +-
 .../explorer/FileExplorerHeader.tsx           |    8 +-
 .../explorer/FileExplorerNavigation.tsx       |    2 +-
 .../src/components/explorer/FileThumbnail.tsx |    2 +-
 .../src/components/explorer/LayoutButtons.tsx |    2 +-
 .../src/components/explorer/grid/FileGrid.tsx |    2 +-
 .../components/explorer/grid/FileGridItem.tsx |    4 +-
 .../components/explorer/table/FileTable.tsx   |    6 +-
 .../explorer/upload/UploadModal.tsx           |   16 +-
 .../src/components/filters/Alphabet.tsx       |    8 +-
 .../src/components/filters/FilterDisplay.tsx  |    6 +-
 .../src/components/filters/FilterHeader.tsx   |    6 +-
 .../components/filters/FilterSlideOver.tsx    |    4 +-
 .../src/components/filters/FilterToolBar.tsx  |    6 +-
 .../src/components/filters/OrderBy.tsx        |    4 +-
 .../browser/src/components/filters/Search.tsx |   10 +-
 .../components/filters/URLFilterContainer.tsx |    6 +-
 .../components/filters/URLFilterDrawer.tsx    |    8 +-
 .../src/components/filters/URLOrdering.tsx    |    2 +-
 .../src/components/filters/URLPageSize.tsx    |    4 +-
 .../src/components/filters/URLPagination.tsx  |    8 +-
 .../filters/form/AgeRatingFilter.tsx          |    2 +-
 .../filters/form/MediaFilterForm.tsx          |    2 +-
 .../filters/form/SeriesFilterForm.tsx         |    2 +-
 .../src/components/jobs/JobOverlay.tsx        |    4 +-
 .../components/library/LastVisitedLibrary.tsx |    6 +-
 .../sections/BasicLibraryInformation.tsx      |    4 +-
 .../sections/DefaultLibraryView.tsx           |    6 +-
 .../sections/DefaultReadingSettings.tsx       |    8 +-
 .../sections/FileConversionOptions.tsx        |    4 +-
 .../sections/IgnoreRulesConfig.tsx            |   20 +-
 .../sections/LibraryPattern.tsx               |    6 +-
 .../sections/ScannerOptInFeatures.tsx         |    4 +-
 .../sections/ThumbnailConfig.tsx              |   22 +-
 .../components/markdown/MarkdownEditor.tsx    |    4 +-
 .../components/markdown/MarkdownPreview.tsx   |    8 +-
 .../metadataEditor/AddFieldsDialog.tsx        |    4 +-
 .../metadataEditor/MetadataEditorHeader.tsx   |    2 +-
 .../metadataEditor/MetadataEditorTable.tsx    |   10 +-
 .../metadataEditor/ResetMetadata.tsx          |    2 +-
 .../metadataEditor/cells/BadgeListCell.tsx    |    4 +-
 .../metadataEditor/cells/NumberCell.tsx       |    2 +-
 .../metadataEditor/cells/TextCell.tsx         |    2 +-
 .../navigation/mobile/MobileSheet.tsx         |    4 +-
 .../navigation/mobile/MobileTopBar.tsx        |    8 +-
 .../navigation/mobile/NavigationButtons.tsx   |    2 +-
 .../navigation/sidebar/ApplicationVersion.tsx |    2 +-
 .../navigation/sidebar/Settings.tsx           |    2 +-
 .../components/navigation/sidebar/SideBar.tsx |   11 +-
 .../navigation/sidebar/SideBarButtonLink.tsx  |    6 +-
 .../navigation/sidebar/SideBarFooter.tsx      |    2 +-
 .../components/navigation/sidebar/SignOut.tsx |    2 +-
 .../sections/bookClub/BookClubEmoji.tsx       |    2 +-
 .../bookClub/BookClubSideBarSection.tsx       |    6 +-
 .../sidebar/sections/library/LibraryEmoji.tsx |    2 +-
 .../sections/library/LibraryOptionsMenu.tsx   |    2 +-
 .../library/LibrarySideBarSection.tsx         |    6 +-
 .../smartList/SmartListSideBarSection.tsx     |    6 +-
 .../components/navigation/topbar/TopBar.tsx   |   10 +-
 .../navigation/topbar/TopBarButtonItem.tsx    |    2 +-
 .../navigation/topbar/TopBarLinkListItem.tsx  |    2 +-
 .../navigation/topbar/sections/UserMenu.tsx   |   10 +-
 .../book-club/BookClubNavigationItem.tsx      |   22 +-
 .../library/LibraryNavigationItem.tsx         |   24 +-
 .../settings/SettingsNavigationItem.tsx       |   10 +-
 .../smart-list/SmartListNavigationItem.tsx    |   20 +-
 .../readers/epub/EpubReaderFooter.tsx         |    4 +-
 .../readers/epub/EpubReaderHeader.tsx         |    4 +-
 .../epub/controls/ControlsContainer.tsx       |    4 +-
 .../epub/controls/EpubNavigationControls.tsx  |    8 +-
 .../readers/epub/controls/FontSizeControl.tsx |    8 +-
 .../epub/controls/LineHeightControl.tsx       |    8 +-
 .../readers/epub/controls/SearchCommand.tsx   |    8 +-
 .../readers/epub/controls/ThemeControls.tsx   |    4 +-
 .../readers/epub/locations/Bookmarks.tsx      |    4 +-
 .../epub/locations/LocationManager.tsx        |    2 +-
 .../epub/locations/TableOfContents.tsx        |    4 +-
 .../container/BrightnessControl.tsx           |    2 +-
 .../imageBased/container/ControlButton.tsx    |    2 +-
 .../imageBased/container/ControlsOverlay.tsx  |    2 +-
 .../imageBased/container/NextInSeries.tsx     |   12 +-
 .../imageBased/container/ReaderFooter.tsx     |    8 +-
 .../imageBased/container/ReaderHeader.tsx     |    6 +-
 .../imageBased/container/ReaderSettings.tsx   |   20 +-
 .../imageBased/container/SettingsDialog.tsx   |    2 +-
 .../continuous/ContinuousScrollReader.tsx     |    4 +-
 .../imageBased/paged/AnimatedPagedReader.tsx  |    2 +-
 .../readers/imageBased/paged/PageSet.tsx      |    2 +-
 .../readers/imageBased/paged/PagedReader.tsx  |    6 +-
 .../src/components/series/SeriesCard.tsx      |    4 +-
 .../series/SeriesExplorationLayout.tsx        |    2 +-
 .../components/series/StackedSeriesCard.tsx   |    6 +-
 .../series/metadata/SeriesMetadataEditor.tsx  |    2 +-
 .../series/table/CoverImageCell.tsx           |    4 +-
 .../src/components/series/table/columns.tsx   |    2 +-
 .../settings/GenericSettingsHeader.tsx        |    2 +-
 .../createOrUpdate/queryBuilder/GroupBy.tsx   |    4 +-
 .../queryBuilder/SmartListQueryBuilder.tsx    |   12 +-
 .../filterGroup/FieldSelector.tsx             |    6 +-
 .../queryBuilder/filterGroup/FilterGroup.tsx  |    8 +-
 .../queryBuilder/filterGroup/GroupJoiner.tsx  |   10 +-
 .../filterGroup/OperatorSelect.tsx            |    2 +-
 .../sections/AccessSettings.tsx               |    2 +-
 .../createOrUpdate/sections/BasicDetails.tsx  |    2 +-
 .../sections/FilterConfigJSON.tsx             |    2 +-
 .../sections/SmartListReview.tsx              |    4 +-
 .../steppedForm/ReviewStepContainer.tsx       |    6 +-
 .../steppedForm/SteppedFormIndicators.tsx     |    6 +-
 .../steppedForm/SteppedFormSceneHeader.tsx    |    2 +-
 .../src/components/table/EntityTable.tsx      |    4 +-
 .../table/EntityTableColumnConfiguration.tsx  |   14 +-
 .../src/components/table/Pagination.tsx       |    2 +-
 .../browser/src/components/table/Table.tsx    |   18 +-
 .../src/components/table/TableFilterInput.tsx |    2 +-
 .../src/components/table/TableFooter.tsx      |    6 +-
 .../browser/src/components/tags/TagList.tsx   |    2 +-
 .../thumbnail/SeriesStackedThumbnails.tsx     |   12 +-
 .../thumbnail/ThumbnailEntityCard.tsx         |   16 +-
 .../components/thumbnail/ThumbnailImage.tsx   |    8 +-
 .../components/thumbnail/UploadImageModal.tsx |    6 +-
 .../unimplemented/UnderConstruction.tsx       |    6 +-
 .../src/scenes/auth/LoginOrClaimScene.tsx     |   18 +-
 .../src/scenes/book/BookActionMenu.tsx        |    2 +-
 .../src/scenes/book/BookFileInformation.tsx   |    4 +-
 .../scenes/book/BookLibrarySeriesLinks.tsx    |    2 +-
 .../src/scenes/book/BookOverviewScene.tsx     |   10 +-
 .../scenes/book/BookOverviewSceneHeader.tsx   |   16 +-
 .../src/scenes/book/BooksAfterCursor.tsx      |    4 +-
 .../src/scenes/book/EmailBookDialog.tsx       |    8 +-
 .../book/settings/BookManagementScene.tsx     |    4 +-
 .../src/scenes/book/settings/BookPageGrid.tsx |    6 +-
 .../book/settings/BookThumbnailSelector.tsx   |    4 +-
 .../src/scenes/bookClub/BookClubHeader.tsx    |    8 +-
 .../src/scenes/bookClub/BookClubLayout.tsx    |    2 +-
 .../scenes/bookClub/BookClubNavigation.tsx    |    8 +-
 .../scenes/bookClub/UserBookClubsScene.tsx    |   14 +-
 .../createClub/CreateBookClubForm.tsx         |    8 +-
 .../createClub/CreateBookClubScene.tsx        |    2 +-
 .../bookClub/createClub/CreateClubReview.tsx  |    2 +-
 .../tabs/settings/BookClubSettingsSideBar.tsx |   18 +-
 .../settings/danger/BookClubDeletionScene.tsx |    2 +-
 .../settings/danger/DeleteBookClubSection.tsx |    4 +-
 .../settings/members/ManageMembersScene.tsx   |    2 +-
 .../settings/members/MemberActionMenu.tsx     |    2 +-
 .../tabs/settings/roles/MemberSpecDisplay.tsx |   12 +-
 .../tabs/settings/scheduler/AddBookCard.tsx   |   12 +-
 .../scheduler/CreateOrAddToScheduleForm.tsx   |    2 +-
 .../src/scenes/bookSearch/BookSearchScene.tsx |    4 +-
 .../createLibrary/CreateLibraryForm.tsx       |   16 +-
 .../createLibrary/CreateLibraryScene.tsx      |    2 +-
 .../scenes/createLibrary/LibraryReview.tsx    |   12 +-
 .../createSmartList/CreateSmartListForm.tsx   |   12 +-
 .../createSmartList/CreateSmartListScene.tsx  |    2 +-
 .../browser/src/scenes/error/FourOhFour.tsx   |    6 +-
 .../error/ServerConnectionErrorScene.tsx      |    4 +-
 .../src/scenes/home/ContinueReading.tsx       |   16 +-
 .../browser/src/scenes/home/HomeScene.tsx     |    2 +-
 .../browser/src/scenes/home/NoLibraries.tsx   |    6 +-
 packages/browser/src/scenes/home/OnDeck.tsx   |   10 +-
 .../src/scenes/home/RecentlyAddedMedia.tsx    |   10 +-
 .../src/scenes/home/RecentlyAddedSeries.tsx   |   12 +-
 .../src/scenes/library/LibraryHeader.tsx      |   12 +-
 .../src/scenes/library/LibraryLayout.tsx      |    2 +-
 .../src/scenes/library/LibraryNavigation.tsx  |    6 +-
 .../library/tabs/books/LibraryBooksScene.tsx  |    4 +-
 .../tabs/series/LibrarySeriesScene.tsx        |    4 +-
 .../tabs/settings/LibraryAdminLayout.tsx      |    2 +-
 .../tabs/settings/LibrarySeriesGrid.tsx       |    6 +-
 .../tabs/settings/LibrarySettingsHeader.tsx   |    4 +-
 .../tabs/settings/LibrarySettingsSidebar.tsx  |   20 +-
 .../accessControl/AccessControlScene.tsx      |    2 +-
 .../accessControl/LibraryExclusions.tsx       |    2 +-
 .../settings/danger/deletion/CleanLibrary.tsx |    2 +-
 .../danger/deletion/DeleteLibrary.tsx         |    4 +-
 .../danger/deletion/DeletionScene.tsx         |    2 +-
 .../danger/deletion/MissingEntitiesTable.tsx  |    4 +-
 .../options/analysis/AnalyzeMedia.tsx         |    2 +-
 .../options/analysis/LibraryAnalysisScene.tsx |    2 +-
 .../options/scanner/PatternDisplay.tsx        |    6 +-
 .../options/scanner/ScannerActionsSection.tsx |    6 +-
 .../options/scanner/ScannerBehaviorScene.tsx  |    2 +-
 .../scanner/customScan/ScanConfigForm.tsx     |    4 +-
 .../scanner/history/ScanHistorySection.tsx    |    2 +-
 .../scanner/history/ScanHistoryTable.tsx      |   12 +-
 .../scanner/history/ScanRecordInspector.tsx   |   10 +-
 .../thumbnails/DeleteLibraryThumbnails.tsx    |    2 +-
 .../thumbnails/LibraryThumbnailSelector.tsx   |    2 +-
 .../thumbnails/ProcessLibraryThumbnails.tsx   |    2 +-
 .../thumbnails/RegenerateThumbnails.tsx       |    2 +-
 .../thumbnails/ThumbnailManagementSection.tsx |    2 +-
 .../thumbnails/ThumbnailSettingsScene.tsx     |    2 +-
 .../src/scenes/series/SeriesHeader.tsx        |   16 +-
 .../src/scenes/series/SeriesLayout.tsx        |    2 +-
 .../src/scenes/series/SeriesNavigation.tsx    |    6 +-
 .../series/tabs/books/SeriesBooksScene.tsx    |    4 +-
 .../series/tabs/settings/SeriesBookGrid.tsx   |    6 +-
 .../tabs/settings/SeriesSettingsScene.tsx     |    4 +-
 .../tabs/settings/SeriesThumbnailSelector.tsx |    4 +-
 .../src/scenes/settings/SettingsHeader.tsx    |    4 +-
 .../src/scenes/settings/SettingsLayout.tsx    |    4 +-
 .../scenes/settings/SettingsNavigation.tsx    |    4 +-
 .../src/scenes/settings/SettingsSideBar.tsx   |   14 +-
 .../scenes/settings/SettingsSideBarLink.tsx   |    4 +-
 .../settings/app/apiKeys/APIKeyInspector.tsx  |   16 +-
 .../app/apiKeys/APIKeySettingsScene.tsx       |    2 +-
 .../settings/app/apiKeys/APIKeyTable.tsx      |   16 +-
 .../app/apiKeys/CreateAPIKeyModal.tsx         |   10 +-
 .../features/DiscordPresenceSwitch.tsx        |    4 +-
 .../features/OptionalFeaturesSection.tsx      |    2 +-
 .../settings/app/general/AvatarPicker.tsx     |   14 +-
 .../app/general/LocalePreferences.tsx         |    2 +-
 .../settings/app/general/ProfileForm.tsx      |    8 +-
 .../preferences/AppearanceSettingsScene.tsx   |    6 +-
 .../app/preferences/DebugSettings.tsx         |    8 +-
 .../preferences/DisplaySpacingPreference.tsx  |   18 +-
 .../settings/app/preferences/FontSelect.tsx   |    2 +-
 .../app/preferences/MaxWidthPreference.tsx    |    6 +-
 .../PrimaryNavigationPreference.tsx           |   20 +-
 .../settings/app/preferences/ThemeSelect.tsx  |    2 +-
 .../app/preferences/ThumbnailPlaceholder.tsx  |    2 +-
 .../app/preferences/ThumbnailRatioSelect.tsx  |    2 +-
 .../NavigationArrangement.tsx                 |    6 +-
 .../NavigationArrangementItem.tsx             |   10 +-
 .../app/reader/DefaultReadingDirection.tsx    |    2 +-
 .../app/reader/PreloadPagesSection.tsx        |    4 +-
 .../app/reader/ReaderDefaultSettingsScene.tsx |   10 +-
 .../server/email/EmailSettingsScene.tsx       |    2 +-
 .../devices/CreateOrUpdateDeviceModal.tsx     |    2 +-
 .../server/email/devices/DevicesSection.tsx   |    2 +-
 .../server/email/devices/DevicesTable.tsx     |    8 +-
 .../emailers/CreateOrUpdateEmailerForm.tsx    |   12 +-
 .../server/email/emailers/EmailerListItem.tsx |    4 +-
 .../email/emailers/EmailerSendHistory.tsx     |    2 +-
 .../emailers/EmailerSendHistoryTable.tsx      |    8 +-
 .../EmailerSendRecordAttachmentTable.tsx      |    2 +-
 .../server/email/emailers/EmailersList.tsx    |    4 +-
 .../server/email/emailers/EmailersSection.tsx |    2 +-
 .../email/emailers/TestEmailerButton.tsx      |    2 +-
 .../general/GeneralServerSettingsScene.tsx    |    2 +-
 .../settings/server/general/HelpfulLinks.tsx  |   10 +-
 .../server/general/ServerEmojisSection.tsx    |   20 +-
 .../server/general/ServerInfoSection.tsx      |    8 +-
 .../server/general/ServerPublicURL.tsx        |    2 +-
 .../settings/server/general/ServerStats.tsx   |    2 +-
 .../settings/server/jobs/JobScheduler.tsx     |   10 +-
 .../settings/server/jobs/JobSettingsScene.tsx |    4 +-
 .../scenes/settings/server/jobs/JobTable.tsx  |    2 +-
 .../server/logs/live-logs/LiveLogsFeed.tsx    |    4 +-
 .../server/logs/live-logs/LiveLogsSection.tsx |    2 +-
 .../persisted-logs/PersistedLogsSection.tsx   |    2 +-
 .../persisted-logs/PersistedLogsTable.tsx     |    2 +-
 .../settings/server/users/UsersStats.tsx      |   10 +-
 .../users/create-or-update/AccountDetails.tsx |    4 +-
 .../CreateOrUpdateUserForm.tsx                |    6 +-
 .../create-or-update/UserPermissionsTable.tsx |   10 +-
 .../create-or-update/UserRestrictionsForm.tsx |    6 +-
 .../login-activity/LoginActivitySection.tsx   |    4 +-
 .../login-activity/LoginActivityTable.tsx     |   10 +-
 .../users/user-table/DeleteUserModal.tsx      |    4 +-
 .../server/users/user-table/UserTable.tsx     |    4 +-
 .../users/user-table/UserTableSection.tsx     |    4 +-
 .../server/users/user-table/UsernameRow.tsx   |    2 +-
 .../src/scenes/smartList/SmartListCard.tsx    |    4 +-
 .../scenes/smartList/UserSmartListHeader.tsx  |    2 +-
 .../scenes/smartList/UserSmartListLayout.tsx  |    2 +-
 .../smartList/UserSmartListNavigation.tsx     |    4 +-
 .../scenes/smartList/UserSmartListsScene.tsx  |   10 +-
 .../smartList/items/table/BookLinksCell.tsx   |    2 +-
 .../smartList/items/table/CoverImageCell.tsx  |    4 +-
 .../items/table/FilterBottomDrawer.tsx        |    8 +-
 .../table/GroupedVirtualSmartListTable.tsx    |   18 +-
 .../items/table/SavedViewSelector.tsx         |    2 +-
 .../items/table/SmartListTableItem.tsx        |    2 +-
 .../items/table/TableColumnsBottomDrawer.tsx  |   10 +-
 .../items/table/TableHeaderActions.tsx        |    2 +-
 .../items/table/ViewManagerDropdown.tsx       |    6 +-
 .../items/table/VirtualSmartListTable.tsx     |    6 +-
 .../smartList/items/table/groupColumns.tsx    |    6 +-
 .../smartList/items/table/mediaColumns.tsx    |    2 +-
 .../settings/SmartListSettingsSideBar.tsx     |   18 +-
 .../settings/access/AccessSettingsScene.tsx   |    2 +-
 .../settings/danger/DangerSettingsScene.tsx   |    6 +-
 packages/browser/src/styles/index.css         |   18 +-
 packages/components/package.json              |   13 +-
 packages/components/postcss.config.js         |    5 +-
 .../components/src/accordion/Accordion.tsx    |    4 +-
 packages/components/src/alert/Alert.tsx       |    8 +-
 .../src/breadcrumbs/Breadcrumbs.tsx           |    2 +-
 .../components/src/calendar/DatePicker.tsx    |    6 +-
 packages/components/src/card/Card.stories.tsx |    6 +-
 packages/components/src/card/Card.tsx         |    2 +-
 .../components/src/card/HoverCard.stories.tsx |    2 +-
 packages/components/src/card/HoverCard.tsx    |    2 +-
 .../components/src/command/primitives.tsx     |   20 +-
 packages/components/src/container/Divider.tsx |    2 +-
 .../src/container/SplitContainer.tsx          |    4 +-
 .../src/context-menu/primitives.tsx           |   20 +-
 packages/components/src/dialog/primitives.tsx |   10 +-
 packages/components/src/drawer/Drawer.tsx     |   12 +-
 .../components/src/dropdown/primitives.tsx    |   20 +-
 packages/components/src/emoji/EmojiPicker.tsx |    2 +-
 packages/components/src/form/Form.tsx         |    2 +-
 packages/components/src/image/primitives.tsx  |    2 +-
 packages/components/src/input/CheckBox.tsx    |    8 +-
 packages/components/src/input/Input.tsx       |   10 +-
 .../components/src/input/PasswordInput.tsx    |    2 +-
 packages/components/src/input/Switch.tsx      |    2 +-
 packages/components/src/input/TextArea.tsx    |    2 +-
 packages/components/src/input/WideSwitch.tsx  |    6 +-
 .../components/src/input/raw/RawInput.tsx     |    2 +-
 .../components/src/input/raw/RawSwitch.tsx    |    2 +-
 .../src/navigation/NavigationMenu.tsx         |   18 +-
 packages/components/src/popover/Popover.tsx   |    2 +-
 .../src/preformatted/Preformatted.tsx         |    6 +-
 .../src/progress/FullScreenLoader.tsx         |    4 +-
 .../src/progress/ProgressSpinner.tsx          |    2 +-
 .../components/src/radio/RadioCardItem.tsx    |    8 +-
 packages/components/src/radio/primitives.tsx  |    4 +-
 .../components/src/scroll-area/ScrollArea.tsx |    6 +-
 packages/components/src/select/ComboBox.tsx   |    6 +-
 .../components/src/select/NativeSelect.tsx    |    4 +-
 packages/components/src/select/primitives.tsx |    8 +-
 packages/components/src/sheet/primitives.tsx  |    8 +-
 packages/components/src/slider/Slider.tsx     |    6 +-
 packages/components/src/styles/tailwind.css   |    5 +-
 packages/components/src/tabs/Tabs.tsx         |    6 +-
 packages/components/src/text/Heading.tsx      |    2 +-
 packages/components/src/text/Separator.tsx    |    2 +-
 packages/components/src/text/Text.tsx         |    2 +-
 packages/components/src/toast/primitives.tsx  |    8 +-
 .../components/src/tooltip/primitives.tsx     |    2 +-
 packages/components/tailwind.config.ts        |    8 -
 packages/components/tailwind/index.ts         |   27 +-
 packages/components/tailwind/preset.css       |  129 ++
 packages/components/tailwind/preset.ts        |   82 --
 packages/components/tailwind/themes.css       |  535 ++++++++
 prettier.config.js                            |    2 +-
 yarn.lock                                     | 1170 +++++------------
 408 files changed, 2179 insertions(+), 2197 deletions(-)
 delete mode 100644 apps/desktop/postcss.config.js
 delete mode 100644 apps/desktop/tailwind.config.ts
 delete mode 100644 apps/web/postcss.config.js
 delete mode 100644 apps/web/tailwind.config.ts
 delete mode 100644 packages/components/tailwind.config.ts
 create mode 100644 packages/components/tailwind/preset.css
 delete mode 100644 packages/components/tailwind/preset.ts
 create mode 100644 packages/components/tailwind/themes.css

diff --git a/.prettierignore b/.prettierignore
index b692d950b3..f3531156da 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -4,6 +4,7 @@ generated.ts
 node_modules
 target
 dist
+dev-dist
 build
 .next
 .expo
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 824cb4f5f6..4c86cb38fb 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -14,6 +14,7 @@
 		"build:mac-universal": "yarn exec vite build && tauri build --target universal-apple-darwin -- --features bundled-server",
 		"build:mac-arm": "yarn exec vite build && tauri build --target aarch64-apple-darwin -- --features bundled-server",
 		"build:windows": "tauri build --target x86_64-pc-windows-msvc -- --features bundled-server",
+		"format": "eslint --fix . && prettier --config ../../prettier.config.js --ignore-path ../../.prettierignore --write .",
 		"nuke": "yarn exec rimraf node_modules"
 	},
 	"dependencies": {
@@ -27,17 +28,14 @@
 		"react-dom": "^19.0.0"
 	},
 	"devDependencies": {
-		"@tailwindcss/typography": "^0.5.10",
 		"@tauri-apps/api": "^2.0.2",
 		"@tauri-apps/cli": "^2.0.3",
 		"@types/react": "^19.0.0",
 		"@types/react-dom": "^19.0.0",
 		"@vitejs/plugin-react": "^4.1.0",
-		"autoprefixer": "^10.4.16",
-		"postcss": "^8.4.31",
-		"tailwind": "^4.0.0",
-		"tailwind-scrollbar-hide": "^1.1.7",
-		"tailwindcss": "^3.3.3",
+		"@tailwindcss/vite": "^4.2.2",
+		"tailwindcss": "^4.2.2",
+		"tw-animate-css": "^1.4.0",
 		"typescript": "^5.3.3",
 		"vite": "^4.5.0",
 		"vite-plugin-tsconfig-paths": "^1.3.1"
diff --git a/apps/desktop/postcss.config.js b/apps/desktop/postcss.config.js
deleted file mode 100644
index 65994d3285..0000000000
--- a/apps/desktop/postcss.config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-	plugins: {
-		autoprefixer: {},
-		tailwindcss: {},
-	},
-}
diff --git a/apps/desktop/src/Home.tsx b/apps/desktop/src/Home.tsx
index 80e23756c0..00639e144e 100644
--- a/apps/desktop/src/Home.tsx
+++ b/apps/desktop/src/Home.tsx
@@ -104,10 +104,10 @@ export default function Home() {
 			/>
 			<div
 				data-tauri-drag-region
-				className="flex h-screen w-screen items-center bg-background py-6"
+				className="py-6 flex h-screen w-screen items-center bg-background"
 			>
-				<div className="mx-auto flex h-full w-full max-w-sm flex-col justify-center gap-6 sm:max-w-md md:max-w-xl">
-					<div className="flex flex-col gap-y-6">
+				<div className="max-w-sm gap-6 sm:max-w-md md:max-w-xl mx-auto flex h-full w-full flex-col justify-center">
+					<div className="gap-y-6 flex flex-col">
 						<div className="flex items-end justify-between">
 							<div>
 								<Heading size="sm">{t(getKey('label'))}</Heading>
@@ -120,7 +120,7 @@ export default function Home() {
 						</div>
 
 						{!savedServers.length && (
-							<div className="select-none rounded-lg border border-dashed border-edge-subtle p-4 text-foreground-muted">
+							<div className="rounded-lg p-4 border border-dashed border-edge-subtle text-foreground-muted select-none">
 								{t(getKey('getStarted'))}
 							</div>
 						)}
@@ -142,7 +142,7 @@ export default function Home() {
 						)}
 
 						<div
-							className={cn('flex flex-col gap-y-6', {
+							className={cn('gap-y-6 flex flex-col', {
 								'pointer-events-none opacity-50': savedServers.length === 0,
 							})}
 						>
diff --git a/apps/desktop/src/components/ConfiguredServer.tsx b/apps/desktop/src/components/ConfiguredServer.tsx
index 2bf2473b36..8fe84d94cf 100644
--- a/apps/desktop/src/components/ConfiguredServer.tsx
+++ b/apps/desktop/src/components/ConfiguredServer.tsx
@@ -43,7 +43,7 @@ export default function ConfiguredServer({
 
 	return (
 		<div
-			className={cn('group flex items-center justify-between p-4', {
+			className={cn('group p-4 flex items-center justify-between', {
 				'hover:bg-background-surface-hover/10': isReachable,
 			})}
 		>
@@ -51,23 +51,20 @@ export default function ConfiguredServer({
 				className="flex grow cursor-pointer flex-col"
 				onClick={isReachable ? onSwitch : undefined}
 			>
-				<span className="flex items-center space-x-2">
+				<span className="space-x-2 flex items-center">
 					<Text>{server.name}</Text>
 					{isActive && (
 						<ToolTip content={t(getKey('activeServer.tooltip'))} align="center">
 							<BadgeCheck
 								data-testid="activeBadge"
-								className="h-4 w-4 text-fill-success text-opacity-75"
+								className="h-4 w-4 text-fill-success/75"
 								strokeWidth={0.95}
 							/>
 						</ToolTip>
 					)}
 					{isReachable === false && (
 						<ToolTip content={t(getKey('unreachableServer.tooltip'))} align="center">
-							<WifiOff
-								data-testid="unreachableBadge"
-								className="h-4 w-4 text-fill-danger text-opacity-75"
-							/>
+							<WifiOff data-testid="unreachableBadge" className="h-4 w-4 text-fill-danger/75" />
 						</ToolTip>
 					)}
 				</span>
@@ -76,7 +73,7 @@ export default function ConfiguredServer({
 				</Text>
 			</div>
 
-			<div className="flex items-center space-x-1.5 opacity-90 group-hover:opacity-100">
+			<div className="space-x-1.5 flex items-center opacity-90 group-hover:opacity-100">
 				{/* {!isActive && (
 					<ToolTip content={t(getKey('switchToServer.tooltip'))}>
 						<IconButton size="xs" onClick={onSwitch} data-testid="switchButton">
diff --git a/apps/desktop/src/components/RemoveAllTokensSection.tsx b/apps/desktop/src/components/RemoveAllTokensSection.tsx
index c9756a01fc..ffab3bab03 100644
--- a/apps/desktop/src/components/RemoveAllTokensSection.tsx
+++ b/apps/desktop/src/components/RemoveAllTokensSection.tsx
@@ -11,7 +11,7 @@ export default function RemoveAllTokensSection({ onConfirmClear }: Props) {
 	const { t } = useLocaleContext()
 
 	return (
-		<div className="flex flex-col space-y-4">
+		<div className="space-y-4 flex flex-col">
 			<div>
 				<Heading size="xs">{t(getKey('label'))}</Heading>
 				<Text size="sm" variant="muted" className="mt-1">
diff --git a/apps/desktop/src/components/createOrUpdate/CreateOrUpdateSavedServerForm.tsx b/apps/desktop/src/components/createOrUpdate/CreateOrUpdateSavedServerForm.tsx
index 4de7e36774..58f28ceaf5 100644
--- a/apps/desktop/src/components/createOrUpdate/CreateOrUpdateSavedServerForm.tsx
+++ b/apps/desktop/src/components/createOrUpdate/CreateOrUpdateSavedServerForm.tsx
@@ -84,7 +84,7 @@ export default function CreateOrUpdateSavedServerForm({
 				errorMessage={errors.url?.message}
 			/>
 
-			<div className="flex flex-col gap-2">
+			<div className="gap-2 flex flex-col">
 				<Label htmlFor="authMode">Auth method</Label>
 				<NativeSelect
 					options={[
@@ -114,7 +114,7 @@ export default function CreateOrUpdateSavedServerForm({
 			)}
 
 			{authMode === 'login' && (
-				<div className="rounded-lg border border-dashed border-edge p-2">
+				<div className="rounded-lg p-2 border border-dashed border-edge">
 					<Text variant="muted" size="sm">
 						You will occasionally be prompted to log in when you connect to this server
 					</Text>
diff --git a/apps/desktop/src/splash-screen.html b/apps/desktop/src/splash-screen.html
index d5db76da20..68bc612e94 100644
--- a/apps/desktop/src/splash-screen.html
+++ b/apps/desktop/src/splash-screen.html
@@ -20,11 +20,6 @@
 		</script>
 
 		<style>
-			* {
-				margin: 0;
-				padding: 0;
-				box-sizing: border-box;
-			}
 			html.dark {
 				background-color: #1b1c1e;
 			}
diff --git a/apps/desktop/tailwind.config.ts b/apps/desktop/tailwind.config.ts
deleted file mode 100644
index 20b6468351..0000000000
--- a/apps/desktop/tailwind.config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import stumpPreset, { getContent } from '@stump/components/tailwind'
-import type { Config } from 'tailwindcss'
-
-export default {
-	content: getContent({ relativePath: 'apps/desktop' }),
-	presets: [stumpPreset],
-} satisfies Config
diff --git a/apps/desktop/vite.config.ts b/apps/desktop/vite.config.ts
index f135934ae5..d345074e43 100644
--- a/apps/desktop/vite.config.ts
+++ b/apps/desktop/vite.config.ts
@@ -1,3 +1,4 @@
+import tailwindcss from '@tailwindcss/vite'
 import react from '@vitejs/plugin-react'
 import { resolve } from 'path'
 import { defineConfig } from 'vite'
@@ -24,6 +25,7 @@ export default defineConfig({
 		pkgJson: { name, version },
 	},
 	plugins: [
+		tailwindcss(),
 		react({
 			babel: {
 				plugins: [['babel-plugin-react-compiler', {}]],
diff --git a/apps/docs/components/DownloadLinks.tsx b/apps/docs/components/DownloadLinks.tsx
index 76b7ded5c3..86b2137591 100644
--- a/apps/docs/components/DownloadLinks.tsx
+++ b/apps/docs/components/DownloadLinks.tsx
@@ -47,7 +47,7 @@ const hoverVariants = {
 
 export default function DownloadLinks() {
 	return (
-		<div className="relative flex w-full items-start justify-center space-x-2 md:justify-start">
+		<div className="space-x-2 md:justify-start relative flex w-full items-start justify-center">
 			{links.map((link, idx) => (
 				<motion.div
 					key={idx}
@@ -61,10 +61,10 @@ export default function DownloadLinks() {
 				>
 					<a
 						className={clsx(
-							'flex items-center rounded-md border border-transparent bg-transparent p-1 text-sm font-medium text-neutral-700 transition-all duration-300 dark:bg-opacity-90 dark:text-neutral-200 dark:shadow-sm',
+							'rounded-md p-1 text-sm font-medium text-neutral-700 dark:bg-opacity-90 dark:text-neutral-200 dark:shadow-sm flex items-center border border-transparent bg-transparent transition-all duration-300',
 							{ 'cursor-not-allowed opacity-50': link.disabled },
 							{
-								'hover:border-neutral-200 hover:bg-neutral-50 hover:text-neutral-900 focus:outline-none active:border-neutral-200 active:bg-neutral-50 active:text-neutral-600 dark:hover:border-neutral-500 dark:hover:bg-neutral-700 dark:hover:bg-opacity-100 dark:hover:text-white dark:active:text-white dark:active:opacity-90':
+								'hover:border-neutral-200 hover:bg-neutral-50 hover:text-neutral-900 active:border-neutral-200 active:bg-neutral-50 active:text-neutral-600 dark:hover:border-neutral-500 dark:hover:bg-neutral-700 dark:hover:bg-opacity-100 dark:hover:text-white dark:active:text-white focus:outline-none dark:active:opacity-90':
 									!link.disabled,
 							},
 						)}
diff --git a/apps/docs/components/Feedback.tsx b/apps/docs/components/Feedback.tsx
index b8b3a5d743..a4d1a3b18f 100644
--- a/apps/docs/components/Feedback.tsx
+++ b/apps/docs/components/Feedback.tsx
@@ -3,8 +3,8 @@ import { Bug } from 'lucide-react'
 
 export default function Feedback() {
 	return (
-		<div className="mx-auto flex w-full max-w-7xl flex-col gap-20 px-6 py-10 lg:px-8 lg:py-24">
-			<div className="flex flex-col gap-5">
+		<div className="max-w-7xl gap-20 px-6 py-10 lg:px-8 lg:py-24 mx-auto flex w-full flex-col">
+			<div className="gap-5 flex flex-col">
 				<h2 className="text-2xl font-bold tracking-tight text-black sm:text-4xl dark:text-neutral-100">
 					Feedback
 				</h2>
@@ -15,15 +15,15 @@ export default function Feedback() {
 				</p>
 			</div>
 
-			<div className="grid grid-cols-1 gap-x-6 gap-y-10 text-base leading-7 sm:grid-cols-2 lg:mx-0 lg:max-w-none lg:grid-cols-3 lg:gap-x-8 lg:gap-y-16">
+			<div className="gap-x-6 gap-y-10 text-base leading-7 sm:grid-cols-2 lg:mx-0 lg:max-w-none lg:grid-cols-3 lg:gap-x-8 lg:gap-y-16 grid grid-cols-1">
 				{methods.map((method) => (
-					<div className="relative pl-9" key={method.title}>
-						<dt className="inline font-semibold text-black dark:text-neutral-100">
+					<div className="pl-9 relative" key={method.title}>
+						<dt className="font-semibold text-black dark:text-neutral-100 inline">
 							{/* @ts-expect-error: its fine */}
-							<method.icon className="absolute left-1 top-1 h-5 w-5" />
+							<method.icon className="left-1 top-1 h-5 w-5 absolute" />
 							{method.title}
 						</dt>{' '}
-						<dd className="text-neutral-650 inline dark:text-neutral-400">{method.description}</dd>
+						<dd className="text-neutral-650 dark:text-neutral-400 inline">{method.description}</dd>
 					</div>
 				))}
 			</div>
@@ -39,7 +39,7 @@ const methods = [
 				The best way to provide feedback is to{' '}
 				<a
 					href="https://github.com/stumpapp/stump/issues"
-					className="text-black underline dark:text-neutral-100"
+					className="text-black dark:text-neutral-100 underline"
 					target="_blank"
 					rel="noreferrer"
 				>
@@ -57,7 +57,7 @@ const methods = [
 				Join the{' '}
 				<a
 					href="https://discord.gg/63Ybb7J3as"
-					className="text-black underline dark:text-neutral-100"
+					className="text-black dark:text-neutral-100 underline"
 					target="_blank"
 					rel="noreferrer"
 				>
diff --git a/apps/docs/components/Footer.tsx b/apps/docs/components/Footer.tsx
index 0712f7619e..7ff526b7d9 100644
--- a/apps/docs/components/Footer.tsx
+++ b/apps/docs/components/Footer.tsx
@@ -33,11 +33,11 @@ const navigation = {
 export default function Footer() {
 	return (
 		<footer
-			className="w-full border-t bg-[#FAFAFA] dark:border-neutral-800 dark:bg-[#0E0E0E]"
+			className="dark:border-neutral-800 w-full border-t bg-[#FAFAFA] dark:bg-[#0E0E0E]"
 			aria-labelledby="footer-heading"
 		>
-			<div className="mx-auto flex max-w-[85rem] flex-col items-center justify-center space-y-7 px-4 py-12 sm:px-6 lg:px-8 lg:py-16">
-				<div className="flex items-center space-x-8">
+			<div className="max-w-340 space-y-7 px-4 py-12 sm:px-6 lg:px-8 lg:py-16 mx-auto flex flex-col items-center justify-center">
+				<div className="space-x-8 flex items-center">
 					{navigation.nav.map((item) => (
 						<Link
 							key={item.href}
@@ -53,7 +53,7 @@ export default function Footer() {
 						</Link>
 					))}
 				</div>
-				<div className="flex items-center space-x-6">
+				<div className="space-x-6 flex items-center">
 					{navigation.social.map((item) => (
 						<a
 							key={item.name}
@@ -69,8 +69,8 @@ export default function Footer() {
 					))}
 				</div>
 
-				<div className="flex items-center space-x-4">
-					<img className="h-8" src="/favicon.ico" alt="Stump" />
+				<div className="space-x-4 flex items-center">
+					<img className="h-8 w-8 object-scale-down" src="/favicon.ico" alt="Stump" />
 
 					<p className="text-sm text-gray-700 dark:text-gray-200">
 						&copy; Copyright {new Date().getFullYear()} Aaron Leopold
diff --git a/apps/docs/components/HelpDocsCTA.tsx b/apps/docs/components/HelpDocsCTA.tsx
index d4c6a6eb63..4d9fd20c18 100644
--- a/apps/docs/components/HelpDocsCTA.tsx
+++ b/apps/docs/components/HelpDocsCTA.tsx
@@ -12,7 +12,7 @@ export default function HelpDocsCTA({ className, filePath }: Props) {
 	return (
 		<Link
 			href={href}
-			className={clsx('flex items-center space-x-2', className)}
+			className={clsx('space-x-2 flex items-center', className)}
 			target="_blank"
 			rel="noopener noreferrer"
 		>
diff --git a/apps/docs/components/Hero.tsx b/apps/docs/components/Hero.tsx
index a210713b8d..2b7adf5aec 100644
--- a/apps/docs/components/Hero.tsx
+++ b/apps/docs/components/Hero.tsx
@@ -97,11 +97,11 @@ export default function Hero() {
 	const words = headingText.split(' ')
 
 	return (
-		<div className="mx-auto h-screen max-w-7xl px-6 lg:flex lg:px-8">
-			<div className="mx-auto max-w-2xl flex-shrink-0 lg:mx-0 lg:max-w-xl lg:pt-8">
-				<div className="flex flex-col items-center gap-5 md:items-start">
+		<div className="max-w-7xl px-6 lg:flex lg:px-8 mx-auto h-screen">
+			<div className="max-w-2xl lg:mx-0 lg:max-w-xl lg:pt-8 mx-auto shrink-0">
+				<div className="gap-5 md:items-start flex flex-col items-center">
 					<div>
-						<h1 className="text-center text-4xl font-medium tracking-tight text-black sm:text-6xl md:text-left dark:text-neutral-100">
+						<h1 className="text-4xl font-medium tracking-tight text-black sm:text-6xl md:text-left dark:text-neutral-100 text-center">
 							{words.map((word, index) => (
 								<motion.span
 									key={index}
@@ -109,7 +109,7 @@ export default function Hero() {
 									initial="hidden"
 									animate="visible"
 									variants={wordVariants}
-									className="mr-[0.25em] inline-block last:mr-0"
+									className="last:mr-0 mr-[0.25em] inline-block"
 								>
 									{word}
 								</motion.span>
@@ -120,14 +120,14 @@ export default function Hero() {
 							initial="hidden"
 							animate="visible"
 							variants={descriptionVariants}
-							className="text-neutral-650 mx-auto mt-5 max-w-md text-center text-base sm:text-lg md:max-w-3xl md:text-left md:text-xl dark:text-neutral-400"
+							className="text-neutral-650 mt-5 max-w-md text-base sm:text-lg md:max-w-3xl md:text-left md:text-xl dark:text-neutral-400 mx-auto text-center"
 						>
 							Designed to be fast, beautiful, and simple. Curate your digital libraries and stream
 							your media to any device.
 						</motion.p>
 					</div>
 
-					<div className="flex justify-center space-x-2 md:mt-8 md:justify-start">
+					<div className="space-x-2 md:mt-8 md:justify-start flex justify-center">
 						<motion.div
 							className="flex"
 							custom={1.1}
@@ -136,7 +136,7 @@ export default function Hero() {
 							variants={buttonVariants}
 						>
 							<Link
-								className="bg-neutral-650 dark:hover:bg-neutral-650 hover:border-neutral-450 active:border-neutral-450 dark:active:border-neutral-450 dark:hover:border-neutral-450 dark:active:bg-neutral-650 flex cursor-pointer items-center rounded-md border border-neutral-500 px-3 py-1.5 text-sm font-medium text-neutral-800 transition-all duration-300 hover:bg-neutral-600 hover:text-white focus:outline-none active:bg-neutral-50 active:text-white dark:border-neutral-500 dark:bg-neutral-700 dark:bg-opacity-90 dark:text-neutral-200 dark:shadow-sm dark:hover:bg-neutral-700 dark:hover:bg-opacity-100 dark:hover:text-white dark:active:text-white dark:active:opacity-90"
+								className="bg-neutral-650 dark:hover:bg-neutral-650 hover:border-neutral-450 active:border-neutral-450 dark:active:border-neutral-450 dark:hover:border-neutral-450 dark:active:bg-neutral-650 rounded-md border-neutral-500 px-3 py-1.5 text-sm font-medium text-neutral-800 hover:bg-neutral-600 hover:text-white active:bg-neutral-50 active:text-white dark:border-neutral-500 dark:bg-neutral-700 dark:bg-opacity-90 dark:text-neutral-200 dark:shadow-sm dark:hover:bg-neutral-700 dark:hover:bg-opacity-100 dark:hover:text-white dark:active:text-white flex cursor-pointer items-center border transition-all duration-300 focus:outline-none dark:active:opacity-90"
 								href="/installation"
 							>
 								<span>Documentation</span>
@@ -151,7 +151,7 @@ export default function Hero() {
 							variants={buttonVariants}
 						>
 							<Link
-								className="dark:active:border-neutral-650 dark:active:bg-neutral-650 flex cursor-pointer items-center space-x-2 rounded-md border border-transparent bg-transparent px-3 py-1.5 text-sm font-medium text-neutral-700 transition-all duration-300 hover:border-neutral-200 hover:bg-neutral-50 hover:text-neutral-900 focus:outline-none active:border-neutral-200 active:bg-neutral-50 active:text-neutral-600 dark:bg-opacity-90 dark:text-neutral-200 dark:shadow-sm dark:hover:border-neutral-500 dark:hover:bg-neutral-700 dark:hover:bg-opacity-100 dark:hover:text-white dark:active:text-white dark:active:opacity-90"
+								className="dark:active:border-neutral-650 dark:active:bg-neutral-650 space-x-2 rounded-md px-3 py-1.5 text-sm font-medium text-neutral-700 hover:border-neutral-200 hover:bg-neutral-50 hover:text-neutral-900 active:border-neutral-200 active:bg-neutral-50 active:text-neutral-600 dark:bg-opacity-90 dark:text-neutral-200 dark:shadow-sm dark:hover:border-neutral-500 dark:hover:bg-neutral-700 dark:hover:bg-opacity-100 dark:hover:text-white dark:active:text-white flex cursor-pointer items-center border border-transparent bg-transparent transition-all duration-300 focus:outline-none dark:active:opacity-90"
 								href="https://www.github.com/stumpapp/stump"
 								target="_blank"
 							>
@@ -169,15 +169,15 @@ export default function Hero() {
 				</div>
 			</div>
 
-			<div className="mx-auto mt-16 max-w-2xl sm:mt-20 lg:ml-10 lg:mr-0 lg:mt-0 lg:max-w-none lg:flex-none xl:ml-24">
-				<div className="h-full max-w-3xl sm:max-w-5xl lg:max-w-none">
+			<div className="mt-16 max-w-2xl sm:mt-20 lg:ml-10 lg:mr-0 lg:mt-0 lg:max-w-none lg:flex-none xl:ml-24 mx-auto">
+				<div className="max-w-3xl sm:max-w-5xl lg:max-w-none h-full">
 					<motion.img
 						initial="hidden"
 						animate="visible"
 						variants={imageVariants}
 						src={imageURL}
 						alt="Demo"
-						className="w-[60rem]"
+						className="w-240"
 					/>
 				</div>
 			</div>
diff --git a/apps/docs/components/InlineIconButton.tsx b/apps/docs/components/InlineIconButton.tsx
index 0b771e42cd..93ab27ffcb 100644
--- a/apps/docs/components/InlineIconButton.tsx
+++ b/apps/docs/components/InlineIconButton.tsx
@@ -13,7 +13,7 @@ export default function InlineIconButton(props: InlineIconButtonProps) {
 	return (
 		<span
 			className={clsx(
-				'inline-flex items-center rounded-md bg-[#D3D5D7] px-1 text-black dark:bg-[#161719] dark:text-[#D3D5D7]',
+				'rounded-md px-1 text-black inline-flex items-center bg-[#D3D5D7] dark:bg-[#161719] dark:text-[#D3D5D7]',
 				{ 'p-1': !props.text },
 			)}
 		>
diff --git a/apps/docs/components/LandingPage.tsx b/apps/docs/components/LandingPage.tsx
index 6169b9c7d2..6a3df539b8 100644
--- a/apps/docs/components/LandingPage.tsx
+++ b/apps/docs/components/LandingPage.tsx
@@ -12,11 +12,11 @@ export default function LandingPage() {
 
 	// I hate this hack, but there is a hydration issue with the image where it uses the wrong source
 	if (!mounted) {
-		return <div className="mx-auto h-screen max-w-7xl px-6 py-10 lg:flex lg:px-8 lg:py-20" />
+		return <div className="max-w-7xl px-6 py-10 lg:flex lg:px-8 lg:py-20 mx-auto h-screen" />
 	}
 
 	return (
-		<div className="flex h-full w-full flex-col items-center gap-y-12 overflow-x-hidden">
+		<div className="gap-y-12 flex h-full w-full flex-col items-center overflow-x-hidden">
 			<Hero />
 			<MobileApp />
 			<Feedback />
diff --git a/apps/docs/components/MobileApp.tsx b/apps/docs/components/MobileApp.tsx
index 28c832acf6..9d746e301d 100644
--- a/apps/docs/components/MobileApp.tsx
+++ b/apps/docs/components/MobileApp.tsx
@@ -3,21 +3,21 @@ import Link from 'next/link'
 
 export default function MobileApp() {
 	return (
-		<div className="w-full bg-white dark:bg-[#0E0E0E]">
-			<div className="mx-auto flex min-h-screen max-w-7xl flex-col items-center gap-16 px-6 py-10 lg:gap-20 lg:px-8 lg:py-24">
-				<div className="mx-auto max-w-2xl flex-shrink-0 md:text-center lg:mx-0 lg:max-w-xl lg:pt-8">
+		<div className="bg-white w-full dark:bg-[#0E0E0E]">
+			<div className="max-w-7xl gap-16 px-6 py-10 lg:gap-20 lg:px-8 lg:py-24 mx-auto flex min-h-screen flex-col items-center">
+				<div className="max-w-2xl md:text-center lg:mx-0 lg:max-w-xl lg:pt-8 mx-auto shrink-0">
 					<h2 className="text-2xl font-bold tracking-tight text-black sm:text-4xl dark:text-neutral-100">
 						Mobile app in early alpha
 					</h2>
 
-					<p className="text-neutral-650 mx-auto mt-5 max-w-md text-base sm:text-lg md:max-w-3xl md:text-xl dark:text-neutral-400">
+					<p className="text-neutral-650 mt-5 max-w-md text-base sm:text-lg md:max-w-3xl md:text-xl dark:text-neutral-400 mx-auto">
 						An app for both iOS and Android is in the works, with a more tailored mobile-first
 						experience
 					</p>
 
-					<div className="mt-5 flex items-center justify-center gap-2">
+					<div className="mt-5 gap-2 flex items-center justify-center">
 						<Link
-							className="bg-neutral-650 dark:hover:bg-neutral-650 hover:border-neutral-450 active:border-neutral-450 dark:active:border-neutral-450 dark:hover:border-neutral-450 dark:active:bg-neutral-650 flex cursor-pointer items-center rounded-md border border-neutral-500 px-3 py-1.5 text-sm font-medium text-neutral-800 transition-all duration-300 hover:bg-neutral-600 hover:text-white focus:outline-none active:bg-neutral-50 active:text-white dark:border-neutral-500 dark:bg-neutral-700 dark:bg-opacity-90 dark:text-neutral-200 dark:shadow-sm dark:hover:bg-neutral-700 dark:hover:bg-opacity-100 dark:hover:text-white dark:active:text-white dark:active:opacity-90"
+							className="bg-neutral-650 dark:hover:bg-neutral-650 hover:border-neutral-450 active:border-neutral-450 dark:active:border-neutral-450 dark:hover:border-neutral-450 dark:active:bg-neutral-650 rounded-md border-neutral-500 px-3 py-1.5 text-sm font-medium text-neutral-800 hover:bg-neutral-600 hover:text-white active:bg-neutral-50 active:text-white dark:border-neutral-500 dark:bg-neutral-700 dark:bg-opacity-90 dark:text-neutral-200 dark:shadow-sm dark:hover:bg-neutral-700 dark:hover:bg-opacity-100 dark:hover:text-white dark:active:text-white flex cursor-pointer items-center border transition-all duration-300 focus:outline-none dark:active:opacity-90"
 							href="/guides/mobile/app"
 						>
 							<span>Documentation</span>
@@ -25,14 +25,14 @@ export default function MobileApp() {
 
 						{/* https://play.google.com/store/apps/details?id=com.stumpapp.stump */}
 						<Link
-							className="dark:active:border-neutral-650 dark:active:bg-neutral-650 flex cursor-pointer items-center space-x-2 rounded-md border border-transparent bg-transparent px-3 py-1.5 text-sm font-medium text-neutral-700 transition-all duration-300 hover:border-neutral-200 hover:bg-neutral-50 hover:text-neutral-900 focus:outline-none active:border-neutral-200 active:bg-neutral-50 active:text-neutral-600 dark:bg-opacity-90 dark:text-neutral-200 dark:shadow-sm dark:hover:border-neutral-500 dark:hover:bg-neutral-700 dark:hover:bg-opacity-100 dark:hover:text-white dark:active:text-white dark:active:opacity-90"
+							className="dark:active:border-neutral-650 dark:active:bg-neutral-650 space-x-2 rounded-md px-3 py-1.5 text-sm font-medium text-neutral-700 hover:border-neutral-200 hover:bg-neutral-50 hover:text-neutral-900 active:border-neutral-200 active:bg-neutral-50 active:text-neutral-600 dark:bg-opacity-90 dark:text-neutral-200 dark:shadow-sm dark:hover:border-neutral-500 dark:hover:bg-neutral-700 dark:hover:bg-opacity-100 dark:hover:text-white dark:active:text-white flex cursor-pointer items-center border border-transparent bg-transparent transition-all duration-300 focus:outline-none dark:active:opacity-90"
 							href="/guides/mobile/app#getting-the-app"
 						>
 							<span>Google Beta</span>
 						</Link>
 
 						<Link
-							className="dark:active:border-neutral-650 dark:active:bg-neutral-650 flex cursor-pointer items-center space-x-2 rounded-md border border-transparent bg-transparent px-3 py-1.5 text-sm font-medium text-neutral-700 transition-all duration-300 hover:border-neutral-200 hover:bg-neutral-50 hover:text-neutral-900 focus:outline-none active:border-neutral-200 active:bg-neutral-50 active:text-neutral-600 dark:bg-opacity-90 dark:text-neutral-200 dark:shadow-sm dark:hover:border-neutral-500 dark:hover:bg-neutral-700 dark:hover:bg-opacity-100 dark:hover:text-white dark:active:text-white dark:active:opacity-90"
+							className="dark:active:border-neutral-650 dark:active:bg-neutral-650 space-x-2 rounded-md px-3 py-1.5 text-sm font-medium text-neutral-700 hover:border-neutral-200 hover:bg-neutral-50 hover:text-neutral-900 active:border-neutral-200 active:bg-neutral-50 active:text-neutral-600 dark:bg-opacity-90 dark:text-neutral-200 dark:shadow-sm dark:hover:border-neutral-500 dark:hover:bg-neutral-700 dark:hover:bg-opacity-100 dark:hover:text-white dark:active:text-white flex cursor-pointer items-center border border-transparent bg-transparent transition-all duration-300 focus:outline-none dark:active:opacity-90"
 							href="https://testflight.apple.com/join/a4srR634"
 							target="_blank"
 						>
@@ -42,18 +42,18 @@ export default function MobileApp() {
 					</div>
 				</div>
 
-				<div className="mx-auto max-w-7xl lg:px-8">
+				<div className="max-w-7xl lg:px-8 mx-auto">
 					<img src="/images/expo-preview.png" className="w-auto object-scale-down" />
 				</div>
 
-				<div className="mx-auto grid max-w-2xl grid-cols-1 gap-x-6 gap-y-10 text-base leading-7 text-gray-300 sm:grid-cols-2 lg:mx-0 lg:max-w-none lg:grid-cols-3 lg:gap-x-8 lg:gap-y-16">
+				<div className="max-w-2xl gap-x-6 gap-y-10 text-base leading-7 sm:grid-cols-2 lg:mx-0 lg:max-w-none lg:grid-cols-3 lg:gap-x-8 lg:gap-y-16 mx-auto grid grid-cols-1 text-gray-300">
 					{features.map((feature) => (
-						<div className="relative pl-9" key={feature.title}>
-							<dt className="inline font-semibold text-black dark:text-neutral-100">
-								<feature.icon className="absolute left-1 top-1 h-5 w-5" />
+						<div className="pl-9 relative" key={feature.title}>
+							<dt className="font-semibold text-black dark:text-neutral-100 inline">
+								<feature.icon className="left-1 top-1 h-5 w-5 absolute" />
 								{feature.title}
 							</dt>{' '}
-							<dd className="text-neutral-650 inline dark:text-neutral-400">
+							<dd className="text-neutral-650 dark:text-neutral-400 inline">
 								{feature.description}
 							</dd>
 						</div>
diff --git a/apps/docs/components/NavBar.tsx b/apps/docs/components/NavBar.tsx
index 759df6ba2f..5d1c28daff 100644
--- a/apps/docs/components/NavBar.tsx
+++ b/apps/docs/components/NavBar.tsx
@@ -49,7 +49,7 @@ export default function NavBar(props: Props) {
 
 	return (
 		<motion.div
-			className="sticky top-0 z-50"
+			className="top-0 sticky z-50"
 			initial={asPath === '/' ? 'hidden' : 'visible'}
 			transition={{ duration: 0.2 }}
 			variants={{
@@ -64,5 +64,5 @@ export default function NavBar(props: Props) {
 }
 
 export function ExtraContent() {
-	return <ThemeSwitch className="hidden md:inline-block" />
+	return <ThemeSwitch className="md:inline-block hidden" />
 }
diff --git a/apps/docs/components/StumpLogo.tsx b/apps/docs/components/StumpLogo.tsx
index 87ea55cc5a..78e590ca92 100644
--- a/apps/docs/components/StumpLogo.tsx
+++ b/apps/docs/components/StumpLogo.tsx
@@ -1,7 +1,7 @@
 export default function StumpLogo() {
 	return (
-		<div className="flex items-center space-x-2">
-			<img className="h-8" src="/favicon.ico" alt="Stump" />
+		<div className="space-x-2 flex items-center">
+			<img className="h-8 w-8 object-scale-down" src="/favicon.ico" alt="Stump" />
 			<h3 className="text-xl font-bold text-gray-850 dark:text-gray-200">Stump</h3>
 		</div>
 	)
diff --git a/apps/docs/globals.css b/apps/docs/globals.css
index b5c61c9567..60d76cf90b 100644
--- a/apps/docs/globals.css
+++ b/apps/docs/globals.css
@@ -1,3 +1,7 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import 'tailwindcss';
+
+@source './components/**/*.{js,ts,jsx,tsx}';
+@source './pages/**/*.{js,ts,jsx,tsx,mdx}';
+@source './theme.config.tsx';
+
+@custom-variant dark (&:is(.dark, .dark *));
diff --git a/apps/docs/package.json b/apps/docs/package.json
index b8f2b9beee..79d47f1e44 100644
--- a/apps/docs/package.json
+++ b/apps/docs/package.json
@@ -11,6 +11,7 @@
 		"lint": "eslint .",
 		"deploy-preview": "vercel",
 		"deploy": "vercel --prod",
+		"format": "eslint --fix . && prettier --config ../../prettier.config.js --ignore-path ../../.prettierignore --write .",
 		"nuke": "rimraf node_modules"
 	},
 	"keywords": [],
@@ -18,7 +19,7 @@
 	"license": "ISC",
 	"dependencies": {
 		"@icons-pack/react-simple-icons": "=9.1.0",
-		"clsx": "2.0.0",
+		"clsx": "2.1.1",
 		"framer-motion": "^10.16.4",
 		"lucide-react": "=0.428.0",
 		"next": "^14.2.15",
@@ -31,10 +32,10 @@
 	"devDependencies": {
 		"@types/node": "^20.8.7",
 		"@types/react": "=19.1.0",
-		"autoprefixer": "^10.4.16",
+		"@tailwindcss/postcss": "^4.2.2",
 		"eslint-config-next": "^14.2.15",
 		"postcss": "^8.4.31",
-		"tailwindcss": "^3.3.3",
+		"tailwindcss": "^4.2.2",
 		"typescript": "^5.3.3"
 	}
 }
diff --git a/apps/docs/pages/guides/access-control/oidc.mdx b/apps/docs/pages/guides/access-control/oidc.mdx
index fae4e6ed58..bb912ab29e 100644
--- a/apps/docs/pages/guides/access-control/oidc.mdx
+++ b/apps/docs/pages/guides/access-control/oidc.mdx
@@ -127,12 +127,12 @@ OIDC is configured in the same manner as other Stump settings, through environme
 
 ### Optional Settings
 
-| Variable                        | Default                | Description                                                           |
-| ------------------------------- | ---------------------- | --------------------------------------------------------------------- |
-| `STUMP_OIDC_SCOPES`             | `openid,email,profile` | Additional scopes to request from the provider (comma-separated)      |
-| `STUMP_OIDC_ALLOW_REGISTRATION` | `true`                 | Allow automatic user registration via OIDC on first login             |
-| `STUMP_OIDC_DISABLE_LOCAL_AUTH` | `false`                | Disable local username/password authentication when OIDC is enabled   |
-| `STUMP_OIDC_EXTRA_AUDIENCES`    | _(none)_               | Comma-separated list of additional trusted audiences in the ID token  |
+| Variable                        | Default                | Description                                                          |
+| ------------------------------- | ---------------------- | -------------------------------------------------------------------- |
+| `STUMP_OIDC_SCOPES`             | `openid,email,profile` | Additional scopes to request from the provider (comma-separated)     |
+| `STUMP_OIDC_ALLOW_REGISTRATION` | `true`                 | Allow automatic user registration via OIDC on first login            |
+| `STUMP_OIDC_DISABLE_LOCAL_AUTH` | `false`                | Disable local username/password authentication when OIDC is enabled  |
+| `STUMP_OIDC_EXTRA_AUDIENCES`    | _(none)_               | Comma-separated list of additional trusted audiences in the ID token |
 
 ### Docker Compose Example
 
diff --git a/apps/docs/pages/guides/access-control/users.mdx b/apps/docs/pages/guides/access-control/users.mdx
index 06ff1115ca..b0130e8eef 100644
--- a/apps/docs/pages/guides/access-control/users.mdx
+++ b/apps/docs/pages/guides/access-control/users.mdx
@@ -37,9 +37,7 @@ This will route you to a subpage which displays a form to create a new user
 - **Username**: The username of the user. This is used to log in to the server
 - **Password**: The password of the user. This is used to log in to the server. You can click the `Generate` button to generate a random password, or manually enter one
 - **Age restriction**: The _optional_ age restriction of the user. This is used to determine which books the user can access. You may enter a number corresponding to the **maximum** age rating the user can access. For example, if you enter `13` then the user will be able to access books with an age rating of `13` or lower. See the [age restrictions](/guides/access-control#age-restrictions) section of the Access Control guide for more information
-
   - **Note**: If you check the `Enforce restrictions for missing metadata` checkbox, then the user will only be able to access books that:
-
     1. _Explicitly_ have an age rating set
     2. The age rating is less than or equal to the user's age restriction
 
diff --git a/apps/docs/pages/guides/basics/thumbnails.mdx b/apps/docs/pages/guides/basics/thumbnails.mdx
index 029e1fb710..d53833f39b 100644
--- a/apps/docs/pages/guides/basics/thumbnails.mdx
+++ b/apps/docs/pages/guides/basics/thumbnails.mdx
@@ -62,7 +62,9 @@ If you choose to enable this feature, Stump will compute the dominant colors of
 If you choose to disable this feature, a default gray placeholder will be used instead.
 
 <Callout emoji="📱" type="info">
-	These placeholders are currently only supported by the mobile app. The web app does not yet support them. If you would like to see this feature added to the web app, please let me know and I can try to prioritize it
+	These placeholders are currently only supported by the mobile app. The web app does not yet
+	support them. If you would like to see this feature added to the web app, please let me know and I
+	can try to prioritize it
 </Callout>
 
 ## Management
diff --git a/apps/docs/pages/guides/features/email.mdx b/apps/docs/pages/guides/features/email.mdx
index 1d61f6a99c..e2febb6a81 100644
--- a/apps/docs/pages/guides/features/email.mdx
+++ b/apps/docs/pages/guides/features/email.mdx
@@ -46,8 +46,6 @@ A device alias refers to a named email address that can be quickly selected when
 
 A device alias may also be "inverted" to create a forbidden email address. This is useful for blocking certain email addresses from receiving books via your server. This really only comes into play when considering arbitrary send permissions, since without that permission a user would have to select from a list of device aliases which _aren't_ forbidden.
 
-
-
 ## Permissions
 
 The following table lists perissions which can be assigned to users to control access to email functionality:
diff --git a/apps/docs/postcss.config.js b/apps/docs/postcss.config.js
index 734c9975b8..0373b1eb84 100644
--- a/apps/docs/postcss.config.js
+++ b/apps/docs/postcss.config.js
@@ -1,7 +1,5 @@
-/** @type {import('postcss').Postcss} */
 module.exports = {
 	plugins: {
-		autoprefixer: {},
-		tailwindcss: {},
+		'@tailwindcss/postcss': {},
 	},
 }
diff --git a/apps/expo/package.json b/apps/expo/package.json
index c909764f58..c8f9da36e4 100644
--- a/apps/expo/package.json
+++ b/apps/expo/package.json
@@ -51,7 +51,7 @@
 		"axios": "^1.7.9",
 		"babel-plugin-inline-import": "^3.0.0",
 		"class-variance-authority": "^0.7.0",
-		"clsx": "^2.1.0",
+		"clsx": "^2.1.1",
 		"colorjs.io": "^0.5.2",
 		"date-fns": "^4.1.0",
 		"drizzle-orm": "^0.44.6",
@@ -114,7 +114,7 @@
 		"reanimated-color-picker": "^4.1.1",
 		"sonner-native": "^0.23.0",
 		"string-strip-html": "^13.4.13",
-		"tailwind-merge": "^2.2.1",
+		"tailwind-merge": "^3.5.0",
 		"tailwindcss": "3.3.5",
 		"tailwindcss-animate": "^1.0.7",
 		"thumbhash": "^0.1.1",
diff --git a/apps/web/package.json b/apps/web/package.json
index c0b9a32feb..d804fb7f2a 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -7,6 +7,7 @@
 		"dev": "vite --host",
 		"start": "vite preview",
 		"build": "vite build",
+		"format": "eslint --fix . && prettier --config ../../prettier.config.js --ignore-path ../../.prettierignore --write .",
 		"nuke": "rimraf node_modules"
 	},
 	"dependencies": {
@@ -22,11 +23,9 @@
 		"@types/react-dom": "^19.0.0",
 		"@types/react-router-dom": "^5.3.3",
 		"@vitejs/plugin-react": "^5.0.2",
-		"autoprefixer": "^10.4.19",
-		"postcss": "^8.4.38",
-		"tailwind": "^4.0.0",
-		"tailwind-scrollbar-hide": "^1.1.7",
-		"tailwindcss": "^3.4.3",
+		"@tailwindcss/vite": "^4.2.2",
+		"tailwindcss": "^4.2.2",
+		"tw-animate-css": "^1.4.0",
 		"typescript": "^5.4.5",
 		"vite": "^7.1.5",
 		"vite-plugin-pwa": "^1.0.3",
diff --git a/apps/web/postcss.config.js b/apps/web/postcss.config.js
deleted file mode 100644
index 65994d3285..0000000000
--- a/apps/web/postcss.config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-	plugins: {
-		autoprefixer: {},
-		tailwindcss: {},
-	},
-}
diff --git a/apps/web/src/index.html b/apps/web/src/index.html
index a183b10c5c..2952cc1360 100644
--- a/apps/web/src/index.html
+++ b/apps/web/src/index.html
@@ -21,11 +21,6 @@
 			} catch {}
 		</script>
 		<style>
-			* {
-				margin: 0;
-				padding: 0;
-				box-sizing: border-box;
-			}
 			html.autumn {
 				background-color: #2c1a12;
 			}
diff --git a/apps/web/tailwind.config.ts b/apps/web/tailwind.config.ts
deleted file mode 100644
index 064554f3c4..0000000000
--- a/apps/web/tailwind.config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import stumpPreset, { getContent } from '@stump/components/tailwind'
-import type { Config } from 'tailwindcss'
-
-export default {
-	content: getContent({ relativePath: 'packages/web' }),
-	presets: [stumpPreset],
-} satisfies Config
diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts
index 3e01644b99..126a6ae7ab 100644
--- a/apps/web/vite.config.ts
+++ b/apps/web/vite.config.ts
@@ -1,8 +1,9 @@
+import tailwindcss from '@tailwindcss/vite'
 import react from '@vitejs/plugin-react'
+import type { PluginOption } from 'vite'
 import { defineConfig } from 'vite'
 import { VitePWA } from 'vite-plugin-pwa'
 import tsconfigPaths from 'vite-plugin-tsconfig-paths'
-import type { PluginOption } from 'vite'
 
 // https://www.npmjs.com/package/vite-plugin-node-polyfills
 import { name, version } from './package.json'
@@ -19,6 +20,7 @@ export default defineConfig({
 		pkgJson: { name, version },
 	},
 	plugins: [
+		tailwindcss(),
 		react({
 			babel: {
 				plugins: [['babel-plugin-react-compiler', {}]],
diff --git a/eslint.config.mjs b/eslint.config.mjs
index ec793feead..2733c509d9 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -10,7 +10,7 @@ import tseslint from 'typescript-eslint'
 
 export default [
 	{
-		ignores: ['**/dist/*', '**/target/**', '**/.next/**', '**/.vercel/**', '**/emoji/data.json'],
+		ignores: ['**/dist/*', '**/dev-dist/**', '**/target/**', '**/.next/**', '**/.vercel/**', '**/emoji/data.json'],
 	},
 	{
 		files: ['**/*.{js,mjs,cjs,ts,jsx,tsx}'],
diff --git a/package.json b/package.json
index 374a9d3f58..91b15e02f4 100644
--- a/package.json
+++ b/package.json
@@ -93,5 +93,6 @@
 				"@babel/core"
 			]
 		}
-	}
+	},
+	"dependencies": {}
 }
diff --git a/packages/browser/package.json b/packages/browser/package.json
index c30f76965e..a14d1a2fdb 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -32,7 +32,7 @@
 		"@tauri-apps/plugin-store": "^2.0.0",
 		"ansi-to-react": "^6.2.6",
 		"class-variance-authority": "^0.7.0",
-		"clsx": "^2.1.0",
+		"clsx": "^2.1.1",
 		"colorjs.io": "^0.5.2",
 		"epubjs": "^0.3.93",
 		"framer-motion": "^10.18.0",
diff --git a/packages/browser/src/AppLayout.tsx b/packages/browser/src/AppLayout.tsx
index 44119f5de4..b1d23e2506 100644
--- a/packages/browser/src/AppLayout.tsx
+++ b/packages/browser/src/AppLayout.tsx
@@ -238,12 +238,12 @@ export function AppLayout() {
 					<main
 						id="main"
 						className={cn(
-							'flex w-full flex-1 flex-col overflow-y-auto overflow-x-hidden bg-background',
+							'flex w-full flex-1 flex-col overflow-x-hidden overflow-y-auto bg-background',
 							{
 								'scrollbar-hide': storeUser.preferences?.enableHideScrollbar,
 							},
 							{
-								'bg-gradient-to-br from-background-gradient-from to-background-gradient-to':
+								'from-background-gradient-from to-background-gradient-to bg-linear-to-br':
 									shouldUseGradient,
 							},
 						)}
diff --git a/packages/browser/src/components/BackgroundFetchIndicator.tsx b/packages/browser/src/components/BackgroundFetchIndicator.tsx
index f48ab907e9..7287e239fa 100644
--- a/packages/browser/src/components/BackgroundFetchIndicator.tsx
+++ b/packages/browser/src/components/BackgroundFetchIndicator.tsx
@@ -21,7 +21,7 @@ export default function BackgroundFetchIndicator() {
 	}
 
 	return (
-		<div className="fixed bottom-4 right-6 z-50">
+		<div className="bottom-4 right-6 fixed z-50">
 			<svg className="stroke-contrast h-6 w-6 animate-spin" viewBox="0 0 256 256">
 				<line
 					x1="128"
diff --git a/packages/browser/src/components/BadgeList.tsx b/packages/browser/src/components/BadgeList.tsx
index c336931644..3e94d0c8c4 100644
--- a/packages/browser/src/components/BadgeList.tsx
+++ b/packages/browser/src/components/BadgeList.tsx
@@ -32,17 +32,17 @@ export default function BadgeList({ children, className, maxItems = 20 }: Props)
 					transition: 'height 0.25s cubic-bezier(0.4, 0, 0.2, 1)',
 				}}
 			>
-				<div ref={containerRef} className={cn('flex flex-wrap gap-1', className)}>
+				<div ref={containerRef} className={cn('gap-1 flex flex-wrap', className)}>
 					{visible}
 				</div>
 			</div>
 
 			{overflows && (
-				<div className="relative mt-1.5 flex w-full items-center">
+				<div className="mt-1.5 relative flex w-full items-center">
 					<div className="flex-1 border-t border-dashed border-edge" />
 					<button
 						onClick={toggle}
-						className="cursor-pointer rounded-full border border-dashed border-edge bg-background px-3 py-0.5 text-xs font-medium text-foreground-muted transition-colors hover:bg-background-surface hover:text-foreground"
+						className="px-3 py-0.5 text-xs font-medium cursor-pointer rounded-full border border-dashed border-edge bg-background text-foreground-muted transition-colors hover:bg-background-surface hover:text-foreground"
 					>
 						{expanded ? 'See less' : `See ${items.length - maxItems} more`}
 					</button>
diff --git a/packages/browser/src/components/DirectoryPickerModal.tsx b/packages/browser/src/components/DirectoryPickerModal.tsx
index 935223cc90..775a631fe7 100644
--- a/packages/browser/src/components/DirectoryPickerModal.tsx
+++ b/packages/browser/src/components/DirectoryPickerModal.tsx
@@ -87,8 +87,8 @@ export default function DirectoryPickerModal({
 					<Dialog.Close onClick={onClose} />
 				</Dialog.Header>
 
-				<div className="flex flex-col space-y-2 overflow-hidden p-1">
-					<div className="flex items-center space-x-2">
+				<div className="space-y-2 p-1 flex flex-col overflow-hidden">
+					<div className="space-x-2 flex items-center">
 						<Button
 							className="h-8 w-8 p-0 text-sm"
 							disabled={!canGoBack}
@@ -115,7 +115,7 @@ export default function DirectoryPickerModal({
 						/>
 					</div>
 
-					<div className="flex h-[20rem] flex-col divide-y divide-edge/75 overflow-hidden">
+					<div className="h-80 flex flex-col divide-y divide-edge/75 overflow-hidden">
 						<AutoSizer>
 							{({ height, width }) => (
 								<Virtuoso
@@ -126,14 +126,14 @@ export default function DirectoryPickerModal({
 									itemContent={(index, directory) => (
 										<button
 											className={cx(
-												'my-0.5 w-full justify-start rounded-lg px-2 py-1.5 text-left hover:bg-background-surface',
+												'my-0.5 rounded-lg px-2 py-1.5 w-full justify-start text-left hover:bg-background-surface',
 												{
 													'bg-background-surface/40': index % 2 === 0,
 												},
 											)}
 											onClick={() => setPath(directory.path)}
 										>
-											<Text className="line-clamp-1 inline-flex items-center gap-x-2">
+											<Text className="gap-x-2 line-clamp-1 inline-flex items-center">
 												<Folder size="1.25rem" className="shrink-0" />
 												<span className="line-clamp-1">{directory.name}</span>
 											</Text>
@@ -147,7 +147,7 @@ export default function DirectoryPickerModal({
 					</div>
 				</div>
 
-				<Dialog.Footer className="w-full items-center gap-3 sm:justify-between sm:gap-0">
+				<Dialog.Footer className="gap-3 sm:justify-between sm:gap-0 w-full items-center">
 					<CheckBox
 						variant="primary"
 						label="Show Hidden Directories"
@@ -155,7 +155,7 @@ export default function DirectoryPickerModal({
 						onClick={toggle}
 					/>
 
-					<div className="flex w-full flex-col-reverse space-y-2 space-y-reverse sm:flex-row sm:justify-end sm:space-x-2 sm:space-y-0">
+					<div className="space-y-2 sm:flex-row sm:justify-end sm:space-x-2 sm:space-y-0 flex w-full flex-col-reverse space-y-reverse">
 						<Button onClick={onClose}>Cancel</Button>
 						<Button variant="primary" onClick={handleConfirm}>
 							Confirm
diff --git a/packages/browser/src/components/ErrorFallback.tsx b/packages/browser/src/components/ErrorFallback.tsx
index 5e8c87f7f3..14f29c3664 100644
--- a/packages/browser/src/components/ErrorFallback.tsx
+++ b/packages/browser/src/components/ErrorFallback.tsx
@@ -25,7 +25,7 @@ export function ErrorFallback({ error, resetErrorBoundary }: FallbackProps) {
 			<img
 				src="/assets/svg/bomb.svg"
 				alt="Construction illustration"
-				className="mx-auto hidden max-h-64 w-1/2 shrink-0 object-scale-down sm:inline-block"
+				className="max-h-64 sm:inline-block mx-auto hidden w-1/2 shrink-0 object-scale-down"
 			/>
 			<div className="max-w-sm sm:max-w-md md:max-w-xl">
 				<div className="text-left">
@@ -34,7 +34,7 @@ export function ErrorFallback({ error, resetErrorBoundary }: FallbackProps) {
 						{error.message || 'The error message was empty.'}
 					</p>
 				</div>
-				<div className="flex w-full items-center gap-3 pt-3">
+				<div className="gap-3 pt-3 flex w-full items-center">
 					<ButtonOrLink
 						variant="primary"
 						onClick={resetErrorBoundary}
diff --git a/packages/browser/src/components/GenericEmptyState.tsx b/packages/browser/src/components/GenericEmptyState.tsx
index 64c1ad884b..f4a1b4e87c 100644
--- a/packages/browser/src/components/GenericEmptyState.tsx
+++ b/packages/browser/src/components/GenericEmptyState.tsx
@@ -18,7 +18,7 @@ export default function GenericEmptyState({
 	return (
 		<div
 			className={cn(
-				'flex min-h-[150px] flex-col items-center justify-center gap-2',
+				'gap-2 flex min-h-[150px] flex-col items-center justify-center',
 				{ 'md:items-start md:justify-start': leftAlign },
 				containerClassName,
 			)}
diff --git a/packages/browser/src/components/HorizontalCardList.tsx b/packages/browser/src/components/HorizontalCardList.tsx
index fec8918631..faeff26a4e 100644
--- a/packages/browser/src/components/HorizontalCardList.tsx
+++ b/packages/browser/src/components/HorizontalCardList.tsx
@@ -47,8 +47,8 @@ export default function HorizontalCardList({
 			return (
 				<div className="flex">
 					{emptyState || (
-						<div className="flex items-start justify-start space-x-3 rounded-lg border border-dashed border-edge-subtle px-4 py-4">
-							<span className="rounded-lg border border-edge bg-background-surface p-2">
+						<div className="space-x-3 rounded-lg px-4 py-4 flex items-start justify-start border border-dashed border-edge-subtle">
+							<span className="rounded-lg p-2 border border-edge bg-background-surface">
 								<CircleSlash2 className="h-8 w-8 text-foreground-muted" />
 							</span>
 							<div>
@@ -81,11 +81,11 @@ export default function HorizontalCardList({
 	}
 
 	return (
-		<div className="flex flex-col space-y-2">
+		<div className="space-y-2 flex flex-col">
 			<div className="flex flex-row items-center justify-between">
 				<Heading size="sm">{title}</Heading>
 				<div className={cn('self-end', { hidden: !items.length })}>
-					<div className="flex gap-2">
+					<div className="gap-2 flex">
 						<ToolTip content="Seek backwards" isDisabled={!canSkipBackward} align="end">
 							<Button
 								variant="ghost"
diff --git a/packages/browser/src/components/LinkBadge.tsx b/packages/browser/src/components/LinkBadge.tsx
index 5bfd18ad2c..fb15a39291 100644
--- a/packages/browser/src/components/LinkBadge.tsx
+++ b/packages/browser/src/components/LinkBadge.tsx
@@ -37,7 +37,7 @@ export default function LinkBadge({ href, text }: Props) {
 		<Badge className="line-clamp-1 flex items-center" size="sm">
 			<Link href={href} target="_blank" rel="noopener noreferrer" className="flex items-center">
 				{content}
-				<ExternalLink className="ml-1 h-3 w-3 flex-shrink-0" />
+				<ExternalLink className="ml-1 h-3 w-3 shrink-0" />
 			</Link>
 		</Badge>
 	)
diff --git a/packages/browser/src/components/MultiRowHorizontalCardList.tsx b/packages/browser/src/components/MultiRowHorizontalCardList.tsx
index 881e66b973..efaff8e89a 100644
--- a/packages/browser/src/components/MultiRowHorizontalCardList.tsx
+++ b/packages/browser/src/components/MultiRowHorizontalCardList.tsx
@@ -58,8 +58,8 @@ export default function MultiRowHorizontalCardList<T>({
 			return (
 				<div className="flex">
 					{emptyState || (
-						<div className="flex items-start justify-start space-x-3 rounded-lg border border-dashed border-edge-subtle px-4 py-4">
-							<span className="rounded-lg border border-edge bg-background-surface p-2">
+						<div className="space-x-3 rounded-lg px-4 py-4 flex items-start justify-start border border-dashed border-edge-subtle">
+							<span className="rounded-lg p-2 border border-edge bg-background-surface">
 								<CircleSlash2 className="h-8 w-8 text-foreground-muted" />
 							</span>
 							<div>
@@ -84,7 +84,7 @@ export default function MultiRowHorizontalCardList<T>({
 					Scroller: HorizontalScroller,
 				}}
 				itemContent={(_, column) => (
-					<div className="flex flex-col gap-3 px-1.5 pb-1">
+					<div className="gap-3 px-1.5 pb-1 flex flex-col">
 						{column.map((item) => (
 							<div key={keyExtractor(item)}>{renderItem(item)}</div>
 						))}
@@ -98,11 +98,11 @@ export default function MultiRowHorizontalCardList<T>({
 	}
 
 	return (
-		<div className="flex flex-col space-y-2">
+		<div className="space-y-2 flex flex-col">
 			<div className="flex flex-row items-center justify-between">
 				<Heading size="sm">{title}</Heading>
 				<div className={cn('self-end', { hidden: !items.length })}>
-					<div className="flex gap-2">
+					<div className="gap-2 flex">
 						<ToolTip content="Seek backwards" isDisabled={!canSkipBackward} align="end">
 							<Button
 								variant="ghost"
diff --git a/packages/browser/src/components/PagePopoverForm.tsx b/packages/browser/src/components/PagePopoverForm.tsx
index 807d414630..f3d76165a1 100644
--- a/packages/browser/src/components/PagePopoverForm.tsx
+++ b/packages/browser/src/components/PagePopoverForm.tsx
@@ -69,7 +69,7 @@ export default function PagePopoverForm({
 		<Popover open={isOpen} onOpenChange={handleOpenChange}>
 			<Popover.Trigger asChild={typeof trigger !== 'string'}>{trigger}</Popover.Trigger>
 			<Popover.Content size="md">
-				<div className="flex flex-col gap-2">
+				<div className="gap-2 flex flex-col">
 					<Form id={`pagination-page-entry-form-${pos}`} form={form} onSubmit={handleSubmit}>
 						<Input
 							label="Jump to another page"
diff --git a/packages/browser/src/components/Pagination.tsx b/packages/browser/src/components/Pagination.tsx
index 597930fd33..b601dee668 100644
--- a/packages/browser/src/components/Pagination.tsx
+++ b/packages/browser/src/components/Pagination.tsx
@@ -34,7 +34,7 @@ function PaginationArrow({ kind, isDisabled, onClick, onMouseEnter }: Pagination
 			>
 				<div
 					className={cx(
-						'inline-flex items-center border-t-2 border-transparent pt-4 text-xs font-medium hover:border-edge-subtle md:text-sm',
+						'pt-4 text-xs font-medium md:text-sm inline-flex items-center border-t-2 border-transparent hover:border-edge-subtle',
 						!isDisabled && 'text-foreground-subtle',
 						isDisabled && 'pointer-events-none cursor-not-allowed text-foreground-muted',
 						{ 'pl-0 pr-1': kind === 'previous' },
@@ -71,9 +71,9 @@ function PaginationLink({ value, onClick, isActive, onMouseEnter }: PaginationLi
 			onClick={onClick}
 			onMouseEnter={onMouseEnter}
 			className={cn(
-				'inline-flex cursor-pointer items-center border-t-2 px-4 pt-4 text-xs font-medium text-foreground-muted md:text-sm',
+				'px-4 pt-4 text-xs font-medium md:text-sm inline-flex cursor-pointer items-center border-t-2 text-foreground-muted',
 				{
-					'border-edge-brand text-brand hover:border-edge-brand': isActive,
+					'text-brand border-edge-brand hover:border-edge-brand': isActive,
 				},
 				{
 					'border-transparent text-foreground-muted hover:border-edge-subtle': !isActive,
@@ -135,7 +135,7 @@ export default function Pagination({
 					'mt-7': position === 'bottom',
 				})}
 			>
-				<div className="-mt-px flex w-full items-start justify-between gap-2 px-4">
+				<div className="gap-2 px-4 -mt-px flex w-full items-start justify-between">
 					<PaginationArrow
 						kind="previous"
 						onClick={() => onChangePage(currentPage - 1)}
@@ -166,7 +166,7 @@ export default function Pagination({
 									onPageChange={handleEllipsisNavigate}
 									trigger={
 										<div className="-mt-1">
-											<button className="flex items-center border-t-2 border-transparent px-4 pt-4 text-xs font-medium text-foreground-muted hover:border-edge-subtle focus:outline-none md:text-sm">
+											<button className="px-4 pt-4 text-xs font-medium md:text-sm flex items-center border-t-2 border-transparent text-foreground-muted hover:border-edge-subtle focus:outline-none">
 												<MoreHorizontal className="h-4 w-4" />
 											</button>
 										</div>
diff --git a/packages/browser/src/components/ReadMore.tsx b/packages/browser/src/components/ReadMore.tsx
index c194cb6810..16d8673fc6 100644
--- a/packages/browser/src/components/ReadMore.tsx
+++ b/packages/browser/src/components/ReadMore.tsx
@@ -37,15 +37,15 @@ export default function ReadMore({ text }: Props) {
 			</div>
 
 			<div
-				className="pointer-events-none -mt-8 h-8 bg-gradient-to-t from-background to-transparent transition-opacity duration-150"
+				className="-mt-8 h-8 pointer-events-none bg-linear-to-t from-background to-transparent transition-opacity duration-150"
 				style={{ opacity: showingAll ? 0 : 1 }}
 			/>
 
-			<div className="relative mt-2 flex w-full items-center">
+			<div className="mt-2 relative flex w-full items-center">
 				<div className="flex-1 border-t border-dashed border-edge" />
 				<button
 					onClick={toggle}
-					className="cursor-pointer rounded-full border border-dashed border-edge bg-background px-3 py-0.5 text-xs font-medium text-foreground-muted transition-colors hover:bg-background-surface hover:text-foreground"
+					className="px-3 py-0.5 text-xs font-medium cursor-pointer rounded-full border border-dashed border-edge bg-background text-foreground-muted transition-colors hover:bg-background-surface hover:text-foreground"
 				>
 					{showingAll ? 'Read less' : 'Read more'}
 				</button>
diff --git a/packages/browser/src/components/ServerStatusOverlay.tsx b/packages/browser/src/components/ServerStatusOverlay.tsx
index a85b1853de..e8ad7a50be 100644
--- a/packages/browser/src/components/ServerStatusOverlay.tsx
+++ b/packages/browser/src/components/ServerStatusOverlay.tsx
@@ -32,18 +32,18 @@ export default function ServerStatusOverlay() {
 			{show && (
 				<motion.div
 					// @ts-expect-error: It is there I promise
-					className="fixed bottom-[1rem] right-[1rem] flex w-64 flex-col items-center justify-center rounded-md bg-background-surface p-3 shadow"
+					className="bottom-4 right-4 w-64 rounded-md p-3 shadow fixed flex flex-col items-center justify-center bg-background-surface"
 					initial={{ opacity: 0, scale: 0.9, y: 100 }}
 					animate={{ opacity: 1, scale: 1, y: 0 }}
 					exit={{ opacity: 0, scale: 0.9, y: 100 }}
 				>
-					<div className="flex w-full flex-col gap-1">
+					<div className="gap-1 flex w-full flex-col">
 						<div className="flex w-full items-center justify-between">
 							<Text size="sm">Server is not connected</Text>
 							<div className="relative">
-								<span className="flex h-2 w-2">
-									<span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-red-400 opacity-75"></span>
-									<span className="relative inline-flex h-2 w-2 rounded-full bg-red-500"></span>
+								<span className="h-2 w-2 flex">
+									<span className="animate-ping bg-red-400 absolute inline-flex h-full w-full rounded-full opacity-75"></span>
+									<span className="h-2 w-2 bg-red-500 relative inline-flex rounded-full"></span>
 								</span>
 							</div>
 						</div>
diff --git a/packages/browser/src/components/TableOrGridLayout.tsx b/packages/browser/src/components/TableOrGridLayout.tsx
index 8edae2f1dd..976833dede 100644
--- a/packages/browser/src/components/TableOrGridLayout.tsx
+++ b/packages/browser/src/components/TableOrGridLayout.tsx
@@ -9,7 +9,7 @@ type Props = {
 
 export default function TableOrGridLayout({ layout, setLayout }: Props) {
 	return (
-		<div className="flex shrink-0 items-center gap-1">
+		<div className="gap-1 flex shrink-0 items-center">
 			<ToolTip content="Grid" size="sm">
 				<IconButton
 					variant="ghost"
diff --git a/packages/browser/src/components/UserMenu.tsx b/packages/browser/src/components/UserMenu.tsx
index 9db3eae4c1..35840e1b74 100644
--- a/packages/browser/src/components/UserMenu.tsx
+++ b/packages/browser/src/components/UserMenu.tsx
@@ -33,8 +33,8 @@ export default function UserMenu({ variant = 'sidebar' }: Props) {
 					<Popover.Trigger asChild>
 						<Card
 							className={cn(
-								'flex h-[2.35rem] w-full cursor-pointer items-center border-transparent border-opacity-80 px-1 transition-all duration-150 hover:border-opacity-100',
-								{ 'border-edge-subtle border-opacity-100': isOpen },
+								'border-opacity-80 px-1 hover:border-opacity-100 flex h-[2.35rem] w-full cursor-pointer items-center border-transparent transition-all duration-150',
+								{ 'border-opacity-100 border-edge-subtle': isOpen },
 								{ 'border-edge-subtle': isSidebar },
 								{ 'justify-center rounded-full hover:border-edge-subtle': !isSidebar },
 							)}
@@ -47,7 +47,7 @@ export default function UserMenu({ variant = 'sidebar' }: Props) {
 								className="h-6 w-6"
 							/>
 							{isSidebar && (
-								<Text className="ml-2 line-clamp-1 select-none text-ellipsis" size="sm">
+								<Text className="ml-2 line-clamp-1 text-ellipsis select-none" size="sm">
 									{user.username}
 								</Text>
 							)}
@@ -55,7 +55,7 @@ export default function UserMenu({ variant = 'sidebar' }: Props) {
 					</Popover.Trigger>
 
 					<Popover.Content
-						className="flex flex-col divide-y divide-edge overflow-hidden p-0 shadow-sm"
+						className="p-0 shadow-sm flex flex-col divide-y divide-edge overflow-hidden"
 						align={isSidebar ? 'start' : 'end'}
 						style={{ width: isSidebar ? width : 'auto' }}
 					>
diff --git a/packages/browser/src/components/book/BookCard.tsx b/packages/browser/src/components/book/BookCard.tsx
index 10a12f1e3d..f92493f620 100644
--- a/packages/browser/src/components/book/BookCard.tsx
+++ b/packages/browser/src/components/book/BookCard.tsx
@@ -132,7 +132,7 @@ const BookCard = memo(function BookCard({
 	const renderSubtitle = () => {
 		if (isMissing) {
 			return (
-				<Text size="xs" className="uppercase text-amber-500">
+				<Text size="xs" className="text-amber-500 uppercase">
 					File Missing
 				</Text>
 			)
@@ -140,7 +140,7 @@ const BookCard = memo(function BookCard({
 
 		if (progressPercent > 0 && progressPercent < 100) {
 			return (
-				<div className="flex items-center justify-between gap-1">
+				<div className="gap-1 flex items-center justify-between">
 					<Text size="xs" variant="muted">
 						{progressPercent}%
 					</Text>
@@ -194,15 +194,15 @@ const BookCard = memo(function BookCard({
 			onClick={handleClick}
 			onMouseEnter={prefetch}
 			className={cn(
-				'group relative flex flex-col gap-1',
-				'rounded-lg border border-transparent p-1 transition-colors duration-100',
+				'group gap-1 relative flex flex-col',
+				'rounded-lg p-1 border border-transparent transition-colors duration-100',
 				'focus-visible:outline-none',
-				fullWidth ? 'w-full' : 'w-[10rem] shrink-0 sm:w-[10.666rem] md:w-[12rem]',
+				fullWidth ? 'w-full' : 'w-40 sm:w-[10.666rem] md:w-48 shrink-0',
 			)}
 		>
 			<div
 				className={cn(
-					'absolute -inset-0.5 -z-10 rounded-lg',
+					'-inset-0.5 rounded-lg absolute -z-10',
 					'scale-95 opacity-0 duration-100',
 					'group-hover:scale-100 group-hover:opacity-100',
 					'group-focus-visible:scale-100 group-focus-visible:opacity-100',
@@ -235,10 +235,10 @@ const BookCard = memo(function BookCard({
 				/>
 			)}
 
-			<div className="flex h-[52px] flex-col gap-0.5 px-0.5">
+			<div className="gap-0.5 px-0.5 flex h-[52px] flex-col">
 				<Text
 					size="sm"
-					className="line-clamp-2 min-w-0 whitespace-normal font-medium leading-tight"
+					className="min-w-0 font-medium leading-tight line-clamp-2 whitespace-normal"
 				>
 					{data.resolvedName}
 				</Text>
diff --git a/packages/browser/src/components/book/BookSearch.tsx b/packages/browser/src/components/book/BookSearch.tsx
index 573a1ebeaf..0fa10a29ce 100644
--- a/packages/browser/src/components/book/BookSearch.tsx
+++ b/packages/browser/src/components/book/BookSearch.tsx
@@ -68,7 +68,7 @@ export default function BookSearch({ onBookSelect }: Props) {
 	const books = data?.pages.flatMap((page) => page.media.nodes) || []
 
 	return (
-		<div className="flex flex-1 flex-col gap-y-4">
+		<div className="gap-y-4 flex flex-1 flex-col">
 			<Input
 				placeholder="Search for a book..."
 				value={search}
diff --git a/packages/browser/src/components/book/BookSearchOverlay.tsx b/packages/browser/src/components/book/BookSearchOverlay.tsx
index fa5bd36fff..35f75e8f9e 100644
--- a/packages/browser/src/components/book/BookSearchOverlay.tsx
+++ b/packages/browser/src/components/book/BookSearchOverlay.tsx
@@ -25,7 +25,7 @@ export default function BookSearchOverlay({ onBookSelect, sheetProps }: Props) {
 		}
 
 		return (
-			<Button variant="secondary" className="flex h-full items-center gap-1.5">
+			<Button variant="secondary" className="gap-1.5 flex h-full items-center">
 				<Search className="h-4 w-4" />
 				<span>Search for a book</span>
 			</Button>
@@ -47,7 +47,7 @@ export default function BookSearchOverlay({ onBookSelect, sheetProps }: Props) {
 			trigger={renderTrigger()}
 			size="xl"
 		>
-			<div className="flex flex-1 flex-col overflow-hidden p-4">
+			<div className="p-4 flex flex-1 flex-col overflow-hidden">
 				<BookSearch onBookSelect={handleSelectBook} />
 			</div>
 		</Sheet>
diff --git a/packages/browser/src/components/book/metadata/MediaMetadataEditor.tsx b/packages/browser/src/components/book/metadata/MediaMetadataEditor.tsx
index 0d6eaf2e83..427fba6156 100644
--- a/packages/browser/src/components/book/metadata/MediaMetadataEditor.tsx
+++ b/packages/browser/src/components/book/metadata/MediaMetadataEditor.tsx
@@ -112,7 +112,7 @@ export default function MediaMetadataEditor({ mediaId, data }: Props) {
 		() => [
 			columnHelper.accessor('label', {
 				header: ({ table }) => (
-					<div className="flex h-full items-center pl-4 font-bold leading-6 text-foreground/90">
+					<div className="pl-4 font-bold leading-6 flex h-full items-center text-foreground/90">
 						<Label className="flex items-center">
 							<CheckBox
 								variant="primary"
diff --git a/packages/browser/src/components/book/table/BookLinksCell.tsx b/packages/browser/src/components/book/table/BookLinksCell.tsx
index ec0eec3e3a..6be282bae9 100644
--- a/packages/browser/src/components/book/table/BookLinksCell.tsx
+++ b/packages/browser/src/components/book/table/BookLinksCell.tsx
@@ -21,7 +21,7 @@ export default function BookLinksCell({ links }: Props) {
 	}
 
 	return (
-		<div className="flex flex-wrap items-center gap-1.5">
+		<div className="gap-1.5 flex flex-wrap items-center">
 			{links.map((href) => (
 				<a key={href} href={href} target="_blank" rel="noopener noreferrer">
 					<Badge size="sm">
diff --git a/packages/browser/src/components/book/table/CoverImageCell.tsx b/packages/browser/src/components/book/table/CoverImageCell.tsx
index c24471162f..6e774046ee 100644
--- a/packages/browser/src/components/book/table/CoverImageCell.tsx
+++ b/packages/browser/src/components/book/table/CoverImageCell.tsx
@@ -42,7 +42,7 @@ export default function CoverImageCell({ id, title }: Props) {
 		return (
 			<div
 				title={`${title} (Image failed to load)`}
-				className="flex h-14 w-auto items-center justify-center rounded-sm border-[0.5px] border-edge bg-sidebar shadow-sm"
+				className="h-14 rounded-sm shadow-sm flex w-auto items-center justify-center border-[0.5px] border-edge bg-sidebar"
 				style={{ aspectRatio: thumbnailRatio }}
 				onClick={attemptReload}
 			>
@@ -52,10 +52,10 @@ export default function CoverImageCell({ id, title }: Props) {
 	}
 
 	return (
-		<div className="flex h-14 w-auto items-center justify-center">
+		<div className="h-14 flex w-auto items-center justify-center">
 			<EntityImage
 				title={title}
-				className="h-14 w-auto rounded-md object-cover p-px"
+				className="h-14 rounded-md w-auto object-cover p-px"
 				style={{ aspectRatio: thumbnailRatio }}
 				src={sdk.media.thumbnailURL(id)}
 				onError={() => setShowFallback(true)}
diff --git a/packages/browser/src/components/book/table/columns.tsx b/packages/browser/src/components/book/table/columns.tsx
index df58b5ac30..3549d9aa5a 100644
--- a/packages/browser/src/components/book/table/columns.tsx
+++ b/packages/browser/src/components/book/table/columns.tsx
@@ -23,7 +23,7 @@ function MetadataBadgeListCell({ values }: { values?: string[] | null }) {
 	const remaining = Math.max(values.length - visible.length, 0)
 
 	return (
-		<div className="flex max-h-[3.125rem] flex-wrap gap-1 overflow-hidden">
+		<div className="max-h-12.5 gap-1 flex flex-wrap overflow-hidden">
 			{visible.map((value) => (
 				<Badge key={value} size="sm" className="line-clamp-1 max-w-full">
 					{value}
@@ -62,7 +62,7 @@ const nameColumn = columnHelper.accessor(({ resolvedName }) => resolvedName, {
 						})
 					: paths.bookOverview(id)
 			}
-			className="line-clamp-2 text-sm text-opacity-100 no-underline hover:text-opacity-90"
+			className="text-sm line-clamp-2 no-underline hover:text-foreground/90"
 		>
 			{getValue()}
 		</Link>
diff --git a/packages/browser/src/components/bookClub/books/BookClubBookItem.tsx b/packages/browser/src/components/bookClub/books/BookClubBookItem.tsx
index 07eacc98e5..52c7b36e9d 100644
--- a/packages/browser/src/components/bookClub/books/BookClubBookItem.tsx
+++ b/packages/browser/src/components/bookClub/books/BookClubBookItem.tsx
@@ -113,7 +113,7 @@ export default function BookClubBookItem({ data }: Props) {
 		const image = details?.imageUrl ? (
 			<ImageComponent src={details.imageUrl} className="rounded-md object-cover" />
 		) : (
-			<div className="flex h-full w-full items-center justify-center rounded-md border border-edge/80 bg-background-surface/50">
+			<div className="rounded-md flex h-full w-full items-center justify-center border border-edge/80 bg-background-surface/50">
 				<Book className="h-10 w-10 text-foreground-muted" />
 			</div>
 		)
@@ -128,7 +128,7 @@ export default function BookClubBookItem({ data }: Props) {
 					<AspectRatio ratio={2 / 3}>{image}</AspectRatio>
 				</div>
 
-				<div className="flex w-full flex-col gap-1.5 text-right">
+				<div className="gap-1.5 flex w-full flex-col text-right">
 					<Heading size="sm">{heading}</Heading>
 					{author && <Text size="xs">{author}</Text>}
 					{link && (
@@ -143,7 +143,7 @@ export default function BookClubBookItem({ data }: Props) {
 
 	return (
 		<li className="ml-4">
-			<div className="absolute -left-1.5 mt-1.5 h-3 w-3 rounded-full border border-edge bg-background-surface"></div>
+			<div className="-left-1.5 mt-1.5 h-3 w-3 absolute rounded-full border border-edge bg-background-surface"></div>
 
 			<div className="flex items-start justify-between">
 				<Text variant="muted" className="mb-1" size="sm">
@@ -152,12 +152,12 @@ export default function BookClubBookItem({ data }: Props) {
 				{renderBadge()}
 			</div>
 
-			<Card className="mt-2 flex flex-col gap-4 p-3">
+			<Card className="mt-2 gap-4 p-3 flex flex-col">
 				{renderBookInfo()}
 
 				{!isCurrent && (
 					<div
-						className={cx('flex items-center justify-between rounded-md p-3', {
+						className={cx('rounded-md p-3 flex items-center justify-between', {
 							'bg-background-surface': !isCurrent,
 							'bg-fill-brand-secondary': isCurrent,
 						})}
diff --git a/packages/browser/src/components/bookClub/books/BookClubBooks.tsx b/packages/browser/src/components/bookClub/books/BookClubBooks.tsx
index bc3b4e692c..cba50f97ea 100644
--- a/packages/browser/src/components/bookClub/books/BookClubBooks.tsx
+++ b/packages/browser/src/components/bookClub/books/BookClubBooks.tsx
@@ -58,9 +58,9 @@ export default function BookClubBooks() {
 	// break out the past books into separate list?
 	const renderBooks = () => {
 		return (
-			<div className="h-full w-full px-0 md:px-4">
+			<div className="px-0 md:px-4 h-full w-full">
 				<ol
-					className={cn('relative flex h-full flex-col space-y-4 border-l border-edge', {
+					className={cn('space-y-4 relative flex h-full flex-col border-l border-edge', {
 						'pb-2': showPastBooks,
 					})}
 				>
@@ -93,7 +93,7 @@ export default function BookClubBooks() {
 	const renderContent = () => {
 		if (!bookClub.currentBook && pastBooks.length === 0) {
 			return (
-				<div className="flex flex-col px-4">
+				<div className="px-4 flex flex-col">
 					<GenericEmptyState
 						title="No books to display"
 						subtitle="The club has no books scheduled"
@@ -123,9 +123,9 @@ export default function BookClubBooks() {
 	}
 
 	return (
-		<div className="flex h-full w-full flex-col md:-ml-4 md:w-2/3 lg:w-[28rem]">
+		<div className="md:-ml-4 md:w-2/3 lg:w-md flex h-full w-full flex-col">
 			{!!bookClub.currentBook && (
-				<Heading size="md" className="flex items-center px-4 pb-4">
+				<Heading size="md" className="px-4 pb-4 flex items-center">
 					Books
 				</Heading>
 			)}
diff --git a/packages/browser/src/components/bookClub/createOrUpdateForm/BasicInformation.tsx b/packages/browser/src/components/bookClub/createOrUpdateForm/BasicInformation.tsx
index 3a2edbc129..6de75639a5 100644
--- a/packages/browser/src/components/bookClub/createOrUpdateForm/BasicInformation.tsx
+++ b/packages/browser/src/components/bookClub/createOrUpdateForm/BasicInformation.tsx
@@ -21,7 +21,7 @@ export default function BasicBookClubInformation() {
 	})
 
 	return (
-		<div className="flex flex-grow flex-col gap-6">
+		<div className="gap-6 flex grow flex-col">
 			<Input
 				variant="primary"
 				label={t(getKey('name.label'))}
diff --git a/packages/browser/src/components/bookClub/createOrUpdateForm/MembershipOptions.tsx b/packages/browser/src/components/bookClub/createOrUpdateForm/MembershipOptions.tsx
index 47fd1c9ab6..67d198d021 100644
--- a/packages/browser/src/components/bookClub/createOrUpdateForm/MembershipOptions.tsx
+++ b/packages/browser/src/components/bookClub/createOrUpdateForm/MembershipOptions.tsx
@@ -14,7 +14,7 @@ export default function MembershipOptions() {
 	const creatorHideProgress = form.watch('creatorHideProgress')
 
 	return (
-		<div className="flex flex-col gap-4 pt-2 md:max-w-lg">
+		<div className="gap-4 pt-2 md:max-w-lg flex flex-col">
 			<Input
 				variant="primary"
 				fullWidth
diff --git a/packages/browser/src/components/bookClub/createOrUpdateForm/RoleMappingForm.tsx b/packages/browser/src/components/bookClub/createOrUpdateForm/RoleMappingForm.tsx
index 7bd6e71767..b61fcf7820 100644
--- a/packages/browser/src/components/bookClub/createOrUpdateForm/RoleMappingForm.tsx
+++ b/packages/browser/src/components/bookClub/createOrUpdateForm/RoleMappingForm.tsx
@@ -14,8 +14,8 @@ export default function RoleMappingForm() {
 	const { errors } = useFormState({ control: form.control })
 
 	return (
-		<div className="flex flex-col gap-y-6">
-			<Card className="grid grid-cols-1 gap-6 bg-background-surface/50 p-4 md:max-w-3xl md:grid-cols-2">
+		<div className="gap-y-6 flex flex-col">
+			<Card className="gap-6 p-4 md:max-w-3xl md:grid-cols-2 grid grid-cols-1 bg-background-surface/50">
 				<Input
 					variant="primary"
 					fullWidth
diff --git a/packages/browser/src/components/container/ContentContainer.tsx b/packages/browser/src/components/container/ContentContainer.tsx
index 1b02552256..d8db85ced1 100644
--- a/packages/browser/src/components/container/ContentContainer.tsx
+++ b/packages/browser/src/components/container/ContentContainer.tsx
@@ -15,7 +15,7 @@ export default function ContentContainer({ children, className }: Props) {
 	return (
 		<div
 			className={cn(
-				'mt-6 flex flex-col gap-8 pb-16 md:gap-12 md:pb-4',
+				'mt-6 gap-8 pb-16 md:gap-12 md:pb-4 flex flex-col',
 				{
 					'max-w-4xl': primaryNavigationMode === 'SIDEBAR',
 				},
diff --git a/packages/browser/src/components/container/DynamicCardGrid.tsx b/packages/browser/src/components/container/DynamicCardGrid.tsx
index 01711b1538..7f9f9efe6b 100644
--- a/packages/browser/src/components/container/DynamicCardGrid.tsx
+++ b/packages/browser/src/components/container/DynamicCardGrid.tsx
@@ -17,7 +17,7 @@ function DynamicCardGrid({ count, renderItem }: Props) {
 			style={{
 				gridTemplateColumns: `repeat(${columns}, minmax(0, 1fr))`,
 			}}
-			className="grid flex-1 auto-rows-max items-start justify-center gap-2 py-2 md:justify-start"
+			className="gap-2 py-2 md:justify-start grid flex-1 auto-rows-max items-start justify-center"
 		>
 			{Array.from({ length: count }).map((_, index) => renderItem(index))}
 		</div>
diff --git a/packages/browser/src/components/container/GridSizeSlider.tsx b/packages/browser/src/components/container/GridSizeSlider.tsx
index f6ad2262bb..13feced313 100644
--- a/packages/browser/src/components/container/GridSizeSlider.tsx
+++ b/packages/browser/src/components/container/GridSizeSlider.tsx
@@ -19,7 +19,7 @@ export function GridSizeSlider() {
 
 	// TODO: Tooltip as you drag that shows a label, e.g. below but from locale files
 	return (
-		<div className="flex items-center gap-2">
+		<div className="gap-2 flex items-center">
 			<LayoutGrid className="h-4 w-4 text-foreground-muted" />
 			<Slider
 				value={[currentIndex]}
diff --git a/packages/browser/src/components/container/SceneContainer.tsx b/packages/browser/src/components/container/SceneContainer.tsx
index fee1773a6a..48a5d26d3d 100644
--- a/packages/browser/src/components/container/SceneContainer.tsx
+++ b/packages/browser/src/components/container/SceneContainer.tsx
@@ -27,7 +27,7 @@ const SceneContainer = forwardRef<HTMLDivElement, SceneContainerProps>(
 				// NOTE: adding padding bottom because of the overflow-hidden on the html element and the fixed
 				// topbar. This is... annoying.
 				className={cn(
-					'relative flex w-full flex-col p-4 pb-16 md:pb-4',
+					'p-4 pb-16 md:pb-4 relative flex w-full flex-col',
 					{
 						'mx-auto flex-1': preferTopBar && !unsetConstraints,
 					},
diff --git a/packages/browser/src/components/entity/EntityCard.tsx b/packages/browser/src/components/entity/EntityCard.tsx
index 4f3f8b7aae..16ad341727 100644
--- a/packages/browser/src/components/entity/EntityCard.tsx
+++ b/packages/browser/src/components/entity/EntityCard.tsx
@@ -95,7 +95,7 @@ export default function EntityCard({
 			return (
 				<Text
 					size={getDensityTextSize(gridDensity)}
-					className="line-clamp-2 h-[40px] min-w-0 whitespace-normal"
+					className="min-w-0 line-clamp-2 h-[40px] whitespace-normal"
 				>
 					{title}
 				</Text>
@@ -117,7 +117,7 @@ export default function EntityCard({
 					max={100}
 					variant="primary-dark"
 					size="sm"
-					className="!-mt-1"
+					className="-mt-1!"
 					rounded="none"
 				/>
 			)
@@ -133,7 +133,7 @@ export default function EntityCard({
 	const renderFooter = () => {
 		if (title || subtitle) {
 			return (
-				<div className="flex flex-1 flex-col space-y-2 px-1.5 pb-1">
+				<div className="space-y-2 px-1.5 pb-1 flex flex-1 flex-col">
 					{renderTitle()}
 					{subtitle}
 				</div>
@@ -162,7 +162,7 @@ export default function EntityCard({
 		} else {
 			return (
 				<div className="flex h-full w-full items-center justify-center bg-sidebar">
-					<Book className="absolute h-16 w-16 text-foreground-muted" />
+					<Book className="h-16 w-16 absolute text-foreground-muted" />
 				</div>
 			)
 		}
@@ -172,18 +172,18 @@ export default function EntityCard({
 		<Container
 			{...containerProps}
 			className={cn(
-				'relative flex flex-1 flex-col space-y-1 overflow-hidden rounded-lg border-[1.5px] border-edge bg-background/80 transition-colors duration-100',
+				'space-y-1 rounded-lg relative flex flex-1 flex-col overflow-hidden border-[1.5px] border-edge bg-background/80 transition-colors duration-100',
 				{ 'cursor-pointer hover:border-edge-brand dark:hover:border-edge-brand': hasClickAction },
 				{ 'max-w-[16rem]': isCover },
 				{
-					'w-[10rem] sm:w-[10.666rem] md:w-[12rem]': !isFullWidth,
+					'w-40 sm:w-[10.666rem] md:w-48': !isFullWidth,
 				},
 				className,
 			)}
 		>
 			<div
-				className={cn('h-full w-full p-0', {
-					'w-[10rem] sm:w-[10.666rem] md:w-[12rem]': !isFullWidth,
+				className={cn('p-0 h-full w-full', {
+					'w-40 sm:w-[10.666rem] md:w-48': !isFullWidth,
 				})}
 				style={{ aspectRatio: thumbnailRatio }}
 			>
diff --git a/packages/browser/src/components/entity/EntityCardSizeSlider.tsx b/packages/browser/src/components/entity/EntityCardSizeSlider.tsx
index 80c18753e9..36862c7496 100644
--- a/packages/browser/src/components/entity/EntityCardSizeSlider.tsx
+++ b/packages/browser/src/components/entity/EntityCardSizeSlider.tsx
@@ -19,7 +19,7 @@ export function GridSizeSlider() {
 
 	// TODO: Tooltip as you drag that shows a label, e.g. below but from locale files
 	return (
-		<div className="flex items-center gap-2">
+		<div className="gap-2 flex items-center">
 			<LayoutGrid className="h-4 w-4 text-foreground-muted" />
 			<Slider
 				value={[currentIndex]}
diff --git a/packages/browser/src/components/explorer/FileExplorer.tsx b/packages/browser/src/components/explorer/FileExplorer.tsx
index a19aa946d0..c0499a0cc1 100644
--- a/packages/browser/src/components/explorer/FileExplorer.tsx
+++ b/packages/browser/src/components/explorer/FileExplorer.tsx
@@ -12,7 +12,7 @@ export default function FileExplorer() {
 
 	if (!files.length) {
 		return (
-			<div className="flex h-full w-full items-center justify-center px-4">
+			<div className="px-4 flex h-full w-full items-center justify-center">
 				<GenericEmptyState title="No files" subtitle="This folder is empty" />
 			</div>
 		)
diff --git a/packages/browser/src/components/explorer/FileExplorerFooter.tsx b/packages/browser/src/components/explorer/FileExplorerFooter.tsx
index b633a6bcd0..fde01c2a41 100644
--- a/packages/browser/src/components/explorer/FileExplorerFooter.tsx
+++ b/packages/browser/src/components/explorer/FileExplorerFooter.tsx
@@ -20,9 +20,9 @@ export default function FileExplorerFooter() {
 	}, [currentPath, rootPath])
 
 	return (
-		<footer className="fixed bottom-0 z-10 h-10 w-full border-t border-edge bg-background px-4">
-			<div className="flex h-full w-full items-center gap-4">
-				<span className="rounded-md border border-dotted border-edge-subtle px-2 py-0.5">
+		<footer className="bottom-0 h-10 px-4 fixed z-10 w-full border-t border-edge bg-background">
+			<div className="gap-4 flex h-full w-full items-center">
+				<span className="rounded-md px-2 py-0.5 border border-dotted border-edge-subtle">
 					<Text variant="muted" size="sm">
 						{relativePath}
 					</Text>
diff --git a/packages/browser/src/components/explorer/FileExplorerHeader.tsx b/packages/browser/src/components/explorer/FileExplorerHeader.tsx
index 3421cc2bad..bb5a1ef815 100644
--- a/packages/browser/src/components/explorer/FileExplorerHeader.tsx
+++ b/packages/browser/src/components/explorer/FileExplorerHeader.tsx
@@ -15,15 +15,15 @@ export default function FileExplorerHeader() {
 	const basename = useMemo(() => currentPath?.split('/').pop() ?? '', [currentPath])
 
 	return (
-		<header className="sticky top-0 z-10 flex h-10 w-full justify-between border-y border-edge bg-background px-4 md:border-y-0 md:border-b">
-			<nav className="flex h-10 w-full items-center gap-4">
+		<header className="top-0 h-10 px-4 md:border-y-0 md:border-b sticky z-10 flex w-full justify-between border-y border-edge bg-background">
+			<nav className="h-10 gap-4 flex w-full items-center">
 				<FileExplorerNavigation />
-				<Text size="sm" className="line-clamp-1 text-opacity-80">
+				<Text size="sm" className="line-clamp-1 text-foreground/80">
 					{basename}
 				</Text>
 			</nav>
 
-			<div className="flex shrink-0 items-center gap-3">
+			<div className="gap-3 flex shrink-0 items-center">
 				<LayoutButtons />
 				{uploadConfig?.enabled && <UploadModal />}
 			</div>
diff --git a/packages/browser/src/components/explorer/FileExplorerNavigation.tsx b/packages/browser/src/components/explorer/FileExplorerNavigation.tsx
index 11e346bc32..4c06147948 100644
--- a/packages/browser/src/components/explorer/FileExplorerNavigation.tsx
+++ b/packages/browser/src/components/explorer/FileExplorerNavigation.tsx
@@ -13,7 +13,7 @@ export default function FileExplorerNavigation() {
 	const isDesktop = platform !== 'browser'
 
 	return (
-		<div className="m-0 flex shrink-0 items-center gap-1">
+		<div className="m-0 gap-1 flex shrink-0 items-center">
 			<IconButton
 				variant="ghost"
 				size="xs"
diff --git a/packages/browser/src/components/explorer/FileThumbnail.tsx b/packages/browser/src/components/explorer/FileThumbnail.tsx
index 84b6db0118..88f2a984d2 100644
--- a/packages/browser/src/components/explorer/FileThumbnail.tsx
+++ b/packages/browser/src/components/explorer/FileThumbnail.tsx
@@ -109,7 +109,7 @@ export default function FileThumbnail({
 
 	return (
 		<EntityImage
-			className={cn('w-auto rounded-sm object-cover', sizeClasses)}
+			className={cn('rounded-sm w-auto object-cover', sizeClasses)}
 			style={{ aspectRatio: thumbnailRatio }}
 			src={sdk.media.thumbnailURL(book.id)}
 			onError={() => setShowFallback(true)}
diff --git a/packages/browser/src/components/explorer/LayoutButtons.tsx b/packages/browser/src/components/explorer/LayoutButtons.tsx
index 63e0f71af1..a7c8e1a214 100644
--- a/packages/browser/src/components/explorer/LayoutButtons.tsx
+++ b/packages/browser/src/components/explorer/LayoutButtons.tsx
@@ -7,7 +7,7 @@ export default function LayoutButtons() {
 	const { layout, setLayout } = useFileExplorerContext()
 
 	return (
-		<div className="flex shrink-0 items-center gap-1">
+		<div className="gap-1 flex shrink-0 items-center">
 			<ToolTip content="Grid view" align="end">
 				<IconButton
 					variant="ghost"
diff --git a/packages/browser/src/components/explorer/grid/FileGrid.tsx b/packages/browser/src/components/explorer/grid/FileGrid.tsx
index da0e5d0923..410c277d7d 100644
--- a/packages/browser/src/components/explorer/grid/FileGrid.tsx
+++ b/packages/browser/src/components/explorer/grid/FileGrid.tsx
@@ -18,7 +18,7 @@ export default function FileGrid() {
 	}
 
 	return (
-		<div className="flex h-full w-full flex-1 flex-grow">
+		<div className="flex h-full w-full flex-1 grow">
 			<AutoSizer>
 				{({ height, width }) => (
 					<VirtuosoGrid
diff --git a/packages/browser/src/components/explorer/grid/FileGridItem.tsx b/packages/browser/src/components/explorer/grid/FileGridItem.tsx
index c43a1834f4..999a79de8d 100644
--- a/packages/browser/src/components/explorer/grid/FileGridItem.tsx
+++ b/packages/browser/src/components/explorer/grid/FileGridItem.tsx
@@ -53,7 +53,7 @@ export default function FileGridItem({ file }: Props) {
 	return (
 		<ToolTip content={tooltipName} align="start">
 			<button
-				className="group flex h-full w-32 flex-col items-center justify-center gap-y-1.5 focus:outline-none"
+				className="group w-32 gap-y-1.5 flex h-full flex-col items-center justify-center focus:outline-none"
 				onDoubleClick={() => onSelect(file)}
 				{...(book
 					? {
@@ -69,7 +69,7 @@ export default function FileGridItem({ file }: Props) {
 				/>
 
 				<Text
-					className="line-clamp-2 max-w-full rounded-md p-1 group-hover:bg-background-surface-hover/80 group-focus:bg-background-surface"
+					className="rounded-md p-1 line-clamp-2 max-w-full group-hover:bg-background-surface-hover/80 group-focus:bg-background-surface"
 					size="xs"
 				>
 					{name}
diff --git a/packages/browser/src/components/explorer/table/FileTable.tsx b/packages/browser/src/components/explorer/table/FileTable.tsx
index 631d62f2d6..77fe65df8c 100644
--- a/packages/browser/src/components/explorer/table/FileTable.tsx
+++ b/packages/browser/src/components/explorer/table/FileTable.tsx
@@ -90,7 +90,7 @@ export default function FileTable() {
 
 	const { rows } = table.getRowModel()
 	return (
-		<div className="relative mb-5 h-full w-full flex-1 flex-grow">
+		<div className="mb-5 relative h-full w-full flex-1 grow">
 			<AutoSizer>
 				{({ height, width }) => (
 					<TableVirtuoso
@@ -132,14 +132,14 @@ export default function FileTable() {
 							table.getFlatHeaders().map((header) => (
 								<th
 									key={header.id}
-									className="h-10 bg-background pl-1.5 pr-1.5 first:pl-4 last:pr-4"
+									className="h-10 pl-1.5 pr-1.5 first:pl-4 last:pr-4 bg-background"
 									style={{
 										width: header.getSize(),
 									}}
 								>
 									<div
 										className={cn('flex items-center', {
-											'cursor-pointer select-none gap-x-2': header.column.getCanSort(),
+											'gap-x-2 cursor-pointer select-none': header.column.getCanSort(),
 										})}
 										onClick={header.column.getToggleSortingHandler()}
 										style={{
diff --git a/packages/browser/src/components/explorer/upload/UploadModal.tsx b/packages/browser/src/components/explorer/upload/UploadModal.tsx
index b3dbd8309f..23c8381282 100644
--- a/packages/browser/src/components/explorer/upload/UploadModal.tsx
+++ b/packages/browser/src/components/explorer/upload/UploadModal.tsx
@@ -198,18 +198,18 @@ export default function UploadModal() {
 		if (isUploading) {
 			return (
 				<>
-					<span className="flex items-center justify-center rounded-lg border border-edge bg-background-surface/80 p-4">
+					<span className="rounded-lg p-4 flex items-center justify-center border border-edge bg-background-surface/80">
 						<ProgressSpinner className="h-7 w-7" />
 					</span>
 
 					<div className="text-center">
-						<Heading size="xs" className="flex items-center justify-center space-x-1">
+						<Heading size="xs" className="space-x-1 flex items-center justify-center">
 							{t('common.uploading')}{' '}
 							{uploadProgress > 0 && (
 								<span className="text-foreground-muted">({uploadProgress}%)</span>
 							)}
 						</Heading>
-						<div className="mt-2 flex h-4 w-64 items-center justify-center">
+						<div className="mt-2 h-4 w-64 flex items-center justify-center">
 							<ProgressBar
 								value={uploadProgress}
 								isIndeterminate={uploadProgress === 0}
@@ -225,7 +225,7 @@ export default function UploadModal() {
 			const Icon = displayedType === 'books' ? Book : FolderArchive
 			return (
 				<>
-					<span className="flex items-center justify-center rounded-lg border border-edge bg-background-surface/80 p-4">
+					<span className="rounded-lg p-4 flex items-center justify-center border border-edge bg-background-surface/80">
 						<Icon className="h-8 w-8 text-foreground-muted" />
 					</span>
 
@@ -263,7 +263,7 @@ export default function UploadModal() {
 					<div
 						{...getRootProps()}
 						className={cn(
-							'flex shrink-0 flex-grow cursor-pointer flex-col items-center justify-center space-y-4 rounded-lg border border-dashed border-edge-subtle p-4 !outline-none ring-2 ring-transparent ring-offset-2 ring-offset-background-overlay',
+							'space-y-4 rounded-lg p-4 flex shrink-0 grow cursor-pointer flex-col items-center justify-center border border-dashed border-edge-subtle ring-2 ring-transparent ring-offset-2 ring-offset-background-overlay outline-none!',
 							{ 'ring-edge-brand': isFocused },
 						)}
 					>
@@ -292,7 +292,7 @@ export default function UploadModal() {
 					<Accordion type="single" collapsible>
 						<Accordion.Item
 							value="files"
-							className="rounded-lg border-none bg-background-surface/80 px-4 py-2"
+							className="rounded-lg px-4 py-2 border-none bg-background-surface/80"
 						>
 							<Accordion.Trigger
 								noUnderline
@@ -307,11 +307,11 @@ export default function UploadModal() {
 							</Accordion.Trigger>
 
 							<Accordion.Content>
-								<div className="flex flex-col space-y-1">
+								<div className="space-y-1 flex flex-col">
 									{files.map((file, idx) => (
 										<div
 											key={file.name}
-											className="group flex items-center gap-x-2 rounded-lg border border-edge p-2"
+											className="group gap-x-2 rounded-lg p-2 flex items-center border border-edge"
 										>
 											<Text size="sm" className="line-clamp-1">
 												{file.name}
diff --git a/packages/browser/src/components/filters/Alphabet.tsx b/packages/browser/src/components/filters/Alphabet.tsx
index a4197ad065..756bf0c3c6 100644
--- a/packages/browser/src/components/filters/Alphabet.tsx
+++ b/packages/browser/src/components/filters/Alphabet.tsx
@@ -14,18 +14,18 @@ export default function Alphabet({
 	onPrefetchLetter,
 }: Props) {
 	return (
-		<div className="flex h-8 items-center justify-around gap-1 px-4 pt-4">
+		<div className="h-8 gap-1 px-4 pt-4 flex items-center justify-around">
 			{Array.from({ length: 26 }, (_, i) => String.fromCharCode(65 + i)).map((letter) => (
 				<div
 					key={letter}
 					className={cn(
-						'flex cursor-pointer items-center justify-center text-xs text-foreground-muted text-opacity-70 hover:text-opacity-100',
+						'text-xs flex cursor-pointer items-center justify-center text-foreground-muted/70 hover:text-foreground-muted',
 						{
-							'text-fill-brand text-opacity-100': startsWith === letter,
+							'text-fill-brand': startsWith === letter,
 						},
 
 						{
-							'pointer-events-none text-foreground-disabled text-opacity-20': !alphabet?.[letter],
+							'pointer-events-none text-foreground-disabled/20': !alphabet?.[letter],
 						},
 					)}
 					onClick={() => onSelectLetter(startsWith === letter ? undefined : letter)}
diff --git a/packages/browser/src/components/filters/FilterDisplay.tsx b/packages/browser/src/components/filters/FilterDisplay.tsx
index fe2d03fa3a..da0f453dc4 100644
--- a/packages/browser/src/components/filters/FilterDisplay.tsx
+++ b/packages/browser/src/components/filters/FilterDisplay.tsx
@@ -54,11 +54,11 @@ export default function FilterDisplay() {
 	}
 
 	return (
-		<Card className="hidden p-4 md:inline-block">
-			<div className="flex max-h-60 flex-wrap items-center gap-4 overflow-y-auto scrollbar-hide">
+		<Card className="p-4 md:inline-block hidden">
+			<div className="max-h-60 gap-4 scrollbar-hide flex flex-wrap items-center overflow-y-auto">
 				{Object.entries(filterMapping).map(([key, values]) => {
 					return (
-						<div key={key} className="flex items-center gap-1">
+						<div key={key} className="gap-1 flex items-center">
 							<Text size="sm" variant="muted">
 								{key} {renderPredicate(key, values)}
 							</Text>
diff --git a/packages/browser/src/components/filters/FilterHeader.tsx b/packages/browser/src/components/filters/FilterHeader.tsx
index fc5f4ab43e..cd057934ed 100644
--- a/packages/browser/src/components/filters/FilterHeader.tsx
+++ b/packages/browser/src/components/filters/FilterHeader.tsx
@@ -79,7 +79,7 @@ export default function FilterHeader({
 		<header
 			ref={ref}
 			className={cn(
-				'sticky z-50 flex h-12 w-full shrink-0 items-center justify-between gap-2 border-b border-edge px-4 md:top-0',
+				'h-12 gap-2 px-4 md:top-0 sticky z-50 flex w-full shrink-0 items-center justify-between border-b border-edge',
 				{
 					'bg-background': isSticky || !isMobile,
 				},
@@ -94,10 +94,10 @@ export default function FilterHeader({
 				isDisabled={isSearchDisabled}
 			/>
 
-			<div className="flex items-center gap-4">
+			<div className="gap-4 flex items-center">
 				{sizeControls}
 
-				<div className="flex items-center gap-x-2">
+				<div className="gap-x-2 flex items-center">
 					{orderControls}
 					{filterControls}
 				</div>
diff --git a/packages/browser/src/components/filters/FilterSlideOver.tsx b/packages/browser/src/components/filters/FilterSlideOver.tsx
index 0d629585e9..4c6abce163 100644
--- a/packages/browser/src/components/filters/FilterSlideOver.tsx
+++ b/packages/browser/src/components/filters/FilterSlideOver.tsx
@@ -62,7 +62,7 @@ export default function FilterSlideOver({ prompt, formVariant }: Props) {
 			title="Filter options"
 			description={prompt || 'Use the options below to narrow your search'}
 			trigger={
-				<Button variant="ghost" className="flex h-full items-center gap-1.5">
+				<Button variant="ghost" className="gap-1.5 flex h-full items-center">
 					<Filter className="h-4 w-4" />
 					<span>Filter</span>
 					<span className="text-brand">({nonSearchFilterCount})</span>
@@ -70,7 +70,7 @@ export default function FilterSlideOver({ prompt, formVariant }: Props) {
 			}
 			size={isMobile ? 'xl' : 'default'}
 			footer={
-				<div className="flex items-center gap-4 py-2">
+				<div className="gap-4 py-2 flex items-center">
 					<Button type="button" variant="danger" onClick={handleClearFilters}>
 						Clear filters
 					</Button>
diff --git a/packages/browser/src/components/filters/FilterToolBar.tsx b/packages/browser/src/components/filters/FilterToolBar.tsx
index 8730ec3acd..7fc822dc9e 100644
--- a/packages/browser/src/components/filters/FilterToolBar.tsx
+++ b/packages/browser/src/components/filters/FilterToolBar.tsx
@@ -54,8 +54,8 @@ export default function FilterToolBar({
 	const renderOrderBy = !!orderBy && !!entity && !isDisabled
 
 	return (
-		<header className="flex max-w-full flex-col gap-2 px-4">
-			<div className="flex flex-col items-center gap-2 md:flex-row">
+		<header className="gap-2 px-4 flex max-w-full flex-col">
+			<div className="gap-2 md:flex-row flex flex-col items-center">
 				<Search
 					initialValue={search || ''}
 					placeholder={searchPlaceholder}
@@ -69,7 +69,7 @@ export default function FilterToolBar({
 					isLoading={isRefetching}
 					isDisabled={isDisabled}
 				/>
-				<div className="flex w-full shrink-0 gap-2 md:w-auto">
+				<div className="gap-2 md:w-auto flex w-full shrink-0">
 					{renderOrderBy && <OrderBy entity={entity} />}
 					{renderFilter && <FilterSlideOver prompt={filterSlideOverPrompt} formVariant={entity} />}
 				</div>
diff --git a/packages/browser/src/components/filters/OrderBy.tsx b/packages/browser/src/components/filters/OrderBy.tsx
index 8d62155621..e502bcd795 100644
--- a/packages/browser/src/components/filters/OrderBy.tsx
+++ b/packages/browser/src/components/filters/OrderBy.tsx
@@ -36,7 +36,7 @@ export default function OrderBy({ entity }: Props) {
 				<Button
 					variant="ghost"
 					className={cx('shrink-0', {
-						'!bg-background-surface': isOpen,
+						'bg-background-surface!': isOpen,
 					})}
 				>
 					<SortAsc className="mr-1.5 h-4 w-4 text-foreground-subtle" />
@@ -45,7 +45,7 @@ export default function OrderBy({ entity }: Props) {
 			</Popover.Trigger>
 
 			<Popover.Content
-				className="flex flex-col gap-3 overflow-hidden border-opacity-50 bg-background shadow-sm"
+				className="gap-3 border-opacity-50 shadow-sm flex flex-col overflow-hidden bg-background"
 				align={isMobile ? 'start' : 'end'}
 			>
 				<OrderBySelect entity={entity} value={ordering.orderBy} onChange={handleChangeOrderBy} />
diff --git a/packages/browser/src/components/filters/Search.tsx b/packages/browser/src/components/filters/Search.tsx
index 926cfd6d20..78b7739861 100644
--- a/packages/browser/src/components/filters/Search.tsx
+++ b/packages/browser/src/components/filters/Search.tsx
@@ -90,10 +90,10 @@ export default function Search({
 			onKeyDown={expanded ? undefined : (e) => e.key === 'Enter' && handleExpand()}
 			title={isDisabled ? "This functionality isn't available right now" : undefined}
 			className={cn(
-				'relative flex h-8 shrink-0 cursor-pointer items-center gap-2 overflow-hidden rounded-xl border border-edge-subtle bg-transparent text-sm transition-all duration-300 ease-in-out',
+				'h-8 gap-2 rounded-xl text-sm ease-in-out relative flex shrink-0 cursor-pointer items-center overflow-hidden border border-edge-subtle bg-transparent transition-all duration-300',
 				'text-foreground-muted hover:bg-background-surface hover:text-foreground',
 				'disabled:cursor-not-allowed disabled:opacity-50',
-				expanded ? 'w-full cursor-text sm:w-2/5' : 'w-32',
+				expanded ? 'sm:w-2/5 w-full cursor-text' : 'w-32',
 			)}
 		>
 			<SearchIcon className="ml-2.5 h-4 w-4 shrink-0" />
@@ -107,14 +107,14 @@ export default function Search({
 					onBlur={handleBlur}
 					placeholder={placeholder || 'Search'}
 					disabled={isDisabled}
-					className="h-full w-full bg-transparent pr-8 text-sm text-foreground-subtle outline-none placeholder:text-foreground-muted"
+					className="pr-8 text-sm h-full w-full bg-transparent text-foreground-subtle outline-none placeholder:text-foreground-muted"
 				/>
 			) : (
-				<span className="select-none whitespace-nowrap pr-2.5 text-sm">Search</span>
+				<span className="pr-2.5 text-sm whitespace-nowrap select-none">Search</span>
 			)}
 
 			{showLoader && (
-				<div className="absolute inset-y-0 right-0 flex items-center pr-2.5">
+				<div className="inset-y-0 right-0 pr-2.5 absolute flex items-center">
 					<ProgressSpinner size="sm" />
 				</div>
 			)}
diff --git a/packages/browser/src/components/filters/URLFilterContainer.tsx b/packages/browser/src/components/filters/URLFilterContainer.tsx
index 8a480356d5..6e3ca2af97 100644
--- a/packages/browser/src/components/filters/URLFilterContainer.tsx
+++ b/packages/browser/src/components/filters/URLFilterContainer.tsx
@@ -76,13 +76,13 @@ const URLFilterContainer = forwardRef<HTMLDivElement, Props>(
 			<Suspense>
 				<div
 					ref={ref}
-					className={cn('flex flex-1 flex-col overflow-x-auto pb-24 md:pb-10', className)}
+					className={cn('pb-24 md:pb-10 flex flex-1 flex-col overflow-x-auto', className)}
 					id="urlFilterContainer"
 				>
 					{children}
 
 					<div
-						className="fixed bottom-0 z-50 flex h-12 items-center justify-between border-t border-edge bg-background px-4 md:h-10"
+						className="bottom-0 h-12 px-4 md:h-10 fixed z-50 flex items-center justify-between border-t border-edge bg-background"
 						data-testid="urlFilterFooter"
 						style={{
 							right: scrollbarWidth,
@@ -92,7 +92,7 @@ const URLFilterContainer = forwardRef<HTMLDivElement, Props>(
 									: `calc(100% - ${SIDEBAR_WIDTH}px - ${scrollbarWidth}px)`,
 						}}
 					>
-						<div className="flex shrink-0 items-center gap-x-2">
+						<div className="gap-x-2 flex shrink-0 items-center">
 							{tableControls}
 							<URLPageSize />
 						</div>
diff --git a/packages/browser/src/components/filters/URLFilterDrawer.tsx b/packages/browser/src/components/filters/URLFilterDrawer.tsx
index 4f61f8ea3e..a5ad1e5d3f 100644
--- a/packages/browser/src/components/filters/URLFilterDrawer.tsx
+++ b/packages/browser/src/components/filters/URLFilterDrawer.tsx
@@ -60,9 +60,9 @@ export default function URLFilterDrawer({ entity }: Props) {
 						</IconButton>
 
 						{activeFilters > 0 && (
-							<span className="absolute right-0 top-0 -mr-1.5 -mt-1.5 flex h-4 w-4">
-								<span className="relative inline-flex h-4 w-4 items-center justify-center rounded-full bg-fill-brand">
-									<span className="text-xxs font-semibold text-white">{activeFilters}</span>
+							<span className="right-0 top-0 -mr-1.5 -mt-1.5 h-4 w-4 absolute flex">
+								<span className="h-4 w-4 relative inline-flex items-center justify-center rounded-full bg-fill-brand">
+									<span className="font-semibold text-white text-xxs">{activeFilters}</span>
 								</span>
 							</span>
 						)}
@@ -71,7 +71,7 @@ export default function URLFilterDrawer({ entity }: Props) {
 			}
 			size={isMobile ? 'xl' : 'default'}
 			footer={
-				<div className="-mt-4 flex w-full items-center gap-x-4 py-2">
+				<div className="-mt-4 gap-x-4 py-2 flex w-full items-center">
 					<Button
 						size="sm"
 						className="w-full"
diff --git a/packages/browser/src/components/filters/URLOrdering.tsx b/packages/browser/src/components/filters/URLOrdering.tsx
index 1cc3843dc5..abd62d346f 100644
--- a/packages/browser/src/components/filters/URLOrdering.tsx
+++ b/packages/browser/src/components/filters/URLOrdering.tsx
@@ -55,7 +55,7 @@ export default function URLOrdering({ entity }: Props) {
 			</ToolTip>
 
 			<Popover.Content
-				className="flex flex-col gap-3 overflow-hidden p-3 shadow-sm"
+				className="gap-3 p-3 shadow-sm flex flex-col overflow-hidden"
 				align={isMobile ? 'start' : 'end'}
 			>
 				<OrderBySelect entity={entity} value={orderBy || 'name'} onChange={handleChangeOrderBy} />
diff --git a/packages/browser/src/components/filters/URLPageSize.tsx b/packages/browser/src/components/filters/URLPageSize.tsx
index f01b96618c..33293d47c5 100644
--- a/packages/browser/src/components/filters/URLPageSize.tsx
+++ b/packages/browser/src/components/filters/URLPageSize.tsx
@@ -27,12 +27,12 @@ export default function URLPageSize() {
 	}, [pageSize])
 
 	return (
-		<form className="flex shrink-0 items-center space-x-2" onSubmit={handleInputSubmit}>
+		<form className="space-x-2 flex shrink-0 items-center" onSubmit={handleInputSubmit}>
 			<Input
 				type="number"
 				variant="activeGhost"
 				size="sm"
-				className="h-7 w-7 p-0 text-center text-xs [appearance:textfield] sm:h-6 sm:w-6 [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
+				className="h-7 w-7 p-0 text-xs sm:h-6 sm:w-6 [appearance:textfield] text-center [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
 				value={inputPageSize ?? ''}
 				onChange={handleInputChange}
 				min={1}
diff --git a/packages/browser/src/components/filters/URLPagination.tsx b/packages/browser/src/components/filters/URLPagination.tsx
index 9ae1a83db4..3625d9ff89 100644
--- a/packages/browser/src/components/filters/URLPagination.tsx
+++ b/packages/browser/src/components/filters/URLPagination.tsx
@@ -62,13 +62,13 @@ export default function URLPagination({ pages, currentPage, onChangePage, onPref
 	}, [currentPage])
 
 	return (
-		<div className="flex items-center space-x-4">
-			<form className="flex shrink-0 items-center space-x-2" onSubmit={handleInputSubmit}>
+		<div className="space-x-4 flex items-center">
+			<form className="space-x-2 flex shrink-0 items-center" onSubmit={handleInputSubmit}>
 				<Input
 					type="number"
 					variant="activeGhost"
 					size="sm"
-					className="h-7 w-7 p-0 text-center text-xs [appearance:textfield] sm:h-6 sm:w-6 [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
+					className="h-7 w-7 p-0 text-xs sm:h-6 sm:w-6 [appearance:textfield] text-center [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
 					disabled={pages <= 1}
 					value={inputPage ?? ''}
 					onChange={handleInputChange}
@@ -80,7 +80,7 @@ export default function URLPagination({ pages, currentPage, onChangePage, onPref
 					of {pages}
 				</Text>
 			</form>
-			<div className="flex items-center space-x-1">
+			<div className="space-x-1 flex items-center">
 				<ToolTip content="Previous page" size="sm" align="end">
 					<IconButton
 						size="xs"
diff --git a/packages/browser/src/components/filters/form/AgeRatingFilter.tsx b/packages/browser/src/components/filters/form/AgeRatingFilter.tsx
index 985c7a5538..33f8aee7b3 100644
--- a/packages/browser/src/components/filters/form/AgeRatingFilter.tsx
+++ b/packages/browser/src/components/filters/form/AgeRatingFilter.tsx
@@ -61,7 +61,7 @@ export default function AgeRatingFilter({ variant = 'media' }: Props) {
 					value="custom"
 					innerContainerClassName="flex-col sm:items-start sm:justify-start gap-1.5"
 				>
-					<fieldset className="flex items-start justify-end gap-2" disabled={selection === null}>
+					<fieldset className="gap-2 flex items-start justify-end" disabled={selection === null}>
 						<Input
 							type="number"
 							placeholder={localAgeRating?.toString() ?? '8'}
diff --git a/packages/browser/src/components/filters/form/MediaFilterForm.tsx b/packages/browser/src/components/filters/form/MediaFilterForm.tsx
index 218a853f36..1f7976d8d1 100644
--- a/packages/browser/src/components/filters/form/MediaFilterForm.tsx
+++ b/packages/browser/src/components/filters/form/MediaFilterForm.tsx
@@ -208,7 +208,7 @@ export default function MediaFilterForm() {
 
 	return (
 		<Form
-			className="flex max-h-full grow flex-col overflow-y-auto overflow-x-visible px-6 py-2 scrollbar-hide"
+			className="px-6 py-2 scrollbar-hide flex max-h-full grow flex-col overflow-x-visible overflow-y-auto"
 			id="filter-form"
 			form={form}
 			onSubmit={handleSubmit}
diff --git a/packages/browser/src/components/filters/form/SeriesFilterForm.tsx b/packages/browser/src/components/filters/form/SeriesFilterForm.tsx
index 21f7875b6d..0c6f23455b 100644
--- a/packages/browser/src/components/filters/form/SeriesFilterForm.tsx
+++ b/packages/browser/src/components/filters/form/SeriesFilterForm.tsx
@@ -72,7 +72,7 @@ export default function SeriesFilterForm() {
 
 	return (
 		<Form
-			className="flex max-h-full grow flex-col overflow-y-auto overflow-x-visible px-6 py-2 scrollbar-hide"
+			className="px-6 py-2 scrollbar-hide flex max-h-full grow flex-col overflow-x-visible overflow-y-auto"
 			id="filter-form"
 			form={form}
 			onSubmit={handleSubmit}
diff --git a/packages/browser/src/components/jobs/JobOverlay.tsx b/packages/browser/src/components/jobs/JobOverlay.tsx
index dcf85f936f..03eb6394e8 100644
--- a/packages/browser/src/components/jobs/JobOverlay.tsx
+++ b/packages/browser/src/components/jobs/JobOverlay.tsx
@@ -68,7 +68,7 @@ export default function JobOverlay() {
 			{firstRunningJob && (
 				<motion.div
 					// @ts-expect-error: It does have className actually?
-					className="fixed right-[1rem] flex h-28 w-64 flex-col items-start justify-between rounded-md border border-edge-subtle bg-background-surface p-4 shadow"
+					className="right-4 h-28 w-64 rounded-md p-4 shadow fixed flex flex-col items-start justify-between border border-edge-subtle bg-background-surface"
 					initial={{ opacity: 0, scale: 0.9, y: 100 }}
 					animate={{ opacity: 1, scale: 1, y: 0 }}
 					exit={{ opacity: 0, scale: 0.9, y: 100 }}
@@ -80,7 +80,7 @@ export default function JobOverlay() {
 						{firstRunningJob.message ?? 'Job in Progress'}
 					</Text>
 
-					<div className="flex w-full flex-col gap-y-2">
+					<div className="gap-y-2 flex w-full flex-col">
 						<div className="flex w-full items-center justify-between">
 							{taskCountString && <Text size="xs">{taskCountString}</Text>}
 							{subTaskCounts && <Text size="xs">{subTaskCountString}</Text>}
diff --git a/packages/browser/src/components/library/LastVisitedLibrary.tsx b/packages/browser/src/components/library/LastVisitedLibrary.tsx
index 128271863f..1e4b47d611 100644
--- a/packages/browser/src/components/library/LastVisitedLibrary.tsx
+++ b/packages/browser/src/components/library/LastVisitedLibrary.tsx
@@ -34,17 +34,17 @@ export default function LastVisitedLibrary({ container }: Props) {
 
 	const renderContent = () => {
 		return (
-			<div className="flex flex-col gap-y-2">
+			<div className="gap-y-2 flex flex-col">
 				<Label className="text-sm">Last visited</Label>
 				<EntityCard
 					href={paths.librarySeries(library.id)}
 					imageUrl={library.thumbnail.url}
 					isCover
-					className="flex-auto flex-shrink-0"
+					className="flex-auto shrink-0"
 					fullWidth={(imageFailed) => !imageFailed}
 				/>
 
-				<Text className="line-clamp-1 text-sm" variant="muted">
+				<Text className="text-sm line-clamp-1" variant="muted">
 					{library.name}
 				</Text>
 			</div>
diff --git a/packages/browser/src/components/library/createOrUpdate/sections/BasicLibraryInformation.tsx b/packages/browser/src/components/library/createOrUpdate/sections/BasicLibraryInformation.tsx
index b72c2111db..e38f10e8d4 100644
--- a/packages/browser/src/components/library/createOrUpdate/sections/BasicLibraryInformation.tsx
+++ b/packages/browser/src/components/library/createOrUpdate/sections/BasicLibraryInformation.tsx
@@ -32,8 +32,8 @@ export default function BasicLibraryInformation({ onSetShowDirectoryPicker }: Pr
 	})
 
 	return (
-		<div className="flex flex-grow flex-col gap-6">
-			<div className="flex flex-col flex-wrap gap-y-6 md:flex-row md:gap-x-6 md:gap-y-6">
+		<div className="gap-6 flex grow flex-col">
+			<div className="gap-y-6 md:flex-row md:gap-x-6 md:gap-y-6 flex flex-col flex-wrap">
 				<Input
 					variant="primary"
 					label={t(getKey('name.label'))}
diff --git a/packages/browser/src/components/library/createOrUpdate/sections/DefaultLibraryView.tsx b/packages/browser/src/components/library/createOrUpdate/sections/DefaultLibraryView.tsx
index 42eb8a6472..18894ad766 100644
--- a/packages/browser/src/components/library/createOrUpdate/sections/DefaultLibraryView.tsx
+++ b/packages/browser/src/components/library/createOrUpdate/sections/DefaultLibraryView.tsx
@@ -43,7 +43,7 @@ export default function DefaultLibraryView() {
 	}, [hideSeriesView, viewMode, form])
 
 	return (
-		<div className="flex flex-col gap-6">
+		<div className="gap-6 flex flex-col">
 			<div>
 				<Heading size="sm">{t(getKey('label'))}</Heading>
 				<Text size="sm" variant="muted">
@@ -51,13 +51,13 @@ export default function DefaultLibraryView() {
 				</Text>
 			</div>
 
-			<div className="flex flex-col gap-y-4">
+			<div className="gap-y-4 flex flex-col">
 				<input type="hidden" {...form.register('defaultLibraryViewMode')} />
 
 				<RadioGroup
 					value={viewMode}
 					onValueChange={handleViewModeChange}
-					className="flex flex-col sm:flex-row"
+					className="sm:flex-row flex flex-col"
 					disabled={hideSeriesView}
 					defaultValue={LibraryViewMode.Series}
 				>
diff --git a/packages/browser/src/components/library/createOrUpdate/sections/DefaultReadingSettings.tsx b/packages/browser/src/components/library/createOrUpdate/sections/DefaultReadingSettings.tsx
index 3d8012759e..a3f5d26814 100644
--- a/packages/browser/src/components/library/createOrUpdate/sections/DefaultReadingSettings.tsx
+++ b/packages/browser/src/components/library/createOrUpdate/sections/DefaultReadingSettings.tsx
@@ -11,8 +11,8 @@ export default function DefaultReadingSettings() {
 
 	return (
 		<>
-			<div className="flex items-center gap-2">
-				<div className="flex flex-col gap-2">
+			<div className="gap-2 flex items-center">
+				<div className="gap-2 flex flex-col">
 					<Label>{t(getKey('imageScaling.label'))}</Label>
 					<NativeSelect
 						options={[
@@ -28,7 +28,7 @@ export default function DefaultReadingSettings() {
 					</Text>
 				</div>
 
-				<div className="flex flex-col gap-2">
+				<div className="gap-2 flex flex-col">
 					<Label>{t(getKey('readingDirection.label'))}</Label>
 					<NativeSelect
 						options={[
@@ -43,7 +43,7 @@ export default function DefaultReadingSettings() {
 				</div>
 			</div>
 
-			<div className="flex flex-col gap-2 md:w-2/3">
+			<div className="gap-2 md:w-2/3 flex flex-col">
 				<Label>{t(getKey('readingMode.label'))}</Label>
 				<NativeSelect
 					options={[
diff --git a/packages/browser/src/components/library/createOrUpdate/sections/FileConversionOptions.tsx b/packages/browser/src/components/library/createOrUpdate/sections/FileConversionOptions.tsx
index b0b78e25c0..e219190de4 100644
--- a/packages/browser/src/components/library/createOrUpdate/sections/FileConversionOptions.tsx
+++ b/packages/browser/src/components/library/createOrUpdate/sections/FileConversionOptions.tsx
@@ -51,8 +51,8 @@ export default function FileConversionOptions({ onDidChange }: Props) {
 	}, [form, convertRarToZip, hardDeleteConversions, onDidChange])
 
 	return (
-		<div className="flex flex-col gap-y-6">
-			<div className="flex flex-col gap-y-1.5">
+		<div className="gap-y-6 flex flex-col">
+			<div className="gap-y-1.5 flex flex-col">
 				<Heading size="sm">{t(getKey('section.heading'))}</Heading>
 				<Text size="sm" variant="muted">
 					{t(getKey('section.description'))}
diff --git a/packages/browser/src/components/library/createOrUpdate/sections/IgnoreRulesConfig.tsx b/packages/browser/src/components/library/createOrUpdate/sections/IgnoreRulesConfig.tsx
index 640b190f4f..5793b801b1 100644
--- a/packages/browser/src/components/library/createOrUpdate/sections/IgnoreRulesConfig.tsx
+++ b/packages/browser/src/components/library/createOrUpdate/sections/IgnoreRulesConfig.tsx
@@ -127,7 +127,7 @@ export default function IgnoreRulesConfig() {
 	}, [ctx, ignoreRules, t])
 
 	return (
-		<div className="flex max-w-2xl flex-grow flex-col gap-6">
+		<div className="max-w-2xl gap-6 flex grow flex-col">
 			<div className="flex items-center justify-between">
 				<div>
 					<Heading size="sm">{t(getKey('section.heading'))}</Heading>
@@ -140,12 +140,12 @@ export default function IgnoreRulesConfig() {
 			</div>
 
 			{!ignoreRules.length && (
-				<Card className="flex items-center justify-center border-dashed border-edge-subtle p-6">
-					<div className="flex flex-col space-y-3">
+				<Card className="p-6 flex items-center justify-center border-dashed border-edge-subtle">
+					<div className="space-y-3 flex flex-col">
 						<div className="relative flex justify-center">
-							<span className="flex items-center justify-center rounded-xl bg-background-surface p-2">
+							<span className="rounded-xl p-2 flex items-center justify-center bg-background-surface">
 								<SquareAsterisk className="h-6 w-6 text-foreground-muted" />
-								<Slash className="absolute h-6 w-6 scale-x-[-1] transform text-foreground opacity-80" />
+								<Slash className="h-6 w-6 absolute scale-x-[-1] transform text-foreground opacity-80" />
 							</span>
 						</div>
 
@@ -176,13 +176,13 @@ export default function IgnoreRulesConfig() {
 				{isEditing && (
 					<motion.div
 						// @ts-expect-error: It does have className actually?
-						className="flex flex-col space-y-4"
+						className="space-y-4 flex flex-col"
 						initial={{ height: 0, opacity: 0 }}
 						animate={{ height: 'auto', opacity: 1 }}
 						exit={{ height: 0, opacity: 0 }}
 						transition={{ duration: 0.15 }}
 					>
-						<div className="flex items-center space-x-4">
+						<div className="space-x-4 flex items-center">
 							<Input
 								className="font-mono"
 								label={t(getKey('addRule.label'))}
@@ -199,7 +199,7 @@ export default function IgnoreRulesConfig() {
 							</Button>
 						</div>
 
-						<div className="flex items-center space-x-4">
+						<div className="space-x-4 flex items-center">
 							<CheckBox
 								id="ignoreParents"
 								label={t(getKey('addRule.ignoreParents.label'))}
@@ -325,7 +325,7 @@ const ConfiguredIgnoreRule = ({ id, isReadOnly, onRemove, index }: ConfiguredIgn
 	}
 
 	return (
-		<div className="group flex flex-col space-y-4 px-3 py-1 even:bg-background-surface/50">
+		<div className="group space-y-4 px-3 py-1 flex flex-col even:bg-background-surface/50">
 			<div
 				className={cn('flex items-center justify-between', {
 					'items-center': isEditing,
@@ -334,7 +334,7 @@ const ConfiguredIgnoreRule = ({ id, isReadOnly, onRemove, index }: ConfiguredIgn
 				{renderGlob()}
 
 				<div
-					className={cn('transition-opacity-[opacity_0.3s] flex items-center space-x-2', {
+					className={cn('transition-opacity-[opacity_0.3s] space-x-2 flex items-center', {
 						'opacity-0 group-hover:opacity-100': !isEditing,
 					})}
 				>
diff --git a/packages/browser/src/components/library/createOrUpdate/sections/LibraryPattern.tsx b/packages/browser/src/components/library/createOrUpdate/sections/LibraryPattern.tsx
index 777c7d722b..c0d14515ba 100644
--- a/packages/browser/src/components/library/createOrUpdate/sections/LibraryPattern.tsx
+++ b/packages/browser/src/components/library/createOrUpdate/sections/LibraryPattern.tsx
@@ -27,7 +27,7 @@ export default function LibraryPatternRadioGroup() {
 
 	// Note: if this section ever becomes more than library pattern, restore the section locale keys
 	return (
-		<div className="flex flex-col gap-6">
+		<div className="gap-6 flex flex-col">
 			<div>
 				<Heading size="sm">{t(getOptionKey('label'))}</Heading>
 				<Text size="sm" variant="muted">
@@ -35,13 +35,13 @@ export default function LibraryPatternRadioGroup() {
 				</Text>
 			</div>
 
-			<div className="flex flex-col gap-y-4">
+			<div className="gap-y-4 flex flex-col">
 				<input type="hidden" {...form.register('libraryPattern')} />
 
 				<RadioGroup
 					value={libraryPattern}
 					onValueChange={handleChange}
-					className="mt-1 flex flex-col sm:flex-row"
+					className="mt-1 sm:flex-row flex flex-col"
 					disabled={!isCreating}
 					title={isCreating ? undefined : t(getKey('section.disabled'))}
 					defaultValue="SERIES_BASED"
diff --git a/packages/browser/src/components/library/createOrUpdate/sections/ScannerOptInFeatures.tsx b/packages/browser/src/components/library/createOrUpdate/sections/ScannerOptInFeatures.tsx
index 06cc0c32c9..5e7728ba67 100644
--- a/packages/browser/src/components/library/createOrUpdate/sections/ScannerOptInFeatures.tsx
+++ b/packages/browser/src/components/library/createOrUpdate/sections/ScannerOptInFeatures.tsx
@@ -81,8 +81,8 @@ export default function ScannerOptInFeatures({ onDidChange }: Props) {
 	const { t } = useLocaleContext()
 
 	return (
-		<div className="flex flex-col gap-y-6">
-			<div className="flex flex-col gap-y-1.5">
+		<div className="gap-y-6 flex flex-col">
+			<div className="gap-y-1.5 flex flex-col">
 				<Heading size="sm">{t(getKey('section.heading'))}</Heading>
 				<Text size="sm" variant="muted">
 					{t(getKey('section.description'))}
diff --git a/packages/browser/src/components/library/createOrUpdate/sections/ThumbnailConfig.tsx b/packages/browser/src/components/library/createOrUpdate/sections/ThumbnailConfig.tsx
index 681de4a0a6..4f63ba9114 100644
--- a/packages/browser/src/components/library/createOrUpdate/sections/ThumbnailConfig.tsx
+++ b/packages/browser/src/components/library/createOrUpdate/sections/ThumbnailConfig.tsx
@@ -116,7 +116,7 @@ export default function ThumbnailConfigForm() {
 	)
 
 	return (
-		<div className="flex flex-grow flex-col gap-6">
+		<div className="gap-6 flex grow flex-col">
 			<div>
 				<Heading size="sm">
 					{t(getKey(`section.heading.${isCreating ? 'create' : 'update'}`))}
@@ -126,7 +126,7 @@ export default function ThumbnailConfigForm() {
 				</Text>
 			</div>
 
-			<div className="flex max-w-2xl flex-col gap-4">
+			<div className="max-w-2xl gap-4 flex flex-col">
 				<WideSwitch
 					description="Generate thumbnail images for this library"
 					label="Enabled"
@@ -136,8 +136,8 @@ export default function ThumbnailConfigForm() {
 
 				{!enabled && (
 					<div key="no-thumbnail-config">
-						<Card className="flex flex-col items-center gap-y-4 border-dashed p-6">
-							<span className="rounded-full border border-fill-brand-secondary bg-fill-brand p-1">
+						<Card className="gap-y-4 p-6 flex flex-col items-center border-dashed">
+							<span className="p-1 rounded-full border border-fill-brand-secondary bg-fill-brand">
 								<Check className="text-foreground" />
 							</span>
 							<Text size="sm" variant="muted">
@@ -148,8 +148,8 @@ export default function ThumbnailConfigForm() {
 				)}
 
 				{enabled && (
-					<div key="thumbnail-config" className="flex flex-col gap-4">
-						<div className="grid w-full items-center gap-1.5 lg:max-w-sm">
+					<div key="thumbnail-config" className="gap-4 flex flex-col">
+						<div className="gap-1.5 lg:max-w-sm grid w-full items-center">
 							<Label>{t(getKey('resizeMethod.label'))}</Label>
 							<NativeSelect
 								options={[
@@ -174,7 +174,7 @@ export default function ThumbnailConfigForm() {
 								<Text size="xs" variant="muted">
 									{t(getKey('scaleEvenlyByFactor.description'))}
 								</Text>
-								<div className="flex flex-col gap-2">
+								<div className="gap-2 flex flex-col">
 									<Label>{t(getKey('scaleEvenlyByFactor.factor.label'))}</Label>
 									<Input
 										contrast
@@ -226,7 +226,7 @@ export default function ThumbnailConfigForm() {
 									{t(getKey('scaleDimension.description'))}
 								</Text>
 
-								<div className="grid w-full items-center gap-2 lg:max-w-xs">
+								<div className="gap-2 lg:max-w-xs grid w-full items-center">
 									<Label>{t(getKey('scaleDimension.dimension.label'))}</Label>
 									<NativeSelect
 										options={[
@@ -262,8 +262,8 @@ export default function ThumbnailConfigForm() {
 
 				{enabled && (
 					<>
-						<div className="grid w-full items-center gap-2 lg:max-w-sm">
-							<Label className={cx({ 'cursor-not-allowed text-opacity-50': !resizeMethod })}>
+						<div className="gap-2 lg:max-w-sm grid w-full items-center">
+							<Label className={cx({ 'cursor-not-allowed opacity-50': !resizeMethod })}>
 								{t(getKey('format.label'))}
 							</Label>
 							<NativeSelect
@@ -275,7 +275,7 @@ export default function ThumbnailConfigForm() {
 							<Text
 								size="xs"
 								variant="muted"
-								className={cx({ 'cursor-not-allowed text-opacity-50': !enabled })}
+								className={cx({ 'cursor-not-allowed opacity-50': !enabled })}
 							>
 								{t(getKey('format.description'))}
 							</Text>
diff --git a/packages/browser/src/components/markdown/MarkdownEditor.tsx b/packages/browser/src/components/markdown/MarkdownEditor.tsx
index 0be17e019a..089baafad7 100644
--- a/packages/browser/src/components/markdown/MarkdownEditor.tsx
+++ b/packages/browser/src/components/markdown/MarkdownEditor.tsx
@@ -38,7 +38,7 @@ export default function MarkdownEditor({ initialState = 'writing', initialConten
 			return (
 				<textarea
 					ref={editorRef}
-					className="w-full bg-transparent px-1 py-2 text-foreground-subtle focus:outline-none"
+					className="px-1 py-2 w-full bg-transparent text-foreground-subtle focus:outline-none"
 					value={content}
 					onChange={(e) => setContent(e.target.value)}
 					rows={4}
@@ -67,7 +67,7 @@ export default function MarkdownEditor({ initialState = 'writing', initialConten
 					</Tabs.List>
 				</Tabs>
 
-				<div className="flex items-center gap-x-1.5 pr-1">
+				<div className="gap-x-1.5 pr-1 flex items-center">
 					<ToolTip content="Add spoiler" isDisabled={writingState === 'preview'}>
 						<IconButton
 							size="xs"
diff --git a/packages/browser/src/components/markdown/MarkdownPreview.tsx b/packages/browser/src/components/markdown/MarkdownPreview.tsx
index a0d96d338e..f1384e6218 100644
--- a/packages/browser/src/components/markdown/MarkdownPreview.tsx
+++ b/packages/browser/src/components/markdown/MarkdownPreview.tsx
@@ -63,10 +63,10 @@ const Spoiler = ({ children }: PropsWithChildren) => {
 		<span
 			className={cx(
 				{
-					'cursor-pointer bg-gray-800 text-gray text-opacity-0': isSpoiler,
+					'text-gray/0 cursor-pointer bg-gray-800': isSpoiler,
 				},
 				{
-					'bg-background bg-opacity-10': !isSpoiler,
+					'bg-background/10': !isSpoiler,
 				},
 			)}
 			onClick={() => setIsSpoiler(!isSpoiler)}
@@ -79,7 +79,7 @@ const Spoiler = ({ children }: PropsWithChildren) => {
 
 const Table = forwardRef<HTMLTableElement, PropsWithChildren>((props, ref) => {
 	return (
-		<div className="my-1 overflow-hidden rounded-xl border border-edge">
+		<div className="my-1 rounded-xl overflow-hidden border border-edge">
 			<table ref={ref} {...props} className="w-full divide-y divide-edge" />
 		</div>
 	)
@@ -111,7 +111,7 @@ const Th = forwardRef<HTMLTableCellElement, PropsWithChildren>((props, ref) => {
 		<th
 			ref={ref}
 			{...props}
-			className="relative h-8 bg-background-surface/50 pl-1.5 pr-1.5 text-left text-sm first:pl-4 last:pr-4"
+			className="h-8 pl-1.5 pr-1.5 text-sm first:pl-4 last:pr-4 relative bg-background-surface/50 text-left"
 		/>
 	)
 })
diff --git a/packages/browser/src/components/metadataEditor/AddFieldsDialog.tsx b/packages/browser/src/components/metadataEditor/AddFieldsDialog.tsx
index 28ba5132b7..38ad7763f5 100644
--- a/packages/browser/src/components/metadataEditor/AddFieldsDialog.tsx
+++ b/packages/browser/src/components/metadataEditor/AddFieldsDialog.tsx
@@ -48,7 +48,7 @@ export default function AddFieldsDialog<Field extends string>({ binding, onSave
 					<Dialog.Close />
 				</Dialog.Header>
 
-				<div className="flex flex-col gap-y-4">
+				<div className="gap-y-4 flex flex-col">
 					<TextArea
 						placeholder={`${t('common.enter')} ${label}...`}
 						rows={4}
@@ -56,7 +56,7 @@ export default function AddFieldsDialog<Field extends string>({ binding, onSave
 						onChange={(e) => setValue(e.target.value)}
 					/>
 
-					<div className="flex flex-wrap gap-2">
+					<div className="gap-2 flex flex-wrap">
 						{parsedValues.map((value, index) => (
 							<Badge key={index}>{value}</Badge>
 						))}
diff --git a/packages/browser/src/components/metadataEditor/MetadataEditorHeader.tsx b/packages/browser/src/components/metadataEditor/MetadataEditorHeader.tsx
index fbd081b92b..d7196ad2dd 100644
--- a/packages/browser/src/components/metadataEditor/MetadataEditorHeader.tsx
+++ b/packages/browser/src/components/metadataEditor/MetadataEditorHeader.tsx
@@ -8,7 +8,7 @@ export const MetadataEditorHeader = () => {
 	// Note: I had to separate the buttons because dynamically setting `type` based
 	// on state would trigger a submit
 	return (
-		<div className="flex h-full flex-1 items-center justify-end gap-2 pr-1.5">
+		<div className="gap-2 pr-1.5 flex h-full flex-1 items-center justify-end">
 			{state === MetadataEditorState.Editing && (
 				<Button
 					type="button"
diff --git a/packages/browser/src/components/metadataEditor/MetadataEditorTable.tsx b/packages/browser/src/components/metadataEditor/MetadataEditorTable.tsx
index 3cef7b5993..4e011d50d3 100644
--- a/packages/browser/src/components/metadataEditor/MetadataEditorTable.tsx
+++ b/packages/browser/src/components/metadataEditor/MetadataEditorTable.tsx
@@ -97,7 +97,7 @@ export default function MetadataEditorTable<Item extends RowData>({
 
 	return (
 		<Card
-			className="overflow-hidden rounded-xl border-edge"
+			className="rounded-xl overflow-hidden border-edge"
 			ref={tableContainerRef}
 			style={{
 				direction: table.options.columnResizeDirection,
@@ -123,7 +123,7 @@ export default function MetadataEditorTable<Item extends RowData>({
 										...getCommonPinningStyles(header.column),
 									},
 								}}
-								className="relative min-h-10"
+								className="min-h-10 relative"
 							>
 								{flexRender(header.column.columnDef.header, header.getContext())}
 
@@ -136,7 +136,7 @@ export default function MetadataEditorTable<Item extends RowData>({
 											ensureResizeFillsSpace(header.column.id, optimalWidth)
 										}}
 										className={cn(
-											'absolute -right-px top-0 z-50 h-full w-px cursor-col-resize touch-none opacity-0 transition-opacity duration-75 hover:opacity-50',
+											'top-0 absolute -right-px z-50 h-full w-px cursor-col-resize touch-none opacity-0 transition-opacity duration-75 hover:opacity-50',
 											{
 												'opacity-100': header.column.getIsResizing(),
 											},
@@ -156,7 +156,7 @@ export default function MetadataEditorTable<Item extends RowData>({
 						<tr key={row.id} className="flex w-fit">
 							{row.getVisibleCells().map((cell) => (
 								<td
-									className="py-2 pl-1.5 pr-1.5 first:border-r first:border-edge first:pl-4 last:pl-0 last:pr-0"
+									className="py-2 pl-1.5 pr-1.5 first:pl-4 last:pl-0 last:pr-0 first:border-r first:border-edge"
 									key={cell.id}
 									style={{
 										width: cell.column.getSize(),
@@ -172,7 +172,7 @@ export default function MetadataEditorTable<Item extends RowData>({
 					{!rows.length && (
 						<tr>
 							<td colSpan={2}>
-								<div className="flex h-32 items-center justify-center">No Metadata</div>
+								<div className="h-32 flex items-center justify-center">No Metadata</div>
 							</td>
 						</tr>
 					)}
diff --git a/packages/browser/src/components/metadataEditor/ResetMetadata.tsx b/packages/browser/src/components/metadataEditor/ResetMetadata.tsx
index e098a70a2d..9f8fc03469 100644
--- a/packages/browser/src/components/metadataEditor/ResetMetadata.tsx
+++ b/packages/browser/src/components/metadataEditor/ResetMetadata.tsx
@@ -49,7 +49,7 @@ export default function ResetMetadata({ onConfirmReset, isDisabled }: Props) {
 				<RadioGroup
 					value={impact}
 					onValueChange={handleChange}
-					className="divide gap-0 space-y-0 divide-y divide-edge overflow-hidden rounded-xl border border-edge"
+					className="divide gap-0 space-y-0 rounded-xl divide-y divide-edge overflow-hidden border border-edge"
 				>
 					<RadioGroup.CardItem
 						label="Series"
diff --git a/packages/browser/src/components/metadataEditor/cells/BadgeListCell.tsx b/packages/browser/src/components/metadataEditor/cells/BadgeListCell.tsx
index 9aa342002e..1f1bda2293 100644
--- a/packages/browser/src/components/metadataEditor/cells/BadgeListCell.tsx
+++ b/packages/browser/src/components/metadataEditor/cells/BadgeListCell.tsx
@@ -70,7 +70,7 @@ export default function BadgeListCell<Field extends string>({
 						<Button
 							variant="danger"
 							size="icon"
-							className="absolute -right-2 -top-2 z-10 h-4 w-4 opacity-0 transition-opacity group-hover:opacity-100"
+							className="-right-2 -top-2 h-4 w-4 absolute z-10 opacity-0 transition-opacity group-hover:opacity-100"
 							aria-label="Remove item"
 							onClick={() => onRemove(index)}
 						>
@@ -100,7 +100,7 @@ export default function BadgeListCell<Field extends string>({
 	const data = isEditing ? valuesFromForm : values
 
 	return (
-		<div className="flex h-full flex-wrap items-center gap-1">
+		<div className="gap-1 flex h-full flex-wrap items-center">
 			{data?.map(renderBadge)}
 
 			{isEditing && <AddFieldsDialog binding={binding} onSave={onAppendValues} />}
diff --git a/packages/browser/src/components/metadataEditor/cells/NumberCell.tsx b/packages/browser/src/components/metadataEditor/cells/NumberCell.tsx
index e2898b4d00..bf2f4cba3a 100644
--- a/packages/browser/src/components/metadataEditor/cells/NumberCell.tsx
+++ b/packages/browser/src/components/metadataEditor/cells/NumberCell.tsx
@@ -26,7 +26,7 @@ export default function NumberCell<Field extends string>({
 
 	if (isEditing) {
 		return (
-			<div className="group flex items-center gap-2">
+			<div className="group gap-2 flex items-center">
 				<Input
 					type="number"
 					step={isDecimal ? 'any' : 1}
diff --git a/packages/browser/src/components/metadataEditor/cells/TextCell.tsx b/packages/browser/src/components/metadataEditor/cells/TextCell.tsx
index dd35ca9510..0e8e1aca7d 100644
--- a/packages/browser/src/components/metadataEditor/cells/TextCell.tsx
+++ b/packages/browser/src/components/metadataEditor/cells/TextCell.tsx
@@ -27,7 +27,7 @@ export default function TextCell<Field extends string>({
 		const Component = isLong ? TextArea : Input
 		const extraProps = isLong ? {} : { size: 'sm' }
 		return (
-			<div className="group flex items-center gap-2">
+			<div className="group gap-2 flex items-center">
 				{/* @ts-expect-error: TS doesn't know I am doing this correctly lol */}
 				<Component
 					defaultValue={value || ''}
diff --git a/packages/browser/src/components/navigation/mobile/MobileSheet.tsx b/packages/browser/src/components/navigation/mobile/MobileSheet.tsx
index 9986c3aeff..458d574954 100644
--- a/packages/browser/src/components/navigation/mobile/MobileSheet.tsx
+++ b/packages/browser/src/components/navigation/mobile/MobileSheet.tsx
@@ -28,14 +28,14 @@ export default function MobileSheet() {
 			onOpen={() => setOpen(true)}
 			onClose={() => setOpen(false)}
 			footer={
-				<div className="w-full pb-2">
+				<div className="pb-2 w-full">
 					<SideBarFooter />
 				</div>
 			}
 			closeIcon={false}
 			position="left"
 		>
-			<div className="flex-1 overflow-y-auto px-6">
+			<div className="px-6 flex-1 overflow-y-auto">
 				<SideBar asChild />
 			</div>
 		</Sheet>
diff --git a/packages/browser/src/components/navigation/mobile/MobileTopBar.tsx b/packages/browser/src/components/navigation/mobile/MobileTopBar.tsx
index ea008c9fa1..ddf361173c 100644
--- a/packages/browser/src/components/navigation/mobile/MobileTopBar.tsx
+++ b/packages/browser/src/components/navigation/mobile/MobileTopBar.tsx
@@ -12,13 +12,13 @@ export const TOPBAR_HEIGHT_PX = 53
  */
 export default function TopBar() {
 	return (
-		<header className="sticky top-0 z-10 flex h-14 w-full shrink-0 border-b border-edge-subtle bg-sidebar px-4 md:hidden">
-			<div className="grid w-full grid-cols-8 items-center gap-2">
+		<header className="top-0 h-14 px-4 md:hidden sticky z-10 flex w-full shrink-0 border-b border-edge-subtle bg-sidebar">
+			<div className="gap-2 grid w-full grid-cols-8 items-center">
 				<div className="col-span-1">
 					<MobileSheet />
 				</div>
-				<div className="col-span-6 flex h-full items-center justify-center gap-2">
-					<Link to="/" className="flex shrink-0 items-center justify-start gap-2">
+				<div className="gap-2 col-span-6 flex h-full items-center justify-center">
+					<Link to="/" className="gap-2 flex shrink-0 items-center justify-start">
 						<img src="/assets/favicon.ico" className="h-6 w-6 object-scale-down" />
 						<Heading variant="gradient" size="xs">
 							Stump
diff --git a/packages/browser/src/components/navigation/mobile/NavigationButtons.tsx b/packages/browser/src/components/navigation/mobile/NavigationButtons.tsx
index 70aa3eb5b4..b0f7bccf5f 100644
--- a/packages/browser/src/components/navigation/mobile/NavigationButtons.tsx
+++ b/packages/browser/src/components/navigation/mobile/NavigationButtons.tsx
@@ -27,7 +27,7 @@ export default function NavigationButtons() {
 	})
 
 	return (
-		<div className="m-0 hidden items-center gap-1 md:flex">
+		<div className="m-0 gap-1 md:flex hidden items-center">
 			<ToolTip content="Navigate back" size="xs">
 				<IconButton variant="ghost" size="sm" onClick={navigateBackward}>
 					<ChevronLeft size="0.75rem" />
diff --git a/packages/browser/src/components/navigation/sidebar/ApplicationVersion.tsx b/packages/browser/src/components/navigation/sidebar/ApplicationVersion.tsx
index 37b5aaeef0..2084a696e8 100644
--- a/packages/browser/src/components/navigation/sidebar/ApplicationVersion.tsx
+++ b/packages/browser/src/components/navigation/sidebar/ApplicationVersion.tsx
@@ -26,7 +26,7 @@ export default function ApplicationVersion() {
 			href={url}
 			target="__blank"
 			rel="noopener noreferrer"
-			className={cx('flex items-center space-x-2 pl-2 text-[0.65rem]', TEXT_VARIANTS.muted)}
+			className={cx('space-x-2 pl-2 flex items-center text-xxs', TEXT_VARIANTS.muted)}
 			underline={false}
 		>
 			<span>
diff --git a/packages/browser/src/components/navigation/sidebar/Settings.tsx b/packages/browser/src/components/navigation/sidebar/Settings.tsx
index 08bae35b39..bb5e50c2ae 100644
--- a/packages/browser/src/components/navigation/sidebar/Settings.tsx
+++ b/packages/browser/src/components/navigation/sidebar/Settings.tsx
@@ -16,7 +16,7 @@ export default function SettingsButton() {
 			<IconButton
 				variant="ghost"
 				className={cn(
-					'border border-transparent p-1.5 text-foreground',
+					'p-1.5 border border-transparent text-foreground',
 					isActive
 						? 'border-edge-subtle/50 bg-sidebar-surface hover:bg-sidebar-surface'
 						: 'hover:border-edge-subtle/50 hover:bg-sidebar-surface/70',
diff --git a/packages/browser/src/components/navigation/sidebar/SideBar.tsx b/packages/browser/src/components/navigation/sidebar/SideBar.tsx
index f057df2e7b..cf8f404637 100644
--- a/packages/browser/src/components/navigation/sidebar/SideBar.tsx
+++ b/packages/browser/src/components/navigation/sidebar/SideBar.tsx
@@ -81,7 +81,7 @@ export default function SideBar({ asChild, hidden }: Props) {
 	const renderHeader = () => {
 		if (!isBrowser && isAtLeastMedium) {
 			return (
-				<header className="flex w-full justify-between gap-1">
+				<header className="gap-1 flex w-full justify-between">
 					<UserMenu />
 					<NavigationButtons />
 				</header>
@@ -173,7 +173,7 @@ export default function SideBar({ asChild, hidden }: Props) {
 			<>
 				{renderHeader()}
 
-				<div className="flex max-h-full grow flex-col gap-2 overflow-y-auto p-1 scrollbar-hide">
+				<div className="gap-2 p-1 scrollbar-hide flex max-h-full grow flex-col overflow-y-auto">
 					{isAtLeastMedium && isBrowser && <UserMenu />}
 
 					{sections}
@@ -198,7 +198,7 @@ export default function SideBar({ asChild, hidden }: Props) {
 		<motion.aside
 			key="primary-sidebar"
 			// @ts-expect-error: It is there I promise
-			className="hidden min-h-full md:inline-block"
+			className="md:inline-block hidden min-h-full"
 			animate={hidden ? 'hidden' : 'visible'}
 			variants={variants}
 			initial={false}
@@ -206,10 +206,9 @@ export default function SideBar({ asChild, hidden }: Props) {
 		>
 			<div
 				className={cn(
-					'relative z-10 flex h-full w-56 shrink-0 flex-col gap-4 border-r border-edge bg-sidebar px-2 py-4',
+					'w-56 gap-4 px-2 py-4 relative z-10 flex h-full shrink-0 flex-col border-r border-edge bg-sidebar',
 					{
-						'bg-gradient-to-tr from-sidebar-gradient-from to-sidebar-gradient-to':
-							shouldUseGradient,
+						'from-sidebar-gradient-from to-sidebar-gradient-to bg-linear-to-tr': shouldUseGradient,
 					},
 				)}
 			>
diff --git a/packages/browser/src/components/navigation/sidebar/SideBarButtonLink.tsx b/packages/browser/src/components/navigation/sidebar/SideBarButtonLink.tsx
index 98dc59f5d7..ada63b33c6 100644
--- a/packages/browser/src/components/navigation/sidebar/SideBarButtonLink.tsx
+++ b/packages/browser/src/components/navigation/sidebar/SideBarButtonLink.tsx
@@ -24,9 +24,9 @@ export default function SideBarButtonLink({
 	return (
 		<div
 			className={cn(
-				'group inline-flex h-[2.35rem] w-full shrink-0 items-center justify-start rounded-md px-2 text-sm transition-all duration-150 hover:bg-sidebar-surface-hover',
+				'group rounded-md px-2 text-sm inline-flex h-[2.35rem] w-full shrink-0 items-center justify-start transition-all duration-150 hover:bg-sidebar-surface-hover',
 				{
-					'justify-center border border-dashed border-edge-subtle bg-opacity-50 text-foreground text-opacity-90 hover:bg-sidebar-surface hover:text-opacity-100':
+					'justify-center border border-dashed border-edge-subtle text-foreground/90 hover:bg-sidebar-surface hover:text-foreground':
 						variant === 'action',
 				},
 				{ 'text-foreground': variant !== 'action' },
@@ -43,7 +43,7 @@ export default function SideBarButtonLink({
 			{leftContent}
 			<Link
 				to={to}
-				className={cn('line-clamp-1 flex h-full w-full flex-1 items-center break-words p-0', {
+				className={cn('p-0 line-clamp-1 flex h-full w-full flex-1 items-center wrap-break-word', {
 					'justify-center': variant === 'action',
 				})}
 			>
diff --git a/packages/browser/src/components/navigation/sidebar/SideBarFooter.tsx b/packages/browser/src/components/navigation/sidebar/SideBarFooter.tsx
index 8cb5b7b1c8..0b83f72035 100644
--- a/packages/browser/src/components/navigation/sidebar/SideBarFooter.tsx
+++ b/packages/browser/src/components/navigation/sidebar/SideBarFooter.tsx
@@ -2,7 +2,7 @@ import SettingsButton from './Settings'
 
 export default function SideBarFooter() {
 	return (
-		<footer className="flex flex-col gap-1.5">
+		<footer className="gap-1.5 flex flex-col">
 			<div className="flex items-center justify-between">
 				<SettingsButton />
 			</div>
diff --git a/packages/browser/src/components/navigation/sidebar/SignOut.tsx b/packages/browser/src/components/navigation/sidebar/SignOut.tsx
index 4b89acd38c..c8f8cee47e 100644
--- a/packages/browser/src/components/navigation/sidebar/SignOut.tsx
+++ b/packages/browser/src/components/navigation/sidebar/SignOut.tsx
@@ -23,7 +23,7 @@ export default function SignOut() {
 			onConfirm={handleLogout}
 			trigger={
 				<button
-					className="flex h-[2.35rem] w-full items-center gap-1.5 bg-sidebar-overlay bg-opacity-50 px-2 text-foreground-subtle outline-none transition-colors duration-150 hover:bg-sidebar-overlay-hover"
+					className="gap-1.5 px-2 flex h-[2.35rem] w-full items-center bg-sidebar-overlay/50 text-foreground-subtle transition-colors duration-150 outline-none hover:bg-sidebar-overlay-hover"
 					onClick={on}
 				>
 					<LogOut className="h-4 w-4" />
diff --git a/packages/browser/src/components/navigation/sidebar/sections/bookClub/BookClubEmoji.tsx b/packages/browser/src/components/navigation/sidebar/sections/bookClub/BookClubEmoji.tsx
index 635ef0e78e..9a0919b5aa 100644
--- a/packages/browser/src/components/navigation/sidebar/sections/bookClub/BookClubEmoji.tsx
+++ b/packages/browser/src/components/navigation/sidebar/sections/bookClub/BookClubEmoji.tsx
@@ -34,7 +34,7 @@ export default function BookClubEmoji({ emoji, placeholder, disabled }: Props) {
 
 	if (disabled) {
 		return (
-			<span className="mr-2 flex h-4 w-4 shrink-0 items-center justify-center">
+			<span className="mr-2 h-4 w-4 flex shrink-0 items-center justify-center">
 				{emoji ?? placeholder}
 			</span>
 		)
diff --git a/packages/browser/src/components/navigation/sidebar/sections/bookClub/BookClubSideBarSection.tsx b/packages/browser/src/components/navigation/sidebar/sections/bookClub/BookClubSideBarSection.tsx
index 033d23f750..0f1536892f 100644
--- a/packages/browser/src/components/navigation/sidebar/sections/bookClub/BookClubSideBarSection.tsx
+++ b/packages/browser/src/components/navigation/sidebar/sections/bookClub/BookClubSideBarSection.tsx
@@ -50,7 +50,7 @@ export default function BookClubSideBarSection({
 	const renderBookClubs = () => {
 		if (!bookClubs || !bookClubs.length) {
 			return (
-				<Text className="select-none px-1 py-2" variant="muted" size="sm">
+				<Text className="px-1 py-2 select-none" variant="muted" size="sm">
 					{t('sidebar.buttons.noBookClubs')}
 				</Text>
 			)
@@ -91,7 +91,7 @@ export default function BookClubSideBarSection({
 	const showLinkToAll = links.includes(FilterableArrangementEntityLink.ShowAll)
 
 	return (
-		<Accordion type="single" collapsible className="w-full py-2" defaultValue="bookClubs">
+		<Accordion type="single" collapsible className="py-2 w-full" defaultValue="bookClubs">
 			<Accordion.Item value="bookClubs" className="border-none">
 				<Accordion.Trigger noUnderline asLabel className="px-1 py-0 pb-2">
 					{t('sidebar.buttons.bookClubs')}
@@ -106,7 +106,7 @@ export default function BookClubSideBarSection({
 							{t('sidebar.buttons.seeAll')}
 						</SideBarButtonLink>
 					)}
-					<div className="ml-2 space-y-1 border-l border-l-edge pl-1">{renderBookClubs()}</div>
+					<div className="ml-2 space-y-1 pl-1 border-l border-l-edge">{renderBookClubs()}</div>
 					{showCreateLink && (
 						<SideBarButtonLink
 							to={paths.bookClubCreate()}
diff --git a/packages/browser/src/components/navigation/sidebar/sections/library/LibraryEmoji.tsx b/packages/browser/src/components/navigation/sidebar/sections/library/LibraryEmoji.tsx
index e47975d2f3..1ffab3d65a 100644
--- a/packages/browser/src/components/navigation/sidebar/sections/library/LibraryEmoji.tsx
+++ b/packages/browser/src/components/navigation/sidebar/sections/library/LibraryEmoji.tsx
@@ -37,7 +37,7 @@ export default function LibraryEmoji({ emoji, placeholder, library, disabled }:
 
 	if (disabled) {
 		return (
-			<span className="mr-2 flex h-4 w-4 shrink-0 items-center justify-center">
+			<span className="mr-2 h-4 w-4 flex shrink-0 items-center justify-center">
 				{emoji ?? placeholder}
 			</span>
 		)
diff --git a/packages/browser/src/components/navigation/sidebar/sections/library/LibraryOptionsMenu.tsx b/packages/browser/src/components/navigation/sidebar/sections/library/LibraryOptionsMenu.tsx
index c3947a38d2..c8833227de 100644
--- a/packages/browser/src/components/navigation/sidebar/sections/library/LibraryOptionsMenu.tsx
+++ b/packages/browser/src/components/navigation/sidebar/sections/library/LibraryOptionsMenu.tsx
@@ -79,7 +79,7 @@ export default function LibraryOptionsMenu({ library }: Props) {
 			<DropdownMenu
 				modal={isMobile}
 				trigger={
-					<button className="p-1 text-foreground-muted text-opacity-50 outline-none hover:text-opacity-100 focus:ring-0 focus:ring-offset-0 data-[state=open]:text-opacity-100">
+					<button className="p-1 text-foreground-muted/50 outline-none hover:text-foreground-muted focus:ring-0 focus:ring-offset-0 data-[state=open]:text-foreground-muted">
 						<MoreHorizontal className="h-4 w-4 shrink-0" />
 					</button>
 				}
diff --git a/packages/browser/src/components/navigation/sidebar/sections/library/LibrarySideBarSection.tsx b/packages/browser/src/components/navigation/sidebar/sections/library/LibrarySideBarSection.tsx
index 0c145220a6..e42b3f86e9 100644
--- a/packages/browser/src/components/navigation/sidebar/sections/library/LibrarySideBarSection.tsx
+++ b/packages/browser/src/components/navigation/sidebar/sections/library/LibrarySideBarSection.tsx
@@ -61,7 +61,7 @@ export default function LibrarySideBarSection({
 	const renderLibraries = () => {
 		if (!libraries || !libraries.length) {
 			return (
-				<Text className="select-none px-1 py-2" variant="muted" size="sm">
+				<Text className="px-1 py-2 select-none" variant="muted" size="sm">
 					{t('sidebar.buttons.noLibraries')}
 				</Text>
 			)
@@ -96,7 +96,7 @@ export default function LibrarySideBarSection({
 	}
 
 	return (
-		<Accordion type="single" collapsible className="w-full py-2" defaultValue="libraries">
+		<Accordion type="single" collapsible className="py-2 w-full" defaultValue="libraries">
 			<Accordion.Item value="libraries" className="border-none">
 				<Accordion.Trigger noUnderline asLabel className="px-1 py-0 pb-2">
 					{t('sidebar.buttons.libraries')}
@@ -111,7 +111,7 @@ export default function LibrarySideBarSection({
 							{t('sidebar.buttons.seeAll')}
 						</SideBarButtonLink>
 					)}
-					<div className="ml-2 space-y-1 border-l border-l-edge pl-1">{renderLibraries()}</div>
+					<div className="ml-2 space-y-1 pl-1 border-l border-l-edge">{renderLibraries()}</div>
 					{showCreateLink && (
 						<SideBarButtonLink
 							to={paths.libraryCreate()}
diff --git a/packages/browser/src/components/navigation/sidebar/sections/smartList/SmartListSideBarSection.tsx b/packages/browser/src/components/navigation/sidebar/sections/smartList/SmartListSideBarSection.tsx
index 3690364486..d8b9f3dd2d 100644
--- a/packages/browser/src/components/navigation/sidebar/sections/smartList/SmartListSideBarSection.tsx
+++ b/packages/browser/src/components/navigation/sidebar/sections/smartList/SmartListSideBarSection.tsx
@@ -40,7 +40,7 @@ export default function SmartListSideBarSection({
 	const renderLists = () => {
 		if (!lists || !lists.length) {
 			return (
-				<Text className="select-none px-1 py-2" variant="muted" size="sm">
+				<Text className="px-1 py-2 select-none" variant="muted" size="sm">
 					{t('sidebar.buttons.noSmartlists')}
 				</Text>
 			)
@@ -62,7 +62,7 @@ export default function SmartListSideBarSection({
 	}
 
 	return (
-		<Accordion type="single" collapsible className="w-full py-2" defaultValue="smartlists">
+		<Accordion type="single" collapsible className="py-2 w-full" defaultValue="smartlists">
 			<Accordion.Item value="smartlists" className="border-none">
 				<Accordion.Trigger noUnderline asLabel className="px-1 py-0 pb-2">
 					{t('sidebar.buttons.smartlists')}
@@ -77,7 +77,7 @@ export default function SmartListSideBarSection({
 							{t('sidebar.buttons.seeAll')}
 						</SideBarButtonLink>
 					)}
-					<div className="ml-2 space-y-1 border-l border-l-edge pl-1">{renderLists()}</div>
+					<div className="ml-2 space-y-1 pl-1 border-l border-l-edge">{renderLists()}</div>
 					{links.includes(FilterableArrangementEntityLink.Create) && (
 						<SideBarButtonLink
 							to={paths.smartListCreate()}
diff --git a/packages/browser/src/components/navigation/topbar/TopBar.tsx b/packages/browser/src/components/navigation/topbar/TopBar.tsx
index 1521d0140e..290544ccdc 100644
--- a/packages/browser/src/components/navigation/topbar/TopBar.tsx
+++ b/packages/browser/src/components/navigation/topbar/TopBar.tsx
@@ -154,19 +154,19 @@ export default function TopNavigation() {
 	return (
 		<div className="h-12 w-full border-b border-edge bg-sidebar">
 			<div
-				className="mx-auto flex h-12 items-center justify-between"
+				className="h-12 mx-auto flex items-center justify-between"
 				style={{
 					maxWidth: layoutMaxWidthPx ? `${layoutMaxWidthPx}px` : undefined,
 				}}
 			>
-				<NavigationMenu className="z-[100] h-full">
+				<NavigationMenu className="z-100 h-full">
 					<div ref={ref}>
-						<NavigationMenu.List className="w-full pl-4">{sections}</NavigationMenu.List>
+						<NavigationMenu.List className="pl-4 w-full">{sections}</NavigationMenu.List>
 					</div>
 				</NavigationMenu>
 
-				<div className="flex h-full shrink-0 items-center gap-x-2">
-					<NavigationMenu className="z-[100] h-full pr-4" viewPortProps={{ align: 'right' }}>
+				<div className="gap-x-2 flex h-full shrink-0 items-center">
+					<NavigationMenu className="pr-4 z-100 h-full" viewPortProps={{ align: 'right' }}>
 						<NavigationMenu.List className="w-full">
 							<SettingsNavigationItem />
 							<UserMenu />
diff --git a/packages/browser/src/components/navigation/topbar/TopBarButtonItem.tsx b/packages/browser/src/components/navigation/topbar/TopBarButtonItem.tsx
index b08490f342..19542f9c3b 100644
--- a/packages/browser/src/components/navigation/topbar/TopBarButtonItem.tsx
+++ b/packages/browser/src/components/navigation/topbar/TopBarButtonItem.tsx
@@ -11,7 +11,7 @@ const TopBarButtonItem = forwardRef<HTMLDivElement, Props>(
 				ref={ref}
 				{...props}
 				className={cn(
-					'flex w-full cursor-pointer select-none items-center rounded-md px-3 py-2 leading-none text-foreground-subtle no-underline outline-none transition-colors hover:bg-sidebar-surface-hover focus:bg-sidebar-surface',
+					'rounded-md px-3 py-2 flex w-full cursor-pointer items-center leading-none text-foreground-subtle no-underline transition-colors outline-none select-none hover:bg-sidebar-surface-hover focus:bg-sidebar-surface',
 					{ 'pointer-events-none text-foreground-muted': isDisabled },
 					className,
 				)}
diff --git a/packages/browser/src/components/navigation/topbar/TopBarLinkListItem.tsx b/packages/browser/src/components/navigation/topbar/TopBarLinkListItem.tsx
index 141fe999ca..3b69fc2842 100644
--- a/packages/browser/src/components/navigation/topbar/TopBarLinkListItem.tsx
+++ b/packages/browser/src/components/navigation/topbar/TopBarLinkListItem.tsx
@@ -23,7 +23,7 @@ export default function TopBarLinkListItem({
 			<Link
 				to={to}
 				className={cn(
-					'flex w-full select-none items-center rounded-md px-3 py-2 leading-none text-foreground-subtle no-underline outline-none transition-colors hover:bg-sidebar-surface-hover focus:bg-sidebar-surface',
+					'rounded-md px-3 py-2 flex w-full items-center leading-none text-foreground-subtle no-underline transition-colors outline-none select-none hover:bg-sidebar-surface-hover focus:bg-sidebar-surface',
 					{ 'pointer-events-none text-foreground-muted': isDisabled },
 					{ 'bg-sidebar-surface': isActive },
 					className,
diff --git a/packages/browser/src/components/navigation/topbar/sections/UserMenu.tsx b/packages/browser/src/components/navigation/topbar/sections/UserMenu.tsx
index 422c44f3d6..36c0095350 100644
--- a/packages/browser/src/components/navigation/topbar/sections/UserMenu.tsx
+++ b/packages/browser/src/components/navigation/topbar/sections/UserMenu.tsx
@@ -51,19 +51,19 @@ export default function UserMenu() {
 					className="h-6 w-6"
 				/>
 			</NavigationMenu.Trigger>
-			<NavigationMenu.Content className="left-auto right-0">
-				<ul className="flex flex-col text-sm md:w-48">
+			<NavigationMenu.Content className="right-0 left-auto">
+				<ul className="text-sm md:w-48 flex flex-col">
 					<TopBarLinkListItem
-						className="rounded-none py-3"
+						className="py-3 rounded-none"
 						to={paths.notifications()}
 						isActive={location.pathname.startsWith(paths.notifications())}
 						isDisabled
 					>
 						<Bell className="mr-2 h-4 w-4 shrink-0" />
-						<span className="ml-1 line-clamp-1 font-medium">Notifications</span>
+						<span className="ml-1 font-medium line-clamp-1">Notifications</span>
 					</TopBarLinkListItem>
 
-					<TopBarButtonItem className="rounded-none py-3" onClick={logout}>
+					<TopBarButtonItem className="py-3 rounded-none" onClick={logout}>
 						<LogOut className="mr-2 h-4 w-4 shrink-0" />
 						Logout
 					</TopBarButtonItem>
diff --git a/packages/browser/src/components/navigation/topbar/sections/book-club/BookClubNavigationItem.tsx b/packages/browser/src/components/navigation/topbar/sections/book-club/BookClubNavigationItem.tsx
index ef728b27d0..964c84ef40 100644
--- a/packages/browser/src/components/navigation/topbar/sections/book-club/BookClubNavigationItem.tsx
+++ b/packages/browser/src/components/navigation/topbar/sections/book-club/BookClubNavigationItem.tsx
@@ -45,8 +45,8 @@ export default function BookClubNavigationItem({
 	const renderBookClubs = () => {
 		if (!bookClubs?.length) {
 			return (
-				<div className="flex w-full flex-1 items-center justify-start px-2">
-					<div className="flex flex-col items-start gap-y-2">
+				<div className="px-2 flex w-full flex-1 items-center justify-start">
+					<div className="gap-y-2 flex flex-col items-start">
 						<CircleSlash2 className="h-7 w-7 text-foreground-muted" />
 						<div className="text-left">
 							<Label>{t('sidebar.buttons.noBookClubs')}</Label>
@@ -63,7 +63,7 @@ export default function BookClubNavigationItem({
 			<AutoSizer>
 				{({ height, width }) => (
 					<ScrollArea
-						className="flex flex-col gap-y-2"
+						className="gap-y-2 flex flex-col"
 						style={{ height: canCreateBookClub ? height - 48 : height, width }}
 					>
 						{bookClubs.map((club) => (
@@ -78,7 +78,7 @@ export default function BookClubNavigationItem({
 									) : (
 										<Club className="mr-2 h-4 w-4 shrink-0" />
 									)}
-									<span className="line-clamp-1 font-medium">{club.name}</span>
+									<span className="font-medium line-clamp-1">{club.name}</span>
 								</TopBarLinkListItem>
 							</div>
 						))}
@@ -97,22 +97,22 @@ export default function BookClubNavigationItem({
 			<NavigationMenu.Content>
 				<div
 					style={{ width }}
-					className={cn('flex min-h-[150px] min-w-[300px] flex-col gap-3 p-2', {
+					className={cn('gap-3 p-2 flex min-h-[150px] min-w-[300px] flex-col', {
 						'md:w-[400px] lg:w-[500px]': !width,
 						'md:w-[300px] lg:w-[350px]': !width && !bookClubs?.length,
 					})}
 				>
-					<div className="flex w-full flex-1 flex-col gap-y-2">
+					<div className="gap-y-2 flex w-full flex-1 flex-col">
 						{renderBookClubs()}
 
-						<div className="flex w-full items-center gap-2">
+						<div className="gap-2 flex w-full items-center">
 							{showCreateLink && (
 								<TopBarLinkListItem
 									to={paths.bookClubCreate()}
 									isActive={location.pathname.startsWith(paths.bookClubCreate())}
-									className="justify-center self-end border border-dashed border-edge-subtle p-1"
+									className="p-1 justify-center self-end border border-dashed border-edge-subtle"
 								>
-									<span className="line-clamp-1 text-sm font-medium">
+									<span className="text-sm font-medium line-clamp-1">
 										{t('sidebar.buttons.createBookClub')}
 									</span>
 								</TopBarLinkListItem>
@@ -122,9 +122,9 @@ export default function BookClubNavigationItem({
 								<TopBarLinkListItem
 									to={paths.bookClubs()}
 									isActive={location.pathname.startsWith(paths.bookClubs())}
-									className="justify-center self-end border border-dashed border-edge-subtle p-1"
+									className="p-1 justify-center self-end border border-dashed border-edge-subtle"
 								>
-									<span className="line-clamp-1 text-sm font-medium">
+									<span className="text-sm font-medium line-clamp-1">
 										{t('sidebar.buttons.seeAll')}
 									</span>
 								</TopBarLinkListItem>
diff --git a/packages/browser/src/components/navigation/topbar/sections/library/LibraryNavigationItem.tsx b/packages/browser/src/components/navigation/topbar/sections/library/LibraryNavigationItem.tsx
index f15170688e..891e43bb4d 100644
--- a/packages/browser/src/components/navigation/topbar/sections/library/LibraryNavigationItem.tsx
+++ b/packages/browser/src/components/navigation/topbar/sections/library/LibraryNavigationItem.tsx
@@ -52,8 +52,8 @@ export default function LibraryNavigationItem({
 	const renderLibraries = () => {
 		if (!libraries?.length) {
 			return (
-				<div className="flex w-full flex-1 items-center justify-start px-2">
-					<div className="flex flex-col items-start gap-y-2">
+				<div className="px-2 flex w-full flex-1 items-center justify-start">
+					<div className="gap-y-2 flex flex-col items-start">
 						<CircleSlash2 className="h-7 w-7 text-foreground-muted" />
 						<div className="text-left">
 							<Label>No libraries</Label>
@@ -70,7 +70,7 @@ export default function LibraryNavigationItem({
 			<AutoSizer>
 				{({ height, width }) => (
 					<ScrollArea
-						className="flex flex-col gap-y-2"
+						className="gap-y-2 flex flex-col"
 						style={{ height: canCreateLibrary ? height - 48 : height, width }}
 					>
 						{libraries.map((library) => (
@@ -85,7 +85,7 @@ export default function LibraryNavigationItem({
 									) : (
 										<LibrarySquare className="mr-2 h-4 w-4 shrink-0" />
 									)}
-									<span className="line-clamp-1 font-medium">{library.name}</span>
+									<span className="font-medium line-clamp-1">{library.name}</span>
 								</TopBarLinkListItem>
 							</div>
 						))}
@@ -104,27 +104,27 @@ export default function LibraryNavigationItem({
 			<NavigationMenu.Content>
 				<div
 					style={{ width }}
-					className={cn('flex min-h-[150px] min-w-[300px] gap-3 p-2', {
+					className={cn('gap-3 p-2 flex min-h-[150px] min-w-[300px]', {
 						'md:w-[400px] lg:w-[500px]': !width,
 						'md:w-[300px] lg:w-[350px]': !width && !libraries?.length,
 					})}
 				>
 					<div
-						className={cn('flex w-2/3 shrink-0 flex-col gap-y-2', {
+						className={cn('gap-y-2 flex w-2/3 shrink-0 flex-col', {
 							'w-full': !libraries?.length,
 						})}
 					>
-						<div className={cx('flex w-full flex-1', { 'flex-col gap-y-2': !libraries?.length })}>
+						<div className={cx('flex w-full flex-1', { 'gap-y-2 flex-col': !libraries?.length })}>
 							{renderLibraries()}
 
-							<div className="flex w-full items-center gap-2">
+							<div className="gap-2 flex w-full items-center">
 								{showCreateLink && (
 									<TopBarLinkListItem
 										to={paths.libraryCreate()}
 										isActive={location.pathname.startsWith(paths.libraryCreate())}
-										className="justify-center self-end border border-dashed border-edge-subtle p-1"
+										className="p-1 justify-center self-end border border-dashed border-edge-subtle"
 									>
-										<span className="line-clamp-1 text-sm font-medium">Create library</span>
+										<span className="text-sm font-medium line-clamp-1">Create library</span>
 									</TopBarLinkListItem>
 								)}
 
@@ -132,9 +132,9 @@ export default function LibraryNavigationItem({
 									<TopBarLinkListItem
 										to={paths.libraries()}
 										isActive={location.pathname.startsWith(paths.libraries())}
-										className="justify-center self-end border border-dashed border-edge-subtle p-1"
+										className="p-1 justify-center self-end border border-dashed border-edge-subtle"
 									>
-										<span className="line-clamp-1 text-sm font-medium">See all</span>
+										<span className="text-sm font-medium line-clamp-1">See all</span>
 									</TopBarLinkListItem>
 								)}
 							</div>
diff --git a/packages/browser/src/components/navigation/topbar/sections/settings/SettingsNavigationItem.tsx b/packages/browser/src/components/navigation/topbar/sections/settings/SettingsNavigationItem.tsx
index 44cdea532f..1f5d03cf43 100644
--- a/packages/browser/src/components/navigation/topbar/sections/settings/SettingsNavigationItem.tsx
+++ b/packages/browser/src/components/navigation/topbar/sections/settings/SettingsNavigationItem.tsx
@@ -57,7 +57,7 @@ export default function SettingsNavigationItem() {
 				<div key={groupLabel}>
 					<Label>{groupLabel}</Label>
 
-					<ul className="flex flex-col gap-y-0.5 pt-2 text-sm">
+					<ul className="gap-y-0.5 pt-2 text-sm flex flex-col">
 						{items.map(({ to, icon, label, disabled }) => {
 							const isDisabled = disabled || (platform === 'browser' && to.includes('desktop'))
 
@@ -71,7 +71,7 @@ export default function SettingsNavigationItem() {
 										isDisabled={isDisabled}
 									>
 										<Icon className="mr-2 h-4 w-4 shrink-0" />
-										<span className="ml-1 line-clamp-1 font-medium">
+										<span className="ml-1 font-medium line-clamp-1">
 											{t(withGroup(label.toLowerCase()))}
 										</span>
 									</TopBarLinkListItem>
@@ -89,12 +89,12 @@ export default function SettingsNavigationItem() {
 			<NavigationMenu.Trigger className={classes} showChevron={false}>
 				<Cog className="h-4 w-4" />
 			</NavigationMenu.Trigger>
-			<NavigationMenu.Content className="left-auto right-0">
+			<NavigationMenu.Content className="right-0 left-auto">
 				<div
 					className={cn(
-						'grid justify-between gap-x-2 p-4 md:w-[400px]',
+						'gap-x-2 p-4 md:w-[400px] grid justify-between',
 						{
-							'grid-cols-1 md:w-[200px]': groups.length === 1,
+							'md:w-[200px] grid-cols-1': groups.length === 1,
 						},
 						{ 'grid-cols-2': groups.length === 2 },
 					)}
diff --git a/packages/browser/src/components/navigation/topbar/sections/smart-list/SmartListNavigationItem.tsx b/packages/browser/src/components/navigation/topbar/sections/smart-list/SmartListNavigationItem.tsx
index b41c1e9472..75960aa2a0 100644
--- a/packages/browser/src/components/navigation/topbar/sections/smart-list/SmartListNavigationItem.tsx
+++ b/packages/browser/src/components/navigation/topbar/sections/smart-list/SmartListNavigationItem.tsx
@@ -40,8 +40,8 @@ export default function SmartListNavigationItem({
 	const renderSmartLists = () => {
 		if (!lists?.length) {
 			return (
-				<div className="flex w-full flex-1 items-center justify-start px-2">
-					<div className="flex flex-col items-start gap-y-2">
+				<div className="px-2 flex w-full flex-1 items-center justify-start">
+					<div className="gap-y-2 flex flex-col items-start">
 						<CircleSlash2 className="h-7 w-7 text-foreground-muted" />
 						<div className="text-left">
 							<Label>{t('sidebar.buttons.noSmartlists')}</Label>
@@ -57,7 +57,7 @@ export default function SmartListNavigationItem({
 		return (
 			<AutoSizer>
 				{({ height, width }) => (
-					<ScrollArea className="flex flex-col gap-y-2" style={{ height: height - 48, width }}>
+					<ScrollArea className="gap-y-2 flex flex-col" style={{ height: height - 48, width }}>
 						{lists.map((list) => (
 							<div key={list.id} className="w-full">
 								<TopBarLinkListItem
@@ -88,24 +88,24 @@ export default function SmartListNavigationItem({
 			<NavigationMenu.Content>
 				<div
 					style={{ width }}
-					className={cn('flex min-h-[150px] min-w-[300px] flex-col gap-3 p-2', {
+					className={cn('gap-3 p-2 flex min-h-[150px] min-w-[300px] flex-col', {
 						'md:w-[400px] lg:w-[500px]': !width,
 						'md:w-[300px] lg:w-[350px]': !width && !lists?.length,
 					})}
 				>
-					<div className="flex w-full flex-1 flex-col gap-y-2">
+					<div className="gap-y-2 flex w-full flex-1 flex-col">
 						{renderSmartLists()}
 
 						<div className="flex-1" />
 
-						<div className="flex w-full items-center gap-2">
+						<div className="gap-2 flex w-full items-center">
 							{showCreateLink && (
 								<TopBarLinkListItem
 									to={paths.smartListCreate()}
 									isActive={location.pathname.startsWith(paths.smartListCreate())}
-									className="justify-center self-end border border-dashed border-edge-subtle p-1"
+									className="p-1 justify-center self-end border border-dashed border-edge-subtle"
 								>
-									<span className="line-clamp-1 text-sm font-medium">
+									<span className="text-sm font-medium line-clamp-1">
 										{t('sidebar.buttons.createSmartlist')}
 									</span>
 								</TopBarLinkListItem>
@@ -115,9 +115,9 @@ export default function SmartListNavigationItem({
 								<TopBarLinkListItem
 									to={paths.smartLists()}
 									isActive={location.pathname.startsWith(paths.smartLists())}
-									className="justify-center self-end border border-dashed border-edge-subtle p-1"
+									className="p-1 justify-center self-end border border-dashed border-edge-subtle"
 								>
-									<span className="line-clamp-1 text-sm font-medium">
+									<span className="text-sm font-medium line-clamp-1">
 										{t('sidebar.buttons.seeAll')}
 									</span>
 								</TopBarLinkListItem>
diff --git a/packages/browser/src/components/readers/epub/EpubReaderFooter.tsx b/packages/browser/src/components/readers/epub/EpubReaderFooter.tsx
index 1f9d5c11a8..6712e637ca 100644
--- a/packages/browser/src/components/readers/epub/EpubReaderFooter.tsx
+++ b/packages/browser/src/components/readers/epub/EpubReaderFooter.tsx
@@ -51,7 +51,7 @@ export default function EpubReaderFooter() {
 	return (
 		<div>
 			<ControlsContainer position="bottom" className="h-[33px]">
-				<div className="z-50 flex flex-1 flex-col gap-y-1">
+				<div className="gap-y-1 z-50 flex flex-1 flex-col">
 					<div>
 						<Text size="xs" variant="muted">
 							{chapterName} ({virtualPage}/{virtualPageCount})
@@ -68,7 +68,7 @@ export default function EpubReaderFooter() {
 							>
 								{index === currentSectionIndex && (
 									<div
-										className="absolute top-0 h-full w-[2px] bg-foreground-muted"
+										className="top-0 absolute h-full w-[2px] bg-foreground-muted"
 										style={{ left: `${chapterProgress}%` }}
 									/>
 								)}
diff --git a/packages/browser/src/components/readers/epub/EpubReaderHeader.tsx b/packages/browser/src/components/readers/epub/EpubReaderHeader.tsx
index 230b0ed651..21cbbb0d1b 100644
--- a/packages/browser/src/components/readers/epub/EpubReaderHeader.tsx
+++ b/packages/browser/src/components/readers/epub/EpubReaderHeader.tsx
@@ -26,7 +26,7 @@ export default function EpubReaderHeader() {
 
 	return (
 		<ControlsContainer position="top">
-			<div className="flex items-center gap-x-2">
+			<div className="gap-x-2 flex items-center">
 				<Link to={paths.bookOverview(bookEntity?.id || '')} title="Book Overview">
 					<ControlButton>
 						<ArrowLeft className="h-4 w-4" />
@@ -49,7 +49,7 @@ export default function EpubReaderHeader() {
 
 			<Spacer />
 
-			<div className="flex items-center gap-x-2">
+			<div className="gap-x-2 flex items-center">
 				<SearchCommand />
 				<ThemeControls />
 				<FullScreenToggle />
diff --git a/packages/browser/src/components/readers/epub/controls/ControlsContainer.tsx b/packages/browser/src/components/readers/epub/controls/ControlsContainer.tsx
index 2f769899cf..00add7f955 100644
--- a/packages/browser/src/components/readers/epub/controls/ControlsContainer.tsx
+++ b/packages/browser/src/components/readers/epub/controls/ControlsContainer.tsx
@@ -17,7 +17,7 @@ export default function ControlsContainer({ position, children, className }: Pro
 				'h-10 w-full shrink-0',
 				{
 					'bottom-0 left-0': position === 'bottom' && fullscreen,
-					'fixed z-[100]': fullscreen,
+					'fixed z-100': fullscreen,
 					'left-0 top-0': position === 'top' && fullscreen,
 				},
 				className,
@@ -28,7 +28,7 @@ export default function ControlsContainer({ position, children, className }: Pro
 		>
 			<div
 				className={cn(
-					'flex h-full items-center gap-1 bg-background px-2 transition-opacity duration-150',
+					'gap-1 px-2 flex h-full items-center bg-background transition-opacity duration-150',
 					{ 'md:bg-transparent': !fullscreen },
 					{ 'opacity-100': !fullscreen || visible },
 					{ 'opacity-0': !visible && fullscreen },
diff --git a/packages/browser/src/components/readers/epub/controls/EpubNavigationControls.tsx b/packages/browser/src/components/readers/epub/controls/EpubNavigationControls.tsx
index ee5ae3b36b..69557cfc55 100644
--- a/packages/browser/src/components/readers/epub/controls/EpubNavigationControls.tsx
+++ b/packages/browser/src/components/readers/epub/controls/EpubNavigationControls.tsx
@@ -70,9 +70,9 @@ export default function EpubNavigationControls({ children }: Props) {
 	})
 
 	return (
-		<div className="relative flex h-full w-full flex-1 items-center gap-1" aria-hidden="true">
+		<div className="gap-1 relative flex h-full w-full flex-1 items-center" aria-hidden="true">
 			<div
-				className={cx('fixed left-2 z-[100] hidden h-1/2 w-12 items-center md:flex', {
+				className={cx('left-2 w-12 md:flex fixed z-100 hidden h-1/2 items-center', {
 					hidden: isVerticalScrolling,
 				})}
 			>
@@ -81,13 +81,13 @@ export default function EpubNavigationControls({ children }: Props) {
 				</ControlButton>
 			</div>
 			<div
-				className="fixed bottom-10 left-0 right-0 top-10 z-[99] md:hidden"
+				className="bottom-10 left-0 right-0 top-10 md:hidden fixed z-99"
 				{...swipeHandlers}
 				onClick={() => setVisible(false)}
 			/>
 			{children}
 			<div
-				className={cx('fixed right-2 z-[100] hidden h-1/2 w-12 items-center justify-end md:flex', {
+				className={cx('right-2 w-12 md:flex fixed z-100 hidden h-1/2 items-center justify-end', {
 					hidden: isVerticalScrolling,
 				})}
 			>
diff --git a/packages/browser/src/components/readers/epub/controls/FontSizeControl.tsx b/packages/browser/src/components/readers/epub/controls/FontSizeControl.tsx
index f6c7574fb7..c091e30b77 100644
--- a/packages/browser/src/components/readers/epub/controls/FontSizeControl.tsx
+++ b/packages/browser/src/components/readers/epub/controls/FontSizeControl.tsx
@@ -45,16 +45,16 @@ export default function FontSizeControl() {
 	const displayedFontSize = localFontSize > 50 ? 50 : localFontSize
 
 	return (
-		<div className="flex flex-col gap-y-2.5">
+		<div className="gap-y-2.5 flex flex-col">
 			<Label>Font size</Label>
-			<div className="flex items-center gap-x-2">
+			<div className="gap-x-2 flex items-center">
 				<IconButton
 					{...bindMinus({
 						callback: () => incrementFontSize(-1),
 					})}
 					variant="ghost"
 					size="xs"
-					className={isHoldingMinus ? 'select-none bg-background-surface-hover' : ''}
+					className={isHoldingMinus ? 'bg-background-surface-hover select-none' : ''}
 				>
 					<Minus className="h-4 w-4" />
 				</IconButton>
@@ -70,7 +70,7 @@ export default function FontSizeControl() {
 					})}
 					variant="ghost"
 					size="xs"
-					className={isHoldingPlus ? 'select-none bg-background-surface-hover' : ''}
+					className={isHoldingPlus ? 'bg-background-surface-hover select-none' : ''}
 				>
 					<Plus className="h-4 w-4" />
 				</IconButton>
diff --git a/packages/browser/src/components/readers/epub/controls/LineHeightControl.tsx b/packages/browser/src/components/readers/epub/controls/LineHeightControl.tsx
index c48f8a0602..233627cb73 100644
--- a/packages/browser/src/components/readers/epub/controls/LineHeightControl.tsx
+++ b/packages/browser/src/components/readers/epub/controls/LineHeightControl.tsx
@@ -39,16 +39,16 @@ export default function LineHeightControl() {
 	const { bindButton: bindPlus, isHolding: isHoldingPlus } = usePressAndHold()
 
 	return (
-		<div className="flex flex-col gap-y-2.5">
+		<div className="gap-y-2.5 flex flex-col">
 			<Label>Line height</Label>
-			<div className="flex items-center gap-x-2">
+			<div className="gap-x-2 flex items-center">
 				<IconButton
 					{...bindMinus({
 						callback: () => incrementLineHeight(-0.1),
 					})}
 					variant="ghost"
 					size="xs"
-					className={isHoldingMinus ? 'select-none bg-background-surface-hover' : ''}
+					className={isHoldingMinus ? 'bg-background-surface-hover select-none' : ''}
 				>
 					<Minus className="h-4 w-4" />
 				</IconButton>
@@ -61,7 +61,7 @@ export default function LineHeightControl() {
 					})}
 					variant="ghost"
 					size="xs"
-					className={isHoldingPlus ? 'select-none bg-background-surface-hover' : ''}
+					className={isHoldingPlus ? 'bg-background-surface-hover select-none' : ''}
 				>
 					<Plus className="h-4 w-4" />
 				</IconButton>
diff --git a/packages/browser/src/components/readers/epub/controls/SearchCommand.tsx b/packages/browser/src/components/readers/epub/controls/SearchCommand.tsx
index ecda27b773..4ffe6e489b 100644
--- a/packages/browser/src/components/readers/epub/controls/SearchCommand.tsx
+++ b/packages/browser/src/components/readers/epub/controls/SearchCommand.tsx
@@ -98,7 +98,7 @@ export default function SearchCommand() {
 						<Command.Item
 							key={result.cfi}
 							onDoubleClick={() => handleGoToCfi(result.cfi)}
-							className="flex flex-col space-y-1"
+							className="space-y-1 flex flex-col"
 						>
 							<p className="w-full">
 								{result.excerpt.split(new RegExp(`(${query})`, 'gi')).map((part, idx) => {
@@ -126,7 +126,7 @@ export default function SearchCommand() {
 	const renderContent = () => {
 		if (isSearching) {
 			return (
-				<div className="flex h-32 w-full items-center justify-center">
+				<div className="h-32 flex w-full items-center justify-center">
 					<Spinner />
 				</div>
 			)
@@ -143,12 +143,12 @@ export default function SearchCommand() {
 				<Search className="h-4 w-4" />
 			</ControlButton>
 			<Command.Dialog open={open} onOpenChange={setOpen}>
-				<div className="flex items-center border-b border-b-edge px-4">
+				<div className="px-4 flex items-center border-b border-b-edge">
 					<Search className="mr-2 h-4 w-4 shrink-0 text-foreground-muted opacity-50" />
 					<input
 						placeholder="Enter a basic query to search for"
 						className={cn(
-							'flex h-11 w-full rounded-md bg-transparent py-3 text-sm text-foreground-subtle outline-none placeholder:text-foreground-muted disabled:cursor-not-allowed disabled:opacity-50',
+							'h-11 rounded-md py-3 text-sm flex w-full bg-transparent text-foreground-subtle outline-none placeholder:text-foreground-muted disabled:cursor-not-allowed disabled:opacity-50',
 						)}
 						value={query}
 						onChange={(e) => setQuery(e.target.value)}
diff --git a/packages/browser/src/components/readers/epub/controls/ThemeControls.tsx b/packages/browser/src/components/readers/epub/controls/ThemeControls.tsx
index 9c59dd43b4..6f26ae5630 100644
--- a/packages/browser/src/components/readers/epub/controls/ThemeControls.tsx
+++ b/packages/browser/src/components/readers/epub/controls/ThemeControls.tsx
@@ -17,7 +17,7 @@ export default function ThemeControls() {
 				</ControlButton>
 			</Dialog.Trigger>
 
-			<Dialog.Content size="md" className="z-[101] flex flex-col gap-4 bg-background-surface">
+			<Dialog.Content size="md" className="gap-4 z-101 flex flex-col bg-background-surface">
 				<Heading size="md">Appearance</Heading>
 
 				<FontFamily />
@@ -40,7 +40,7 @@ export default function ThemeControls() {
 			<Popover.Content
 				size="sm"
 				align="end"
-				className="z-[101] flex flex-col gap-4 bg-background-surface"
+				className="gap-4 z-101 flex flex-col bg-background-surface"
 			>
 				<FontSizeControl />
 				<LineHeightControl />
diff --git a/packages/browser/src/components/readers/epub/locations/Bookmarks.tsx b/packages/browser/src/components/readers/epub/locations/Bookmarks.tsx
index ca9750da22..83f5f72a9e 100644
--- a/packages/browser/src/components/readers/epub/locations/Bookmarks.tsx
+++ b/packages/browser/src/components/readers/epub/locations/Bookmarks.tsx
@@ -33,11 +33,11 @@ export default function Bookmarks({ onLocationChanged }: Props) {
 	}
 
 	return (
-		<div className="flex max-h-full flex-col divide-y divide-edge overflow-y-auto px-2 scrollbar-hide">
+		<div className="px-2 scrollbar-hide flex max-h-full flex-col divide-y divide-edge overflow-y-auto">
 			{bookmarksArray.map(({ previewContent, epubcfi }) => (
 				<button
 					key={epubcfi}
-					className="flex flex-col justify-start gap-1.5 p-2 px-1 py-1.5 text-left hover:bg-background-surface"
+					className="gap-1.5 p-2 px-1 py-1.5 flex flex-col justify-start text-left hover:bg-background-surface"
 					onClick={() => handleSelect(epubcfi as string)}
 					disabled={!epubcfi?.length}
 				>
diff --git a/packages/browser/src/components/readers/epub/locations/LocationManager.tsx b/packages/browser/src/components/readers/epub/locations/LocationManager.tsx
index f80e413504..d78e4e0eb5 100644
--- a/packages/browser/src/components/readers/epub/locations/LocationManager.tsx
+++ b/packages/browser/src/components/readers/epub/locations/LocationManager.tsx
@@ -69,7 +69,7 @@ export default function LocationManager() {
 
 					<Dialog.Close onClick={handleClose} />
 				</Dialog.Header>
-				<div className="h-[300px] overflow-y-auto scrollbar-hide">{renderTabContent()}</div>
+				<div className="scrollbar-hide h-[300px] overflow-y-auto">{renderTabContent()}</div>
 			</Dialog.Content>
 		</Dialog>
 	)
diff --git a/packages/browser/src/components/readers/epub/locations/TableOfContents.tsx b/packages/browser/src/components/readers/epub/locations/TableOfContents.tsx
index 9086789bdc..0b5efff52f 100644
--- a/packages/browser/src/components/readers/epub/locations/TableOfContents.tsx
+++ b/packages/browser/src/components/readers/epub/locations/TableOfContents.tsx
@@ -16,7 +16,7 @@ function TableOfContentsItem({ item, handleSelect }: ItemProps) {
 	return (
 		<>
 			<button
-				className="justify-start px-1 py-1.5 text-left hover:bg-background-surface"
+				className="px-1 py-1.5 justify-start text-left hover:bg-background-surface"
 				onClick={() => handleSelect(item.content)}
 			>
 				<Text className="line-clamp-1">{item.label}</Text>
@@ -42,7 +42,7 @@ export default function TableOfContents({ onLocationChanged }: Props) {
 
 	return (
 		<div
-			className="flex max-h-full flex-col divide-y divide-edge overflow-y-auto px-2 pt-4 scrollbar-hide"
+			className="px-2 pt-4 scrollbar-hide flex max-h-full flex-col divide-y divide-edge overflow-y-auto"
 			aria-label="Table of Contents"
 		>
 			{toc?.map((item) => (
diff --git a/packages/browser/src/components/readers/imageBased/container/BrightnessControl.tsx b/packages/browser/src/components/readers/imageBased/container/BrightnessControl.tsx
index 2347247e4d..dd64c83bc2 100644
--- a/packages/browser/src/components/readers/imageBased/container/BrightnessControl.tsx
+++ b/packages/browser/src/components/readers/imageBased/container/BrightnessControl.tsx
@@ -27,7 +27,7 @@ export default function BrightnessControl() {
 	const value = useMemo(() => (isNaN(brightness) ? 1 : brightness), [brightness])
 
 	return (
-		<div className="flex flex-col space-y-2 py-1.5">
+		<div className="space-y-2 py-1.5 flex flex-col">
 			<Label>Brightness</Label>
 			<Slider
 				value={[value]}
diff --git a/packages/browser/src/components/readers/imageBased/container/ControlButton.tsx b/packages/browser/src/components/readers/imageBased/container/ControlButton.tsx
index 570381325d..7a324d337e 100644
--- a/packages/browser/src/components/readers/imageBased/container/ControlButton.tsx
+++ b/packages/browser/src/components/readers/imageBased/container/ControlButton.tsx
@@ -7,7 +7,7 @@ const ControlButton = forwardRef<HTMLButtonElement, ComponentProps<typeof IconBu
 			<IconButton
 				variant="ghost-on-black"
 				size="xs"
-				className={cn('hover:bg-fill-on-black focus:ring-offset-black', className)}
+				className={cn('focus:ring-offset-black hover:bg-fill-on-black', className)}
 				ref={ref}
 				pressEffect={false}
 				{...props}
diff --git a/packages/browser/src/components/readers/imageBased/container/ControlsOverlay.tsx b/packages/browser/src/components/readers/imageBased/container/ControlsOverlay.tsx
index 67e4bb092a..03042647c1 100644
--- a/packages/browser/src/components/readers/imageBased/container/ControlsOverlay.tsx
+++ b/packages/browser/src/components/readers/imageBased/container/ControlsOverlay.tsx
@@ -25,7 +25,7 @@ export default function ControlsOverlay() {
 
 			<motion.div
 				// @ts-expect-error: This exists
-				className="absolute inset-0 z-10 flex-1"
+				className="inset-0 absolute z-10 flex-1"
 				style={{
 					background:
 						'linear-gradient(0deg, hsla(0, 0%, 0%, 0.95), hsla(0, 0%, 0%, 0.80), hsla(0, 0%, 0%, 0.5), hsla(0, 0%, 0%, 0.5), hsla(0, 0%, 0%, 0.5), hsla(0, 0%, 0%, 0.5), hsla(0, 0%, 0%, 0.80), hsla(0, 0%, 0%, 0.95))',
diff --git a/packages/browser/src/components/readers/imageBased/container/NextInSeries.tsx b/packages/browser/src/components/readers/imageBased/container/NextInSeries.tsx
index 544719ea70..b867c6d279 100644
--- a/packages/browser/src/components/readers/imageBased/container/NextInSeries.tsx
+++ b/packages/browser/src/components/readers/imageBased/container/NextInSeries.tsx
@@ -38,21 +38,21 @@ export default function NextInSeries() {
 			<>
 				<Button
 					size="icon"
-					className="absolute right-2 top-2"
+					className="right-2 top-2 absolute"
 					variant="ghost"
 					onClick={() => setIsHidden(true)}
 				>
 					<X className="h-4 w-4" onClick={() => setIsHidden(true)} />
 				</Button>
 
-				<div className="flex flex-col gap-4">
+				<div className="gap-4 flex flex-col">
 					<div>
 						<Label className="opacity-80">Next Up:</Label>
 						<Text size="lg">{nextInSeries.name}</Text>
 					</div>
 
 					<EntityImage
-						className="rounded-xl object-contain shadow"
+						className="rounded-xl shadow object-contain"
 						src={nextInSeries.thumbnailUrl}
 					/>
 
@@ -64,7 +64,7 @@ export default function NextInSeries() {
 		)
 
 		const trigger = (
-			<div className="cursor-pointer rounded-full border border-[#898d9480] bg-black/30 p-2 backdrop-blur-sm transition-all duration-200 hover:border-[#898d94] md:bg-black/5">
+			<div className="bg-black/30 p-2 backdrop-blur-sm md:bg-black/5 cursor-pointer rounded-full border border-[#898d9480] transition-all duration-200 hover:border-[#898d94]">
 				<ArrowRight
 					className={cn('h-6 w-6 text-white', {
 						'rotate-180 transform': readingDirection === ReadingDirection.Rtl,
@@ -80,7 +80,7 @@ export default function NextInSeries() {
 					<Popover.Content
 						side={readingDirection === ReadingDirection.Ltr ? 'left' : 'right'}
 						sideOffset={8}
-						className="relative w-72"
+						className="w-72 relative"
 					>
 						{content}
 					</Popover.Content>
@@ -103,7 +103,7 @@ export default function NextInSeries() {
 	return (
 		<div
 			className={cn(
-				'absolute top-1/2 z-[60] flex -translate-y-1/2 items-center justify-center',
+				'absolute top-1/2 z-60 flex -translate-y-1/2 items-center justify-center',
 				readingDirection === ReadingDirection.Ltr ? 'right-4' : 'left-4',
 			)}
 		>
diff --git a/packages/browser/src/components/readers/imageBased/container/ReaderFooter.tsx b/packages/browser/src/components/readers/imageBased/container/ReaderFooter.tsx
index 67704fa281..285392e1e8 100644
--- a/packages/browser/src/components/readers/imageBased/container/ReaderFooter.tsx
+++ b/packages/browser/src/components/readers/imageBased/container/ReaderFooter.tsx
@@ -95,7 +95,7 @@ export default function ReaderFooter() {
 				<div className="flex flex-col justify-end" style={containerSize}>
 					<div
 						className={cn(
-							'flex cursor-pointer overflow-hidden rounded-lg border-2 border-transparent shadow-xl transition duration-300 hover:border-edge-brand',
+							'rounded-lg shadow-xl flex cursor-pointer overflow-hidden border-2 border-transparent transition duration-300 hover:border-edge-brand',
 							{ 'rounded-[10px] border-edge-brand': isCurrentSet },
 						)}
 						style={{
@@ -136,7 +136,7 @@ export default function ReaderFooter() {
 			variants={transition}
 			transition={{ duration: 0.2, ease: 'easeInOut' }}
 			// @ts-expect-error: It does have className?
-			className="fixed bottom-0 left-0 z-[100] flex w-full flex-col justify-end gap-2 overflow-hidden bg-opacity-75 text-white shadow-lg"
+			className="bottom-0 left-0 gap-2 text-white shadow-lg fixed z-100 flex w-full flex-col justify-end overflow-hidden"
 		>
 			<Virtuoso
 				ref={virtuosoRef}
@@ -162,7 +162,7 @@ export default function ReaderFooter() {
 				}
 			/>
 
-			<div className="flex w-full flex-col gap-2 px-4 pb-4">
+			<div className="gap-2 px-4 pb-4 flex w-full flex-col">
 				<ProgressBar
 					size="sm"
 					value={currentPage}
@@ -206,7 +206,7 @@ const Item = forwardRef<HTMLDivElement, ItemProps<number[]>>(
 	({ children, style, ...props }, ref) => {
 		return (
 			<div
-				className="select-none px-1"
+				className="px-1 select-none"
 				ref={ref}
 				{...props}
 				style={{
diff --git a/packages/browser/src/components/readers/imageBased/container/ReaderHeader.tsx b/packages/browser/src/components/readers/imageBased/container/ReaderHeader.tsx
index 5812f249d6..50c2839e72 100644
--- a/packages/browser/src/components/readers/imageBased/container/ReaderHeader.tsx
+++ b/packages/browser/src/components/readers/imageBased/container/ReaderHeader.tsx
@@ -27,14 +27,14 @@ export default function ReaderHeader() {
 	return (
 		<motion.nav
 			// @ts-expect-error: It does have className?
-			className="fixed left-0 top-0 z-[100] flex h-12 w-full items-center px-4 text-foreground"
+			className="left-0 top-0 h-12 px-4 fixed z-100 flex w-full items-center text-foreground"
 			initial={false}
 			animate={showToolBar ? 'visible' : 'hidden'}
 			variants={transition}
 			transition={{ duration: 0.2, ease: 'easeInOut' }}
 		>
 			<div className="flex w-full items-center justify-between">
-				<div className="flex items-center space-x-4">
+				<div className="space-x-4 flex items-center">
 					<Link
 						className="flex items-center text-foreground-on-black hover:text-foreground-on-black/80"
 						title="Go to media overview"
@@ -46,7 +46,7 @@ export default function ReaderHeader() {
 
 				<Text className="text-foreground-on-black">{resolvedName}</Text>
 
-				<div className="flex items-center space-x-2">
+				<div className="space-x-2 flex items-center">
 					{isFullscreenAvailable && (
 						<ControlButton onClick={toggleFullscreen}>
 							<FullScreenIcon className="h-4 w-4" />
diff --git a/packages/browser/src/components/readers/imageBased/container/ReaderSettings.tsx b/packages/browser/src/components/readers/imageBased/container/ReaderSettings.tsx
index 7c13a78fd5..8812bf31a2 100644
--- a/packages/browser/src/components/readers/imageBased/container/ReaderSettings.tsx
+++ b/packages/browser/src/components/readers/imageBased/container/ReaderSettings.tsx
@@ -103,9 +103,9 @@ export default function ReaderSettings({ forBook, currentPage }: Props) {
 	)
 
 	return (
-		<div className="flex flex-col gap-4" key={forBook}>
+		<div className="gap-4 flex flex-col" key={forBook}>
 			<div>
-				<Label className="text-xs font-medium uppercase text-foreground-muted">Mode</Label>
+				<Label className="text-xs font-medium text-foreground-muted uppercase">Mode</Label>
 
 				<ReadingModeSelect
 					value={activeSettings.readingMode || DEFAULT_BOOK_PREFERENCES.readingMode}
@@ -119,7 +119,7 @@ export default function ReaderSettings({ forBook, currentPage }: Props) {
 			</div>
 
 			<div>
-				<Label className="text-xs font-medium uppercase text-foreground-muted">Image Options</Label>
+				<Label className="text-xs font-medium text-foreground-muted uppercase">Image Options</Label>
 
 				<DoubleSpreadBehavior
 					behavior={
@@ -141,9 +141,9 @@ export default function ReaderSettings({ forBook, currentPage }: Props) {
 			</div>
 
 			<div>
-				<Label className="text-xs font-medium uppercase text-foreground-muted">Preferences</Label>
-				<div className="flex flex-col gap-3 pt-2">
-					<Label className="flex items-center justify-between px-1">
+				<Label className="text-xs font-medium text-foreground-muted uppercase">Preferences</Label>
+				<div className="gap-3 pt-2 flex flex-col">
+					<Label className="px-1 flex items-center justify-between">
 						<span>Separate second page</span>
 						<RawSwitch
 							primaryRing
@@ -153,7 +153,7 @@ export default function ReaderSettings({ forBook, currentPage }: Props) {
 						/>
 					</Label>
 
-					<Label className="flex items-center justify-between px-1">
+					<Label className="px-1 flex items-center justify-between">
 						<span>Pan and zoom without Ctrl / Cmd</span>
 						<RawSwitch
 							primaryRing
@@ -163,7 +163,7 @@ export default function ReaderSettings({ forBook, currentPage }: Props) {
 						/>
 					</Label>
 
-					<Label className="flex items-center justify-between px-1">
+					<Label className="px-1 flex items-center justify-between">
 						<span>Tap sides to navigate</span>
 						<RawSwitch
 							primaryRing
@@ -173,7 +173,7 @@ export default function ReaderSettings({ forBook, currentPage }: Props) {
 						/>
 					</Label>
 
-					<Label className="flex items-center justify-between px-1">
+					<Label className="px-1 flex items-center justify-between">
 						<span>Reading timer</span>
 						<RawSwitch
 							primaryRing
@@ -186,7 +186,7 @@ export default function ReaderSettings({ forBook, currentPage }: Props) {
 					{/* TODO: Once UX for settings is settled remove this */}
 					{!forBook && (
 						<div>
-							<Label className="flex items-center justify-between rounded-lg border border-dashed border-fill-brand/40 bg-fill-brand-secondary p-3">
+							<Label className="rounded-lg p-3 flex items-center justify-between border border-dashed border-fill-brand/40 bg-fill-brand-secondary">
 								<span>Experimental animated reader</span>
 								<RawSwitch
 									primaryRing
diff --git a/packages/browser/src/components/readers/imageBased/container/SettingsDialog.tsx b/packages/browser/src/components/readers/imageBased/container/SettingsDialog.tsx
index eb88fe72f0..096b40532b 100644
--- a/packages/browser/src/components/readers/imageBased/container/SettingsDialog.tsx
+++ b/packages/browser/src/components/readers/imageBased/container/SettingsDialog.tsx
@@ -19,7 +19,7 @@ export default function SettingsDialog() {
 				</ControlButton>
 			</Dialog.Trigger>
 
-			<Dialog.Content size="md" className="z-[101] flex flex-col gap-4 bg-background-surface">
+			<Dialog.Content size="md" className="gap-4 z-101 flex flex-col bg-background-surface">
 				<Tabs
 					value={modality}
 					defaultValue="book"
diff --git a/packages/browser/src/components/readers/imageBased/continuous/ContinuousScrollReader.tsx b/packages/browser/src/components/readers/imageBased/continuous/ContinuousScrollReader.tsx
index c6d367a11d..907262d360 100644
--- a/packages/browser/src/components/readers/imageBased/continuous/ContinuousScrollReader.tsx
+++ b/packages/browser/src/components/readers/imageBased/continuous/ContinuousScrollReader.tsx
@@ -168,14 +168,14 @@ const Page = ({ page, src, imageScaling: { scaleToFit }, onPageClick }: PageProp
 		className={cn(
 			'z-30 select-none',
 			{
-				'mx-auto my-0 w-auto self-center': scaleToFit === ReadingImageScaleFit.None,
+				'my-0 mx-auto w-auto self-center': scaleToFit === ReadingImageScaleFit.None,
 			},
 			{
 				'm-auto h-full max-h-screen w-auto object-cover':
 					scaleToFit === ReadingImageScaleFit.Height,
 			},
 			{
-				'mx-auto my-0 w-full object-contain': scaleToFit === ReadingImageScaleFit.Width,
+				'my-0 mx-auto w-full object-contain': scaleToFit === ReadingImageScaleFit.Width,
 			},
 		)}
 		src={src}
diff --git a/packages/browser/src/components/readers/imageBased/paged/AnimatedPagedReader.tsx b/packages/browser/src/components/readers/imageBased/paged/AnimatedPagedReader.tsx
index 3f06cd62b2..6392c0eeab 100644
--- a/packages/browser/src/components/readers/imageBased/paged/AnimatedPagedReader.tsx
+++ b/packages/browser/src/components/readers/imageBased/paged/AnimatedPagedReader.tsx
@@ -227,7 +227,7 @@ function SideBarControl({ onClick, position }: SideBarControlProps) {
 		<div
 			className={cn(
 				'absolute z-50 h-full w-[15%] border border-transparent transition-all duration-300',
-				'active:border-edge-subtle active:bg-background-surface active:bg-opacity-50',
+				'active:border-edge-subtle active:bg-background-surface/50',
 				{ 'right-0': position === 'right' },
 				{ 'left-0': position === 'left' },
 			)}
diff --git a/packages/browser/src/components/readers/imageBased/paged/PageSet.tsx b/packages/browser/src/components/readers/imageBased/paged/PageSet.tsx
index c864af3e49..51571f5e41 100644
--- a/packages/browser/src/components/readers/imageBased/paged/PageSet.tsx
+++ b/packages/browser/src/components/readers/imageBased/paged/PageSet.tsx
@@ -51,7 +51,7 @@ const PageSet = forwardRef<HTMLDivElement, Props>(
 			>
 				<div
 					className={cn('relative flex w-full justify-center', {
-						'mx-auto flex-row gap-0': currentSet.length > 1,
+						'gap-0 mx-auto flex-row': currentSet.length > 1,
 					})}
 				>
 					{currentSet.map((idx) => (
diff --git a/packages/browser/src/components/readers/imageBased/paged/PagedReader.tsx b/packages/browser/src/components/readers/imageBased/paged/PagedReader.tsx
index 39dcc24a3b..d8f280c928 100644
--- a/packages/browser/src/components/readers/imageBased/paged/PagedReader.tsx
+++ b/packages/browser/src/components/readers/imageBased/paged/PagedReader.tsx
@@ -289,7 +289,7 @@ function PagedReader({ currentPage, onPageChange }: PagedReaderProps) {
 	useHotkeys('right, left, space, escape', (_, handler) => hotKeyHandler(handler))
 
 	return (
-		<div className="relative m-auto flex w-[100vw] justify-center">
+		<div className="relative m-auto flex w-screen justify-center">
 			{!showToolBar && tapSidesToNavigate && (
 				<SideBarControl
 					fixed={fixSideNavigation}
@@ -339,8 +339,8 @@ function SideBarControl({ onClick, position, fixed }: SideBarControlProps) {
 		<div
 			className={clsx(
 				'z-50 h-full shrink-0 border border-transparent transition-all duration-300',
-				'active:border-edge-subtle active:bg-background-surface active:bg-opacity-50',
-				fixed ? 'absolute w-[10%]' : 'relative mx-[-3%] flex flex-1 flex-grow',
+				'active:border-edge-subtle active:bg-background-surface/50',
+				fixed ? 'absolute w-[10%]' : 'relative mx-[-3%] flex flex-1 grow',
 				{ 'right-0': position === 'right' },
 				{ 'left-0': position === 'left' },
 			)}
diff --git a/packages/browser/src/components/series/SeriesCard.tsx b/packages/browser/src/components/series/SeriesCard.tsx
index 8bf4610929..e2318a1925 100644
--- a/packages/browser/src/components/series/SeriesCard.tsx
+++ b/packages/browser/src/components/series/SeriesCard.tsx
@@ -52,7 +52,7 @@ export default function SeriesCard({ data, fullWidth, variant = 'default' }: Ser
 		const isMissing = data.status === 'MISSING'
 		if (isMissing) {
 			return (
-				<Text size="xs" className="uppercase text-amber-500">
+				<Text size="xs" className="text-amber-500 uppercase">
 					Series Missing
 				</Text>
 			)
@@ -69,7 +69,7 @@ export default function SeriesCard({ data, fullWidth, variant = 'default' }: Ser
 
 	const overrides = isCoverOnly
 		? {
-				className: 'flex-shrink',
+				className: 'shrink',
 				href: undefined,
 				progress: undefined,
 				subtitle: undefined,
diff --git a/packages/browser/src/components/series/SeriesExplorationLayout.tsx b/packages/browser/src/components/series/SeriesExplorationLayout.tsx
index 06ed4ba0e7..de782fa852 100644
--- a/packages/browser/src/components/series/SeriesExplorationLayout.tsx
+++ b/packages/browser/src/components/series/SeriesExplorationLayout.tsx
@@ -11,7 +11,7 @@ export default function SeriesExplorationLayout() {
 	}))
 
 	return (
-		<div className="flex shrink-0 items-center gap-1">
+		<div className="gap-1 flex shrink-0 items-center">
 			<ToolTip content="Grid" size="sm">
 				<IconButton
 					variant="ghost"
diff --git a/packages/browser/src/components/series/StackedSeriesCard.tsx b/packages/browser/src/components/series/StackedSeriesCard.tsx
index 3934108d35..3ac1fb7cb8 100644
--- a/packages/browser/src/components/series/StackedSeriesCard.tsx
+++ b/packages/browser/src/components/series/StackedSeriesCard.tsx
@@ -65,9 +65,9 @@ const StackedSeriesCard = memo(function StackedSeriesCard({ data }: Props) {
 		>
 			{width != null && <SeriesStackedThumbnails width={width} thumbnailData={thumbnailData} />}
 
-			<div className="absolute left-0 top-0 z-20 w-full px-2.5 py-3">
+			<div className="left-0 top-0 px-2.5 py-3 absolute z-20 w-full">
 				<Text
-					className="line-clamp-2 !text-wrap text-base font-bold leading-tight text-white md:text-lg"
+					className="text-base font-bold leading-tight text-white md:text-lg line-clamp-2 text-wrap!"
 					style={{
 						textShadow: '2px 1px 2px rgba(0, 0, 0, 0.5)',
 					}}
@@ -75,7 +75,7 @@ const StackedSeriesCard = memo(function StackedSeriesCard({ data }: Props) {
 					{data.resolvedName}
 				</Text>
 				<Text
-					className="mt-0.5 line-clamp-1 text-xs font-medium leading-tight text-gray-200 md:text-sm"
+					className="mt-0.5 text-xs font-medium leading-tight md:text-sm line-clamp-1 text-gray-200"
 					style={{
 						textShadow: '2px 1px 2px rgba(0, 0, 0, 0.5)',
 					}}
diff --git a/packages/browser/src/components/series/metadata/SeriesMetadataEditor.tsx b/packages/browser/src/components/series/metadata/SeriesMetadataEditor.tsx
index e0b93b293b..9ef3184f14 100644
--- a/packages/browser/src/components/series/metadata/SeriesMetadataEditor.tsx
+++ b/packages/browser/src/components/series/metadata/SeriesMetadataEditor.tsx
@@ -100,7 +100,7 @@ export default function SeriesMetadataEditor({ seriesId, data }: Props) {
 		() => [
 			columnHelper.accessor('label', {
 				header: ({ table }) => (
-					<div className="flex h-full items-center pl-4 font-bold leading-6 text-foreground/90">
+					<div className="pl-4 font-bold leading-6 flex h-full items-center text-foreground/90">
 						<Label className="flex items-center">
 							<CheckBox
 								variant="primary"
diff --git a/packages/browser/src/components/series/table/CoverImageCell.tsx b/packages/browser/src/components/series/table/CoverImageCell.tsx
index 5a39b49796..9e5cd943a9 100644
--- a/packages/browser/src/components/series/table/CoverImageCell.tsx
+++ b/packages/browser/src/components/series/table/CoverImageCell.tsx
@@ -48,7 +48,7 @@ export default function CoverImageCell({ id, title }: Props) {
 		return (
 			<div
 				title={`${title} (Image failed to load)`}
-				className="flex h-14 w-auto items-center justify-center rounded-sm border-[0.5px] border-edge bg-sidebar shadow-sm"
+				className="h-14 rounded-sm shadow-sm flex w-auto items-center justify-center border-[0.5px] border-edge bg-sidebar"
 				style={{ aspectRatio: thumbnailRatio }}
 				onClick={attemptReload}
 			>
@@ -60,7 +60,7 @@ export default function CoverImageCell({ id, title }: Props) {
 	return (
 		<EntityImage
 			title={title}
-			className="h-14 w-auto rounded-sm object-cover"
+			className="h-14 rounded-sm w-auto object-cover"
 			style={{ aspectRatio: thumbnailRatio }}
 			src={sdk.series.thumbnailURL(id)}
 			onError={() => setShowFallback(true)}
diff --git a/packages/browser/src/components/series/table/columns.tsx b/packages/browser/src/components/series/table/columns.tsx
index 3c7fb2def7..70393b4074 100644
--- a/packages/browser/src/components/series/table/columns.tsx
+++ b/packages/browser/src/components/series/table/columns.tsx
@@ -35,7 +35,7 @@ const nameColumn = columnHelper.accessor(({ resolvedName }) => resolvedName, {
 	}) => (
 		<Link
 			to={paths.seriesOverview(id)}
-			className="line-clamp-2 text-sm text-opacity-100 no-underline hover:text-opacity-90"
+			className="text-sm line-clamp-2 no-underline hover:opacity-90"
 		>
 			{getValue()}
 		</Link>
diff --git a/packages/browser/src/components/settings/GenericSettingsHeader.tsx b/packages/browser/src/components/settings/GenericSettingsHeader.tsx
index c3c575e46e..8a39a3f32e 100644
--- a/packages/browser/src/components/settings/GenericSettingsHeader.tsx
+++ b/packages/browser/src/components/settings/GenericSettingsHeader.tsx
@@ -57,7 +57,7 @@ export default function GenericSettingsHeader({ localeBase, routeGroups }: Props
 
 	return (
 		<header
-			className={cn('flex w-full flex-col space-y-4 border-b border-b-edge p-4 md:pl-52', {
+			className={cn('space-y-4 p-4 md:pl-52 flex w-full flex-col border-b border-b-edge', {
 				// Note: We make the border transparent because the width constraint when using a top bar
 				'mx-auto border-b-transparent': preferTopBar && !!layoutMaxWidthPx,
 			})}
diff --git a/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/GroupBy.tsx b/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/GroupBy.tsx
index 681cbddaee..21ba07841d 100644
--- a/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/GroupBy.tsx
+++ b/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/GroupBy.tsx
@@ -26,11 +26,11 @@ export default function GroupBy({ disabled }: Props) {
 	const { t } = useLocaleContext()
 
 	return (
-		<div className="flex flex-col space-y-1.5 pb-4">
+		<div className="space-y-1.5 pb-4 flex flex-col">
 			<Label>{t(getKey('label'))}</Label>
 			<div>
 				<NativeSelect
-					className="h-8 w-[unset] py-0"
+					className="h-8 py-0 w-[unset]"
 					disabled={disabled}
 					options={[
 						{
diff --git a/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/SmartListQueryBuilder.tsx b/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/SmartListQueryBuilder.tsx
index 31d6347500..d5a8af6d39 100644
--- a/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/SmartListQueryBuilder.tsx
+++ b/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/SmartListQueryBuilder.tsx
@@ -24,7 +24,7 @@ export default function SmartListQueryBuilder({ disabled }: Props) {
 
 	return (
 		<>
-			<div className={cn('flex flex-col space-y-4', { 'cursor-not-allowed opacity-65': disabled })}>
+			<div className={cn('space-y-4 flex flex-col', { 'cursor-not-allowed opacity-65': disabled })}>
 				<Alert variant="info" id="smart-list-performance" dismissible>
 					<AlertTriangle />
 					<AlertDescription>{t(getKey('uiPerformance'))}</AlertDescription>
@@ -32,13 +32,13 @@ export default function SmartListQueryBuilder({ disabled }: Props) {
 
 				<GroupBy disabled={disabled} />
 
-				<div className={cn('flex items-center space-x-3.5', { 'pointer-events-none': disabled })}>
+				<div className={cn('space-x-3.5 flex items-center', { 'pointer-events-none': disabled })}>
 					<Tabs variant="primary" activeOnHover value={joiner}>
 						<Tabs.List className="rounded-lg">
 							<Tabs.Trigger
 								value="and"
 								asChild
-								className="w-8 min-w-[unset] rounded-lg px-1 text-xs"
+								className="w-8 rounded-lg px-1 text-xs min-w-[unset]"
 								onClick={() => form.setValue('filters.joiner', 'and')}
 							>
 								<Text className="cursor-pointer truncate">{t(getKey('rootJoiner.and.label'))}</Text>
@@ -47,7 +47,7 @@ export default function SmartListQueryBuilder({ disabled }: Props) {
 							<Tabs.Trigger
 								value="or"
 								asChild
-								className="w-8 min-w-[unset] rounded-lg px-1 text-xs"
+								className="w-8 rounded-lg px-1 text-xs min-w-[unset]"
 								onClick={() => form.setValue('filters.joiner', 'or')}
 							>
 								<Text className={cx('truncate', { 'cursor-pointer': true })}>
@@ -63,12 +63,12 @@ export default function SmartListQueryBuilder({ disabled }: Props) {
 				</div>
 
 				<div
-					className={cn('relative ml-4 flex flex-col space-y-8 border-l border-l-edge px-2 pt-4', {
+					className={cn('ml-4 space-y-8 px-2 pt-4 relative flex flex-col border-l border-l-edge', {
 						'pointer-events-none': disabled,
 					})}
 				>
 					{groups.length === 0 && (
-						<div className="ml-4 flex max-w-sm items-center justify-center rounded-lg border border-dashed border-edge p-4">
+						<div className="ml-4 max-w-sm rounded-lg p-4 flex items-center justify-center border border-dashed border-edge">
 							<Text variant="muted">{t(getKey('filters.emptyState'))}</Text>
 						</div>
 					)}
diff --git a/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/filterGroup/FieldSelector.tsx b/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/filterGroup/FieldSelector.tsx
index f59c25c534..4247862d9a 100644
--- a/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/filterGroup/FieldSelector.tsx
+++ b/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/filterGroup/FieldSelector.tsx
@@ -114,7 +114,7 @@ export function FieldSelector({ idx }: Props) {
 		if (source) {
 			return (
 				<button
-					className="flex w-full items-center space-x-2 text-sm"
+					className="space-x-2 text-sm flex w-full items-center"
 					onClick={() => setSource(null)}
 				>
 					<ArrowLeft className="ml-2 h-4 w-4 text-foreground-muted" />
@@ -151,13 +151,13 @@ export function FieldSelector({ idx }: Props) {
 					<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 				</Button>
 			</Popover.Trigger>
-			<Popover.Content className="mt-1 max-h-96 w-52 overflow-y-auto p-0" align="start">
+			<Popover.Content className="mt-1 max-h-96 w-52 p-0 overflow-y-auto" align="start">
 				<Command>
 					<Command.List>
 						<Command.Group
 							heading={renderGroupHeader()}
 							className={cn({
-								'[&_[cmdk-group-heading]]:px-0': !!source,
+								'**:[[cmdk-group-heading]]:px-0': !!source,
 							})}
 						>
 							{renderSource()}
diff --git a/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/filterGroup/FilterGroup.tsx b/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/filterGroup/FilterGroup.tsx
index 62989e4754..14a8c33972 100644
--- a/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/filterGroup/FilterGroup.tsx
+++ b/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/filterGroup/FilterGroup.tsx
@@ -38,9 +38,9 @@ export default function FilterGroup({ idx, group }: Props) {
 						return (
 							<div
 								key={filterIndex}
-								className="group/filter relative flex items-start p-4 md:items-center"
+								className="group/filter p-4 md:items-center relative flex items-start"
 							>
-								<div className="flex flex-1 flex-wrap items-center gap-x-4 gap-y-2 md:gap-4">
+								<div className="gap-x-4 gap-y-2 md:gap-4 flex flex-1 flex-wrap items-center">
 									<FieldSelector idx={filterIndex} />
 									{filter.field && (
 										<>
@@ -56,7 +56,7 @@ export default function FilterGroup({ idx, group }: Props) {
 									)}
 								</div>
 
-								<div className="flex h-full w-12 shrink-0 items-center justify-end transition-opacity duration-200 group-hover/filter:opacity-100 md:opacity-0">
+								<div className="w-12 md:opacity-0 flex h-full shrink-0 items-center justify-end transition-opacity duration-200 group-hover/filter:opacity-100">
 									<ToolTip content={t(getKey('actions.deleteFilter'))} align="end">
 										<IconButton
 											size="xs"
@@ -73,7 +73,7 @@ export default function FilterGroup({ idx, group }: Props) {
 					})}
 				</div>
 
-				<div className="flex h-12 items-center space-x-4 bg-background-surface/45 px-4">
+				<div className="h-12 space-x-4 px-4 flex items-center bg-background-surface/45">
 					<GroupJoiner />
 
 					<div className="flex-1" />
diff --git a/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/filterGroup/GroupJoiner.tsx b/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/filterGroup/GroupJoiner.tsx
index 90877ba7bb..c03bf1000c 100644
--- a/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/filterGroup/GroupJoiner.tsx
+++ b/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/filterGroup/GroupJoiner.tsx
@@ -14,13 +14,13 @@ export default function GroupJoiner() {
 	const joiner = useWatch({ control: form.control, name: `filters.groups.${groupIdx}.joiner` })
 
 	return (
-		<div className="flex items-center lg:space-x-4">
+		<div className="lg:space-x-4 flex items-center">
 			<Tabs variant="primary" activeOnHover value={joiner}>
 				<Tabs.List className="rounded-lg">
 					<Tabs.Trigger
 						value="and"
 						asChild
-						className="w-8 min-w-[unset] rounded-lg px-1 text-xs"
+						className="w-8 rounded-lg px-1 text-xs min-w-[unset]"
 						onClick={() => form.setValue(`filters.groups.${groupIdx}.joiner`, 'and')}
 					>
 						<Text className="cursor-pointer truncate">{t(getJoinerKey('and', 'label'))}</Text>
@@ -29,7 +29,7 @@ export default function GroupJoiner() {
 					<Tabs.Trigger
 						value="or"
 						asChild
-						className="w-8 min-w-[unset] rounded-lg px-1 text-xs"
+						className="w-8 rounded-lg px-1 text-xs min-w-[unset]"
 						onClick={() => form.setValue(`filters.groups.${groupIdx}.joiner`, 'or')}
 					>
 						<Text className={cn('truncate', { 'cursor-pointer': true })}>
@@ -40,7 +40,7 @@ export default function GroupJoiner() {
 					<Tabs.Trigger
 						value="not"
 						asChild
-						className="w-8 min-w-[unset] rounded-lg px-1 text-xs"
+						className="w-8 rounded-lg px-1 text-xs min-w-[unset]"
 						onClick={() => form.setValue(`filters.groups.${groupIdx}.joiner`, 'not')}
 					>
 						<Text className={cn('truncate', { 'cursor-pointer': true })}>
@@ -49,7 +49,7 @@ export default function GroupJoiner() {
 					</Tabs.Trigger>
 				</Tabs.List>
 			</Tabs>
-			<Text className="hidden text-sm lg:inline-flex" variant="muted">
+			<Text className="text-sm lg:inline-flex hidden" variant="muted">
 				{t(getJoinerKey(joiner, 'description'))}
 			</Text>
 		</div>
diff --git a/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/filterGroup/OperatorSelect.tsx b/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/filterGroup/OperatorSelect.tsx
index 9b90f49920..e3624008a5 100644
--- a/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/filterGroup/OperatorSelect.tsx
+++ b/packages/browser/src/components/smartList/createOrUpdate/queryBuilder/filterGroup/OperatorSelect.tsx
@@ -117,7 +117,7 @@ export default function OperatorSelect({ idx }: Props) {
 				</Button>
 			</Popover.Trigger>
 
-			<Popover.Content className="mt-1 max-h-96 w-52 overflow-y-auto p-0" align="start">
+			<Popover.Content className="mt-1 max-h-96 w-52 p-0 overflow-y-auto" align="start">
 				<Command>
 					<Command.List>
 						{selectGroups.map(({ label, operators }) => (
diff --git a/packages/browser/src/components/smartList/createOrUpdate/sections/AccessSettings.tsx b/packages/browser/src/components/smartList/createOrUpdate/sections/AccessSettings.tsx
index c5d213a458..f9048cbab8 100644
--- a/packages/browser/src/components/smartList/createOrUpdate/sections/AccessSettings.tsx
+++ b/packages/browser/src/components/smartList/createOrUpdate/sections/AccessSettings.tsx
@@ -19,7 +19,7 @@ export default function AccessSettings({ isCreating }: Props) {
 
 	return (
 		<>
-			<div className="flex max-w-xs flex-col gap-y-1.5">
+			<div className="max-w-xs gap-y-1.5 flex flex-col">
 				<Label>{t(getKey('label'))}</Label>
 				<NativeSelect
 					options={[
diff --git a/packages/browser/src/components/smartList/createOrUpdate/sections/BasicDetails.tsx b/packages/browser/src/components/smartList/createOrUpdate/sections/BasicDetails.tsx
index ddce7a0b4a..6b6d274060 100644
--- a/packages/browser/src/components/smartList/createOrUpdate/sections/BasicDetails.tsx
+++ b/packages/browser/src/components/smartList/createOrUpdate/sections/BasicDetails.tsx
@@ -12,7 +12,7 @@ export default function BasicDetails() {
 	const { t } = useLocaleContext()
 
 	return (
-		<div className="flex flex-col gap-y-6">
+		<div className="gap-y-6 flex flex-col">
 			<Input
 				variant="primary"
 				label={t(getKey('name.label'))}
diff --git a/packages/browser/src/components/smartList/createOrUpdate/sections/FilterConfigJSON.tsx b/packages/browser/src/components/smartList/createOrUpdate/sections/FilterConfigJSON.tsx
index ae4f86410b..edcd397290 100644
--- a/packages/browser/src/components/smartList/createOrUpdate/sections/FilterConfigJSON.tsx
+++ b/packages/browser/src/components/smartList/createOrUpdate/sections/FilterConfigJSON.tsx
@@ -24,7 +24,7 @@ export default function FilterConfigJSON() {
 		<Accordion type="single" collapsible>
 			<Accordion.Item value="raw_filters" className="border-none">
 				<Accordion.Trigger noUnderline asLabel>
-					<div className="flex flex-col items-start gap-y-1">
+					<div className="gap-y-1 flex flex-col items-start">
 						<span>Show JSON</span>
 						<Text variant="muted" size="sm">
 							View the raw JSON representation of the filters
diff --git a/packages/browser/src/components/smartList/createOrUpdate/sections/SmartListReview.tsx b/packages/browser/src/components/smartList/createOrUpdate/sections/SmartListReview.tsx
index e4adf20d8a..173bb62bd5 100644
--- a/packages/browser/src/components/smartList/createOrUpdate/sections/SmartListReview.tsx
+++ b/packages/browser/src/components/smartList/createOrUpdate/sections/SmartListReview.tsx
@@ -14,7 +14,7 @@ export default function SmartListReview() {
 	const { t } = useLocaleContext()
 
 	return (
-		<div className="flex flex-col space-y-8">
+		<div className="space-y-8 flex flex-col">
 			<ReviewStepContainer
 				label={t(getStepKey(1, 'heading'))}
 				description={t(getStepKey(1, 'description'))}
@@ -54,7 +54,7 @@ export default function SmartListReview() {
 			</ReviewStepContainer>
 
 			<div className="grid grid-cols-9">
-				<div className="col-span-9 md:col-span-6">
+				<div className="md:col-span-6 col-span-9">
 					<FilterConfigJSON />
 				</div>
 			</div>
diff --git a/packages/browser/src/components/steppedForm/ReviewStepContainer.tsx b/packages/browser/src/components/steppedForm/ReviewStepContainer.tsx
index 100b58f204..55ea1bbde0 100644
--- a/packages/browser/src/components/steppedForm/ReviewStepContainer.tsx
+++ b/packages/browser/src/components/steppedForm/ReviewStepContainer.tsx
@@ -7,14 +7,14 @@ type StepContainerProps = PropsWithChildren<{
 }>
 
 export const ReviewStepContainer = ({ label, description, children }: StepContainerProps) => (
-	<div className="grid grid-cols-7 justify-between space-y-4 md:space-y-0">
-		<div className="col-span-7 md:col-span-4">
+	<div className="space-y-4 md:space-y-0 grid grid-cols-7 justify-between">
+		<div className="md:col-span-4 col-span-7">
 			<Heading size="sm">{label}</Heading>
 			<Text size="sm" variant="muted" className="mt-1.5">
 				{description}
 			</Text>
 		</div>
 
-		<div className="col-span-7 flex flex-col space-y-2 md:col-span-3">{children}</div>
+		<div className="space-y-2 md:col-span-3 col-span-7 flex flex-col">{children}</div>
 	</div>
 )
diff --git a/packages/browser/src/components/steppedForm/SteppedFormIndicators.tsx b/packages/browser/src/components/steppedForm/SteppedFormIndicators.tsx
index 73d4e0a69f..30511e9196 100644
--- a/packages/browser/src/components/steppedForm/SteppedFormIndicators.tsx
+++ b/packages/browser/src/components/steppedForm/SteppedFormIndicators.tsx
@@ -58,13 +58,13 @@ const Indicator = ({ step, label, isComplete, currentStep }: IndicatorProps) =>
 	const renderIcon = () => {
 		if (isComplete) {
 			return (
-				<div className="flex h-4 w-4 items-center justify-center rounded-full bg-fill-brand text-white">
+				<div className="h-4 w-4 text-white flex items-center justify-center rounded-full bg-fill-brand">
 					<Check className="h-3 w-3" />
 				</div>
 			)
 		} else {
 			return (
-				<div className="flex h-4 w-4 items-center justify-center rounded-full border border-edge-brand/70 text-xs text-foreground-muted">
+				<div className="h-4 w-4 text-xs flex items-center justify-center rounded-full border border-edge-brand/70 text-foreground-muted">
 					{step}
 				</div>
 			)
@@ -84,7 +84,7 @@ const Indicator = ({ step, label, isComplete, currentStep }: IndicatorProps) =>
 
 	return (
 		<button
-			className={cn('flex items-center space-x-2 rounded-full border border-edge px-2.5 py-1.5', {
+			className={cn('space-x-2 px-2.5 py-1.5 flex items-center rounded-full border border-edge', {
 				'border-edge-brand': currentStep === step,
 			})}
 			onClick={handleClick}
diff --git a/packages/browser/src/components/steppedForm/SteppedFormSceneHeader.tsx b/packages/browser/src/components/steppedForm/SteppedFormSceneHeader.tsx
index ea2a33e884..410f92cdc7 100644
--- a/packages/browser/src/components/steppedForm/SteppedFormSceneHeader.tsx
+++ b/packages/browser/src/components/steppedForm/SteppedFormSceneHeader.tsx
@@ -15,7 +15,7 @@ export default function SteppedFormSceneHeader() {
 	const { t } = useLocaleContext()
 
 	return (
-		<header className="flex w-full flex-col space-y-6 border-b border-b-edge p-4">
+		<header className="space-y-6 p-4 flex w-full flex-col border-b border-b-edge">
 			<div>
 				<Heading size="lg" className="font-bold">
 					{t(`${localeBase}.heading`)}
diff --git a/packages/browser/src/components/table/EntityTable.tsx b/packages/browser/src/components/table/EntityTable.tsx
index d5059db98b..7acc48308a 100644
--- a/packages/browser/src/components/table/EntityTable.tsx
+++ b/packages/browser/src/components/table/EntityTable.tsx
@@ -106,11 +106,11 @@ export default function EntityTable<Entity>({
 							return (
 								<th
 									key={header.id}
-									className="sticky !top-0 z-[2] h-10 bg-background pl-1.5 pr-1.5 shadow-sm first:pl-4 last:pr-4"
+									className="top-0! h-10 pl-1.5 pr-1.5 shadow-sm first:pl-4 last:pr-4 sticky z-2 bg-background"
 								>
 									<div
 										className={cn('flex items-center', {
-											'cursor-pointer select-none gap-x-2': isSortable,
+											'gap-x-2 cursor-pointer select-none': isSortable,
 										})}
 										onClick={header.column.getToggleSortingHandler()}
 										style={{
diff --git a/packages/browser/src/components/table/EntityTableColumnConfiguration.tsx b/packages/browser/src/components/table/EntityTableColumnConfiguration.tsx
index 7bac9517a3..119caf7bf3 100644
--- a/packages/browser/src/components/table/EntityTableColumnConfiguration.tsx
+++ b/packages/browser/src/components/table/EntityTableColumnConfiguration.tsx
@@ -276,7 +276,7 @@ export default function EntityTableColumnConfiguration({ entity, configuration,
 			}
 			size={isMobile ? 'xl' : 'lg'}
 			footer={
-				<div className="-mt-4 flex w-full items-center gap-x-4 py-2">
+				<div className="-mt-4 gap-x-4 py-2 flex w-full items-center">
 					<Button className="w-full" onClick={handleSave}>
 						{t('common.save')}
 					</Button>
@@ -302,7 +302,7 @@ export default function EntityTableColumnConfiguration({ entity, configuration,
 					onDragCancel={handleDragCancel}
 					onDragEnd={handleDragEnd}
 				>
-					<div className="grid grid-cols-1 gap-3 p-4 md:grid-cols-2">
+					<div className="gap-3 p-4 md:grid-cols-2 grid grid-cols-1">
 						<ColumnBucket
 							title="Visible"
 							containerId="visible-container"
@@ -368,7 +368,7 @@ function DraggableColumn({ column, moveToOtherList, buttonLabel }: DraggableColu
 			style={style}
 			{...attributes}
 			{...listeners}
-			className={`flex shrink-0 items-center justify-between rounded-md border border-edge bg-background-surface px-2 py-1 ${
+			className={`rounded-md px-2 py-1 flex shrink-0 items-center justify-between border border-edge bg-background-surface ${
 				isDragging ? 'opacity-40' : ''
 			}`}
 		>
@@ -382,7 +382,7 @@ function DraggableColumn({ column, moveToOtherList, buttonLabel }: DraggableColu
 
 function ColumnOverlay({ column }: { column: ReturnType<typeof resolveConfiguration>[number] }) {
 	return (
-		<div className="flex min-w-40 items-center justify-between rounded-md border border-edge bg-background-surface px-2 py-1 shadow-sm">
+		<div className="min-w-40 rounded-md px-2 py-1 shadow-sm flex items-center justify-between border border-edge bg-background-surface">
 			<Text size="sm">{column.label}</Text>
 		</div>
 	)
@@ -407,7 +407,7 @@ function ColumnBucket({
 	const moveLabel = title === 'Visible' ? 'Move to hidden' : 'Move to visible'
 
 	return (
-		<div ref={setNodeRef} className="rounded-md border border-edge bg-background p-3">
+		<div ref={setNodeRef} className="rounded-md p-3 border border-edge bg-background">
 			<div className="mb-2 flex items-center justify-between">
 				<Text size="sm" variant="secondary">
 					{title}
@@ -418,7 +418,7 @@ function ColumnBucket({
 			</div>
 
 			<SortableContext items={identifiers} strategy={rectSortingStrategy}>
-				<div className="flex min-h-20 flex-col gap-2">
+				<div className="min-h-20 gap-2 flex flex-col">
 					{items.map((column) => (
 						<DraggableColumn
 							column={column}
@@ -428,7 +428,7 @@ function ColumnBucket({
 						/>
 					))}
 					{items.length === 0 && (
-						<div className="flex min-h-10 items-center justify-center rounded border border-dashed border-edge px-2 py-3">
+						<div className="min-h-10 rounded px-2 py-3 flex items-center justify-center border border-dashed border-edge">
 							<Text size="xs" variant="muted">
 								Drop columns here
 							</Text>
diff --git a/packages/browser/src/components/table/Pagination.tsx b/packages/browser/src/components/table/Pagination.tsx
index f2b7cc30f2..5a79fe556c 100644
--- a/packages/browser/src/components/table/Pagination.tsx
+++ b/packages/browser/src/components/table/Pagination.tsx
@@ -36,7 +36,7 @@ export default function TablePagination({
 
 	// FIXME: Things get smushed together when there are too many pages
 	return (
-		<div className="flex items-center gap-1">
+		<div className="gap-1 flex items-center">
 			<Button
 				size="icon"
 				variant="ghost"
diff --git a/packages/browser/src/components/table/Table.tsx b/packages/browser/src/components/table/Table.tsx
index 9f182bdd1f..f1001fba4e 100644
--- a/packages/browser/src/components/table/Table.tsx
+++ b/packages/browser/src/components/table/Table.tsx
@@ -145,10 +145,10 @@ export default function Table<T, V>({
 	const tableRows = table.getRowModel().rows
 
 	return (
-		<div className="flex flex-col space-y-2">
+		<div className="space-y-2 flex flex-col">
 			<div className="relative" ref={rootRef} data-overlayscrollbars-initialize>
 				<div
-					className={cn('divide block max-w-full overflow-y-hidden overflow-x-scroll', {
+					className={cn('divide block max-w-full overflow-x-scroll overflow-y-hidden', {
 						'scrollbar-hide': enableHideScrollbar,
 					})}
 					ref={viewportRef}
@@ -162,7 +162,7 @@ export default function Table<T, V>({
 											<th
 												key={header.id}
 												colSpan={header.colSpan}
-												className="bg-background-surface/50 py-2.5 first:pl-2.5"
+												className="py-2.5 first:pl-2.5 bg-background-surface/50"
 												style={{
 													...getCommonPinningStyles(header.column),
 												}}
@@ -176,7 +176,7 @@ export default function Table<T, V>({
 														width: header.getSize(),
 													}}
 												>
-													<Heading className="line-clamp-1 w-full text-sm font-medium">
+													<Heading className="text-sm font-medium line-clamp-1 w-full">
 														{flexRender(header.column.columnDef.header, header.getContext())}
 													</Heading>
 													{sortable && (
@@ -222,13 +222,9 @@ export default function Table<T, V>({
 				</div>
 			</div>
 
-			<div className="flex h-10 items-center justify-between border-t border-edge px-2">
-				<div className="flex items-center gap-4">
-					<Text
-						variant="muted"
-						className="hidden flex-shrink-0 items-center gap-1 md:flex"
-						size="sm"
-					>
+			<div className="h-10 px-2 flex items-center justify-between border-t border-edge">
+				<div className="gap-4 flex items-center">
+					<Text variant="muted" className="gap-1 md:flex hidden shrink-0 items-center" size="sm">
 						{tableRows.length > 0 ? (
 							<>
 								<span>
diff --git a/packages/browser/src/components/table/TableFilterInput.tsx b/packages/browser/src/components/table/TableFilterInput.tsx
index e66d9cf166..1572f821ea 100644
--- a/packages/browser/src/components/table/TableFilterInput.tsx
+++ b/packages/browser/src/components/table/TableFilterInput.tsx
@@ -10,7 +10,7 @@ export default function TableSearchInput({ onChange }: Props) {
 		<input
 			type="text"
 			placeholder="Filter data"
-			className="block w-full border-b border-edge bg-transparent py-1.5 pl-2 pr-20 text-sm leading-6 text-foreground outline-none placeholder:text-foreground-muted"
+			className="py-1.5 pl-2 pr-20 text-sm leading-6 block w-full border-b border-edge bg-transparent text-foreground outline-none placeholder:text-foreground-muted"
 			onChange={(e) => handleChange(e.target.value)}
 		/>
 	)
diff --git a/packages/browser/src/components/table/TableFooter.tsx b/packages/browser/src/components/table/TableFooter.tsx
index 78a92265bb..726a7c885c 100644
--- a/packages/browser/src/components/table/TableFooter.tsx
+++ b/packages/browser/src/components/table/TableFooter.tsx
@@ -17,9 +17,9 @@ export default function TableFooter({ pagination, setPagination, pageCount, data
 	const { pageIndex, pageSize } = pagination
 
 	return (
-		<div className="flex h-10 items-center justify-between border-t border-edge px-2">
-			<div className="flex items-center gap-4">
-				<Text variant="muted" className="hidden flex-shrink-0 items-center gap-1 md:flex" size="sm">
+		<div className="h-10 px-2 flex items-center justify-between border-t border-edge">
+			<div className="gap-4 flex items-center">
+				<Text variant="muted" className="gap-1 md:flex hidden shrink-0 items-center" size="sm">
 					<span>
 						<strong>{firstIndex}</strong> to <strong>{lastIndex}</strong>
 					</span>
diff --git a/packages/browser/src/components/tags/TagList.tsx b/packages/browser/src/components/tags/TagList.tsx
index c5c1443b08..069209d75b 100644
--- a/packages/browser/src/components/tags/TagList.tsx
+++ b/packages/browser/src/components/tags/TagList.tsx
@@ -32,7 +32,7 @@ export default function TagList({ tags, baseUrl }: Props) {
 	}
 
 	return (
-		<div className="flex flex-row space-x-2">
+		<div className="space-x-2 flex flex-row">
 			{(tags ?? DEBUG_TAGS)
 				.filter((tag) => !!tag.name)
 				.map((tag) => (
diff --git a/packages/browser/src/components/thumbnail/SeriesStackedThumbnails.tsx b/packages/browser/src/components/thumbnail/SeriesStackedThumbnails.tsx
index 79eff181b3..97f76a72a3 100644
--- a/packages/browser/src/components/thumbnail/SeriesStackedThumbnails.tsx
+++ b/packages/browser/src/components/thumbnail/SeriesStackedThumbnails.tsx
@@ -126,11 +126,11 @@ export function SeriesStackedThumbnails({ thumbnailData, width: cardWidth, class
 				<div
 					key={index}
 					className={cn(
-						'absolute bottom-0 will-change-transform',
-						'translate-x-[var(--x)] translate-y-[var(--y)] rotate-[var(--r)]',
+						'bottom-0 absolute will-change-transform',
+						'translate-x-(--x) translate-y-(--y) rotate-(--r)',
 						shouldFancyHover && [
 							'transform-gpu duration-300',
-							'group-hover:translate-x-[var(--x-hover)] group-hover:translate-y-[var(--y-hover)] group-hover:rotate-[var(--r-hover)]',
+							'group-hover:translate-x-(--x-hover) group-hover:translate-y-(--y-hover) group-hover:rotate-(--r-hover)',
 						],
 					)}
 					style={
@@ -207,17 +207,17 @@ export function SeriesStackedThumbnails({ thumbnailData, width: cardWidth, class
 			}}
 		>
 			<div
-				className="absolute inset-0 overflow-hidden rounded-xl border border-edge/50"
+				className="inset-0 rounded-xl absolute overflow-hidden border border-edge/50"
 				style={{
 					backgroundColor,
 					boxShadow: '0 1px 2px rgba(0, 0, 0, 0.2)',
 					contain: 'layout style paint',
 				}}
 			>
-				<div className="pointer-events-none absolute inset-0 z-10" style={gradientStyle} />
+				<div className="inset-0 pointer-events-none absolute z-10" style={gradientStyle} />
 			</div>
 
-			<div className="absolute inset-0 z-20" style={{ clipPath: `path('${clipPathString}')` }}>
+			<div className="inset-0 absolute z-20" style={{ clipPath: `path('${clipPathString}')` }}>
 				{renderThumbnails()}
 			</div>
 		</div>
diff --git a/packages/browser/src/components/thumbnail/ThumbnailEntityCard.tsx b/packages/browser/src/components/thumbnail/ThumbnailEntityCard.tsx
index 133ad443ea..adb08b65a3 100644
--- a/packages/browser/src/components/thumbnail/ThumbnailEntityCard.tsx
+++ b/packages/browser/src/components/thumbnail/ThumbnailEntityCard.tsx
@@ -82,7 +82,7 @@ export function ThumbnailEntityCard({
 			return (
 				<Text
 					size={getDensityTextSize(gridDensity)}
-					className="line-clamp-2 h-[40px] min-w-0 whitespace-normal"
+					className="min-w-0 line-clamp-2 h-[40px] whitespace-normal"
 				>
 					{title}
 				</Text>
@@ -103,7 +103,7 @@ export function ThumbnailEntityCard({
 					max={100}
 					variant="primary-dark"
 					size="sm"
-					className="!-mt-1"
+					className="-mt-1!"
 					rounded="none"
 				/>
 			)
@@ -118,7 +118,7 @@ export function ThumbnailEntityCard({
 	const renderFooter = () => {
 		if (title || subtitle) {
 			return (
-				<div className="flex flex-1 flex-col space-y-2 px-1.5 pb-1">
+				<div className="space-y-2 px-1.5 pb-1 flex flex-1 flex-col">
 					{renderTitle()}
 					{subtitle}
 				</div>
@@ -135,7 +135,7 @@ export function ThumbnailEntityCard({
 		if (hasError) {
 			return (
 				<div className="flex h-full w-full items-center justify-center bg-sidebar">
-					<Book className="absolute h-16 w-16 text-foreground-muted" />
+					<Book className="h-16 w-16 absolute text-foreground-muted" />
 				</div>
 			)
 		}
@@ -163,18 +163,18 @@ export function ThumbnailEntityCard({
 		<Container
 			{...containerProps}
 			className={cn(
-				'relative flex flex-1 flex-col space-y-1 overflow-hidden rounded-lg border-[1.5px] border-edge bg-background/80 transition-colors duration-100',
+				'space-y-1 rounded-lg relative flex flex-1 flex-col overflow-hidden border-[1.5px] border-edge bg-background/80 transition-colors duration-100',
 				{ 'cursor-pointer hover:border-edge-brand dark:hover:border-edge-brand': hasClickAction },
 				{ 'max-w-[16rem]': isCover },
 				{
-					'w-[10rem] sm:w-[10.666rem] md:w-[12rem]': !isFullWidth,
+					'w-40 sm:w-[10.666rem] md:w-48': !isFullWidth,
 				},
 				className,
 			)}
 		>
 			<div
-				className={cn('h-full w-full p-0', {
-					'w-[10rem] sm:w-[10.666rem] md:w-[12rem]': !isFullWidth,
+				className={cn('p-0 h-full w-full', {
+					'w-40 sm:w-[10.666rem] md:w-48': !isFullWidth,
 				})}
 				style={{ aspectRatio: thumbnailRatio }}
 			>
diff --git a/packages/browser/src/components/thumbnail/ThumbnailImage.tsx b/packages/browser/src/components/thumbnail/ThumbnailImage.tsx
index 8f27a96595..51194819aa 100644
--- a/packages/browser/src/components/thumbnail/ThumbnailImage.tsx
+++ b/packages/browser/src/components/thumbnail/ThumbnailImage.tsx
@@ -147,7 +147,7 @@ export const ThumbnailImage = forwardRef<HTMLDivElement, ThumbnailImageProps>(
 			onError?.()
 		}
 
-		const imageClasses = cn('absolute inset-0 z-[15] h-full w-full object-cover', imageClassName)
+		const imageClasses = cn('absolute inset-0 z-15 h-full w-full object-cover', imageClassName)
 
 		const imageStyle = { borderRadius: computedStyles.borderRadius }
 
@@ -199,17 +199,17 @@ export const ThumbnailImage = forwardRef<HTMLDivElement, ThumbnailImageProps>(
 							animate={{ opacity: isLoaded ? 1 : 0 }}
 							transition={{ duration: 0.3, ease: 'easeOut' }}
 							// @ts-expect-error: It has className
-							className="absolute inset-0 z-[15]"
+							className="inset-0 absolute z-15"
 						>
 							{renderImage()}
 						</motion.div>
 					)}
 				</AnimatePresence>
 
-				{gradientStyle && <div className="absolute inset-0 z-20" style={gradientStyle} />}
+				{gradientStyle && <div className="inset-0 absolute z-20" style={gradientStyle} />}
 
 				<div
-					className="pointer-events-none absolute inset-0 z-[25] border-thumbnail-border"
+					className="inset-0 pointer-events-none absolute z-25 border-thumbnail-border"
 					style={{
 						...borderStyle,
 						borderStyle: 'solid',
diff --git a/packages/browser/src/components/thumbnail/UploadImageModal.tsx b/packages/browser/src/components/thumbnail/UploadImageModal.tsx
index d620309ac2..0d7e2c1019 100644
--- a/packages/browser/src/components/thumbnail/UploadImageModal.tsx
+++ b/packages/browser/src/components/thumbnail/UploadImageModal.tsx
@@ -76,12 +76,12 @@ export default function UploadImageModal({ isOpen, onClose, onUploadImage }: Pro
 				<Dialog.Header>
 					<Dialog.Close onClick={onClose} />
 				</Dialog.Header>
-				<div className="flex h-[300px] flex-col gap-y-2 py-2 scrollbar-hide">
+				<div className="gap-y-2 py-2 scrollbar-hide flex h-[300px] flex-col">
 					<div className="flex h-[100px] items-center justify-center">
 						<div className={cx('relative', { 'h-[100px]': filePreview })}>
 							{filePreview && (
 								<>
-									<div className="absolute -right-2 -top-2 flex items-center justify-center">
+									<div className="-right-2 -top-2 absolute flex items-center justify-center">
 										<IconButton
 											title={t(withLocaleKey('remove'))}
 											size="xs"
@@ -107,7 +107,7 @@ export default function UploadImageModal({ isOpen, onClose, onUploadImage }: Pro
 
 					<div
 						{...getRootProps()}
-						className="flex shrink-0 flex-grow flex-col items-center justify-center border border-dashed border-edge p-4"
+						className="p-4 flex shrink-0 grow flex-col items-center justify-center border border-dashed border-edge"
 					>
 						<input {...getInputProps()} />
 						<Text variant="muted">{t(withLocaleKey('prompt'))}</Text>
diff --git a/packages/browser/src/components/unimplemented/UnderConstruction.tsx b/packages/browser/src/components/unimplemented/UnderConstruction.tsx
index 04048233ae..feca122a7c 100644
--- a/packages/browser/src/components/unimplemented/UnderConstruction.tsx
+++ b/packages/browser/src/components/unimplemented/UnderConstruction.tsx
@@ -16,14 +16,14 @@ export default function UnderConstruction({ issue }: Props) {
 			<img
 				src="/assets/svg/construction-site.svg"
 				alt="Construction illustration"
-				className="mx-auto h-72 w-1/2 shrink-0 object-scale-down sm:h-96"
+				className="h-72 sm:h-96 mx-auto w-1/2 shrink-0 object-scale-down"
 			/>
 
-			<div className="mx-auto flex max-w-lg flex-col space-y-2 text-center">
+			<div className="max-w-lg space-y-2 mx-auto flex flex-col text-center">
 				<Heading className="text-3xl font-extrabold md:text-4xl">{t(getKey('heading'))}</Heading>
 				<Text size="lg">{t(getKey('message'))}</Text>
 
-				<div className="flex items-center justify-center space-x-2">
+				<div className="space-x-2 flex items-center justify-center">
 					{issue && (
 						<ButtonOrLink
 							href={`https://github.com/stumpapp/stump/issues/${issue}`}
diff --git a/packages/browser/src/scenes/auth/LoginOrClaimScene.tsx b/packages/browser/src/scenes/auth/LoginOrClaimScene.tsx
index 33e0869632..9e31b2346f 100644
--- a/packages/browser/src/scenes/auth/LoginOrClaimScene.tsx
+++ b/packages/browser/src/scenes/auth/LoginOrClaimScene.tsx
@@ -100,7 +100,7 @@ export default function LoginOrClaimScene() {
 	const renderHeader = () => {
 		if (isClaimed) {
 			return (
-				<div className="flex flex-shrink-0 items-center justify-center gap-4 px-2">
+				<div className="gap-4 px-2 flex shrink-0 items-center justify-center">
 					<img src="/assets/favicon.png" width="80" height="80" />
 					<Heading variant="gradient" size="3xl" className="font-bold">
 						Stump
@@ -109,7 +109,7 @@ export default function LoginOrClaimScene() {
 			)
 		} else {
 			return (
-				<div className="text-left sm:max-w-md md:max-w-lg">
+				<div className="sm:max-w-md md:max-w-lg text-left">
 					<h1 className="text-4xl font-semibold text-foreground">{t('authScene.claimHeading')}</h1>
 					<p className="mt-1.5 text-base text-foreground-subtle">{t('authScene.claimText')}</p>
 				</div>
@@ -149,7 +149,7 @@ export default function LoginOrClaimScene() {
 				animate={showServers ? 'appearOut' : 'appearIn'}
 				variants={variants}
 			>
-				<div className="flex h-full w-full flex-col items-center justify-center gap-8 bg-background p-4">
+				<div className="gap-8 p-4 flex h-full w-full flex-col items-center justify-center bg-background">
 					{renderHeader()}
 					{renderError()}
 
@@ -157,7 +157,7 @@ export default function LoginOrClaimScene() {
 						form={form}
 						onSubmit={handleSubmit}
 						className={cx(
-							{ 'w-full sm:max-w-md md:max-w-lg': !isClaimed },
+							{ 'sm:max-w-md md:max-w-lg w-full': !isClaimed },
 							{ 'min-w-[20rem]': isClaimed },
 						)}
 					>
@@ -201,12 +201,12 @@ export default function LoginOrClaimScene() {
 						{oidcConfig.enabled && (
 							<>
 								{!oidcConfig.disableLocalAuth && (
-									<div className="relative my-4">
-										<div className="absolute inset-0 flex items-center">
+									<div className="my-4 relative">
+										<div className="inset-0 absolute flex items-center">
 											<div className="w-full border-t border-edge" />
 										</div>
-										<div className="relative flex justify-center text-xs uppercase">
-											<span className="bg-background px-2 text-foreground-muted">Or</span>
+										<div className="text-xs relative flex justify-center uppercase">
+											<span className="px-2 bg-background text-foreground-muted">Or</span>
 										</div>
 									</div>
 								)}
@@ -227,7 +227,7 @@ export default function LoginOrClaimScene() {
 
 						{isDesktop && (
 							<button
-								className="group flex w-full items-center justify-between border-l border-edge p-4 transition-colors duration-100 hover:border-edge-strong hover:border-opacity-70 hover:bg-background-surface/50"
+								className="group p-4 hover:border-opacity-70 flex w-full items-center justify-between border-l border-edge transition-colors duration-100 hover:border-edge-strong hover:bg-background-surface/50"
 								type="button"
 								onClick={() => setShowServers(true)}
 							>
diff --git a/packages/browser/src/scenes/book/BookActionMenu.tsx b/packages/browser/src/scenes/book/BookActionMenu.tsx
index 156716888f..58bf01ae85 100644
--- a/packages/browser/src/scenes/book/BookActionMenu.tsx
+++ b/packages/browser/src/scenes/book/BookActionMenu.tsx
@@ -272,7 +272,7 @@ export default function BookActionMenu({ book }: Props) {
 				download
 			/>
 
-			<div className="flex w-full items-center gap-1">
+			<div className="gap-1 flex w-full items-center">
 				{canDownload && (
 					<ButtonOrLink
 						className="w-full"
diff --git a/packages/browser/src/scenes/book/BookFileInformation.tsx b/packages/browser/src/scenes/book/BookFileInformation.tsx
index b6c4618cca..2341aa0cd1 100644
--- a/packages/browser/src/scenes/book/BookFileInformation.tsx
+++ b/packages/browser/src/scenes/book/BookFileInformation.tsx
@@ -33,9 +33,9 @@ export default function BookFileInformation({ fragment }: Props) {
 	}
 
 	return (
-		<div className="flex flex-col space-y-1 pb-3 pt-2 text-sm">
+		<div className="space-y-1 pb-3 pt-2 text-sm flex flex-col">
 			<Heading size="xs">File Information</Heading>
-			<div className="flex space-x-4">
+			<div className="space-x-4 flex">
 				<Text size="sm" variant="muted">
 					Size: {formatBytes(data.size)}
 				</Text>
diff --git a/packages/browser/src/scenes/book/BookLibrarySeriesLinks.tsx b/packages/browser/src/scenes/book/BookLibrarySeriesLinks.tsx
index 955d6153f0..9f9da52464 100644
--- a/packages/browser/src/scenes/book/BookLibrarySeriesLinks.tsx
+++ b/packages/browser/src/scenes/book/BookLibrarySeriesLinks.tsx
@@ -32,7 +32,7 @@ export default function BookLibrarySeriesLinks({ seriesId }: Props) {
 	const library = series?.library
 
 	return (
-		<div className="flex items-center gap-1.5">
+		<div className="gap-1.5 flex items-center">
 			{library && (
 				<Link to={paths.librarySeries(library.id)} underline={false}>
 					<Badge variant="default" size="xs" rounded="full" className="cursor-pointer">
diff --git a/packages/browser/src/scenes/book/BookOverviewScene.tsx b/packages/browser/src/scenes/book/BookOverviewScene.tsx
index 639856e975..b985d85b90 100644
--- a/packages/browser/src/scenes/book/BookOverviewScene.tsx
+++ b/packages/browser/src/scenes/book/BookOverviewScene.tsx
@@ -51,15 +51,15 @@ export default function BookOverviewScene() {
 					<title>Stump | {media.resolvedName}</title>
 				</Helmet>
 
-				<div className="flex h-full w-full flex-col gap-4">
-					<div className="flex flex-col items-center gap-3 tablet:mb-2 tablet:flex-row tablet:items-start">
-						<div className="flex w-full max-w-sm shrink-0 flex-col items-center gap-3 sm:max-w-[200px]">
+				<div className="gap-4 flex h-full w-full flex-col">
+					<div className="gap-3 tablet:mb-2 flex flex-col items-center tablet:flex-row tablet:items-start">
+						<div className="max-w-sm gap-3 sm:max-w-[200px] flex w-full shrink-0 flex-col items-center">
 							<ProminentThumbnailImage
 								src={fragmentData.thumbnail.url}
 								alt={media.resolvedName}
 								placeholderData={fragmentData.thumbnail.metadata}
 							/>
-							<div className="flex w-full flex-col gap-2">
+							<div className="gap-2 flex w-full flex-col">
 								<BookReaderLink book={fragmentData} />
 								<BookActionMenu book={fragmentData} />
 							</div>
@@ -70,7 +70,7 @@ export default function BookOverviewScene() {
 
 					<BooksAfterCursor cursor={media.id} />
 
-					<div className="flex flex-col gap-y-2">
+					<div className="gap-y-2 flex flex-col">
 						<Heading size="sm">Metadata</Heading>
 						<MediaMetadataEditor mediaId={media.id} data={media.metadata} />
 					</div>
diff --git a/packages/browser/src/scenes/book/BookOverviewSceneHeader.tsx b/packages/browser/src/scenes/book/BookOverviewSceneHeader.tsx
index ff3d78875e..262541c0c9 100644
--- a/packages/browser/src/scenes/book/BookOverviewSceneHeader.tsx
+++ b/packages/browser/src/scenes/book/BookOverviewSceneHeader.tsx
@@ -37,8 +37,8 @@ export default function BookOverviewSceneHeader({ media, book, completedAt }: Pr
 		: null
 
 	return (
-		<div className="flex w-full flex-col gap-3">
-			<div className="flex flex-wrap items-center gap-3">
+		<div className="gap-3 flex w-full flex-col">
+			<div className="gap-3 flex flex-wrap items-center">
 				<Heading size="lg">{media.resolvedName}</Heading>
 				{media.seriesId && (
 					<Suspense>
@@ -48,7 +48,7 @@ export default function BookOverviewSceneHeader({ media, book, completedAt }: Pr
 			</div>
 
 			{hasStats && (
-				<div className="grid grid-cols-2 gap-3 sm:grid-cols-3 md:flex md:flex-wrap md:gap-6">
+				<div className="gap-3 sm:grid-cols-3 md:flex md:flex-wrap md:gap-6 grid grid-cols-2">
 					{pages > 0 && <Statistic.Item label="Pages" value={pages} />}
 					{size > 0 && <Statistic.Item label="Size" value={formatBytes(size) ?? '—'} />}
 					{media.extension && (
@@ -68,7 +68,7 @@ export default function BookOverviewSceneHeader({ media, book, completedAt }: Pr
 			)}
 
 			{hasMetadataBadges && (
-				<div className="flex flex-wrap items-center gap-2">
+				<div className="gap-2 flex flex-wrap items-center">
 					{metadata?.publisher && (
 						<Badge variant="default" size="xs" rounded="full">
 							{metadata.publisher}
@@ -107,7 +107,7 @@ export default function BookOverviewSceneHeader({ media, book, completedAt }: Pr
 			)}
 
 			{hasGenres && (
-				<div className="flex flex-col gap-1">
+				<div className="gap-1 flex flex-col">
 					<Text size="xs" variant="muted">
 						Genres
 					</Text>
@@ -130,7 +130,7 @@ export default function BookOverviewSceneHeader({ media, book, completedAt }: Pr
 			)}
 
 			{hasWriters && (
-				<div className="flex flex-col gap-1">
+				<div className="gap-1 flex flex-col">
 					<Text size="xs" variant="muted">
 						Writers
 					</Text>
@@ -153,7 +153,7 @@ export default function BookOverviewSceneHeader({ media, book, completedAt }: Pr
 			)}
 
 			{hasTags && (
-				<div className="flex flex-col gap-1">
+				<div className="gap-1 flex flex-col">
 					<Text size="xs" variant="muted">
 						Tags
 					</Text>
@@ -162,7 +162,7 @@ export default function BookOverviewSceneHeader({ media, book, completedAt }: Pr
 			)}
 
 			{hasLinks && (
-				<div className="flex flex-col gap-1">
+				<div className="gap-1 flex flex-col">
 					<Text size="xs" variant="muted">
 						Links
 					</Text>
diff --git a/packages/browser/src/scenes/book/BooksAfterCursor.tsx b/packages/browser/src/scenes/book/BooksAfterCursor.tsx
index bbfdc6c817..c70af00a7f 100644
--- a/packages/browser/src/scenes/book/BooksAfterCursor.tsx
+++ b/packages/browser/src/scenes/book/BooksAfterCursor.tsx
@@ -88,8 +88,8 @@ function BooksAfterCurrent({ cursor }: Props) {
 			onFetchMore={handleFetchMore}
 			footerHeight={64 + 17}
 			emptyState={
-				<div className="flex items-start justify-start space-x-3 rounded-lg border border-dashed border-edge-subtle px-4 py-4">
-					<span className="rounded-lg border border-edge bg-background-surface p-2">
+				<div className="space-x-3 rounded-lg px-4 py-4 flex items-start justify-start border border-dashed border-edge-subtle">
+					<span className="rounded-lg p-2 border border-edge bg-background-surface">
 						<BookX className="h-8 w-8 text-foreground-muted" />
 					</span>
 					<div>
diff --git a/packages/browser/src/scenes/book/EmailBookDialog.tsx b/packages/browser/src/scenes/book/EmailBookDialog.tsx
index 25b1d2e362..4f38601a0e 100644
--- a/packages/browser/src/scenes/book/EmailBookDialog.tsx
+++ b/packages/browser/src/scenes/book/EmailBookDialog.tsx
@@ -111,8 +111,8 @@ function EmailBookDialog({ mediaId, isOpen, onClose, canArbitrarySendEmail }: Pr
 			return null
 		} else {
 			return (
-				<div className="flex flex-col space-y-2">
-					<div className="flex flex-wrap items-center gap-x-2">
+				<div className="space-y-2 flex flex-col">
+					<div className="gap-x-2 flex flex-wrap items-center">
 						{emails.map((email, index) => (
 							<Badge
 								key={index}
@@ -125,7 +125,7 @@ function EmailBookDialog({ mediaId, isOpen, onClose, canArbitrarySendEmail }: Pr
 						))}
 					</div>
 
-					<div className="flex w-full items-center space-x-2">
+					<div className="space-x-2 flex w-full items-center">
 						<Input
 							label={t(getFormKey('email.label'))}
 							description={t(getFormKey('email.description'))}
@@ -161,7 +161,7 @@ function EmailBookDialog({ mediaId, isOpen, onClose, canArbitrarySendEmail }: Pr
 					<Dialog.Close onClick={onClose} disabled={isSending} />
 				</Dialog.Header>
 
-				<div className="flex flex-col space-y-4">
+				<div className="space-y-4 flex flex-col">
 					<ComboBox
 						label={t(getFormKey('devices.label'))}
 						options={devices.map((device) => ({
diff --git a/packages/browser/src/scenes/book/settings/BookManagementScene.tsx b/packages/browser/src/scenes/book/settings/BookManagementScene.tsx
index 4ac4289bfe..df5e552656 100644
--- a/packages/browser/src/scenes/book/settings/BookManagementScene.tsx
+++ b/packages/browser/src/scenes/book/settings/BookManagementScene.tsx
@@ -87,8 +87,8 @@ export default function BookManagementScene() {
 
 	return (
 		<SceneContainer>
-			<div className="flex flex-col items-start gap-y-6 text-left">
-				<div className="flex flex-col gap-y-1.5">
+			<div className="gap-y-6 flex flex-col items-start text-left">
+				<div className="gap-y-1.5 flex flex-col">
 					<Breadcrumbs segments={breadcrumbs} trailingSlash />
 					<Heading size="lg" className="font-bold">
 						Manage
diff --git a/packages/browser/src/scenes/book/settings/BookPageGrid.tsx b/packages/browser/src/scenes/book/settings/BookPageGrid.tsx
index fd3c437de3..043ab5a5de 100644
--- a/packages/browser/src/scenes/book/settings/BookPageGrid.tsx
+++ b/packages/browser/src/scenes/book/settings/BookPageGrid.tsx
@@ -24,7 +24,7 @@ export default function BookPageGrid({ bookId, pages, selectedPage, onSelectPage
 				{({ height, width }) => (
 					<div
 						ref={setScrollElement}
-						className="overflow-y-auto overflow-x-hidden"
+						className="overflow-x-hidden overflow-y-auto"
 						style={{
 							height,
 							width,
@@ -110,7 +110,7 @@ const List = ({ bookId, pages, width, selectedPage, onSelectPage, scrollElement
 							width: '100%',
 						}}
 					>
-						<div className="flex gap-2">
+						<div className="gap-2 flex">
 							{pagesInRow.map((pageNumber) => {
 								const imageUrl = sdk.media.bookPageURL(bookId, pageNumber)
 
@@ -119,7 +119,7 @@ const List = ({ bookId, pages, width, selectedPage, onSelectPage, scrollElement
 										key={pageNumber}
 										src={imageUrl}
 										className={cx(
-											'h-auto rounded-md object-cover transition-colors duration-100',
+											'rounded-md h-auto object-cover transition-colors duration-100',
 											pageNumber === selectedPage
 												? 'ring-2 ring-edge-brand'
 												: 'ring-1 ring-edge hover:ring-edge-brand',
diff --git a/packages/browser/src/scenes/book/settings/BookThumbnailSelector.tsx b/packages/browser/src/scenes/book/settings/BookThumbnailSelector.tsx
index 22b52df660..15896aaf5d 100644
--- a/packages/browser/src/scenes/book/settings/BookThumbnailSelector.tsx
+++ b/packages/browser/src/scenes/book/settings/BookThumbnailSelector.tsx
@@ -132,13 +132,13 @@ export default function BookThumbnailSelector({ fragment }: Props) {
 			<EntityCard
 				imageUrl={page ? sdk.media.bookPageURL(book.id, page) : book.thumbnail.url}
 				isCover
-				className="flex-auto flex-shrink-0"
+				className="flex-auto shrink-0"
 				fullWidth={(imageFailed) => !imageFailed}
 			/>
 
 			<Dialog open={isOpen} onOpenChange={handleOpenChange}>
 				<Dialog.Trigger asChild>
-					<span className="absolute bottom-2 left-2 block">
+					<span className="bottom-2 left-2 absolute block">
 						<EditThumbnailDropdown
 							onChooseSelector={() => setIsOpen(true)}
 							onUploadImage={handleUploadImage}
diff --git a/packages/browser/src/scenes/bookClub/BookClubHeader.tsx b/packages/browser/src/scenes/bookClub/BookClubHeader.tsx
index abe4215309..6ce92f3bfd 100644
--- a/packages/browser/src/scenes/bookClub/BookClubHeader.tsx
+++ b/packages/browser/src/scenes/bookClub/BookClubHeader.tsx
@@ -22,12 +22,12 @@ export default function BookClubHeader() {
 		const avatarUrl = creator.avatarUrl ?? undefined
 
 		return (
-			<Card className="flex items-center justify-between gap-4 p-2.5">
+			<Card className="gap-4 p-2.5 flex items-center justify-between">
 				<Text size="sm" variant="muted">
 					Created by
 				</Text>
 
-				<div className="flex items-center gap-2">
+				<div className="gap-2 flex items-center">
 					<Avatar src={avatarUrl} fallback={displayName} className="h-8 w-8" />
 					<Text size="sm">{displayName}</Text>
 				</div>
@@ -40,7 +40,7 @@ export default function BookClubHeader() {
 	return (
 		<header
 			className={cn(
-				'flex w-full flex-col gap-4 p-4 md:flex-row md:items-start md:justify-between md:gap-0',
+				'gap-4 p-4 md:flex-row md:items-start md:justify-between md:gap-0 flex w-full flex-col',
 				{
 					'mx-auto': preferTopBar && !!layoutMaxWidthPx,
 				},
@@ -49,7 +49,7 @@ export default function BookClubHeader() {
 				maxWidth: preferTopBar ? layoutMaxWidthPx || undefined : undefined,
 			}}
 		>
-			<div className="flex flex-col gap-1 md:max-w-xl">
+			<div className="gap-1 md:max-w-xl flex flex-col">
 				<Heading>{name}</Heading>
 				{/* TODO: read more text for long descriptions... */}
 				<Text size="md" variant="muted">
diff --git a/packages/browser/src/scenes/bookClub/BookClubLayout.tsx b/packages/browser/src/scenes/bookClub/BookClubLayout.tsx
index 4a13eb25da..f38a804b2f 100644
--- a/packages/browser/src/scenes/bookClub/BookClubLayout.tsx
+++ b/packages/browser/src/scenes/bookClub/BookClubLayout.tsx
@@ -173,7 +173,7 @@ export default function BookClubLayout() {
 				{displaySideBar && <BookClubSettingsSideBar />}
 
 				<SceneContainer
-					className={cn('relative flex flex-1 flex-col gap-4 md:pb-0', {
+					className={cn('gap-4 md:pb-0 relative flex flex-1 flex-col', {
 						'md:hide-scrollbar': !!enableHideScrollbar,
 						// pl-48 is for the sidebar, plus pl-4 for the padding
 						'pl-52': displaySideBar,
diff --git a/packages/browser/src/scenes/bookClub/BookClubNavigation.tsx b/packages/browser/src/scenes/bookClub/BookClubNavigation.tsx
index 89d4ebffb2..ce98d70fca 100644
--- a/packages/browser/src/scenes/bookClub/BookClubNavigation.tsx
+++ b/packages/browser/src/scenes/bookClub/BookClubNavigation.tsx
@@ -59,10 +59,10 @@ export default function BookClubNavigation() {
 	}
 
 	return (
-		<div className="sticky top-0 z-10 w-full border-b border-edge bg-background md:relative md:top-[unset] md:z-[unset]">
+		<div className="top-0 md:relative md:top-[unset] md:z-[unset] sticky z-10 w-full border-b border-edge bg-background">
 			<nav
 				className={cn(
-					'-mb-px flex gap-x-6 overflow-x-scroll px-3 scrollbar-hide md:overflow-x-hidden',
+					'gap-x-6 px-3 md:overflow-x-hidden -mb-px scrollbar-hide flex overflow-x-scroll',
 					{
 						'mx-auto': preferTopBar && !!layoutMaxWidthPx,
 					},
@@ -74,8 +74,8 @@ export default function BookClubNavigation() {
 						to={tab.to}
 						key={tab.to}
 						underline={false}
-						className={cx('whitespace-nowrap border-b-2 px-1 py-3 text-sm font-medium', {
-							'border-edge-brand text-brand': tab.isActive,
+						className={cx('px-1 py-3 text-sm font-medium border-b-2 whitespace-nowrap', {
+							'text-brand border-edge-brand': tab.isActive,
 							'border-transparent text-foreground-muted hover:border-edge': !tab.isActive,
 						})}
 					>
diff --git a/packages/browser/src/scenes/bookClub/UserBookClubsScene.tsx b/packages/browser/src/scenes/bookClub/UserBookClubsScene.tsx
index 2937e519ca..fbda3216ab 100644
--- a/packages/browser/src/scenes/bookClub/UserBookClubsScene.tsx
+++ b/packages/browser/src/scenes/bookClub/UserBookClubsScene.tsx
@@ -40,20 +40,20 @@ export default function UserBookClubsScene() {
 		return (
 			<>
 				<div className="min-w-0">
-					<div className="flex items-start gap-x-3">
+					<div className="gap-x-3 flex items-start">
 						<Text size="sm" className="font-semibold leading-6">
 							{bookClub.name}
 						</Text>
 						<p
 							className={cx(
 								{ 'bg-yellow-50 text-yellow-800 ring-yellow-600/20': !isActive },
-								'mt-0.5 whitespace-nowrap rounded-md px-1.5 py-0.5 text-xs font-medium ring-1 ring-inset',
+								'mt-0.5 rounded-md px-1.5 py-0.5 text-xs font-medium whitespace-nowrap ring-1 ring-inset',
 							)}
 						>
 							{isActive ? 'Active' : 'Inactive'}
 						</p>
 					</div>
-					<div className="mt-1 flex items-center gap-x-2 text-xs leading-5 text-gray-500">
+					<div className="mt-1 gap-x-2 text-xs leading-5 flex items-center text-gray-500">
 						<Text className="whitespace-nowrap">{bookClub.description}</Text>
 						<svg viewBox="0 0 2 2" className="h-0.5 w-0.5 fill-current">
 							<circle cx={1} cy={1} r={1} />
@@ -61,7 +61,7 @@ export default function UserBookClubsScene() {
 						<p className="truncate">{pluralize('member', bookClub.membersCount, true)}</p>
 					</div>
 				</div>
-				<div className="flex flex-none items-center gap-x-4">
+				<div className="gap-x-4 flex flex-none items-center">
 					<ButtonOrLink href={paths.bookClub(bookClub.slug)} variant="secondary">
 						Go to club
 					</ButtonOrLink>
@@ -73,8 +73,8 @@ export default function UserBookClubsScene() {
 	const renderContent = () => {
 		if (!bookClubs?.length) {
 			return (
-				<Card className="flex items-center justify-center border-dashed p-6">
-					<div className="flex flex-col items-center gap-3">
+				<Card className="p-6 flex items-center justify-center border-dashed">
+					<div className="gap-3 flex flex-col items-center">
 						{!bookClubs?.length && (
 							<Heading size="xs">You are not a member of any book clubs</Heading>
 						)}
@@ -93,7 +93,7 @@ export default function UserBookClubsScene() {
 					{bookClubs?.map((club) => (
 						<li
 							key={club.id}
-							className="relative flex justify-between gap-x-6 px-4 py-5 hover:bg-gray-50 sm:px-6 lg:px-8 dark:hover:bg-gray-900"
+							className="gap-x-6 px-4 py-5 sm:px-6 lg:px-8 relative flex justify-between hover:bg-gray-50 dark:hover:bg-gray-900"
 						>
 							{renderBookClub(club)}
 						</li>
diff --git a/packages/browser/src/scenes/bookClub/createClub/CreateBookClubForm.tsx b/packages/browser/src/scenes/bookClub/createClub/CreateBookClubForm.tsx
index 5cafdd476c..2ad95f2870 100644
--- a/packages/browser/src/scenes/bookClub/createClub/CreateBookClubForm.tsx
+++ b/packages/browser/src/scenes/bookClub/createClub/CreateBookClubForm.tsx
@@ -73,9 +73,9 @@ export default function CreateBookClubForm({ onSubmit }: Props) {
 	)
 
 	const renderNextButton = (nextStep: number) => (
-		<div className="mt-6 flex w-full md:max-w-sm">
+		<div className="mt-6 md:max-w-sm flex w-full">
 			<Button
-				className="w-full md:w-auto"
+				className="md:w-auto w-full"
 				variant="primary"
 				onClick={() => handleChangeStep(nextStep)}
 			>
@@ -121,11 +121,11 @@ export default function CreateBookClubForm({ onSubmit }: Props) {
 				{renderStep()}
 
 				<div
-					className={cn('mt-6 flex w-full md:max-w-sm', {
+					className={cn('mt-6 md:max-w-sm flex w-full', {
 						'invisible hidden': currentStep < 4,
 					})}
 				>
-					<Button type="submit" className="w-full md:w-auto" variant="primary">
+					<Button type="submit" className="md:w-auto w-full" variant="primary">
 						Create club
 					</Button>
 				</div>
diff --git a/packages/browser/src/scenes/bookClub/createClub/CreateBookClubScene.tsx b/packages/browser/src/scenes/bookClub/createClub/CreateBookClubScene.tsx
index 05b47dba0b..b407312896 100644
--- a/packages/browser/src/scenes/bookClub/createClub/CreateBookClubScene.tsx
+++ b/packages/browser/src/scenes/bookClub/createClub/CreateBookClubScene.tsx
@@ -81,7 +81,7 @@ export default function CreateBookClubScene() {
 				<SteppedFormSceneHeader />
 
 				<SceneContainer>
-					<div className="flex flex-col gap-12">
+					<div className="gap-12 flex flex-col">
 						<Suspense>
 							<CreateBookClubForm onSubmit={handleSubmit} />
 						</Suspense>
diff --git a/packages/browser/src/scenes/bookClub/createClub/CreateClubReview.tsx b/packages/browser/src/scenes/bookClub/createClub/CreateClubReview.tsx
index 88b622663b..86800248fd 100644
--- a/packages/browser/src/scenes/bookClub/createClub/CreateClubReview.tsx
+++ b/packages/browser/src/scenes/bookClub/createClub/CreateClubReview.tsx
@@ -14,7 +14,7 @@ export default function CreateClubReview() {
 	const { t } = useLocaleContext()
 
 	return (
-		<div className="flex flex-col space-y-8">
+		<div className="space-y-8 flex flex-col">
 			<ReviewStepContainer
 				label={t(getStepKey(1, 'heading'))}
 				description={t(getStepKey(1, 'description'))}
diff --git a/packages/browser/src/scenes/bookClub/tabs/settings/BookClubSettingsSideBar.tsx b/packages/browser/src/scenes/bookClub/tabs/settings/BookClubSettingsSideBar.tsx
index e64a90962e..4b57a7781f 100644
--- a/packages/browser/src/scenes/bookClub/tabs/settings/BookClubSettingsSideBar.tsx
+++ b/packages/browser/src/scenes/bookClub/tabs/settings/BookClubSettingsSideBar.tsx
@@ -25,24 +25,24 @@ export default function BookClubSettingsSideBar() {
 	return (
 		<div
 			className={cn(
-				'relative flex h-full w-48 shrink-0 flex-col border-edge bg-background px-2 py-4 text-foreground-subtle',
+				'w-48 px-2 py-4 relative flex h-full shrink-0 flex-col border-edge bg-background text-foreground-subtle',
 				primaryNavigationMode === 'TOPBAR'
-					? 'fixed top-12 z-50 h-screen border-r'
-					: 'fixed top-0 z-50 h-screen border-r',
+					? 'top-12 fixed z-50 h-screen border-r'
+					: 'top-0 fixed z-50 h-screen border-r',
 			)}
 		>
-			<div className="flex h-full flex-grow flex-col gap-4">
-				<div className="flex items-center space-x-2">
+			<div className="gap-4 flex h-full grow flex-col">
+				<div className="space-x-2 flex items-center">
 					<ButtonOrLink
 						href="."
 						variant="ghost"
-						className="h-[unset] w-[unset] shrink-0 border border-transparent p-1 text-foreground hover:border-edge-subtle/50 hover:bg-sidebar-surface/70"
+						className="p-1 h-[unset] w-[unset] shrink-0 border border-transparent text-foreground hover:border-edge-subtle/50 hover:bg-sidebar-surface/70"
 						size="sm"
 					>
 						<ArrowLeft className="h-4 w-4 transform" />
 					</ButtonOrLink>
 
-					<Label className="line-clamp-1 py-1">{bookClub.name}</Label>
+					<Label className="py-1 line-clamp-1">{bookClub.name}</Label>
 				</div>
 
 				{groups
@@ -60,7 +60,7 @@ export default function BookClubSettingsSideBar() {
 							<div key={groupLabel}>
 								{groupLabel && <Label>{groupLabel}</Label>}
 								<ul
-									className={cn('flex flex-col gap-y-0.5 text-sm', {
+									className={cn('gap-y-0.5 text-sm flex flex-col', {
 										'pt-2': groupLabel,
 									})}
 								>
@@ -90,7 +90,7 @@ export default function BookClubSettingsSideBar() {
 							title="Go home"
 							variant="ghost"
 							size="icon"
-							className="border border-transparent p-1.5 text-foreground hover:border-edge-subtle/50 hover:bg-sidebar-surface/70"
+							className="p-1.5 border border-transparent text-foreground hover:border-edge-subtle/50 hover:bg-sidebar-surface/70"
 							onClick={() => navigate(paths.home())}
 						>
 							<Home className="h-4 w-4 -scale-x-[1] transform" />
diff --git a/packages/browser/src/scenes/bookClub/tabs/settings/danger/BookClubDeletionScene.tsx b/packages/browser/src/scenes/bookClub/tabs/settings/danger/BookClubDeletionScene.tsx
index e722a074d3..ea75591ea3 100644
--- a/packages/browser/src/scenes/bookClub/tabs/settings/danger/BookClubDeletionScene.tsx
+++ b/packages/browser/src/scenes/bookClub/tabs/settings/danger/BookClubDeletionScene.tsx
@@ -2,7 +2,7 @@ import DeleteBookClubSection from './DeleteBookClubSection'
 
 export default function BookClubDeletionScene() {
 	return (
-		<div className="flex flex-col space-y-12">
+		<div className="space-y-12 flex flex-col">
 			<DeleteBookClubSection />
 		</div>
 	)
diff --git a/packages/browser/src/scenes/bookClub/tabs/settings/danger/DeleteBookClubSection.tsx b/packages/browser/src/scenes/bookClub/tabs/settings/danger/DeleteBookClubSection.tsx
index 2580e2734c..1e63ef0f6b 100644
--- a/packages/browser/src/scenes/bookClub/tabs/settings/danger/DeleteBookClubSection.tsx
+++ b/packages/browser/src/scenes/bookClub/tabs/settings/danger/DeleteBookClubSection.tsx
@@ -15,7 +15,7 @@ export default function DeleteBookClubSection() {
 	const [showConfirmation, setShowConfirmation] = useState(false)
 
 	return (
-		<div className="flex flex-col space-y-4">
+		<div className="space-y-4 flex flex-col">
 			<div>
 				<Heading size="sm">{t(getKey('heading'))}</Heading>
 				<Text size="sm" variant="muted" className="mt-1">
@@ -33,7 +33,7 @@ export default function DeleteBookClubSection() {
 							type="button"
 							variant="danger"
 							onClick={() => setShowConfirmation(true)}
-							className="flex-shrink-0"
+							className="shrink-0"
 							size="md"
 						>
 							{t(getKey('trigger'))}
diff --git a/packages/browser/src/scenes/bookClub/tabs/settings/members/ManageMembersScene.tsx b/packages/browser/src/scenes/bookClub/tabs/settings/members/ManageMembersScene.tsx
index 04c35a877a..3bb99b01a9 100644
--- a/packages/browser/src/scenes/bookClub/tabs/settings/members/ManageMembersScene.tsx
+++ b/packages/browser/src/scenes/bookClub/tabs/settings/members/ManageMembersScene.tsx
@@ -2,7 +2,7 @@ import MembersTable from './MembersTable'
 
 export default function ManageMembersScene() {
 	return (
-		<div className="flex flex-col gap-12">
+		<div className="gap-12 flex flex-col">
 			<MembersTable />
 		</div>
 	)
diff --git a/packages/browser/src/scenes/bookClub/tabs/settings/members/MemberActionMenu.tsx b/packages/browser/src/scenes/bookClub/tabs/settings/members/MemberActionMenu.tsx
index 471c249cc1..5406a4334d 100644
--- a/packages/browser/src/scenes/bookClub/tabs/settings/members/MemberActionMenu.tsx
+++ b/packages/browser/src/scenes/bookClub/tabs/settings/members/MemberActionMenu.tsx
@@ -7,7 +7,7 @@ type Props = {
 
 export default function MemberActionMenu({ onSelectForRemoval }: Props) {
 	return (
-		<div className="flex flex-1 justify-end pr-2">
+		<div className="pr-2 flex flex-1 justify-end">
 			<DropdownMenu
 				groups={[
 					{
diff --git a/packages/browser/src/scenes/bookClub/tabs/settings/roles/MemberSpecDisplay.tsx b/packages/browser/src/scenes/bookClub/tabs/settings/roles/MemberSpecDisplay.tsx
index 52c71a2cf7..3f9670b416 100644
--- a/packages/browser/src/scenes/bookClub/tabs/settings/roles/MemberSpecDisplay.tsx
+++ b/packages/browser/src/scenes/bookClub/tabs/settings/roles/MemberSpecDisplay.tsx
@@ -18,7 +18,7 @@ export default function MemberSpecDisplay() {
 	})
 
 	return (
-		<div className="flex flex-col gap-4">
+		<div className="gap-4 flex flex-col">
 			<div className="md:max-w-lg">
 				<Heading size="sm">Custom names</Heading>
 				<Text variant="muted" size="sm">
@@ -27,19 +27,19 @@ export default function MemberSpecDisplay() {
 				</Text>
 			</div>
 
-			<Card className="w-full rounded-lg">
+			<Card className="rounded-lg w-full">
 				<table className="min-w-full divide-y divide-edge">
 					<thead className="">
 						<tr>
 							<th
 								scope="col"
-								className="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-foreground sm:pl-6"
+								className="py-3.5 pl-4 pr-3 text-sm font-semibold sm:pl-6 text-left text-foreground"
 							>
 								<Text>Role</Text>
 							</th>
 							<th
 								scope="col"
-								className="border-l border-l-edge px-3 py-3.5 text-left text-sm font-semibold text-foreground"
+								className="px-3 py-3.5 text-sm font-semibold border-l border-l-edge text-left text-foreground"
 							>
 								<Text>Show as</Text>
 							</th>
@@ -54,10 +54,10 @@ export default function MemberSpecDisplay() {
 							.map(([key, value]) => {
 								return (
 									<tr key={key}>
-										<td className="py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6">
+										<td className="py-4 pl-4 pr-3 text-sm font-medium sm:pl-6 text-gray-900">
 											<Text size="sm">{upperFirst(key.toLowerCase())}</Text>
 										</td>
-										<td className="border-l border-l-edge px-3 py-4">
+										<td className="px-3 py-4 border-l border-l-edge">
 											<Input
 												value={String(value)}
 												onChange={(e) => {
diff --git a/packages/browser/src/scenes/bookClub/tabs/settings/scheduler/AddBookCard.tsx b/packages/browser/src/scenes/bookClub/tabs/settings/scheduler/AddBookCard.tsx
index fe65dd3aa7..30fb271668 100644
--- a/packages/browser/src/scenes/bookClub/tabs/settings/scheduler/AddBookCard.tsx
+++ b/packages/browser/src/scenes/bookClub/tabs/settings/scheduler/AddBookCard.tsx
@@ -65,7 +65,7 @@ export default function AddBookCard({ index }: Props) {
 						<EntityImage src={selectedBook.thumbnail.url} className="rounded-md object-cover" />
 					</AspectRatio>
 				</div>
-				<div className="ml-4 flex flex-col gap-1.5">
+				<div className="ml-4 gap-1.5 flex flex-col">
 					<Heading size="sm" className="text-sm md:text-lg">
 						{bookName}
 					</Heading>
@@ -99,7 +99,7 @@ export default function AddBookCard({ index }: Props) {
 					</Text>
 				</div>
 
-				<div className="flex justify-between gap-4">
+				<div className="gap-4 flex justify-between">
 					{renderBookInfo()}
 					{renderSelectedBookOptions()}
 				</div>
@@ -120,7 +120,7 @@ export default function AddBookCard({ index }: Props) {
 					</Text>
 				</div>
 
-				<div className="flex w-full flex-col items-start gap-x-4 gap-y-4 md:flex-row md:gap-y-0">
+				<div className="gap-x-4 gap-y-4 md:flex-row md:gap-y-0 flex w-full flex-col items-start">
 					<Input
 						fullWidth
 						variant="primary"
@@ -147,7 +147,7 @@ export default function AddBookCard({ index }: Props) {
 	}
 
 	return (
-		<Card className="flex w-full flex-col gap-4 p-4">
+		<Card className="gap-4 p-4 flex w-full flex-col">
 			{renderBookPickerOption()}
 			{!isEntityBook && !isDefiningExternalBook && <LeftAlignedDivider text="OR" />}
 			{renderExternalBookOption()}
@@ -162,7 +162,7 @@ export default function AddBookCard({ index }: Props) {
 				</Text>
 			</div>
 
-			<div className="flex w-full flex-col items-start gap-x-4 gap-y-4 md:flex-row md:gap-y-0">
+			<div className="gap-x-4 gap-y-4 md:flex-row md:gap-y-0 flex w-full flex-col items-start">
 				<DatePicker
 					label="Start date"
 					minDate={new Date()}
@@ -181,7 +181,7 @@ export default function AddBookCard({ index }: Props) {
 
 const LeftAlignedDivider = ({ text }: { text: string }) => (
 	<div className="relative">
-		<div className="absolute inset-0 flex items-center" aria-hidden="true">
+		<div className="inset-0 absolute flex items-center" aria-hidden="true">
 			<div className="w-full border-t border-gray-75 dark:border-gray-800" />
 		</div>
 		<div className="relative flex justify-start">
diff --git a/packages/browser/src/scenes/bookClub/tabs/settings/scheduler/CreateOrAddToScheduleForm.tsx b/packages/browser/src/scenes/bookClub/tabs/settings/scheduler/CreateOrAddToScheduleForm.tsx
index 0196686d6f..79314eb79e 100644
--- a/packages/browser/src/scenes/bookClub/tabs/settings/scheduler/CreateOrAddToScheduleForm.tsx
+++ b/packages/browser/src/scenes/bookClub/tabs/settings/scheduler/CreateOrAddToScheduleForm.tsx
@@ -78,7 +78,7 @@ export default function CreateOrAddToScheduleForm() {
 				min={1}
 			/>
 
-			<div className="flex flex-col gap-6">
+			<div className="gap-6 flex flex-col">
 				{Array.from({ length: books.length }).map((_, index) => (
 					<AddBookCard key={index} index={index} />
 				))}
diff --git a/packages/browser/src/scenes/bookSearch/BookSearchScene.tsx b/packages/browser/src/scenes/bookSearch/BookSearchScene.tsx
index ba20a1af22..bff49c649b 100644
--- a/packages/browser/src/scenes/bookSearch/BookSearchScene.tsx
+++ b/packages/browser/src/scenes/bookSearch/BookSearchScene.tsx
@@ -261,7 +261,7 @@ function BookSearchScene() {
 						})
 					}}
 				>
-					<div className="flex flex-1 px-4 pt-4">
+					<div className="px-4 pt-4 flex flex-1">
 						{!!nodes.length && (
 							<DynamicCardGrid
 								count={nodes.length}
@@ -329,7 +329,7 @@ function BookSearchScene() {
 				...rest,
 			}}
 		>
-			<div className="flex flex-1 flex-col pb-4 md:pb-0">
+			<div className="pb-4 md:pb-0 flex flex-1 flex-col">
 				<Helmet>
 					<title>Stump | Books</title>
 				</Helmet>
diff --git a/packages/browser/src/scenes/createLibrary/CreateLibraryForm.tsx b/packages/browser/src/scenes/createLibrary/CreateLibraryForm.tsx
index 69bb47d145..3d0676add1 100644
--- a/packages/browser/src/scenes/createLibrary/CreateLibraryForm.tsx
+++ b/packages/browser/src/scenes/createLibrary/CreateLibraryForm.tsx
@@ -102,10 +102,10 @@ export default function CreateLibraryForm({ existingLibraries, onSubmit, isLoadi
 				return (
 					<>
 						<BasicLibraryInformation onSetShowDirectoryPicker={setShowDirectoryPicker} />
-						<div className="mt-6 flex w-full md:max-w-sm">
+						<div className="mt-6 md:max-w-sm flex w-full">
 							<Button
 								type="button"
-								className="w-full md:w-auto"
+								className="md:w-auto w-full"
 								variant="primary"
 								onClick={() => handleChangeStep(2)}
 							>
@@ -122,9 +122,9 @@ export default function CreateLibraryForm({ existingLibraries, onSubmit, isLoadi
 						<ScannerOptInFeatures />
 						<FileConversionOptions />
 						<IgnoreRulesConfig />
-						<div className="mt-6 flex w-full md:max-w-sm">
+						<div className="mt-6 md:max-w-sm flex w-full">
 							<Button
-								className="w-full md:w-auto"
+								className="md:w-auto w-full"
 								variant="primary"
 								onClick={() => handleChangeStep(3)}
 							>
@@ -137,9 +137,9 @@ export default function CreateLibraryForm({ existingLibraries, onSubmit, isLoadi
 				return (
 					<>
 						<ThumbnailConfig />
-						<div className="mt-6 flex w-full md:max-w-sm">
+						<div className="mt-6 md:max-w-sm flex w-full">
 							<Button
-								className="w-full md:w-auto"
+								className="md:w-auto w-full"
 								variant="primary"
 								onClick={() => handleChangeStep(4)}
 								type="button"
@@ -189,14 +189,14 @@ export default function CreateLibraryForm({ existingLibraries, onSubmit, isLoadi
 					{renderStep()}
 
 					<div
-						className={cn('mt-6 flex w-full md:max-w-sm', {
+						className={cn('mt-6 md:max-w-sm flex w-full', {
 							'invisible hidden': currentStep < 4,
 						})}
 					>
 						<Button
 							type="submit"
 							form="createLibraryForm"
-							className="w-full md:w-auto"
+							className="md:w-auto w-full"
 							variant="primary"
 							isLoading={isLoading}
 						>
diff --git a/packages/browser/src/scenes/createLibrary/CreateLibraryScene.tsx b/packages/browser/src/scenes/createLibrary/CreateLibraryScene.tsx
index 618815da21..ca72ae4ffe 100644
--- a/packages/browser/src/scenes/createLibrary/CreateLibraryScene.tsx
+++ b/packages/browser/src/scenes/createLibrary/CreateLibraryScene.tsx
@@ -123,7 +123,7 @@ export default function CreateLibraryScene() {
 				<SteppedFormSceneHeader />
 
 				<SceneContainer>
-					<div className="flex flex-col gap-12">
+					<div className="gap-12 flex flex-col">
 						{createError && (
 							<Alert variant="destructive">
 								<AlertCircle />
diff --git a/packages/browser/src/scenes/createLibrary/LibraryReview.tsx b/packages/browser/src/scenes/createLibrary/LibraryReview.tsx
index ef5305945a..ba4411c025 100644
--- a/packages/browser/src/scenes/createLibrary/LibraryReview.tsx
+++ b/packages/browser/src/scenes/createLibrary/LibraryReview.tsx
@@ -92,7 +92,7 @@ export default function LibraryReview() {
 	}
 
 	return (
-		<div className="flex flex-col space-y-8">
+		<div className="space-y-8 flex flex-col">
 			<StepContainer
 				label={t(getStepKey(1, 'heading'))}
 				description={t(getStepKey(1, 'description'))}
@@ -120,7 +120,7 @@ export default function LibraryReview() {
 
 				<div>
 					<Label>{t(getLabelKey('tags'))}</Label>
-					<div className="flex flex-wrap gap-1">
+					<div className="gap-1 flex flex-wrap">
 						{!state.tags?.length && (
 							<Text variant="muted" size="sm">
 								{t(getKey('none'))}
@@ -150,7 +150,7 @@ export default function LibraryReview() {
 
 				<div>
 					<Label>{t(getLabelKey('ignoreRules'))}</Label>
-					<div className="flex flex-wrap gap-1">
+					<div className="gap-1 flex flex-wrap">
 						{!state.ignoreRules?.length && (
 							<Text variant="muted" size="sm">
 								{t(getKey('none'))}
@@ -230,14 +230,14 @@ type StepContainerProps = PropsWithChildren<{
 }>
 
 const StepContainer = ({ label, description, children }: StepContainerProps) => (
-	<div className="grid grid-cols-7 justify-between space-y-4 md:space-y-0">
-		<div className="col-span-7 md:col-span-4">
+	<div className="space-y-4 md:space-y-0 grid grid-cols-7 justify-between">
+		<div className="md:col-span-4 col-span-7">
 			<Heading size="sm">{label}</Heading>
 			<Text size="sm" variant="muted" className="mt-1.5">
 				{description}
 			</Text>
 		</div>
 
-		<div className="col-span-7 flex flex-col space-y-2 md:col-span-3">{children}</div>
+		<div className="space-y-2 md:col-span-3 col-span-7 flex flex-col">{children}</div>
 	</div>
 )
diff --git a/packages/browser/src/scenes/createSmartList/CreateSmartListForm.tsx b/packages/browser/src/scenes/createSmartList/CreateSmartListForm.tsx
index 4f4c045f29..96f99d81a7 100644
--- a/packages/browser/src/scenes/createSmartList/CreateSmartListForm.tsx
+++ b/packages/browser/src/scenes/createSmartList/CreateSmartListForm.tsx
@@ -87,9 +87,9 @@ export default function CreateSmartListForm({ onSubmit, isLoading }: Props) {
 						<BasicDetails />
 						<AccessSettings isCreating />
 
-						<div className="mt-6 flex w-full md:max-w-sm">
+						<div className="mt-6 md:max-w-sm flex w-full">
 							<Button
-								className="w-full md:w-auto"
+								className="md:w-auto w-full"
 								variant="primary"
 								onClick={() => handleChangeStep(2)}
 							>
@@ -103,9 +103,9 @@ export default function CreateSmartListForm({ onSubmit, isLoading }: Props) {
 					<>
 						<SmartListQueryBuilder />
 
-						<div className="mt-6 flex w-full md:max-w-sm">
+						<div className="mt-6 md:max-w-sm flex w-full">
 							<Button
-								className="w-full md:w-auto"
+								className="md:w-auto w-full"
 								variant="primary"
 								onClick={() => handleChangeStep(3)}
 							>
@@ -129,14 +129,14 @@ export default function CreateSmartListForm({ onSubmit, isLoading }: Props) {
 				{renderStep()}
 
 				<div
-					className={cn('mt-6 flex w-full md:max-w-sm', {
+					className={cn('mt-6 md:max-w-sm flex w-full', {
 						'invisible hidden': currentStep < 3,
 					})}
 				>
 					<Button
 						type="submit"
 						form="createSmartListForm"
-						className="w-full md:w-auto"
+						className="md:w-auto w-full"
 						variant="primary"
 						isLoading={isLoading}
 					>
diff --git a/packages/browser/src/scenes/createSmartList/CreateSmartListScene.tsx b/packages/browser/src/scenes/createSmartList/CreateSmartListScene.tsx
index 26fdd5238e..64445c1f67 100644
--- a/packages/browser/src/scenes/createSmartList/CreateSmartListScene.tsx
+++ b/packages/browser/src/scenes/createSmartList/CreateSmartListScene.tsx
@@ -68,7 +68,7 @@ export default function CreateSmartListScene() {
 				<SteppedFormSceneHeader />
 
 				<SceneContainer>
-					<div className="flex flex-col gap-12">
+					<div className="gap-12 flex flex-col">
 						{createError && <Alert variant="destructive">{createError}</Alert>}
 
 						<Suspense>
diff --git a/packages/browser/src/scenes/error/FourOhFour.tsx b/packages/browser/src/scenes/error/FourOhFour.tsx
index cd3e613195..8323240706 100644
--- a/packages/browser/src/scenes/error/FourOhFour.tsx
+++ b/packages/browser/src/scenes/error/FourOhFour.tsx
@@ -4,12 +4,12 @@ export default function FourOhFour() {
 	return (
 		<div
 			data-tauri-drag-region
-			className="mx-auto flex h-full w-full max-w-sm flex-col items-center justify-center gap-6 sm:max-w-md md:max-w-lg"
+			className="max-w-sm gap-6 sm:max-w-md md:max-w-lg mx-auto flex h-full w-full flex-col items-center justify-center"
 		>
-			<div className="flex flex-col gap-1.5 text-left">
+			<div className="gap-1.5 flex flex-col text-left">
 				<h1 className="text-5xl font-semibold text-foreground">404</h1>
 				<Text size="lg">The page you are looking for does not seem to exist!</Text>
-				<div className="mt-6 flex items-center gap-2">
+				<div className="mt-6 gap-2 flex items-center">
 					<ButtonOrLink variant="primary" href="/">
 						Go home
 					</ButtonOrLink>
diff --git a/packages/browser/src/scenes/error/ServerConnectionErrorScene.tsx b/packages/browser/src/scenes/error/ServerConnectionErrorScene.tsx
index 36d3f0d686..a12309ddbf 100644
--- a/packages/browser/src/scenes/error/ServerConnectionErrorScene.tsx
+++ b/packages/browser/src/scenes/error/ServerConnectionErrorScene.tsx
@@ -80,7 +80,7 @@ export default function ServerConnectionErrorScene() {
 				animate={showServers ? 'appearOut' : 'appearIn'}
 				variants={variants}
 			>
-				<div className="mx-auto flex h-full w-full max-w-sm flex-col items-start justify-center gap-6 sm:max-w-md md:max-w-xl">
+				<div className="max-w-sm gap-6 sm:max-w-md md:max-w-xl mx-auto flex h-full w-full flex-col items-start justify-center">
 					<div className="text-left">
 						<h1 className="text-4xl font-semibold text-foreground">{t('serverSOS.heading')}</h1>
 						<p className="mt-1.5 text-base text-foreground-subtle">{t(localeKey)}</p>
@@ -88,7 +88,7 @@ export default function ServerConnectionErrorScene() {
 
 					{isDesktop && (
 						<button
-							className="group flex w-full items-center justify-between border-l border-edge p-4 transition-colors duration-100 hover:border-edge-strong hover:border-opacity-70 hover:bg-background-surface/50"
+							className="group p-4 hover:border-opacity-70 flex w-full items-center justify-between border-l border-edge transition-colors duration-100 hover:border-edge-strong hover:bg-background-surface/50"
 							type="button"
 							onClick={() => setShowServers(true)}
 						>
diff --git a/packages/browser/src/scenes/home/ContinueReading.tsx b/packages/browser/src/scenes/home/ContinueReading.tsx
index c8479ae93c..6c173fa800 100644
--- a/packages/browser/src/scenes/home/ContinueReading.tsx
+++ b/packages/browser/src/scenes/home/ContinueReading.tsx
@@ -127,10 +127,10 @@ function ContinueReading() {
 
 	if (!nodes.length) {
 		return (
-			<div className="flex flex-col space-y-2">
+			<div className="space-y-2 flex flex-col">
 				<Heading size="sm">{t('homeScene.continueReading.title')}</Heading>
-				<div className="flex items-start justify-start space-x-3 rounded-lg border border-dashed border-edge-subtle px-4 py-4">
-					<span className="rounded-lg border border-edge bg-background-surface p-2">
+				<div className="space-x-3 rounded-lg px-4 py-4 flex items-start justify-start border border-dashed border-edge-subtle">
+					<span className="rounded-lg p-2 border border-edge bg-background-surface">
 						<BookMarked className="h-8 w-8 text-foreground-muted" />
 					</span>
 					<div>
@@ -208,7 +208,7 @@ const ContinueReadingCard = memo(function ContinueReadingCard({
 	return (
 		<Link
 			to={paths.bookOverview(data.id)}
-			className="group relative block flex-shrink-0 overflow-hidden rounded-xl transition-opacity hover:opacity-90"
+			className="group rounded-xl relative block shrink-0 overflow-hidden transition-opacity hover:opacity-90"
 			style={{ width }}
 		>
 			<ThumbnailImage
@@ -224,9 +224,9 @@ const ContinueReadingCard = memo(function ContinueReadingCard({
 				}}
 			/>
 
-			<div className="pointer-events-none absolute bottom-0 left-0 right-0 z-30 flex flex-col gap-2 p-2.5">
+			<div className="bottom-0 left-0 right-0 gap-2 p-2.5 pointer-events-none absolute z-30 flex flex-col">
 				<Text
-					className="line-clamp-2 !text-wrap text-sm font-semibold leading-tight text-white md:text-base"
+					className="text-sm font-semibold leading-tight text-white md:text-base line-clamp-2 text-wrap!"
 					style={{
 						textShadow: '1px 1px 2px rgba(0, 0, 0, 0.5)',
 					}}
@@ -234,7 +234,7 @@ const ContinueReadingCard = memo(function ContinueReadingCard({
 					{data.resolvedName}
 				</Text>
 
-				<div className="flex items-center justify-between gap-2">
+				<div className="gap-2 flex items-center justify-between">
 					{!isEbookProgress && !!data.readProgress?.page && data.readProgress.page > 0 && (
 						<Text size="xs" className="text-gray-200 opacity-90">
 							{pagesLeft} {pagesLeft === 1 ? 'page' : 'pages'} left
@@ -260,7 +260,7 @@ const ContinueReadingCard = memo(function ContinueReadingCard({
 						max={100}
 						size="sm"
 						className="h-1 rounded-full bg-[#898d94]"
-						indicatorClassName="bg-[#f5f3ef]"
+						indicatorClassName="bg-foreground"
 					/>
 				)}
 			</div>
diff --git a/packages/browser/src/scenes/home/HomeScene.tsx b/packages/browser/src/scenes/home/HomeScene.tsx
index 7d221ba1f6..36ec417c83 100644
--- a/packages/browser/src/scenes/home/HomeScene.tsx
+++ b/packages/browser/src/scenes/home/HomeScene.tsx
@@ -59,7 +59,7 @@ export default function HomeScene() {
 	}
 
 	return (
-		<SceneContainer className="flex flex-col gap-6">
+		<SceneContainer className="gap-6 flex flex-col">
 			{helmet}
 
 			<ContinueReadingMedia />
diff --git a/packages/browser/src/scenes/home/NoLibraries.tsx b/packages/browser/src/scenes/home/NoLibraries.tsx
index 634f4cd9e8..7057141fa2 100644
--- a/packages/browser/src/scenes/home/NoLibraries.tsx
+++ b/packages/browser/src/scenes/home/NoLibraries.tsx
@@ -17,16 +17,16 @@ export default function NoLibraries() {
 				<img
 					src="/assets/svg/mountain.svg"
 					alt="Construction illustration"
-					className="mx-auto h-auto w-3/5 object-scale-down sm:-my-1 sm:w-1/2 sm:px-2"
+					className="sm:-my-1 sm:w-1/2 sm:px-2 mx-auto h-auto w-3/5 object-scale-down"
 				/>
 
-				<div className="mx-auto flex max-w-lg shrink-0 flex-col space-y-1.5 text-center">
+				<div className="max-w-lg space-y-1.5 mx-auto flex shrink-0 flex-col text-center">
 					<Heading className="text-2xl font-bold md:text-3xl">{t(getKey('heading'))}</Heading>
 					<Text className="text-base sm:text-lg">
 						{t(getKey(`message.${canCreateLibrary ? 'create' : 'wait'}`))}
 					</Text>
 
-					<div className="flex items-center justify-center space-x-2 pt-3">
+					<div className="space-x-2 pt-3 flex items-center justify-center">
 						{canCreateLibrary && (
 							<ButtonOrLink href={paths.libraryCreate()} variant="secondary">
 								{t(getKey('links.create'))}
diff --git a/packages/browser/src/scenes/home/OnDeck.tsx b/packages/browser/src/scenes/home/OnDeck.tsx
index e8cea8849b..47e4373508 100644
--- a/packages/browser/src/scenes/home/OnDeck.tsx
+++ b/packages/browser/src/scenes/home/OnDeck.tsx
@@ -130,8 +130,8 @@ function OnDeck() {
 			height={listHeight}
 			onFetchMore={handleFetchMore}
 			emptyState={
-				<div className="flex items-start justify-start space-x-3 rounded-lg border border-dashed border-edge-subtle px-4 py-4">
-					<span className="rounded-lg border border-edge bg-background-surface p-2">
+				<div className="space-x-3 rounded-lg px-4 py-4 flex items-start justify-start border border-dashed border-edge-subtle">
+					<span className="rounded-lg p-2 border border-edge bg-background-surface">
 						<BookMarked className="h-8 w-8 text-foreground-muted" />
 					</span>
 					<div>
@@ -183,7 +183,7 @@ const OnDeckBookCard = memo(function OnDeckBookCard({ fragment, cardWidth }: OnD
 	return (
 		<Link
 			to={paths.bookOverview(data.id)}
-			className="group relative block flex-shrink-0 overflow-hidden rounded-lg transition-opacity hover:opacity-90"
+			className="group rounded-lg relative block shrink-0 overflow-hidden transition-opacity hover:opacity-90"
 			style={{ width: cardWidth }}
 		>
 			<ThumbnailImage
@@ -199,9 +199,9 @@ const OnDeckBookCard = memo(function OnDeckBookCard({ fragment, cardWidth }: OnD
 				}}
 			/>
 
-			<div className="pointer-events-none absolute bottom-0 left-0 right-0 z-30 p-2.5">
+			<div className="bottom-0 left-0 right-0 p-2.5 pointer-events-none absolute z-30">
 				<Text
-					className="line-clamp-2 !text-wrap text-lg font-bold leading-tight text-white"
+					className="text-lg font-bold leading-tight text-white line-clamp-2 text-wrap!"
 					style={{
 						textShadow: '2px 1px 2px rgba(0, 0, 0, 0.5)',
 					}}
diff --git a/packages/browser/src/scenes/home/RecentlyAddedMedia.tsx b/packages/browser/src/scenes/home/RecentlyAddedMedia.tsx
index e285610735..c126864a53 100644
--- a/packages/browser/src/scenes/home/RecentlyAddedMedia.tsx
+++ b/packages/browser/src/scenes/home/RecentlyAddedMedia.tsx
@@ -104,8 +104,8 @@ function RecentlyAddedMedia() {
 	}, [hasNextPage, isFetchingNextPage, fetchNextPage])
 
 	const emptyState = (
-		<div className="flex items-start justify-start space-x-3 rounded-lg border border-dashed border-edge-subtle px-4 py-4">
-			<span className="rounded-lg border border-edge bg-background-surface p-2">
+		<div className="space-x-3 rounded-lg px-4 py-4 flex items-start justify-start border border-dashed border-edge-subtle">
+			<span className="rounded-lg p-2 border border-edge bg-background-surface">
 				<BookX className="h-8 w-8 text-foreground-muted" />
 			</span>
 			<div>
@@ -171,7 +171,7 @@ const RecentlyAddedBookCard = memo(function RecentlyAddedBookCard({
 	return (
 		<Link
 			to={paths.bookOverview(data.id)}
-			className="group relative block flex-shrink-0 overflow-hidden rounded-lg transition-opacity hover:opacity-90"
+			className="group rounded-lg relative block shrink-0 overflow-hidden transition-opacity hover:opacity-90"
 			style={{ width: cardWidth }}
 		>
 			<ThumbnailImage
@@ -187,9 +187,9 @@ const RecentlyAddedBookCard = memo(function RecentlyAddedBookCard({
 				}}
 			/>
 
-			<div className="pointer-events-none absolute bottom-0 left-0 right-0 z-30 p-2">
+			<div className="bottom-0 left-0 right-0 p-2 pointer-events-none absolute z-30">
 				<Text
-					className="line-clamp-2 !text-wrap text-sm font-semibold leading-tight text-white"
+					className="text-sm font-semibold leading-tight text-white line-clamp-2 text-wrap!"
 					style={{
 						textShadow: '1px 1px 2px rgba(0, 0, 0, 0.5)',
 					}}
diff --git a/packages/browser/src/scenes/home/RecentlyAddedSeries.tsx b/packages/browser/src/scenes/home/RecentlyAddedSeries.tsx
index 5665d07749..050ecd331b 100644
--- a/packages/browser/src/scenes/home/RecentlyAddedSeries.tsx
+++ b/packages/browser/src/scenes/home/RecentlyAddedSeries.tsx
@@ -98,16 +98,16 @@ function RecentlyAddedSeriesCard({ series, cardWidth }: RecentlyAddedSeriesCardP
 		<Link
 			to={`/series/${series.id}`}
 			className={cn(
-				'group relative block flex-shrink-0 transition-opacity',
+				'group relative block shrink-0 transition-opacity',
 				!shouldFancyHover && 'hover:opacity-80',
 			)}
 			style={{ width: cardWidth }}
 		>
 			<SeriesStackedThumbnails width={cardWidth} thumbnailData={thumbnailData} />
 
-			<div className="absolute left-0 top-0 z-20 w-full px-2.5 py-3">
+			<div className="left-0 top-0 px-2.5 py-3 absolute z-20 w-full">
 				<Text
-					className="line-clamp-2 !text-wrap text-xl font-bold leading-tight text-white"
+					className="text-xl font-bold leading-tight text-white line-clamp-2 text-wrap!"
 					style={{
 						textShadow: '2px 1px 2px rgba(0, 0, 0, 0.5)',
 					}}
@@ -115,7 +115,7 @@ function RecentlyAddedSeriesCard({ series, cardWidth }: RecentlyAddedSeriesCardP
 					{series.resolvedName}
 				</Text>
 				<Text
-					className="mt-0.5 line-clamp-1 text-sm font-medium leading-tight text-gray-200"
+					className="mt-0.5 text-sm font-medium leading-tight line-clamp-1 text-gray-200"
 					style={{
 						textShadow: '2px 1px 2px rgba(0, 0, 0, 0.5)',
 					}}
@@ -159,8 +159,8 @@ function RecentlyAddedSeries() {
 	}, [hasNextPage, isFetchingNextPage, fetchNextPage])
 
 	const emptyState = (
-		<div className="flex items-start justify-start space-x-3 rounded-lg border border-dashed border-edge-subtle px-4 py-4">
-			<span className="rounded-lg border border-edge bg-background-surface p-2">
+		<div className="space-x-3 rounded-lg px-4 py-4 flex items-start justify-start border border-dashed border-edge-subtle">
+			<span className="rounded-lg p-2 border border-edge bg-background-surface">
 				<BookCopy className="h-8 w-8 text-foreground-muted" />
 			</span>
 			<div>
diff --git a/packages/browser/src/scenes/library/LibraryHeader.tsx b/packages/browser/src/scenes/library/LibraryHeader.tsx
index 86633cd01a..112e18b08a 100644
--- a/packages/browser/src/scenes/library/LibraryHeader.tsx
+++ b/packages/browser/src/scenes/library/LibraryHeader.tsx
@@ -33,23 +33,23 @@ export default function LibraryHeader() {
 
 	return (
 		<header
-			className={cn('flex w-full flex-col gap-4 p-4', {
+			className={cn('gap-4 p-4 flex w-full flex-col', {
 				'mx-auto': preferTopBar && !!layoutMaxWidthPx,
 			})}
 			style={{
 				maxWidth: preferTopBar ? layoutMaxWidthPx || undefined : undefined,
 			}}
 		>
-			<div className="flex w-full flex-col items-center gap-4 md:flex-row md:items-start">
+			<div className="gap-4 md:flex-row md:items-start flex w-full flex-col items-center">
 				{showThumbnailsInHeaders && (
 					<ProminentThumbnailImage src={thumbnail.url} placeholderData={thumbnail.metadata} />
 				)}
 
-				<div className="flex w-full flex-col gap-4">
+				<div className="gap-4 flex w-full flex-col">
 					<Heading size="lg">{name}</Heading>
 
 					{stats && (
-						<div className="grid grid-cols-2 gap-3 sm:grid-cols-3 md:flex md:flex-wrap md:gap-6">
+						<div className="gap-3 sm:grid-cols-3 md:flex md:flex-wrap md:gap-6 grid grid-cols-2">
 							<Statistic.Item label="Series" value={stats.seriesCount} />
 							<Statistic.Item label="Books" value={stats.bookCount} />
 							<Statistic.Item
@@ -80,7 +80,7 @@ export default function LibraryHeader() {
 					)}
 
 					{hasGenres && (
-						<div className="flex flex-col gap-1">
+						<div className="gap-1 flex flex-col">
 							<Text size="xs" variant="muted">
 								Genres
 							</Text>
@@ -103,7 +103,7 @@ export default function LibraryHeader() {
 					)}
 
 					{hasTags && (
-						<div className="flex flex-col gap-1">
+						<div className="gap-1 flex flex-col">
 							<Text size="xs" variant="muted">
 								Tags
 							</Text>
diff --git a/packages/browser/src/scenes/library/LibraryLayout.tsx b/packages/browser/src/scenes/library/LibraryLayout.tsx
index 96ae847c84..e97f24ab68 100644
--- a/packages/browser/src/scenes/library/LibraryLayout.tsx
+++ b/packages/browser/src/scenes/library/LibraryLayout.tsx
@@ -129,7 +129,7 @@ export default function LibraryLayout() {
 				{displaySideBar && <LibrarySettingsSidebar />}
 
 				<SceneContainer
-					className={cn('relative flex flex-1 flex-col gap-4 p-0 md:pb-0', {
+					className={cn('gap-4 p-0 md:pb-0 relative flex flex-1 flex-col', {
 						'md:hide-scrollbar': !!enableHideScrollbar,
 						'pl-48': displaySideBar,
 					})}
diff --git a/packages/browser/src/scenes/library/LibraryNavigation.tsx b/packages/browser/src/scenes/library/LibraryNavigation.tsx
index 48ccf1db39..5a54718a87 100644
--- a/packages/browser/src/scenes/library/LibraryNavigation.tsx
+++ b/packages/browser/src/scenes/library/LibraryNavigation.tsx
@@ -89,13 +89,13 @@ export default function LibraryNavigation() {
 		<div
 			ref={ref}
 			className={cn(
-				'sticky top-0 z-50 h-12 w-full border-b border-edge bg-transparent md:relative md:top-[unset] md:z-[unset]',
+				'top-0 h-12 md:relative md:top-[unset] md:z-[unset] sticky z-50 w-full border-b border-edge bg-transparent',
 				{ 'bg-background': isSticky },
 			)}
 		>
 			<nav
 				className={cn(
-					'-mb-px flex h-12 gap-x-6 overflow-x-scroll px-3 scrollbar-hide md:overflow-x-hidden',
+					'h-12 gap-x-6 px-3 md:overflow-x-hidden -mb-px scrollbar-hide flex overflow-x-scroll',
 					{
 						'mx-auto': preferTopBar && !!layoutMaxWidthPx,
 					},
@@ -108,7 +108,7 @@ export default function LibraryNavigation() {
 						key={tab.to}
 						underline={false}
 						onMouseEnter={tab.onHover}
-						className={cn('whitespace-nowrap border-b-2 px-1 py-3 text-sm font-medium', {
+						className={cn('px-1 py-3 text-sm font-medium border-b-2 whitespace-nowrap', {
 							'border-edge-brand text-foreground-brand': tab.isActive,
 							'border-transparent text-foreground-muted hover:border-edge': !tab.isActive,
 						})}
diff --git a/packages/browser/src/scenes/library/tabs/books/LibraryBooksScene.tsx b/packages/browser/src/scenes/library/tabs/books/LibraryBooksScene.tsx
index e693ae3efb..4755598980 100644
--- a/packages/browser/src/scenes/library/tabs/books/LibraryBooksScene.tsx
+++ b/packages/browser/src/scenes/library/tabs/books/LibraryBooksScene.tsx
@@ -302,7 +302,7 @@ function LibraryBooksScene() {
 						})
 					}}
 				>
-					<div className="flex flex-1 px-4 pt-4">
+					<div className="px-4 pt-4 flex flex-1">
 						{!!nodes.length && (
 							<DynamicCardGrid
 								count={nodes.length}
@@ -372,7 +372,7 @@ function LibraryBooksScene() {
 				...rest,
 			}}
 		>
-			<div className="flex flex-1 flex-col pb-4 md:pb-0">
+			<div className="pb-4 md:pb-0 flex flex-1 flex-col">
 				<Helmet>
 					<title>Stump | {library.name || ''}</title>
 				</Helmet>
diff --git a/packages/browser/src/scenes/library/tabs/series/LibrarySeriesScene.tsx b/packages/browser/src/scenes/library/tabs/series/LibrarySeriesScene.tsx
index 8150746884..b83874580c 100644
--- a/packages/browser/src/scenes/library/tabs/series/LibrarySeriesScene.tsx
+++ b/packages/browser/src/scenes/library/tabs/series/LibrarySeriesScene.tsx
@@ -335,7 +335,7 @@ export default function LibrarySeriesScene() {
 						})
 					}}
 				>
-					<div className="flex flex-1 px-4 pt-4">
+					<div className="px-4 pt-4 flex flex-1">
 						{!!nodes.length && (
 							<DynamicCardGrid
 								count={nodes.length}
@@ -408,7 +408,7 @@ export default function LibrarySeriesScene() {
 				...rest,
 			}}
 		>
-			<div className="flex flex-1 flex-col pb-4 md:pb-0">
+			<div className="pb-4 md:pb-0 flex flex-1 flex-col">
 				<Helmet>
 					<title>Stump | {name}</title>
 				</Helmet>
diff --git a/packages/browser/src/scenes/library/tabs/settings/LibraryAdminLayout.tsx b/packages/browser/src/scenes/library/tabs/settings/LibraryAdminLayout.tsx
index 1c888a214c..8274db50b3 100644
--- a/packages/browser/src/scenes/library/tabs/settings/LibraryAdminLayout.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/LibraryAdminLayout.tsx
@@ -36,7 +36,7 @@ export default function LibraryAdminLayout({ applySceneDefaults = true }: Props)
 		if (applySceneDefaults) {
 			return (
 				<SceneContainer
-					className={cx('flex min-h-full w-full flex-grow flex-col space-y-6', {
+					className={cx('space-y-6 flex min-h-full w-full grow flex-col', {
 						'max-w-4xl': primaryNavigationMode === 'SIDEBAR',
 					})}
 				>
diff --git a/packages/browser/src/scenes/library/tabs/settings/LibrarySeriesGrid.tsx b/packages/browser/src/scenes/library/tabs/settings/LibrarySeriesGrid.tsx
index 26181ce237..11eefeb18f 100644
--- a/packages/browser/src/scenes/library/tabs/settings/LibrarySeriesGrid.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/LibrarySeriesGrid.tsx
@@ -113,7 +113,7 @@ export default function LibrarySeriesGrid({ libraryId, onSelectSeries }: Props)
 				{({ height, width }) => (
 					<div
 						ref={parentRef}
-						className="overflow-y-auto overflow-x-hidden"
+						className="overflow-x-hidden overflow-y-auto"
 						style={{
 							height,
 							width,
@@ -149,11 +149,11 @@ export default function LibrarySeriesGrid({ libraryId, onSelectSeries }: Props)
 												}}
 											>
 												<div
-													className="relative flex w-[7rem] flex-1 flex-col space-y-1 overflow-hidden rounded-md border-[1.5px] border-edge-subtle bg-background shadow-sm transition-colors duration-100 hover:border-edge-brand sm:w-[7.666rem] md:w-[9rem]"
+													className="w-28 space-y-1 rounded-md shadow-sm sm:w-[7.666rem] md:w-36 relative flex flex-1 flex-col overflow-hidden border-[1.5px] border-edge-subtle bg-background transition-colors duration-100 hover:border-edge-brand"
 													onClick={() => onSelectSeries(thisSeries)}
 												>
 													<div
-														className="relative bg-cover bg-center p-0"
+														className="p-0 relative bg-cover bg-center"
 														style={{
 															backgroundImage: `url('${imageUrl}')`,
 															aspectRatio: thumbnailRatio,
diff --git a/packages/browser/src/scenes/library/tabs/settings/LibrarySettingsHeader.tsx b/packages/browser/src/scenes/library/tabs/settings/LibrarySettingsHeader.tsx
index a0e204784a..c8292ac2f3 100644
--- a/packages/browser/src/scenes/library/tabs/settings/LibrarySettingsHeader.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/LibrarySettingsHeader.tsx
@@ -57,7 +57,7 @@ export default function LibrarySettingsHeader() {
 	return (
 		<header
 			className={cn(
-				'flex w-full flex-col items-start justify-between gap-4 border-b border-b-edge p-4 lg:flex-row lg:gap-0',
+				'gap-4 p-4 lg:flex-row lg:gap-0 flex w-full flex-col items-start justify-between border-b border-b-edge',
 				{
 					// Note: We make the border transparent because the width constraint when using a top bar
 					'mx-auto border-b-transparent': preferTopBar && !!layoutMaxWidthPx,
@@ -68,7 +68,7 @@ export default function LibrarySettingsHeader() {
 				maxWidth: preferTopBar ? layoutMaxWidthPx || undefined : undefined,
 			}}
 		>
-			<div className="flex flex-col space-y-4">
+			<div className="space-y-4 flex flex-col">
 				<div>
 					<Heading size="lg" className="font-bold">
 						{translatedHeader}
diff --git a/packages/browser/src/scenes/library/tabs/settings/LibrarySettingsSidebar.tsx b/packages/browser/src/scenes/library/tabs/settings/LibrarySettingsSidebar.tsx
index 286420b669..8793447758 100644
--- a/packages/browser/src/scenes/library/tabs/settings/LibrarySettingsSidebar.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/LibrarySettingsSidebar.tsx
@@ -28,29 +28,29 @@ export default function LibrarySettingsSidebar() {
 	return (
 		<div
 			className={cn(
-				'relative flex h-full w-48 shrink-0 flex-col border-edge bg-background px-2 py-4 text-foreground-subtle',
+				'w-48 px-2 py-4 relative flex h-full shrink-0 flex-col border-edge bg-background text-foreground-subtle',
 				primaryNavigationMode === 'TOPBAR'
-					? 'fixed top-12 z-50 h-screen border-x'
-					: 'fixed top-0 z-50 h-screen border-r',
+					? 'top-12 fixed z-50 h-screen border-x'
+					: 'top-0 fixed z-50 h-screen border-r',
 				{
-					'bg-gradient-to-l from-background-gradient-from to-background-gradient-to':
+					'from-background-gradient-from to-background-gradient-to bg-linear-to-l':
 						shouldUseGradient,
 				},
 			)}
 		>
-			<div className="flex h-full flex-grow flex-col gap-4">
-				<div className="flex items-center space-x-2">
+			<div className="gap-4 flex h-full grow flex-col">
+				<div className="space-x-2 flex items-center">
 					<ButtonOrLink
 						href={paths.libraryBooks(library.id)}
 						variant="ghost"
-						className="h-[unset] w-[unset] shrink-0 border border-transparent p-1 text-foreground hover:border-edge-subtle/50 hover:bg-sidebar-surface/70"
+						className="p-1 h-[unset] w-[unset] shrink-0 border border-transparent text-foreground hover:border-edge-subtle/50 hover:bg-sidebar-surface/70"
 						size="sm"
 					>
 						<ArrowLeft className="h-4 w-4 transform" />
 					</ButtonOrLink>
 
 					{/* TODO: handle wrapping... */}
-					<Label className="line-clamp-1 py-1">{library.name}</Label>
+					<Label className="py-1 line-clamp-1">{library.name}</Label>
 				</div>
 
 				{groups
@@ -69,7 +69,7 @@ export default function LibrarySettingsSidebar() {
 							<div key={groupLabel}>
 								{groupLabel && <Label>{groupLabel}</Label>}
 								<ul
-									className={cn('flex flex-col gap-y-0.5 text-sm', {
+									className={cn('gap-y-0.5 text-sm flex flex-col', {
 										'pt-2': groupLabel,
 									})}
 								>
@@ -98,7 +98,7 @@ export default function LibrarySettingsSidebar() {
 						<IconButton
 							title="Go home"
 							variant="ghost"
-							className="border border-transparent p-1.5 text-foreground hover:border-edge-subtle/50 hover:bg-sidebar-surface/70"
+							className="p-1.5 border border-transparent text-foreground hover:border-edge-subtle/50 hover:bg-sidebar-surface/70"
 							onClick={() => navigate(paths.home())}
 						>
 							<Home className="h-4 w-4 -scale-x-[1] transform" />
diff --git a/packages/browser/src/scenes/library/tabs/settings/danger/accessControl/AccessControlScene.tsx b/packages/browser/src/scenes/library/tabs/settings/danger/accessControl/AccessControlScene.tsx
index 1c88ee2427..a837322d05 100644
--- a/packages/browser/src/scenes/library/tabs/settings/danger/accessControl/AccessControlScene.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/danger/accessControl/AccessControlScene.tsx
@@ -5,7 +5,7 @@ import LibraryExclusions from './LibraryExclusions'
 
 export default function AccessControlScene() {
 	return (
-		<div className="flex flex-col gap-12">
+		<div className="gap-12 flex flex-col">
 			<LibraryExclusions />
 		</div>
 	)
diff --git a/packages/browser/src/scenes/library/tabs/settings/danger/accessControl/LibraryExclusions.tsx b/packages/browser/src/scenes/library/tabs/settings/danger/accessControl/LibraryExclusions.tsx
index 18eae2ef79..5faa4e56d2 100644
--- a/packages/browser/src/scenes/library/tabs/settings/danger/accessControl/LibraryExclusions.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/danger/accessControl/LibraryExclusions.tsx
@@ -133,7 +133,7 @@ export default function LibraryExclusions() {
 
 	// TODO: disabled state if no options
 	return (
-		<div className="flex flex-col gap-4">
+		<div className="gap-4 flex flex-col">
 			<div>
 				<Heading size="sm">{t(getKey('heading'))}</Heading>
 				<Text size="sm" variant="muted" className="mt-1">
diff --git a/packages/browser/src/scenes/library/tabs/settings/danger/deletion/CleanLibrary.tsx b/packages/browser/src/scenes/library/tabs/settings/danger/deletion/CleanLibrary.tsx
index b15a7c14f9..f730b90730 100644
--- a/packages/browser/src/scenes/library/tabs/settings/danger/deletion/CleanLibrary.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/danger/deletion/CleanLibrary.tsx
@@ -89,7 +89,7 @@ export default function CleanLibrary() {
 	}
 
 	return (
-		<div className="flex flex-col space-y-4">
+		<div className="space-y-4 flex flex-col">
 			<div className="flex items-end justify-between">
 				<div>
 					<Heading size="sm">{t(getKey('heading'))}</Heading>
diff --git a/packages/browser/src/scenes/library/tabs/settings/danger/deletion/DeleteLibrary.tsx b/packages/browser/src/scenes/library/tabs/settings/danger/deletion/DeleteLibrary.tsx
index 9674f64579..cba5e3a095 100644
--- a/packages/browser/src/scenes/library/tabs/settings/danger/deletion/DeleteLibrary.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/danger/deletion/DeleteLibrary.tsx
@@ -15,7 +15,7 @@ export default function DeleteLibrary() {
 	const [showConfirmation, setShowConfirmation] = useState(false)
 
 	return (
-		<div className="flex flex-col space-y-4">
+		<div className="space-y-4 flex flex-col">
 			<div>
 				<Heading size="sm">{t(getKey('heading'))}</Heading>
 				<Text size="sm" variant="muted" className="mt-1">
@@ -33,7 +33,7 @@ export default function DeleteLibrary() {
 							type="button"
 							variant="danger"
 							onClick={() => setShowConfirmation(true)}
-							className="flex-shrink-0"
+							className="shrink-0"
 							size="md"
 						>
 							Delete library
diff --git a/packages/browser/src/scenes/library/tabs/settings/danger/deletion/DeletionScene.tsx b/packages/browser/src/scenes/library/tabs/settings/danger/deletion/DeletionScene.tsx
index 1de3af96cf..0751d866be 100644
--- a/packages/browser/src/scenes/library/tabs/settings/danger/deletion/DeletionScene.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/danger/deletion/DeletionScene.tsx
@@ -3,7 +3,7 @@ import DeleteLibrary from './DeleteLibrary'
 
 export default function DeletionScene() {
 	return (
-		<div className="flex flex-col gap-12">
+		<div className="gap-12 flex flex-col">
 			<CleanLibrary />
 			<DeleteLibrary />
 		</div>
diff --git a/packages/browser/src/scenes/library/tabs/settings/danger/deletion/MissingEntitiesTable.tsx b/packages/browser/src/scenes/library/tabs/settings/danger/deletion/MissingEntitiesTable.tsx
index b5b9906789..a2467128ef 100644
--- a/packages/browser/src/scenes/library/tabs/settings/danger/deletion/MissingEntitiesTable.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/danger/deletion/MissingEntitiesTable.tsx
@@ -84,7 +84,7 @@ export default function MisisngEntitiesTable() {
 						.with(MissingEntityType.Book, () => paths.bookOverview(id))
 						.with(MissingEntityType.Series, () => paths.seriesOverview(id))
 						.otherwise(() => undefined)}
-					className="line-clamp-2 text-sm text-opacity-100 no-underline hover:text-opacity-90 hover:underline"
+					className="text-sm text-opacity-100 hover:text-opacity-90 line-clamp-2 no-underline hover:underline"
 				>
 					{path}
 				</Link>
@@ -124,7 +124,7 @@ export default function MisisngEntitiesTable() {
 				totalCount={pageInfo?.totalItems}
 				emptyRenderer={() =>
 					isLoading ? null : (
-						<div className="flex min-h-[150px] flex-col items-center justify-center gap-2">
+						<div className="gap-2 flex min-h-[150px] flex-col items-center justify-center">
 							<CircleSlash2 className="h-10 w-10 pb-2 pt-1 text-foreground-muted" />
 							<Heading size="sm">{t(`${LOCALE_BASE}.emptyHeading`)}</Heading>
 							<Text size="sm" variant="muted">
diff --git a/packages/browser/src/scenes/library/tabs/settings/options/analysis/AnalyzeMedia.tsx b/packages/browser/src/scenes/library/tabs/settings/options/analysis/AnalyzeMedia.tsx
index c0f7fe272a..673962ebe2 100644
--- a/packages/browser/src/scenes/library/tabs/settings/options/analysis/AnalyzeMedia.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/options/analysis/AnalyzeMedia.tsx
@@ -22,7 +22,7 @@ export default function AnalyzeMedia() {
 	const handleAnalyze = useCallback(() => mutate({ id: library.id }), [library.id, mutate])
 
 	return (
-		<div className="flex flex-col gap-6">
+		<div className="gap-6 flex flex-col">
 			<div>
 				<Heading size="sm">{t(getKey('heading'))}</Heading>
 				<Text size="sm" variant="muted">
diff --git a/packages/browser/src/scenes/library/tabs/settings/options/analysis/LibraryAnalysisScene.tsx b/packages/browser/src/scenes/library/tabs/settings/options/analysis/LibraryAnalysisScene.tsx
index ea2c179570..43fe272a65 100644
--- a/packages/browser/src/scenes/library/tabs/settings/options/analysis/LibraryAnalysisScene.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/options/analysis/LibraryAnalysisScene.tsx
@@ -5,7 +5,7 @@ import AnalyzeMedia from './AnalyzeMedia'
 
 export default function LibraryAnalysisScene() {
 	return (
-		<div className="flex flex-col gap-12">
+		<div className="gap-12 flex flex-col">
 			<Alert variant="warning">
 				<AlertTriangle />
 				<AlertTitle>Work in progress</AlertTitle>
diff --git a/packages/browser/src/scenes/library/tabs/settings/options/scanner/PatternDisplay.tsx b/packages/browser/src/scenes/library/tabs/settings/options/scanner/PatternDisplay.tsx
index ca28433d7a..ca4e7f997f 100644
--- a/packages/browser/src/scenes/library/tabs/settings/options/scanner/PatternDisplay.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/options/scanner/PatternDisplay.tsx
@@ -19,13 +19,13 @@ export default function PatternDisplay() {
 
 	return (
 		<div
-			className="flex w-full flex-col space-y-1.5 rounded-xl bg-fill-warning-secondary p-1 lg:w-auto"
+			className="space-y-1.5 rounded-xl p-1 lg:w-auto flex w-full flex-col bg-fill-warning-secondary"
 			data-testid="unrestricted-meta"
 		>
-			<div className="flex items-center px-2.5 py-0.5 text-fill-warning">
+			<div className="px-2.5 py-0.5 flex items-center text-fill-warning">
 				<span className="font-medium">{t(getOptionKey(`${localeKey}.label`))}</span>
 			</div>
-			<div className="rounded-lg bg-fill-warning-secondary p-2.5">
+			<div className="rounded-lg p-2.5 bg-fill-warning-secondary">
 				<Text size="sm" className="text-fill-warning">
 					{t(getOptionKey(`${localeKey}.description`))}
 				</Text>
diff --git a/packages/browser/src/scenes/library/tabs/settings/options/scanner/ScannerActionsSection.tsx b/packages/browser/src/scenes/library/tabs/settings/options/scanner/ScannerActionsSection.tsx
index 55f65984c9..34803c9c76 100644
--- a/packages/browser/src/scenes/library/tabs/settings/options/scanner/ScannerActionsSection.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/options/scanner/ScannerActionsSection.tsx
@@ -11,8 +11,8 @@ export default function ScannerActionsSection() {
 	if (!scan) return null
 
 	return (
-		<div className="flex flex-col gap-y-6">
-			<div className="flex flex-col gap-y-3">
+		<div className="gap-y-6 flex flex-col">
+			<div className="gap-y-3 flex flex-col">
 				<div>
 					<Label className="text-base">{t(getKey('defaultScan.heading'))}</Label>
 					<Text variant="muted">{t(getKey('defaultScan.description'))}</Text>
@@ -24,7 +24,7 @@ export default function ScannerActionsSection() {
 				</div>
 			</div>
 
-			<div className="flex flex-col gap-y-3">
+			<div className="gap-y-3 flex flex-col">
 				<div>
 					<Label className="text-base">{t(getKey('configureScan.heading'))}</Label>
 					<Text variant="muted">{t(getKey('configureScan.description'))}</Text>
diff --git a/packages/browser/src/scenes/library/tabs/settings/options/scanner/ScannerBehaviorScene.tsx b/packages/browser/src/scenes/library/tabs/settings/options/scanner/ScannerBehaviorScene.tsx
index 4c794f93db..9d592c7061 100644
--- a/packages/browser/src/scenes/library/tabs/settings/options/scanner/ScannerBehaviorScene.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/options/scanner/ScannerBehaviorScene.tsx
@@ -9,7 +9,7 @@ export default function GeneralFileOptionsScene() {
 	const { scan } = useLibraryManagement()
 
 	return (
-		<div className="flex flex-col gap-12">
+		<div className="gap-12 flex flex-col">
 			{scan && <ScannerActionsSection />}
 
 			<ScanHistorySection />
diff --git a/packages/browser/src/scenes/library/tabs/settings/options/scanner/customScan/ScanConfigForm.tsx b/packages/browser/src/scenes/library/tabs/settings/options/scanner/customScan/ScanConfigForm.tsx
index d16a852b8b..77bb3d19f1 100644
--- a/packages/browser/src/scenes/library/tabs/settings/options/scanner/customScan/ScanConfigForm.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/options/scanner/customScan/ScanConfigForm.tsx
@@ -62,7 +62,7 @@ export default function ScanConfigForm({ onScan }: Props) {
 			<RadioGroup
 				value={variant}
 				onValueChange={handleVariantChanged}
-				className="divide gap-0 space-y-0 divide-y divide-edge overflow-hidden rounded-xl border border-edge"
+				className="divide gap-0 space-y-0 rounded-xl divide-y divide-edge overflow-hidden border border-edge"
 			>
 				<RadioGroup.CardItem
 					label={t(getOptionKey('forceRebuild', 'label'))}
@@ -92,7 +92,7 @@ export default function ScanConfigForm({ onScan }: Props) {
 			)}
 
 			{variant === 'custom' && (
-				<div className="flex flex-col gap-6 p-4">
+				<div className="gap-6 p-4 flex flex-col">
 					<WideSwitch
 						label="Rebuild metadata"
 						description="Rebuild metadata for all books in the library"
diff --git a/packages/browser/src/scenes/library/tabs/settings/options/scanner/history/ScanHistorySection.tsx b/packages/browser/src/scenes/library/tabs/settings/options/scanner/history/ScanHistorySection.tsx
index ae2ffe33c8..3ba8c452c0 100644
--- a/packages/browser/src/scenes/library/tabs/settings/options/scanner/history/ScanHistorySection.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/options/scanner/history/ScanHistorySection.tsx
@@ -48,7 +48,7 @@ export default function ScanningSection() {
 	}, [id, client])
 
 	return (
-		<div className="flex flex-col gap-4">
+		<div className="gap-4 flex flex-col">
 			<div className="flex items-end justify-between">
 				<div>
 					<Heading size="sm">{t(getKey('heading'))}</Heading>
diff --git a/packages/browser/src/scenes/library/tabs/settings/options/scanner/history/ScanHistoryTable.tsx b/packages/browser/src/scenes/library/tabs/settings/options/scanner/history/ScanHistoryTable.tsx
index f0cd5a5a3f..4a3bc0a920 100644
--- a/packages/browser/src/scenes/library/tabs/settings/options/scanner/history/ScanHistoryTable.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/options/scanner/history/ScanHistoryTable.tsx
@@ -175,12 +175,12 @@ export default function ScanHistoryTable() {
 
 	if (!scanHistory?.length) {
 		return (
-			<Card className="flex items-center justify-center border-dashed border-edge-subtle p-6">
-				<div className="flex flex-col space-y-3">
+			<Card className="p-6 flex items-center justify-center border-dashed border-edge-subtle">
+				<div className="space-y-3 flex flex-col">
 					<div className="relative flex justify-center">
-						<span className="flex items-center justify-center rounded-xl bg-background-surface p-2">
+						<span className="rounded-xl p-2 flex items-center justify-center bg-background-surface">
 							<Database className="h-6 w-6 text-foreground-muted" />
-							<Slash className="absolute h-6 w-6 scale-x-[-1] transform text-foreground opacity-80" />
+							<Slash className="h-6 w-6 absolute scale-x-[-1] transform text-foreground opacity-80" />
 						</span>
 					</div>
 
@@ -210,7 +210,7 @@ export default function ScanHistoryTable() {
 								return (
 									<th
 										key={header.id}
-										className="sticky !top-0 z-[2] h-10 bg-background-surface/50 px-2 shadow-sm"
+										className="top-0! h-10 px-2 shadow-sm sticky z-2 bg-background-surface/50"
 										style={getCommonPinningStyles(header.column)}
 									>
 										<div
@@ -233,7 +233,7 @@ export default function ScanHistoryTable() {
 							<tr key={row.id} className="">
 								{row.getVisibleCells().map((cell) => (
 									<td
-										className="h-14 bg-background px-2"
+										className="h-14 px-2 bg-background"
 										key={cell.id}
 										style={{
 											width: cell.column.getSize(),
diff --git a/packages/browser/src/scenes/library/tabs/settings/options/scanner/history/ScanRecordInspector.tsx b/packages/browser/src/scenes/library/tabs/settings/options/scanner/history/ScanRecordInspector.tsx
index 5bffba49c9..8f02721bf1 100644
--- a/packages/browser/src/scenes/library/tabs/settings/options/scanner/history/ScanRecordInspector.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/options/scanner/history/ScanRecordInspector.tsx
@@ -114,9 +114,9 @@ export default function ScanRecordInspector({ record, onClose }: Props) {
 				</div>
 
 				{displayedData?.options?.config && (
-					<div className="flex flex-col gap-y-3 px-4 py-2">
+					<div className="gap-y-3 px-4 py-2 flex flex-col">
 						<Label className="text-foreground-muted">{t(getFieldKey('config'))}</Label>
-						<div className="rounded-xl bg-background-surface p-4">
+						<div className="rounded-xl p-4 bg-background-surface">
 							<pre className="text-xs text-foreground-muted">
 								{JSON.stringify(displayedData.options.config, null, 2)}
 							</pre>
@@ -125,9 +125,9 @@ export default function ScanRecordInspector({ record, onClose }: Props) {
 				)}
 
 				{associatedJob?.outputData && (
-					<div className="flex flex-col gap-y-3 px-4 py-2">
+					<div className="gap-y-3 px-4 py-2 flex flex-col">
 						<Label className="text-foreground-muted">{t(getFieldKey('jobOutput'))}</Label>
-						<div className="rounded-xl bg-background-surface p-4">
+						<div className="rounded-xl p-4 bg-background-surface">
 							<pre className="text-xs text-foreground-muted">
 								{JSON.stringify(associatedJob.outputData, null, 2)}
 							</pre>
@@ -136,7 +136,7 @@ export default function ScanRecordInspector({ record, onClose }: Props) {
 				)}
 
 				{!!associatedJob?.logs?.length && (
-					<div className="flex flex-col gap-y-3 px-4 py-2">
+					<div className="gap-y-3 px-4 py-2 flex flex-col">
 						<Label className="text-foreground-muted">{t(getFieldKey('logs'))}</Label>
 
 						<Alert variant="warning" className="p-2">
diff --git a/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/DeleteLibraryThumbnails.tsx b/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/DeleteLibraryThumbnails.tsx
index e734a87f3b..d5a27093e2 100644
--- a/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/DeleteLibraryThumbnails.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/DeleteLibraryThumbnails.tsx
@@ -60,7 +60,7 @@ export default function DeleteLibraryThumbnails() {
 				<Button
 					variant="danger"
 					onClick={() => setShowConfirmation(true)}
-					className="flex-shrink-0"
+					className="shrink-0"
 					disabled={isPending || !!data}
 					size="md"
 				>
diff --git a/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/LibraryThumbnailSelector.tsx b/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/LibraryThumbnailSelector.tsx
index c267d22161..98c5d80b20 100644
--- a/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/LibraryThumbnailSelector.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/LibraryThumbnailSelector.tsx
@@ -167,7 +167,7 @@ export default function LibraryThumbnailSelector() {
 	}
 
 	return (
-		<div className="flex flex-col gap-4">
+		<div className="gap-4 flex flex-col">
 			<div>
 				<Label>Select thumbnail</Label>
 				<Text size="sm" variant="muted">
diff --git a/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/ProcessLibraryThumbnails.tsx b/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/ProcessLibraryThumbnails.tsx
index 603902a7b0..15b5280c31 100644
--- a/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/ProcessLibraryThumbnails.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/ProcessLibraryThumbnails.tsx
@@ -25,7 +25,7 @@ export default function ProcessLibraryThumbnails() {
 	const iconStyle = 'mr-2 h-4 w-4'
 
 	return (
-		<div className="flex flex-col gap-4">
+		<div className="gap-4 flex flex-col">
 			<div>
 				<Label>Process thumbnail colors</Label>
 				<Text size="sm" variant="muted">
diff --git a/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/RegenerateThumbnails.tsx b/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/RegenerateThumbnails.tsx
index 28d2315541..3d7a4eb831 100644
--- a/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/RegenerateThumbnails.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/RegenerateThumbnails.tsx
@@ -25,7 +25,7 @@ export default function RegenerateThumbnails() {
 	const iconStyle = 'mr-2 h-4 w-4'
 
 	return (
-		<div className="flex flex-col gap-4">
+		<div className="gap-4 flex flex-col">
 			<div>
 				<Label>Regenerate thumbnails</Label>
 				<Text size="sm" variant="muted">
diff --git a/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/ThumbnailManagementSection.tsx b/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/ThumbnailManagementSection.tsx
index 3ac21ee5f7..101dcdde06 100644
--- a/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/ThumbnailManagementSection.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/ThumbnailManagementSection.tsx
@@ -10,7 +10,7 @@ export default function ThumbnailManagementSection() {
 	const { t } = useLocaleContext()
 
 	return (
-		<div className="flex flex-grow flex-col gap-6">
+		<div className="gap-6 flex grow flex-col">
 			<div>
 				<Heading size="sm">{t(getKey('heading'))}</Heading>
 				<Text size="sm" variant="muted">
diff --git a/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/ThumbnailSettingsScene.tsx b/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/ThumbnailSettingsScene.tsx
index 1e15d87c69..02f6a50588 100644
--- a/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/ThumbnailSettingsScene.tsx
+++ b/packages/browser/src/scenes/library/tabs/settings/options/thumbnails/ThumbnailSettingsScene.tsx
@@ -45,7 +45,7 @@ export default function ThumbnailSettingsScene() {
 	)
 
 	return (
-		<div className="flex flex-col gap-12">
+		<div className="gap-12 flex flex-col">
 			<Form form={form} onSubmit={handleSubmit}>
 				<ThumbnailConfig />
 			</Form>
diff --git a/packages/browser/src/scenes/series/SeriesHeader.tsx b/packages/browser/src/scenes/series/SeriesHeader.tsx
index 268e27dcbc..60746fe14c 100644
--- a/packages/browser/src/scenes/series/SeriesHeader.tsx
+++ b/packages/browser/src/scenes/series/SeriesHeader.tsx
@@ -35,22 +35,22 @@ export default function SeriesHeader() {
 
 	return (
 		<header
-			className={cn('flex w-full flex-col gap-4 p-4', {
+			className={cn('gap-4 p-4 flex w-full flex-col', {
 				'mx-auto': preferTopBar && !!layoutMaxWidthPx,
 			})}
 			style={{
 				maxWidth: preferTopBar ? layoutMaxWidthPx || undefined : undefined,
 			}}
 		>
-			<div className="flex w-full flex-col items-center gap-4 md:flex-row md:items-start">
+			<div className="gap-4 md:flex-row md:items-start flex w-full flex-col items-center">
 				{showThumbnailsInHeaders && (
 					<ProminentThumbnailImage src={thumbnail.url} placeholderData={thumbnail.metadata} />
 				)}
 
-				<div className="flex w-full flex-col gap-4">
+				<div className="gap-4 flex w-full flex-col">
 					<Heading size="lg">{resolvedName}</Heading>
 
-					<div className="grid grid-cols-2 gap-3 sm:grid-cols-3 md:flex md:flex-wrap md:gap-6">
+					<div className="gap-3 sm:grid-cols-3 md:flex md:flex-wrap md:gap-6 grid grid-cols-2">
 						<Statistic.Item label="Books" value={stats.bookCount} />
 						<Statistic.Item
 							label="Completed"
@@ -63,7 +63,7 @@ export default function SeriesHeader() {
 					</div>
 
 					{hasMetadataBadges && (
-						<div className="flex flex-wrap items-center gap-2">
+						<div className="gap-2 flex flex-wrap items-center">
 							{metadata?.publisher && (
 								<Badge variant="default" size="xs" rounded="full">
 									{metadata.publisher}
@@ -89,7 +89,7 @@ export default function SeriesHeader() {
 					)}
 
 					{hasGenres && (
-						<div className="flex flex-col gap-1">
+						<div className="gap-1 flex flex-col">
 							<Text size="xs" variant="muted">
 								Genres
 							</Text>
@@ -112,7 +112,7 @@ export default function SeriesHeader() {
 					)}
 
 					{hasTags && (
-						<div className="flex flex-col gap-1">
+						<div className="gap-1 flex flex-col">
 							<Text size="xs" variant="muted">
 								Tags
 							</Text>
@@ -121,7 +121,7 @@ export default function SeriesHeader() {
 					)}
 
 					{hasLinks && (
-						<div className="flex flex-col gap-1">
+						<div className="gap-1 flex flex-col">
 							<Text size="xs" variant="muted">
 								Links
 							</Text>
diff --git a/packages/browser/src/scenes/series/SeriesLayout.tsx b/packages/browser/src/scenes/series/SeriesLayout.tsx
index 8e72087c61..1ffed9d2b3 100644
--- a/packages/browser/src/scenes/series/SeriesLayout.tsx
+++ b/packages/browser/src/scenes/series/SeriesLayout.tsx
@@ -105,7 +105,7 @@ export default function SeriesLayout() {
 				<SeriesNavigation />
 
 				<SceneContainer
-					className={cn('relative flex flex-1 flex-col gap-4 p-0 md:pb-0', {
+					className={cn('gap-4 p-0 md:pb-0 relative flex flex-1 flex-col', {
 						'md:hide-scrollbar': !!enableHideScrollbar,
 					})}
 				>
diff --git a/packages/browser/src/scenes/series/SeriesNavigation.tsx b/packages/browser/src/scenes/series/SeriesNavigation.tsx
index c881a89199..975551554a 100644
--- a/packages/browser/src/scenes/series/SeriesNavigation.tsx
+++ b/packages/browser/src/scenes/series/SeriesNavigation.tsx
@@ -66,13 +66,13 @@ export default function SeriesNavigation() {
 		<div
 			ref={ref}
 			className={cn(
-				'sticky top-0 z-50 h-12 w-full border-b border-edge bg-transparent md:relative md:top-[unset] md:z-[unset]',
+				'top-0 h-12 md:relative md:top-[unset] md:z-[unset] sticky z-50 w-full border-b border-edge bg-transparent',
 				{ 'bg-background': isSticky },
 			)}
 		>
 			<nav
 				className={cn(
-					'-mb-px flex h-12 gap-x-6 overflow-x-scroll px-3 scrollbar-hide md:overflow-x-hidden',
+					'h-12 gap-x-6 px-3 md:overflow-x-hidden -mb-px scrollbar-hide flex overflow-x-scroll',
 					{
 						'mx-auto': preferTopBar && !!layoutMaxWidthPx,
 					},
@@ -86,7 +86,7 @@ export default function SeriesNavigation() {
 						underline={false}
 						onMouseEnter={tab.onHover}
 						className={cn(
-							'whitespace-nowrap border-b-2 px-1 py-3 text-sm font-medium',
+							'px-1 py-3 text-sm font-medium border-b-2 whitespace-nowrap',
 							{
 								'border-edge-brand text-foreground-brand': tab.isActive,
 								'border-transparent text-foreground-muted hover:border-edge': !tab.isActive,
diff --git a/packages/browser/src/scenes/series/tabs/books/SeriesBooksScene.tsx b/packages/browser/src/scenes/series/tabs/books/SeriesBooksScene.tsx
index 6708e2d12a..6d3d958ca9 100644
--- a/packages/browser/src/scenes/series/tabs/books/SeriesBooksScene.tsx
+++ b/packages/browser/src/scenes/series/tabs/books/SeriesBooksScene.tsx
@@ -294,7 +294,7 @@ function SeriesBooksScene() {
 						})
 					}}
 				>
-					<div className="flex flex-1 px-4 pt-4">
+					<div className="px-4 pt-4 flex flex-1">
 						{!!nodes.length && (
 							<DynamicCardGrid
 								count={nodes.length}
@@ -363,7 +363,7 @@ function SeriesBooksScene() {
 				...rest,
 			}}
 		>
-			<div className="flex flex-1 flex-col pb-4 md:pb-0">
+			<div className="pb-4 md:pb-0 flex flex-1 flex-col">
 				<Helmet>
 					<title>Stump | {series.resolvedName || ''}</title>
 				</Helmet>
diff --git a/packages/browser/src/scenes/series/tabs/settings/SeriesBookGrid.tsx b/packages/browser/src/scenes/series/tabs/settings/SeriesBookGrid.tsx
index 4cef025c9a..cc86d6fe7f 100644
--- a/packages/browser/src/scenes/series/tabs/settings/SeriesBookGrid.tsx
+++ b/packages/browser/src/scenes/series/tabs/settings/SeriesBookGrid.tsx
@@ -67,7 +67,7 @@ export default function SeriesBookGrid({ seriesId, onSelectBook }: Props) {
 				{({ height, width }) => (
 					<div
 						ref={parentRef}
-						className="overflow-y-auto overflow-x-hidden"
+						className="overflow-x-hidden overflow-y-auto"
 						style={{
 							height,
 							width,
@@ -146,7 +146,7 @@ const List = ({ data, width, onSelectBook, getScrollElement }: ListProps) => {
 							width: '100%',
 						}}
 					>
-						<div className="flex gap-2">
+						<div className="gap-2 flex">
 							{booksInRow.map((book) => {
 								const imageUrl = book?.thumbnail.url
 
@@ -154,7 +154,7 @@ const List = ({ data, width, onSelectBook, getScrollElement }: ListProps) => {
 									<EntityImage
 										key={book.id}
 										src={imageUrl}
-										className="h-auto rounded-lg object-cover"
+										className="rounded-lg h-auto object-cover"
 										style={{
 											width: `${getWidth() - 8}px`,
 											aspectRatio: thumbnailRatio,
diff --git a/packages/browser/src/scenes/series/tabs/settings/SeriesSettingsScene.tsx b/packages/browser/src/scenes/series/tabs/settings/SeriesSettingsScene.tsx
index 0885e41afa..ca25dc681a 100644
--- a/packages/browser/src/scenes/series/tabs/settings/SeriesSettingsScene.tsx
+++ b/packages/browser/src/scenes/series/tabs/settings/SeriesSettingsScene.tsx
@@ -74,7 +74,7 @@ export default function SeriesSettingsScene() {
 
 	return (
 		<SceneContainer>
-			<div className="flex flex-col items-start gap-y-6 text-left">
+			<div className="gap-y-6 flex flex-col items-start text-left">
 				<Alert variant="warning">
 					<Construction />
 					<AlertDescription>
@@ -94,7 +94,7 @@ export default function SeriesSettingsScene() {
 
 				<SeriesThumbnailSelector fragment={seriesById} />
 
-				<div className="flex w-full flex-col gap-y-2">
+				<div className="gap-y-2 flex w-full flex-col">
 					<div className="flex items-end justify-between">
 						<div>
 							<Heading size="sm">Metadata</Heading>
diff --git a/packages/browser/src/scenes/series/tabs/settings/SeriesThumbnailSelector.tsx b/packages/browser/src/scenes/series/tabs/settings/SeriesThumbnailSelector.tsx
index fba490b753..3f9ee5dec3 100644
--- a/packages/browser/src/scenes/series/tabs/settings/SeriesThumbnailSelector.tsx
+++ b/packages/browser/src/scenes/series/tabs/settings/SeriesThumbnailSelector.tsx
@@ -161,13 +161,13 @@ export default function SeriesThumbnailSelector({ fragment }: Props) {
 					selectedBook && page ? sdk.media.bookPageURL(selectedBook.id, page) : series.thumbnail.url
 				}
 				isCover
-				className="flex-auto flex-shrink-0"
+				className="flex-auto shrink-0"
 				fullWidth={(imageFailed) => !imageFailed}
 			/>
 
 			<Dialog open={isOpen} onOpenChange={handleOpenChange}>
 				<Dialog.Trigger asChild>
-					<span className="absolute bottom-2 left-2 block">
+					<span className="bottom-2 left-2 absolute block">
 						<EditThumbnailDropdown
 							onChooseSelector={() => setIsOpen(true)}
 							onUploadImage={handleUploadImage}
diff --git a/packages/browser/src/scenes/settings/SettingsHeader.tsx b/packages/browser/src/scenes/settings/SettingsHeader.tsx
index b11a4ca843..56f9f0bc50 100644
--- a/packages/browser/src/scenes/settings/SettingsHeader.tsx
+++ b/packages/browser/src/scenes/settings/SettingsHeader.tsx
@@ -77,7 +77,7 @@ export default function SettingsHeader({ renderNavigation }: Props) {
 		<header
 			className={cx(
 				'px-4 pt-4',
-				{ 'flex flex-col gap-y-8': renderNavigation },
+				{ 'gap-y-8 flex flex-col': renderNavigation },
 				{ 'mx-auto': !!maxWidth },
 			)}
 			style={{ maxWidth }}
@@ -85,7 +85,7 @@ export default function SettingsHeader({ renderNavigation }: Props) {
 			{renderNavigation && <SettingsNavigation />}
 			<div className="text-foreground-muted">
 				{backlink && (
-					<span className="flex items-center gap-x-1 text-xs text-foreground-muted">
+					<span className="gap-x-1 text-xs flex items-center text-foreground-muted">
 						<Link
 							to={`${basePath}${backlink.to}`}
 							className="text-foreground-muted no-underline hover:underline"
diff --git a/packages/browser/src/scenes/settings/SettingsLayout.tsx b/packages/browser/src/scenes/settings/SettingsLayout.tsx
index 81b63f5875..959db03ae2 100644
--- a/packages/browser/src/scenes/settings/SettingsLayout.tsx
+++ b/packages/browser/src/scenes/settings/SettingsLayout.tsx
@@ -41,12 +41,12 @@ export default function SettingsLayout() {
 		<div
 			// The overflow on the parent is intentional, as it allows the native scrollbar to be fully
 			// to the right, instead of on the potentially restricted width of the child container
-			className={cn('flex h-full w-full flex-col overflow-y-auto md:flex-row', {
+			className={cn('md:flex-row flex h-full w-full flex-col overflow-y-auto', {
 				'scrollbar-hide': enableHideScrollbar,
 			})}
 		>
 			<div
-				className={cn('flex w-full flex-col md:flex-row', {
+				className={cn('md:flex-row flex w-full flex-col', {
 					'mx-auto': preferTopBar && !!layoutMaxWidthPx,
 				})}
 				style={{
diff --git a/packages/browser/src/scenes/settings/SettingsNavigation.tsx b/packages/browser/src/scenes/settings/SettingsNavigation.tsx
index c77aba1bec..780fb0daef 100644
--- a/packages/browser/src/scenes/settings/SettingsNavigation.tsx
+++ b/packages/browser/src/scenes/settings/SettingsNavigation.tsx
@@ -53,7 +53,7 @@ export default function SettingsNavigation() {
 	const renderTabs = groups.length > 1
 
 	return (
-		<div className="flex flex-col gap-y-4">
+		<div className="gap-y-4 flex flex-col">
 			{renderTabs && (
 				<Tabs value={activeRouteGroup?.label} variant="primary" activeOnHover>
 					<Tabs.List>
@@ -78,7 +78,7 @@ export default function SettingsNavigation() {
 				</Tabs>
 			)}
 
-			<div className="flex flex-col gap-y-2">
+			<div className="gap-y-2 flex flex-col">
 				<Label>Section</Label>
 				<NativeSelect
 					options={selectOptions}
diff --git a/packages/browser/src/scenes/settings/SettingsSideBar.tsx b/packages/browser/src/scenes/settings/SettingsSideBar.tsx
index b727446dbb..311fee24b6 100644
--- a/packages/browser/src/scenes/settings/SettingsSideBar.tsx
+++ b/packages/browser/src/scenes/settings/SettingsSideBar.tsx
@@ -30,17 +30,17 @@ export default function SettingsSideBar() {
 	return (
 		<div
 			className={cn(
-				'relative flex h-full w-48 shrink-0 flex-col border-edge bg-background px-2 py-4 text-foreground-subtle',
+				'w-48 px-2 py-4 relative flex h-full shrink-0 flex-col border-edge bg-background text-foreground-subtle',
 				primaryNavigationMode === 'TOPBAR'
-					? 'fixed top-12 z-50 h-screen border-r'
-					: 'fixed top-0 z-50 h-screen border-r',
+					? 'top-12 fixed z-50 h-screen border-r'
+					: 'top-0 fixed z-50 h-screen border-r',
 				{
-					'bg-gradient-to-l from-background-gradient-from to-background-gradient-to':
+					'from-background-gradient-from to-background-gradient-to bg-linear-to-l':
 						shouldUseGradient,
 				},
 			)}
 		>
-			<div className="flex h-full flex-grow flex-col gap-4">
+			<div className="gap-4 flex h-full grow flex-col">
 				{groups
 					.map(({ label, items }) => {
 						const groupLabel = label
@@ -54,7 +54,7 @@ export default function SettingsSideBar() {
 							<div key={groupLabel}>
 								{groupLabel && <Label>{groupLabel}</Label>}
 
-								<ul className="flex flex-col gap-y-0.5 pt-2 text-sm">
+								<ul className="gap-y-0.5 pt-2 text-sm flex flex-col">
 									{items.map(({ to, icon, label, disabled, prefetch }) => {
 										if (platform === 'browser' && to.includes('desktop')) {
 											return null
@@ -85,7 +85,7 @@ export default function SettingsSideBar() {
 						<IconButton
 							title="Go home"
 							variant="ghost"
-							className="border border-transparent p-1.5 text-foreground hover:border-edge-subtle/50 hover:bg-sidebar-surface/70"
+							className="p-1.5 border border-transparent text-foreground hover:border-edge-subtle/50 hover:bg-sidebar-surface/70"
 							onClick={() => navigate(paths.home())}
 						>
 							<Home className="h-4 w-4 -scale-x-[1] transform" />
diff --git a/packages/browser/src/scenes/settings/SettingsSideBarLink.tsx b/packages/browser/src/scenes/settings/SettingsSideBarLink.tsx
index 33f66d706f..bbbb5b0682 100644
--- a/packages/browser/src/scenes/settings/SettingsSideBarLink.tsx
+++ b/packages/browser/src/scenes/settings/SettingsSideBarLink.tsx
@@ -25,7 +25,7 @@ export default function SettingsSideBarLink({
 		<Link to={to} className={cn({ 'pointer-events-none': isDisabled })}>
 			<li
 				className={cn(
-					'flex items-center rounded-md px-2 py-1.5',
+					'rounded-md px-2 py-1.5 flex items-center',
 					isDisabled ? 'text-foreground-muted opacity-50' : 'hover:bg-background-surface-hover',
 					{
 						'bg-background-surface': isActive && !isDisabled,
@@ -34,7 +34,7 @@ export default function SettingsSideBarLink({
 				{...(prefetch ? { onMouseEnter: prefetch } : {})}
 			>
 				<Icon className="mr-2 h-4 w-4 shrink-0" />
-				<span className="ml-1 line-clamp-1 font-medium">{children}</span>
+				<span className="ml-1 font-medium line-clamp-1">{children}</span>
 			</li>
 		</Link>
 	)
diff --git a/packages/browser/src/scenes/settings/app/apiKeys/APIKeyInspector.tsx b/packages/browser/src/scenes/settings/app/apiKeys/APIKeyInspector.tsx
index e4e9a97edd..40dcb1fdf7 100644
--- a/packages/browser/src/scenes/settings/app/apiKeys/APIKeyInspector.tsx
+++ b/packages/browser/src/scenes/settings/app/apiKeys/APIKeyInspector.tsx
@@ -42,14 +42,14 @@ export default function APIKeyInspector({ apiKey, onClose }: Props) {
 		if (isAllPermissions) {
 			return (
 				<div
-					className="mx-4 my-2 flex flex-col space-y-1.5 rounded-lg bg-fill-warning-secondary p-[3px]"
+					className="mx-4 my-2 space-y-1.5 rounded-lg flex flex-col bg-fill-warning-secondary p-[3px]"
 					data-testid="unrestricted-meta"
 				>
-					<div className="flex items-center px-2.5 py-0.5 text-fill-warning">
+					<div className="px-2.5 py-0.5 flex items-center text-fill-warning">
 						<Sparkles className="mr-2 h-4 w-4" />
 						<span className="font-medium">{t(getKey('unrestrictedKey.heading'))}</span>
 					</div>
-					<div className="rounded-lg bg-fill-warning-secondary p-2.5">
+					<div className="rounded-lg p-2.5 bg-fill-warning-secondary">
 						<Text size="sm" className="text-fill-warning">
 							{t(getKey('unrestrictedKey.description'))}
 						</Text>
@@ -65,15 +65,15 @@ export default function APIKeyInspector({ apiKey, onClose }: Props) {
 
 		return (
 			<div
-				className="mx-4 my-2 flex flex-col space-y-1.5 rounded-lg bg-background-surface p-[3px]"
+				className="mx-4 my-2 space-y-1.5 rounded-lg flex flex-col bg-background-surface p-[3px]"
 				data-testid="permissions-meta"
 			>
-				<div className="flex items-center px-2.5 py-0.5 text-foreground-subtle/80">
+				<div className="px-2.5 py-0.5 flex items-center text-foreground-subtle/80">
 					<KeyRound className="mr-2 h-4 w-4" />
 					<span className="font-medium">{t(getSharedKey('fields.permissions'))}</span>
 				</div>
-				<div className="rounded-lg bg-background-surface-secondary p-2.5">
-					<div className="flex flex-wrap gap-2">
+				<div className="rounded-lg p-2.5 bg-background-surface-secondary">
+					<div className="gap-2 flex flex-wrap">
 						{permissions.map((perm) => (
 							<Badge
 								key={perm}
@@ -111,7 +111,7 @@ export default function APIKeyInspector({ apiKey, onClose }: Props) {
 					<Text size="sm">{expirationFormatted ?? t('common.never')}</Text>
 				</div>
 
-				<div className="my-2 bg-background-surface px-4 py-2" data-testid="last_used-meta">
+				<div className="my-2 px-4 py-2 bg-background-surface" data-testid="last_used-meta">
 					<Label className="text-foreground-muted">{t(getSharedKey('fields.last_used'))}</Label>
 					<Text size="sm">{lastUsedAtFormatted ?? t('common.never')}</Text>
 				</div>
diff --git a/packages/browser/src/scenes/settings/app/apiKeys/APIKeySettingsScene.tsx b/packages/browser/src/scenes/settings/app/apiKeys/APIKeySettingsScene.tsx
index 9ba6d92d8b..228fd7cecc 100644
--- a/packages/browser/src/scenes/settings/app/apiKeys/APIKeySettingsScene.tsx
+++ b/packages/browser/src/scenes/settings/app/apiKeys/APIKeySettingsScene.tsx
@@ -13,7 +13,7 @@ export default function APIKeySettingsScene() {
 	return (
 		<SceneContainer>
 			<ContentContainer>
-				<div className="flex flex-col gap-4">
+				<div className="gap-4 flex flex-col">
 					<div className="flex items-end justify-between">
 						<div>
 							<Heading size="sm">{t(getKey('title'))}</Heading>
diff --git a/packages/browser/src/scenes/settings/app/apiKeys/APIKeyTable.tsx b/packages/browser/src/scenes/settings/app/apiKeys/APIKeyTable.tsx
index 6592e76bc7..deaeb90476 100644
--- a/packages/browser/src/scenes/settings/app/apiKeys/APIKeyTable.tsx
+++ b/packages/browser/src/scenes/settings/app/apiKeys/APIKeyTable.tsx
@@ -76,7 +76,7 @@ export default function APIKeyTable() {
 						<Badge
 							variant="primary"
 							size="sm"
-							className={cn('flex items-center justify-between space-x-1 pl-2 pr-1', {
+							className={cn('space-x-1 pl-2 pr-1 flex items-center justify-between', {
 								'pr-2': permissions.__typename === 'InheritPermissionStruct',
 							})}
 						>
@@ -88,7 +88,7 @@ export default function APIKeyTable() {
 								)}
 							</span>
 							{permissions.__typename !== 'InheritPermissionStruct' && (
-								<span className="flex h-5 w-5 items-center justify-center rounded-md bg-fill-brand-secondary">
+								<span className="h-5 w-5 rounded-md flex items-center justify-center bg-fill-brand-secondary">
 									{permissions.value.length}
 								</span>
 							)}
@@ -187,12 +187,12 @@ export default function APIKeyTable() {
 
 	if (!apiKeys?.length) {
 		return (
-			<Card className="flex items-center justify-center border-dashed border-edge-subtle p-6">
-				<div className="flex flex-col space-y-3">
+			<Card className="p-6 flex items-center justify-center border-dashed border-edge-subtle">
+				<div className="space-y-3 flex flex-col">
 					<div className="relative flex justify-center">
-						<span className="flex items-center justify-center rounded-lg bg-background-surface p-2">
+						<span className="rounded-lg p-2 flex items-center justify-center bg-background-surface">
 							<KeyRound className="h-6 w-6 text-foreground-muted" />
-							<Slash className="absolute h-6 w-6 scale-x-[-1] transform text-foreground opacity-80" />
+							<Slash className="h-6 w-6 absolute scale-x-[-1] transform text-foreground opacity-80" />
 						</span>
 					</div>
 
@@ -225,7 +225,7 @@ export default function APIKeyTable() {
 								return (
 									<th
 										key={header.id}
-										className="sticky !top-0 z-[2] h-10 bg-background-surface/50 px-2 shadow-sm"
+										className="top-0! h-10 px-2 shadow-sm sticky z-2 bg-background-surface/50"
 										style={getCommonPinningStyles(header.column)}
 									>
 										<div
@@ -248,7 +248,7 @@ export default function APIKeyTable() {
 							<tr key={row.id} className="">
 								{row.getVisibleCells().map((cell) => (
 									<td
-										className="h-14 bg-background px-2 last:px-0"
+										className="h-14 px-2 last:px-0 bg-background"
 										key={cell.id}
 										style={{
 											width: cell.column.getSize(),
diff --git a/packages/browser/src/scenes/settings/app/apiKeys/CreateAPIKeyModal.tsx b/packages/browser/src/scenes/settings/app/apiKeys/CreateAPIKeyModal.tsx
index abe048c9c1..c2f4c2b597 100644
--- a/packages/browser/src/scenes/settings/app/apiKeys/CreateAPIKeyModal.tsx
+++ b/packages/browser/src/scenes/settings/app/apiKeys/CreateAPIKeyModal.tsx
@@ -112,16 +112,16 @@ export default function CreateAPIKeyModal() {
 				</Dialog.Header>
 
 				{apiSecret && (
-					<div className="divide divide-y divide-edge rounded-lg border border-edge bg-background-surface p-0.5">
-						<div className="mb-1 flex h-8 items-center justify-between pl-3 pr-2">
-							<div className="flex items-center space-x-2">
+					<div className="divide rounded-lg p-0.5 divide-y divide-edge border border-edge bg-background-surface">
+						<div className="mb-1 h-8 pl-3 pr-2 flex items-center justify-between">
+							<div className="space-x-2 flex items-center">
 								<KeyRound className="h-4 w-4 text-foreground-muted" />
 								<Text size="sm" className="text-foreground-subtle">
 									{t(getKey('createdKey'))}
 								</Text>
 							</div>
 
-							<div className="flex items-center gap-1">
+							<div className="gap-1 flex items-center">
 								<Button size="icon" onClick={() => setHideSecret((prev) => !prev)}>
 									<VisibilityIcon className="h-4 w-4 text-foreground-muted" />
 								</Button>
@@ -131,7 +131,7 @@ export default function CreateAPIKeyModal() {
 							</div>
 						</div>
 
-						<div className="rounded-lg bg-background-surface-secondary p-3 text-sm text-foreground-subtle">
+						<div className="rounded-lg p-3 text-sm bg-background-surface-secondary text-foreground-subtle">
 							<span>
 								<code>{hideSecret ? maskedSecret : apiSecret}</code>
 							</span>
diff --git a/packages/browser/src/scenes/settings/app/desktop/features/DiscordPresenceSwitch.tsx b/packages/browser/src/scenes/settings/app/desktop/features/DiscordPresenceSwitch.tsx
index 04efaea781..9102ded1dc 100644
--- a/packages/browser/src/scenes/settings/app/desktop/features/DiscordPresenceSwitch.tsx
+++ b/packages/browser/src/scenes/settings/app/desktop/features/DiscordPresenceSwitch.tsx
@@ -46,7 +46,7 @@ export default function DiscordPresenceSwitch() {
 
 	return (
 		<div className="flex items-center justify-between">
-			<div className="flex flex-grow flex-col gap-2 text-left">
+			<div className="gap-2 flex grow flex-col text-left">
 				<Label htmlFor="discord_presence_switch">{t(getKey('label'))}</Label>
 				<Text size="xs" variant="muted">
 					{t(getKey('description'))}
@@ -55,7 +55,7 @@ export default function DiscordPresenceSwitch() {
 
 			<div className="w-6" />
 
-			<div className="flex items-center gap-3">
+			<div className="gap-3 flex items-center">
 				<ToolTip
 					content={t(getKey('reconnect'))}
 					isDisabled={!isChecked || !handleReconnect}
diff --git a/packages/browser/src/scenes/settings/app/desktop/features/OptionalFeaturesSection.tsx b/packages/browser/src/scenes/settings/app/desktop/features/OptionalFeaturesSection.tsx
index 84ce102ccd..f75900e6fb 100644
--- a/packages/browser/src/scenes/settings/app/desktop/features/OptionalFeaturesSection.tsx
+++ b/packages/browser/src/scenes/settings/app/desktop/features/OptionalFeaturesSection.tsx
@@ -8,7 +8,7 @@ export default function OptionalFeaturesSection() {
 	const { t } = useLocaleContext()
 
 	return (
-		<div className="flex flex-col gap-y-6">
+		<div className="gap-y-6 flex flex-col">
 			<div>
 				<Heading size="sm">{t(getKey('label'))}</Heading>
 				<Text variant="muted" size="sm">
diff --git a/packages/browser/src/scenes/settings/app/general/AvatarPicker.tsx b/packages/browser/src/scenes/settings/app/general/AvatarPicker.tsx
index 02c62e730d..94ce6d6097 100644
--- a/packages/browser/src/scenes/settings/app/general/AvatarPicker.tsx
+++ b/packages/browser/src/scenes/settings/app/general/AvatarPicker.tsx
@@ -140,12 +140,12 @@ export default function AvatarPicker() {
 						<Dialog.Close onClick={off} />
 					</Dialog.Header>
 
-					<div className="flex h-[300px] flex-col gap-y-4 py-2 scrollbar-hide">
+					<div className="gap-y-4 py-2 scrollbar-hide flex h-[300px] flex-col">
 						<div className="flex items-center justify-center">
 							<div className={cx('relative h-[100px]', { 'h-[100px]': filePreview })}>
 								{filePreview && (
 									<>
-										<div className="absolute -top-0 right-0 flex items-center justify-center">
+										<div className="top-0 right-0 absolute flex items-center justify-center">
 											<IconButton
 												title={t(getKey('removeSelection'))}
 												size="xs"
@@ -172,7 +172,7 @@ export default function AvatarPicker() {
 						<div
 							{...getRootProps()}
 							className={cn(
-								'flex h-full cursor-pointer items-center justify-center gap-2 rounded-md border border-dashed border-edge-subtle p-4 ring-2 ring-transparent ring-offset-2 ring-offset-background',
+								'gap-2 rounded-md p-4 flex h-full cursor-pointer items-center justify-center border border-dashed border-edge-subtle ring-2 ring-transparent ring-offset-2 ring-offset-background',
 								{ 'ring-edge-brand': isDropzoneFocused },
 							)}
 						>
@@ -190,22 +190,22 @@ export default function AvatarPicker() {
 				</Dialog.Content>
 			</Dialog>
 
-			<div className="flex flex-col gap-2.5 self-center">
+			<div className="gap-2.5 flex flex-col self-center">
 				<Label>{t(getKey('label'))}</Label>
 				<span className="relative">
 					<Avatar
-						className="h-40 w-40 !text-2xl"
+						className="h-40 w-40 text-2xl!"
 						src={imageUrl || undefined}
 						fallback={user?.username}
 						fallbackColor="brand"
 						fallbackWrapperClassName="text-3xl font-medium tracking-widest"
 					/>
-					<span className="absolute bottom-0 left-0 block translate-x-2 transform">
+					<span className="bottom-0 left-0 translate-x-2 absolute block transform">
 						<DropdownMenu
 							align="start"
 							contentWrapperClassName="w-18"
 							trigger={
-								<Button variant="subtle-dark" size="xs" className="border border-edge px-2 py-1.5">
+								<Button variant="subtle-dark" size="xs" className="px-2 py-1.5 border border-edge">
 									<Edit className="mr-2 h-3 w-3" />
 									{t('common.edit')}
 								</Button>
diff --git a/packages/browser/src/scenes/settings/app/general/LocalePreferences.tsx b/packages/browser/src/scenes/settings/app/general/LocalePreferences.tsx
index f5c10b2198..235ac8559f 100644
--- a/packages/browser/src/scenes/settings/app/general/LocalePreferences.tsx
+++ b/packages/browser/src/scenes/settings/app/general/LocalePreferences.tsx
@@ -23,7 +23,7 @@ export default function LocalePreferences() {
 	}, [t])
 
 	return (
-		<div className="flex flex-col gap-y-4">
+		<div className="gap-y-4 flex flex-col">
 			<div>
 				<Heading size="sm">{t('settingsScene.app/account.sections.locale.heading')}</Heading>
 				{subTitle}
diff --git a/packages/browser/src/scenes/settings/app/general/ProfileForm.tsx b/packages/browser/src/scenes/settings/app/general/ProfileForm.tsx
index bb629c7a3f..831277419c 100644
--- a/packages/browser/src/scenes/settings/app/general/ProfileForm.tsx
+++ b/packages/browser/src/scenes/settings/app/general/ProfileForm.tsx
@@ -92,8 +92,8 @@ export default function ProfileForm() {
 
 	return (
 		<Form form={form} onSubmit={handleSubmit}>
-			<div className="flex w-full flex-col-reverse space-y-8 space-y-reverse md:max-w-2xl md:flex-row md:justify-between md:space-y-0">
-				<div className="flex flex-grow flex-col gap-6">
+			<div className="space-y-8 md:max-w-2xl md:flex-row md:justify-between md:space-y-0 flex w-full flex-col-reverse space-y-reverse">
+				<div className="gap-6 flex grow flex-col">
 					<Input
 						variant="primary"
 						className="w-full"
@@ -112,11 +112,11 @@ export default function ProfileForm() {
 						{...form.register('password')}
 					/>
 
-					<div className="flex w-full flex-col items-center gap-4 md:flex-row">
+					<div className="gap-4 md:flex-row flex w-full flex-col items-center">
 						<Button
 							variant="primary"
 							type="submit"
-							className="w-full md:w-[unset]"
+							className="md:w-[unset] w-full"
 							disabled={!hasChanges}
 						>
 							{t('settingsScene.app/account.sections.account.buttons.confirm')}
diff --git a/packages/browser/src/scenes/settings/app/preferences/AppearanceSettingsScene.tsx b/packages/browser/src/scenes/settings/app/preferences/AppearanceSettingsScene.tsx
index 9112a5b24f..fdbf8ffc83 100644
--- a/packages/browser/src/scenes/settings/app/preferences/AppearanceSettingsScene.tsx
+++ b/packages/browser/src/scenes/settings/app/preferences/AppearanceSettingsScene.tsx
@@ -37,7 +37,7 @@ export default function AppearanceSettingsScene() {
 			<ContentContainer>
 				<DebugSettings />
 
-				<div className="flex flex-col gap-y-8">
+				<div className="gap-y-8 flex flex-col">
 					<div>
 						<h3 className="text-base font-medium text-foreground">
 							{t(getKey('themeAndAppearance.label'))}
@@ -65,7 +65,7 @@ export default function AppearanceSettingsScene() {
 
 				<PrimaryNavigationPreference />
 
-				<div className="flex flex-col gap-y-8">
+				<div className="gap-y-8 flex flex-col">
 					<DoubleSidebarToggle />
 					<ReplacePrimarySidebarToggle />
 				</div>
@@ -77,7 +77,7 @@ export default function AppearanceSettingsScene() {
 				<DisplaySpacingPreference />
 				<MaxWidthPreference />
 
-				<div className="flex flex-col gap-y-8">
+				<div className="gap-y-8 flex flex-col">
 					<div>
 						<h3 className="text-base font-medium text-foreground">
 							{t(getKey('additionalPreferences.label'))}
diff --git a/packages/browser/src/scenes/settings/app/preferences/DebugSettings.tsx b/packages/browser/src/scenes/settings/app/preferences/DebugSettings.tsx
index 6a7cffa7a3..9a7c4887e3 100644
--- a/packages/browser/src/scenes/settings/app/preferences/DebugSettings.tsx
+++ b/packages/browser/src/scenes/settings/app/preferences/DebugSettings.tsx
@@ -14,7 +14,7 @@ function DebugSettings() {
 	const store = useDebugStore()
 
 	return (
-		<div className="flex flex-col gap-4">
+		<div className="gap-4 flex flex-col">
 			<div>
 				<h3 className="text-base font-medium text-foreground">Debug settings</h3>
 				<p className="text-sm text-foreground-muted">
@@ -22,9 +22,9 @@ function DebugSettings() {
 				</p>
 			</div>
 
-			<div className="flex flex-col gap-2">
-				<Label className="flex items-center justify-between rounded-lg border border-dashed border-fill-brand/40 bg-fill-brand-secondary p-3">
-					<div className="flex flex-col gap-1">
+			<div className="gap-2 flex flex-col">
+				<Label className="rounded-lg p-3 flex items-center justify-between border border-dashed border-fill-brand/40 bg-fill-brand-secondary">
+					<div className="gap-1 flex flex-col">
 						<span>Query Tools</span>
 						<p className="text-sm text-foreground-muted">Enable debugging tools for queries</p>
 					</div>
diff --git a/packages/browser/src/scenes/settings/app/preferences/DisplaySpacingPreference.tsx b/packages/browser/src/scenes/settings/app/preferences/DisplaySpacingPreference.tsx
index 097a2a5fbc..f2dda7e5b7 100644
--- a/packages/browser/src/scenes/settings/app/preferences/DisplaySpacingPreference.tsx
+++ b/packages/browser/src/scenes/settings/app/preferences/DisplaySpacingPreference.tsx
@@ -22,12 +22,12 @@ export default function DisplaySpacingPreference() {
 	}
 
 	return (
-		<div className="flex flex-col gap-y-1.5">
+		<div className="gap-y-1.5 flex flex-col">
 			<Label>{t(getKey('label'))}</Label>
 			<Text size="sm" variant="muted">
 				{t(getKey('description'))}
 			</Text>
-			<div className="flex items-center gap-x-4">
+			<div className="gap-x-4 flex items-center">
 				<AppearanceOption
 					label={t(getKey('options.default'))}
 					isSelected={!enableCompactDisplay}
@@ -67,10 +67,10 @@ function AppearanceOption({
 	const isLightVariant = !isDarkVariant
 
 	return (
-		<div className="w-1/2 text-center md:w-1/3 lg:w-1/4">
+		<div className="md:w-1/3 lg:w-1/4 w-1/2 text-center">
 			<div
 				className={cn(
-					'relative flex h-32 w-full flex-col rounded-md border border-edge bg-background-surface p-2 opacity-80 transition-all duration-200',
+					'h-32 rounded-md p-2 relative flex w-full flex-col border border-edge bg-background-surface opacity-80 transition-all duration-200',
 					isDefaultDisplay ? 'gap-y-4' : 'gap-y-2',
 					{
 						'border-edge-subtle': isSelected,
@@ -89,31 +89,31 @@ function AppearanceOption({
 			>
 				<div
 					className={cx(
-						'w-full rounded-md bg-background-surface-secondary',
+						'rounded-md w-full bg-background-surface-secondary',
 						isDefaultDisplay ? 'h-1/4' : 'h-1/5',
 					)}
 				/>
 
 				<div
 					className={cx(
-						'w-2/3 rounded-md bg-background-surface-secondary',
+						'rounded-md w-2/3 bg-background-surface-secondary',
 						isDefaultDisplay ? 'h-1/4' : 'h-1/5',
 					)}
 				/>
 
 				<div
 					className={cx(
-						'w-5/6 rounded-md bg-background-surface-secondary',
+						'rounded-md w-5/6 bg-background-surface-secondary',
 						isDefaultDisplay ? 'h-1/4' : 'h-1/5',
 					)}
 				/>
 
 				{!isDefaultDisplay && (
-					<div className="h-1/5 w-full rounded-md bg-background-surface-secondary" />
+					<div className="rounded-md h-1/5 w-full bg-background-surface-secondary" />
 				)}
 
 				{isSelected && (
-					<div className="absolute bottom-2 right-2 flex h-6 w-6 items-center justify-center rounded-full bg-fill-brand">
+					<div className="bottom-2 right-2 h-6 w-6 absolute flex items-center justify-center rounded-full bg-fill-brand">
 						<Check className="h-5 w-5 text-white" />
 					</div>
 				)}
diff --git a/packages/browser/src/scenes/settings/app/preferences/FontSelect.tsx b/packages/browser/src/scenes/settings/app/preferences/FontSelect.tsx
index cf9fe3e338..956a14d94d 100644
--- a/packages/browser/src/scenes/settings/app/preferences/FontSelect.tsx
+++ b/packages/browser/src/scenes/settings/app/preferences/FontSelect.tsx
@@ -42,7 +42,7 @@ export default function FontSelect() {
 	)
 
 	return (
-		<div className="flex flex-col gap-y-1.5 md:max-w-md">
+		<div className="gap-y-1.5 md:max-w-md flex flex-col">
 			<Label htmlFor="extension" className="mb-1.5">
 				{t(`${localeKey}.label`)}
 			</Label>
diff --git a/packages/browser/src/scenes/settings/app/preferences/MaxWidthPreference.tsx b/packages/browser/src/scenes/settings/app/preferences/MaxWidthPreference.tsx
index 6edddaa352..fd5a68beee 100644
--- a/packages/browser/src/scenes/settings/app/preferences/MaxWidthPreference.tsx
+++ b/packages/browser/src/scenes/settings/app/preferences/MaxWidthPreference.tsx
@@ -52,7 +52,7 @@ export default function MaxWidthPreference() {
 
 	return (
 		<div
-			className="flex flex-col gap-y-1.5 md:max-w-md"
+			className="gap-y-1.5 md:max-w-md flex flex-col"
 			title={
 				primaryNavigationMode === 'SIDEBAR'
 					? // TODO: support it
@@ -60,7 +60,7 @@ export default function MaxWidthPreference() {
 					: undefined
 			}
 		>
-			<Label className={cx({ 'text-opacity-50': primaryNavigationMode === 'SIDEBAR' })}>
+			<Label className={cx({ 'opacity-50': primaryNavigationMode === 'SIDEBAR' })}>
 				{t(getKey('label'))}
 			</Label>
 			<NativeSelect
@@ -72,7 +72,7 @@ export default function MaxWidthPreference() {
 			<Text
 				size="xs"
 				variant="muted"
-				className={cx({ 'text-opacity-50': primaryNavigationMode === 'SIDEBAR' })}
+				className={cx({ 'opacity-50': primaryNavigationMode === 'SIDEBAR' })}
 			>
 				{t(getKey('description'))}
 			</Text>
diff --git a/packages/browser/src/scenes/settings/app/preferences/PrimaryNavigationPreference.tsx b/packages/browser/src/scenes/settings/app/preferences/PrimaryNavigationPreference.tsx
index 947c3fd442..79ce29cf24 100644
--- a/packages/browser/src/scenes/settings/app/preferences/PrimaryNavigationPreference.tsx
+++ b/packages/browser/src/scenes/settings/app/preferences/PrimaryNavigationPreference.tsx
@@ -20,12 +20,12 @@ export default function PrimaryNavigationPreference() {
 	}
 
 	return (
-		<div className="flex flex-col gap-y-1.5">
+		<div className="gap-y-1.5 flex flex-col">
 			<Label>{t(getKey('label'))}</Label>
 			<Text size="sm" variant="muted">
 				{t(getKey('description'))}
 			</Text>
-			<div className="flex items-center gap-x-4">
+			<div className="gap-x-4 flex items-center">
 				<AppearanceOption
 					label={t(getKey('options.sidebar'))}
 					isSelected={primaryNavigationMode === 'SIDEBAR'}
@@ -57,11 +57,11 @@ function AppearanceOption({ label, isSelected, onSelect, isSidebar }: Appearance
 	const isLightVariant = !isDarkVariant
 
 	return (
-		<div className="w-1/2 text-center md:w-1/3 lg:w-1/4">
+		<div className="md:w-1/3 lg:w-1/4 w-1/2 text-center">
 			<div
 				className={cx(
-					'relative flex h-32 w-full overflow-hidden rounded-md border border-edge bg-background-surface opacity-80 transition-all duration-200 hover:border-edge-subtle hover:opacity-100',
-					isSidebar ? 'flex-row' : 'flex-col gap-y-2',
+					'h-32 rounded-md relative flex w-full overflow-hidden border border-edge bg-background-surface opacity-80 transition-all duration-200 hover:border-edge-subtle hover:opacity-100',
+					isSidebar ? 'flex-row' : 'gap-y-2 flex-col',
 					{
 						'border-edge-subtle': isSelected,
 					},
@@ -71,17 +71,17 @@ function AppearanceOption({ label, isSelected, onSelect, isSidebar }: Appearance
 				<div className={cx('bg-sidebar', isSidebar ? 'h-full w-1/4' : 'h-1/5 w-full')} />
 
 				<div
-					className={cn('flex h-full w-full flex-col gap-y-4 p-2', {
+					className={cn('gap-y-4 p-2 flex h-full w-full flex-col', {
 						'bg-background/80': isLightVariant,
 					})}
 				>
-					<div className="h-1/5 w-2/3 shrink-0 rounded-md bg-background-surface-secondary" />
-					<div className="h-1/5 w-full shrink-0 rounded-md bg-background-surface-secondary" />
-					<div className="h-1/5 w-full shrink-0 rounded-md bg-background-surface-secondary" />
+					<div className="rounded-md h-1/5 w-2/3 shrink-0 bg-background-surface-secondary" />
+					<div className="rounded-md h-1/5 w-full shrink-0 bg-background-surface-secondary" />
+					<div className="rounded-md h-1/5 w-full shrink-0 bg-background-surface-secondary" />
 				</div>
 
 				{isSelected && (
-					<div className="absolute bottom-2 right-2 flex h-6 w-6 items-center justify-center rounded-full bg-fill-brand">
+					<div className="bottom-2 right-2 h-6 w-6 absolute flex items-center justify-center rounded-full bg-fill-brand">
 						<Check className="h-5 w-5 text-white" />
 					</div>
 				)}
diff --git a/packages/browser/src/scenes/settings/app/preferences/ThemeSelect.tsx b/packages/browser/src/scenes/settings/app/preferences/ThemeSelect.tsx
index cc483cad31..481b6f7b72 100644
--- a/packages/browser/src/scenes/settings/app/preferences/ThemeSelect.tsx
+++ b/packages/browser/src/scenes/settings/app/preferences/ThemeSelect.tsx
@@ -11,7 +11,7 @@ export default function ThemeSelect() {
 	const { theme, changeTheme } = useTheme()
 
 	return (
-		<div className="flex flex-col gap-y-1.5 md:max-w-md">
+		<div className="gap-y-1.5 md:max-w-md flex flex-col">
 			<Label htmlFor="extension" className="mb-1.5">
 				{t(`${localeKey}.label`)}
 			</Label>
diff --git a/packages/browser/src/scenes/settings/app/preferences/ThumbnailPlaceholder.tsx b/packages/browser/src/scenes/settings/app/preferences/ThumbnailPlaceholder.tsx
index 906106a727..2313bdae1e 100644
--- a/packages/browser/src/scenes/settings/app/preferences/ThumbnailPlaceholder.tsx
+++ b/packages/browser/src/scenes/settings/app/preferences/ThumbnailPlaceholder.tsx
@@ -25,7 +25,7 @@ export default function ThumbnailPlaceholder() {
 	] satisfies { label: string; value: ThumbnailPlaceholderStyle }[]
 
 	return (
-		<div className="flex flex-col gap-y-1.5 md:max-w-md">
+		<div className="gap-y-1.5 md:max-w-md flex flex-col">
 			<Label>{t(getKey('label'))}</Label>
 			<NativeSelect value={thumbnailPlaceholderStyle} options={options} onChange={handleChange} />
 			<Text size="xs" variant="muted">
diff --git a/packages/browser/src/scenes/settings/app/preferences/ThumbnailRatioSelect.tsx b/packages/browser/src/scenes/settings/app/preferences/ThumbnailRatioSelect.tsx
index ede42091df..4ce0d82a0f 100644
--- a/packages/browser/src/scenes/settings/app/preferences/ThumbnailRatioSelect.tsx
+++ b/packages/browser/src/scenes/settings/app/preferences/ThumbnailRatioSelect.tsx
@@ -27,7 +27,7 @@ export default function ThumbnailRatioSelect() {
 	)
 
 	return (
-		<div className="flex flex-col gap-y-1.5 md:max-w-md">
+		<div className="gap-y-1.5 md:max-w-md flex flex-col">
 			<Label>{t(getKey('label'))}</Label>
 			<NativeSelect value={closestOption.value} options={OPTIONS} onChange={handleChange} />
 			<Text size="xs" variant="muted">
diff --git a/packages/browser/src/scenes/settings/app/preferences/navigation-arrangement/NavigationArrangement.tsx b/packages/browser/src/scenes/settings/app/preferences/navigation-arrangement/NavigationArrangement.tsx
index ffa91265c6..b9789242c6 100644
--- a/packages/browser/src/scenes/settings/app/preferences/navigation-arrangement/NavigationArrangement.tsx
+++ b/packages/browser/src/scenes/settings/app/preferences/navigation-arrangement/NavigationArrangement.tsx
@@ -239,7 +239,7 @@ export default function NavigationArrangement() {
 	}, [sections, onChangeVisibility, onChangeLinks, checkPermission])
 
 	return (
-		<div className="flex w-full flex-col space-y-4">
+		<div className="space-y-4 flex w-full flex-col">
 			<div className="flex items-center justify-between">
 				<div>
 					<Label>{t(getKey('label'))}</Label>
@@ -252,8 +252,8 @@ export default function NavigationArrangement() {
 			</div>
 
 			<Card
-				className={cn('relative flex flex-col space-y-4 bg-background-surface p-4 md:max-w-xl', {
-					'cursor-not-allowed select-none opacity-60': locked,
+				className={cn('space-y-4 p-4 md:max-w-xl relative flex flex-col bg-background-surface', {
+					'cursor-not-allowed opacity-60 select-none': locked,
 				})}
 				title={locked ? t(getKey('isLocked')) : undefined}
 			>
diff --git a/packages/browser/src/scenes/settings/app/preferences/navigation-arrangement/NavigationArrangementItem.tsx b/packages/browser/src/scenes/settings/app/preferences/navigation-arrangement/NavigationArrangementItem.tsx
index 5c2d36bcb6..a33279125b 100644
--- a/packages/browser/src/scenes/settings/app/preferences/navigation-arrangement/NavigationArrangementItem.tsx
+++ b/packages/browser/src/scenes/settings/app/preferences/navigation-arrangement/NavigationArrangementItem.tsx
@@ -100,12 +100,12 @@ export default function NavigationArrangementItem({
 			{...attributes}
 			{...listeners}
 			className={cn(
-				'flex cursor-grab flex-col rounded-md bg-background-surface-secondary/80 outline-none focus-visible:ring-2 focus-visible:ring-edge-brand',
+				'rounded-md flex cursor-grab flex-col bg-background-surface-secondary/80 outline-none focus-visible:ring-2 focus-visible:ring-edge-brand',
 				{
 					'cursor-not-allowed': disabled,
 				},
 				{
-					'bg-opacity-50': !section.visible,
+					'bg-background-surface-secondary/40': !section.visible,
 				},
 				{
 					'cursor-grabbing': isDragging,
@@ -113,10 +113,10 @@ export default function NavigationArrangementItem({
 			)}
 		>
 			<div className="flex items-center justify-between">
-				<div className={cn('flex-1 shrink-0 py-4 pl-4', { 'opacity-60': !section.visible })}>
+				<div className={cn('py-4 pl-4 flex-1 shrink-0', { 'opacity-60': !section.visible })}>
 					<Text size="sm">{t(getItemKey(section.config.variant))}</Text>
 				</div>
-				<div className="flex items-center space-x-2 pr-4">
+				<div className="space-x-2 pr-4 flex items-center">
 					{isConfigurableSection && (
 						<IconButton
 							size="xs"
@@ -133,7 +133,7 @@ export default function NavigationArrangementItem({
 			</div>
 
 			{isConfigurableSection && showConfiguration && (
-				<div className="flex flex-wrap items-center gap-3 p-4">
+				<div className="gap-3 p-4 flex flex-wrap items-center">
 					<CheckBox
 						variant="primary"
 						label={t(getConfigKey('createAction.label'))}
diff --git a/packages/browser/src/scenes/settings/app/reader/DefaultReadingDirection.tsx b/packages/browser/src/scenes/settings/app/reader/DefaultReadingDirection.tsx
index 6fc3fbbebc..2acda3f2d3 100644
--- a/packages/browser/src/scenes/settings/app/reader/DefaultReadingDirection.tsx
+++ b/packages/browser/src/scenes/settings/app/reader/DefaultReadingDirection.tsx
@@ -20,7 +20,7 @@ export default function DefaultReadingDirection() {
 	}
 
 	return (
-		<div className="flex flex-col gap-1.5 py-1.5">
+		<div className="gap-1.5 py-1.5 flex flex-col">
 			<Label htmlFor="reading-direction">{t(getKey('label'))}</Label>
 			<NativeSelect
 				id="reading-direction"
diff --git a/packages/browser/src/scenes/settings/app/reader/PreloadPagesSection.tsx b/packages/browser/src/scenes/settings/app/reader/PreloadPagesSection.tsx
index 80ee9685b7..8041fc7f29 100644
--- a/packages/browser/src/scenes/settings/app/reader/PreloadPagesSection.tsx
+++ b/packages/browser/src/scenes/settings/app/reader/PreloadPagesSection.tsx
@@ -32,7 +32,7 @@ export default function PreloadPagesSection() {
 
 	return (
 		<>
-			<div className="flex flex-col gap-y-1.5 md:max-w-md">
+			<div className="gap-y-1.5 md:max-w-md flex flex-col">
 				<Input
 					label={t(getKey('preloadAheadCount.label'))}
 					description={t(getKey('preloadAheadCount.description'))}
@@ -44,7 +44,7 @@ export default function PreloadPagesSection() {
 				/>
 			</div>
 
-			<div className="flex flex-col gap-y-1.5 md:max-w-md">
+			<div className="gap-y-1.5 md:max-w-md flex flex-col">
 				<Input
 					label={t(getKey('preloadBehindCount.label'))}
 					description={t(getKey('preloadBehindCount.description'))}
diff --git a/packages/browser/src/scenes/settings/app/reader/ReaderDefaultSettingsScene.tsx b/packages/browser/src/scenes/settings/app/reader/ReaderDefaultSettingsScene.tsx
index 6edcf842ce..ed009d6aec 100644
--- a/packages/browser/src/scenes/settings/app/reader/ReaderDefaultSettingsScene.tsx
+++ b/packages/browser/src/scenes/settings/app/reader/ReaderDefaultSettingsScene.tsx
@@ -28,11 +28,11 @@ export default function ReaderDefaultSettingsScene() {
 			</Helmet>
 
 			<ContentContainer>
-				<div className="flex flex-col gap-y-1.5 md:max-w-md">
+				<div className="gap-y-1.5 md:max-w-md flex flex-col">
 					<DefaultReadingDirection />
 				</div>
 
-				<div className="flex flex-col gap-y-8">
+				<div className="gap-y-8 flex flex-col">
 					<div>
 						<Heading size="sm">{t(getSectionKey('imageBasedBooks.label'))}</Heading>
 						<Text variant="muted" size="sm">
@@ -43,7 +43,7 @@ export default function ReaderDefaultSettingsScene() {
 					<PreloadPagesSection />
 				</div>
 
-				<div className="flex flex-col gap-y-8">
+				<div className="gap-y-8 flex flex-col">
 					<div>
 						<Heading size="sm">{t(getSectionKey('textBasedBooks.label'))}</Heading>
 						<Text variant="muted" size="sm">
@@ -51,14 +51,14 @@ export default function ReaderDefaultSettingsScene() {
 						</Text>
 					</div>
 
-					<div className="flex flex-col gap-y-1.5 md:max-w-md">
+					<div className="gap-y-1.5 md:max-w-md flex flex-col">
 						<DefaultFontFamily />
 						<DefaultFontSize />
 						<DefaultLineHeight />
 					</div>
 				</div>
 
-				<div className="flex flex-col gap-y-8">
+				<div className="gap-y-8 flex flex-col">
 					<div>
 						<Heading size="sm">{t(getSectionKey('data.sections.clearStore.label'))}</Heading>
 						<Text variant="muted" size="sm">
diff --git a/packages/browser/src/scenes/settings/server/email/EmailSettingsScene.tsx b/packages/browser/src/scenes/settings/server/email/EmailSettingsScene.tsx
index 4eb4903c2e..1d7b1c2635 100644
--- a/packages/browser/src/scenes/settings/server/email/EmailSettingsScene.tsx
+++ b/packages/browser/src/scenes/settings/server/email/EmailSettingsScene.tsx
@@ -16,7 +16,7 @@ export default function EmailSettingsScene() {
 			</Helmet>
 
 			<ContentContainer>
-				<div className="flex flex-col gap-12">
+				<div className="gap-12 flex flex-col">
 					<EmailersSection />
 					<DevicesSection />
 				</div>
diff --git a/packages/browser/src/scenes/settings/server/email/devices/CreateOrUpdateDeviceModal.tsx b/packages/browser/src/scenes/settings/server/email/devices/CreateOrUpdateDeviceModal.tsx
index 5ba81567e9..992647a753 100644
--- a/packages/browser/src/scenes/settings/server/email/devices/CreateOrUpdateDeviceModal.tsx
+++ b/packages/browser/src/scenes/settings/server/email/devices/CreateOrUpdateDeviceModal.tsx
@@ -112,7 +112,7 @@ export default function CreateOrUpdateDeviceModal({ isOpen, updatingDevice, onCl
 					</Dialog.Title>
 					<Dialog.Close onClick={onClose} />
 				</Dialog.Header>
-				<div className="flex flex-col gap-y-2 py-2 scrollbar-hide">
+				<div className="gap-y-2 py-2 scrollbar-hide flex flex-col">
 					<Form form={form} onSubmit={handleSubmit} id="create-or-update-device-form">
 						<Input
 							label={t(getKey('name.label'))}
diff --git a/packages/browser/src/scenes/settings/server/email/devices/DevicesSection.tsx b/packages/browser/src/scenes/settings/server/email/devices/DevicesSection.tsx
index 019ee837a0..a975cca43f 100644
--- a/packages/browser/src/scenes/settings/server/email/devices/DevicesSection.tsx
+++ b/packages/browser/src/scenes/settings/server/email/devices/DevicesSection.tsx
@@ -16,7 +16,7 @@ export default function DevicesSection() {
 	const canCreateOrUpdate = canCreateEmailer || canEditEmailer
 
 	return (
-		<div className="flex flex-col gap-4">
+		<div className="gap-4 flex flex-col">
 			<div className="flex items-end justify-between">
 				<div>
 					<Heading size="sm">{t('settingsScene.server/email.sections.devices.title')}</Heading>
diff --git a/packages/browser/src/scenes/settings/server/email/devices/DevicesTable.tsx b/packages/browser/src/scenes/settings/server/email/devices/DevicesTable.tsx
index 3cee766298..c690577df0 100644
--- a/packages/browser/src/scenes/settings/server/email/devices/DevicesTable.tsx
+++ b/packages/browser/src/scenes/settings/server/email/devices/DevicesTable.tsx
@@ -62,12 +62,12 @@ export default function DevicesTable({ onSelectForUpdate }: Props) {
 
 	if (!devices?.length) {
 		return (
-			<Card className="flex items-center justify-center border-dashed border-edge-subtle p-6">
-				<div className="flex flex-col space-y-3">
+			<Card className="p-6 flex items-center justify-center border-dashed border-edge-subtle">
+				<div className="space-y-3 flex flex-col">
 					<div className="relative flex justify-center">
-						<span className="flex items-center justify-center rounded-lg bg-background-surface p-2">
+						<span className="rounded-lg p-2 flex items-center justify-center bg-background-surface">
 							<Smartphone className="h-6 w-6 text-foreground-muted" />
-							<Slash className="absolute h-6 w-6 scale-x-[-1] transform text-foreground opacity-80" />
+							<Slash className="h-6 w-6 absolute scale-x-[-1] transform text-foreground opacity-80" />
 						</span>
 					</div>
 
diff --git a/packages/browser/src/scenes/settings/server/email/emailers/CreateOrUpdateEmailerForm.tsx b/packages/browser/src/scenes/settings/server/email/emailers/CreateOrUpdateEmailerForm.tsx
index 181aa3915d..de6cc7ba8e 100644
--- a/packages/browser/src/scenes/settings/server/email/emailers/CreateOrUpdateEmailerForm.tsx
+++ b/packages/browser/src/scenes/settings/server/email/emailers/CreateOrUpdateEmailerForm.tsx
@@ -94,7 +94,7 @@ export default function CreateOrUpdateEmailerForm({ emailer, existingNames, onSu
 				ignoreFill
 			/>
 
-			<div className="flex flex-col space-y-4">
+			<div className="space-y-4 flex flex-col">
 				<div>
 					<Heading size="sm" className="font-semibold">
 						{t(`${LOCALE_BASE}.smtpSettings.heading`)}
@@ -106,7 +106,7 @@ export default function CreateOrUpdateEmailerForm({ emailer, existingNames, onSu
 				</div>
 
 				{/* FIXME: A little buggy */}
-				<div className="flex flex-col space-y-1 md:max-w-sm">
+				<div className="space-y-1 md:max-w-sm flex flex-col">
 					<Label>{t(`${LOCALE_BASE}.smtpProvider.label`)}</Label>
 					<NativeSelect
 						emptyOption={{ label: 'Custom', value: undefined }}
@@ -131,7 +131,7 @@ export default function CreateOrUpdateEmailerForm({ emailer, existingNames, onSu
 					</Text>
 				</div>
 
-				<div className="flex flex-col gap-4 md:flex-row md:items-start">
+				<div className="gap-4 md:flex-row md:items-start flex flex-col">
 					<Input
 						id="smtpHost"
 						label={t(`${LOCALE_BASE}.smtpHost.label`)}
@@ -153,7 +153,7 @@ export default function CreateOrUpdateEmailerForm({ emailer, existingNames, onSu
 					/>
 				</div>
 
-				<div className="flex flex-col gap-4 lg:flex-row lg:items-start">
+				<div className="gap-4 lg:flex-row lg:items-start flex flex-col">
 					<Input
 						id="username"
 						label={t(`${LOCALE_BASE}.username.label`)}
@@ -184,7 +184,7 @@ export default function CreateOrUpdateEmailerForm({ emailer, existingNames, onSu
 				/>
 			</div>
 
-			<div className="flex flex-col space-y-4">
+			<div className="space-y-4 flex flex-col">
 				<div>
 					<Heading size="sm" className="font-semibold">
 						{t(`${LOCALE_BASE}.senderSettings.heading`)}
@@ -213,7 +213,7 @@ export default function CreateOrUpdateEmailerForm({ emailer, existingNames, onSu
 				/>
 			</div>
 
-			<div className="flex flex-col space-y-4">
+			<div className="space-y-4 flex flex-col">
 				<div>
 					<Heading size="sm" className="font-semibold">
 						{t(`${LOCALE_BASE}.additionalSettings.heading`)}
diff --git a/packages/browser/src/scenes/settings/server/email/emailers/EmailerListItem.tsx b/packages/browser/src/scenes/settings/server/email/emailers/EmailerListItem.tsx
index 77b0ed09dc..0229a5316e 100644
--- a/packages/browser/src/scenes/settings/server/email/emailers/EmailerListItem.tsx
+++ b/packages/browser/src/scenes/settings/server/email/emailers/EmailerListItem.tsx
@@ -81,12 +81,12 @@ export default function EmailerListItem({ fragment }: Props) {
 	}, [canDeleteEmailer, deleteEmailer, emailer.id])
 
 	return (
-		<Card className="flex flex-col space-y-2 p-4" onMouseEnter={() => prefetchHistory()}>
+		<Card className="space-y-2 p-4 flex flex-col" onMouseEnter={() => prefetchHistory()}>
 			<div className="flex items-center justify-between">
 				<Text size="md" className="font-medium">
 					{emailer.name}
 				</Text>
-				<div className="flex items-center space-x-2">
+				<div className="space-x-2 flex items-center">
 					{emailer.isPrimary && (
 						<ToolTip content="Primary emailer" align="end" size="xs">
 							<Sparkles className="text-primary h-4 w-4" strokeWidth={1} />
diff --git a/packages/browser/src/scenes/settings/server/email/emailers/EmailerSendHistory.tsx b/packages/browser/src/scenes/settings/server/email/emailers/EmailerSendHistory.tsx
index 21ae437d4f..8d92907c38 100644
--- a/packages/browser/src/scenes/settings/server/email/emailers/EmailerSendHistory.tsx
+++ b/packages/browser/src/scenes/settings/server/email/emailers/EmailerSendHistory.tsx
@@ -119,7 +119,7 @@ export default function EmailerSendHistory({ emailerId, lastUsedAt }: Props) {
 			{/* TODO: clear the history option */}
 			<Drawer open={drawerOpen} onClose={() => setDrawerOpen(false)} onOpenChange={setDrawerOpen}>
 				<Drawer.Content>
-					<div className="mx-auto w-full max-w-2xl">
+					<div className="max-w-2xl mx-auto w-full">
 						<Drawer.Header>
 							<Drawer.Title>{t(getLocaleKey('heading'))}</Drawer.Title>
 						</Drawer.Header>
diff --git a/packages/browser/src/scenes/settings/server/email/emailers/EmailerSendHistoryTable.tsx b/packages/browser/src/scenes/settings/server/email/emailers/EmailerSendHistoryTable.tsx
index 2911d08f76..e353067ff0 100644
--- a/packages/browser/src/scenes/settings/server/email/emailers/EmailerSendHistoryTable.tsx
+++ b/packages/browser/src/scenes/settings/server/email/emailers/EmailerSendHistoryTable.tsx
@@ -39,14 +39,14 @@ export default function EmailerSendHistoryTable({ records }: Props) {
 	const { rows } = table.getRowModel()
 
 	return (
-		<div className="mx-auto w-full max-w-2xl px-1">
+		<div className="max-w-2xl px-1 mx-auto w-full">
 			<table className="w-full">
 				<thead>
 					<tr>
 						{table.getFlatHeaders().map((header) => (
 							<th key={header.id} className="h-10 first:pl-4 last:pr-4">
 								<div
-									className={cn('flex items-center gap-x-2', {
+									className={cn('gap-x-2 flex items-center', {
 										'cursor-pointer select-none': header.column.getCanSort(),
 									})}
 									onClick={header.column.getToggleSortingHandler()}
@@ -126,7 +126,7 @@ const columns = [
 				return <Text size="sm">{sentBy.username}</Text>
 			} else if (sentByUserId) {
 				return (
-					<div className="flex items-center space-x-2">
+					<div className="space-x-2 flex items-center">
 						<ToolTip content={sentByUserId} align="start" size="sm">
 							<Text size="sm">
 								{sentByUserId.slice(0, 5)}..{sentByUserId.slice(-5)}
@@ -164,7 +164,7 @@ const columns = [
 			const isAlreadyExpanded = row.getIsExpanded()
 			return (
 				<div
-					className="flex cursor-pointer items-center space-x-2"
+					className="space-x-2 flex cursor-pointer items-center"
 					onClick={row.getToggleExpandedHandler()}
 				>
 					<Text size="sm">{isAlreadyExpanded ? 'Hide' : 'Show'}</Text>
diff --git a/packages/browser/src/scenes/settings/server/email/emailers/EmailerSendRecordAttachmentTable.tsx b/packages/browser/src/scenes/settings/server/email/emailers/EmailerSendRecordAttachmentTable.tsx
index 8beff979ca..e4dcfdfa46 100644
--- a/packages/browser/src/scenes/settings/server/email/emailers/EmailerSendRecordAttachmentTable.tsx
+++ b/packages/browser/src/scenes/settings/server/email/emailers/EmailerSendRecordAttachmentTable.tsx
@@ -62,7 +62,7 @@ export default function EmailerSendRecordAttachmentTable({ attachments }: Props)
 										<th key={header.id} className="h-10 pl-1.5 pr-1.5 first:pl-4 last:pr-4">
 											<div
 												className={cn('flex items-center', {
-													'cursor-pointer select-none gap-x-2': isSortable,
+													'gap-x-2 cursor-pointer select-none': isSortable,
 												})}
 												onClick={header.column.getToggleSortingHandler()}
 												style={{
diff --git a/packages/browser/src/scenes/settings/server/email/emailers/EmailersList.tsx b/packages/browser/src/scenes/settings/server/email/emailers/EmailersList.tsx
index 94c8972224..10459c7a8b 100644
--- a/packages/browser/src/scenes/settings/server/email/emailers/EmailersList.tsx
+++ b/packages/browser/src/scenes/settings/server/email/emailers/EmailersList.tsx
@@ -29,7 +29,7 @@ export default function EmailersList() {
 
 	if (!emailers.length) {
 		return (
-			<Card className="flex min-h-[150px] flex-col items-center justify-center gap-4">
+			<Card className="gap-4 flex min-h-[150px] flex-col items-center justify-center">
 				<CircleSlash2 className="h-10 w-10 pb-2 pt-1 text-foreground-muted" />
 				<div className="text-center">
 					<Heading size="xs">{t(`${LOCALE_BASE}.emptyHeading`)}</Heading>
@@ -44,7 +44,7 @@ export default function EmailersList() {
 	}
 
 	return (
-		<div className="flex flex-col space-y-6">
+		<div className="space-y-6 flex flex-col">
 			{emailers.map((emailer) => (
 				<EmailerListItem key={emailer.id} fragment={emailer} />
 			))}
diff --git a/packages/browser/src/scenes/settings/server/email/emailers/EmailersSection.tsx b/packages/browser/src/scenes/settings/server/email/emailers/EmailersSection.tsx
index 2573d82a92..dd740ca810 100644
--- a/packages/browser/src/scenes/settings/server/email/emailers/EmailersSection.tsx
+++ b/packages/browser/src/scenes/settings/server/email/emailers/EmailersSection.tsx
@@ -9,7 +9,7 @@ export default function EmailersSection() {
 	const { t } = useLocaleContext()
 
 	return (
-		<div className="flex flex-col gap-4">
+		<div className="gap-4 flex flex-col">
 			<div>
 				<Heading size="sm">{t('settingsScene.server/email.sections.emailers.title')}</Heading>
 				<Text size="sm" variant="muted" className="mt-1">
diff --git a/packages/browser/src/scenes/settings/server/email/emailers/TestEmailerButton.tsx b/packages/browser/src/scenes/settings/server/email/emailers/TestEmailerButton.tsx
index dc328187f7..5d33cac45f 100644
--- a/packages/browser/src/scenes/settings/server/email/emailers/TestEmailerButton.tsx
+++ b/packages/browser/src/scenes/settings/server/email/emailers/TestEmailerButton.tsx
@@ -70,7 +70,7 @@ export default function TestEmailerButton() {
 	}
 
 	return (
-		<div className="flex flex-row items-center gap-2">
+		<div className="gap-2 flex flex-row items-center">
 			<Input
 				id="testRecipient"
 				label={t(getKey('recipientLabel'))}
diff --git a/packages/browser/src/scenes/settings/server/general/GeneralServerSettingsScene.tsx b/packages/browser/src/scenes/settings/server/general/GeneralServerSettingsScene.tsx
index 63b365a26b..86ed8c325d 100644
--- a/packages/browser/src/scenes/settings/server/general/GeneralServerSettingsScene.tsx
+++ b/packages/browser/src/scenes/settings/server/general/GeneralServerSettingsScene.tsx
@@ -30,7 +30,7 @@ export default function GeneralServerSettingsScene() {
 			</Helmet>
 
 			<ContentContainer>
-				<div className="flex flex-col gap-12">
+				<div className="gap-12 flex flex-col">
 					<Suspense>
 						<ServerStats />
 					</Suspense>
diff --git a/packages/browser/src/scenes/settings/server/general/HelpfulLinks.tsx b/packages/browser/src/scenes/settings/server/general/HelpfulLinks.tsx
index 626a0c84f1..f288dcdaa5 100644
--- a/packages/browser/src/scenes/settings/server/general/HelpfulLinks.tsx
+++ b/packages/browser/src/scenes/settings/server/general/HelpfulLinks.tsx
@@ -6,7 +6,7 @@ export default function HelpfulLinks() {
 	const { t } = useLocaleContext()
 
 	return (
-		<div className="flex flex-col gap-4">
+		<div className="gap-4 flex flex-col">
 			<div>
 				<Heading size="sm">{t('settingsScene.server/general.sections.helpfulLinks.title')}</Heading>
 				<Text size="sm" variant="muted" className="mt-1">
@@ -14,12 +14,12 @@ export default function HelpfulLinks() {
 				</Text>
 			</div>
 
-			<div className="flex flex-row flex-wrap gap-12 md:gap-8">
+			<div className="gap-12 md:gap-8 flex flex-row flex-wrap">
 				<Link
 					href="https://www.stumpapp.dev/guides"
 					target="__blank"
 					rel="noopener noreferrer"
-					className={cn('flex items-center space-x-2 text-sm hover:underline', TEXT_VARIANTS.label)}
+					className={cn('space-x-2 text-sm flex items-center hover:underline', TEXT_VARIANTS.label)}
 					underline={false}
 				>
 					<span>{t('settingsScene.server/general.sections.helpfulLinks.links.documentation')}</span>
@@ -30,7 +30,7 @@ export default function HelpfulLinks() {
 					href="https://github.com/stumpapp/stump"
 					target="__blank"
 					rel="noopener noreferrer"
-					className={cn('flex items-center space-x-2 text-sm hover:underline', TEXT_VARIANTS.label)}
+					className={cn('space-x-2 text-sm flex items-center hover:underline', TEXT_VARIANTS.label)}
 					underline={false}
 				>
 					<span>GitHub</span>
@@ -41,7 +41,7 @@ export default function HelpfulLinks() {
 					href="https://github.com/stumpapp/stump/blob/main/.github/CHANGELOG.md"
 					target="__blank"
 					rel="noopener noreferrer"
-					className={cn('flex items-center space-x-2 text-sm hover:underline', TEXT_VARIANTS.label)}
+					className={cn('space-x-2 text-sm flex items-center hover:underline', TEXT_VARIANTS.label)}
 					underline={false}
 				>
 					<span>{t('settingsScene.server/general.sections.helpfulLinks.links.changelog')}</span>
diff --git a/packages/browser/src/scenes/settings/server/general/ServerEmojisSection.tsx b/packages/browser/src/scenes/settings/server/general/ServerEmojisSection.tsx
index 02f76caa94..d99eb7cee8 100644
--- a/packages/browser/src/scenes/settings/server/general/ServerEmojisSection.tsx
+++ b/packages/browser/src/scenes/settings/server/general/ServerEmojisSection.tsx
@@ -237,7 +237,7 @@ export default function ServerEmojisSection() {
 	const isDropzoneFocused = isDragActive || isFileDialogActive
 
 	return (
-		<div className="flex flex-col gap-4">
+		<div className="gap-4 flex flex-col">
 			<div>
 				<Heading size="sm">{t(getKey('title'))}</Heading>
 				<Text size="sm" variant="muted" className="mt-1">
@@ -246,11 +246,11 @@ export default function ServerEmojisSection() {
 			</div>
 
 			{canManageEmojis && (
-				<div className="rounded-lg border border-edge p-3">
+				<div className="rounded-lg p-3 border border-edge">
 					<div
 						{...getRootProps()}
 						className={cn(
-							'flex cursor-pointer items-center justify-center gap-2 rounded-md border border-dashed border-edge-subtle p-4 ring-2 ring-transparent ring-offset-2 ring-offset-background',
+							'gap-2 rounded-md p-4 flex cursor-pointer items-center justify-center border border-dashed border-edge-subtle ring-2 ring-transparent ring-offset-2 ring-offset-background',
 							{ 'ring-edge-brand': isDropzoneFocused },
 						)}
 					>
@@ -261,8 +261,8 @@ export default function ServerEmojisSection() {
 						</Text>
 					</div>
 
-					<div className="mt-3 flex flex-row items-end gap-3">
-						<div className="flex h-10 w-10 items-center justify-center overflow-hidden rounded-md border border-edge bg-background-surface">
+					<div className="mt-3 gap-3 flex flex-row items-end">
+						<div className="h-10 w-10 rounded-md flex items-center justify-center overflow-hidden border border-edge bg-background-surface">
 							{previewUrl && (
 								<img
 									src={previewUrl}
@@ -281,7 +281,7 @@ export default function ServerEmojisSection() {
 							/>
 						</div>
 
-						<div className="flex items-center gap-2">
+						<div className="gap-2 flex items-center">
 							<Button
 								variant="default"
 								disabled={!selectedFile || isUploading}
@@ -314,11 +314,11 @@ export default function ServerEmojisSection() {
 					<ScrollArea className={cn({ 'h-96': emojis.length > 8 })}>
 						<div className="divide-y divide-edge">
 							{emojis.map((emoji) => (
-								<div key={emoji.id} className="flex items-center gap-3 p-3">
+								<div key={emoji.id} className="gap-3 p-3 flex items-center">
 									<img src={emoji.url} alt={emoji.name} className="h-8 w-8 rounded object-cover" />
 
 									{renamingId === emoji.id ? (
-										<div className="flex flex-1 items-center gap-2">
+										<div className="gap-2 flex flex-1 items-center">
 											<Input
 												value={renameValue}
 												onChange={(event) => setRenameValue(event.target.value)}
@@ -338,7 +338,7 @@ export default function ServerEmojisSection() {
 										</div>
 									) : (
 										<>
-											<div className="rounded-lg bg-background-surface p-0.5">
+											<div className="rounded-lg p-0.5 bg-background-surface">
 												<Text size="sm" className="font-mono">
 													:{emoji.name}:
 												</Text>
@@ -347,7 +347,7 @@ export default function ServerEmojisSection() {
 											<div className="flex-1" />
 
 											{canManageEmojis && (
-												<div className="flex items-center gap-1">
+												<div className="gap-1 flex items-center">
 													<Button
 														variant="ghost"
 														size="sm"
diff --git a/packages/browser/src/scenes/settings/server/general/ServerInfoSection.tsx b/packages/browser/src/scenes/settings/server/general/ServerInfoSection.tsx
index 0c213dc9f2..73c5dd7227 100644
--- a/packages/browser/src/scenes/settings/server/general/ServerInfoSection.tsx
+++ b/packages/browser/src/scenes/settings/server/general/ServerInfoSection.tsx
@@ -40,7 +40,7 @@ export default function ServerInfoSection() {
 	)
 
 	return (
-		<div className="flex flex-col gap-4">
+		<div className="gap-4 flex flex-col">
 			<div>
 				<Heading size="sm">{t('settingsScene.server/general.sections.serverInfo.title')}</Heading>
 				<Text size="sm" variant="muted" className="mt-1">
@@ -64,7 +64,7 @@ export default function ServerInfoSection() {
 				</Alert>
 			)}
 
-			<div className="flex flex-row flex-wrap gap-12 md:gap-8">
+			<div className="gap-12 md:gap-8 flex flex-row flex-wrap">
 				{version && (
 					<div>
 						<Label>Semantic version</Label>
@@ -73,7 +73,7 @@ export default function ServerInfoSection() {
 							target="__blank"
 							rel="noopener noreferrer"
 							className={cn(
-								'flex items-center space-x-2 text-sm hover:underline',
+								'space-x-2 text-sm flex items-center hover:underline',
 								TEXT_VARIANTS.muted,
 							)}
 							underline={false}
@@ -100,7 +100,7 @@ export default function ServerInfoSection() {
 							target="__blank"
 							rel="noopener noreferrer"
 							className={cn(
-								'flex items-center space-x-2 text-sm hover:underline',
+								'space-x-2 text-sm flex items-center hover:underline',
 								TEXT_VARIANTS.muted,
 							)}
 							underline={false}
diff --git a/packages/browser/src/scenes/settings/server/general/ServerPublicURL.tsx b/packages/browser/src/scenes/settings/server/general/ServerPublicURL.tsx
index ef8b2fa2d7..e7eaa048f9 100644
--- a/packages/browser/src/scenes/settings/server/general/ServerPublicURL.tsx
+++ b/packages/browser/src/scenes/settings/server/general/ServerPublicURL.tsx
@@ -51,7 +51,7 @@ export default function ServerPublicURL() {
 	const isDifferent = (serverConfig.publicUrl || '') !== publicUrl
 
 	return (
-		<div className="flex items-start gap-4">
+		<div className="gap-4 flex items-start">
 			<Input
 				label={t(getKey('label'))}
 				description={t(getKey('description'))}
diff --git a/packages/browser/src/scenes/settings/server/general/ServerStats.tsx b/packages/browser/src/scenes/settings/server/general/ServerStats.tsx
index 92314ef6fd..1354385d73 100644
--- a/packages/browser/src/scenes/settings/server/general/ServerStats.tsx
+++ b/packages/browser/src/scenes/settings/server/general/ServerStats.tsx
@@ -28,7 +28,7 @@ export default function ServerStats() {
 	)
 
 	return (
-		<div className="flex max-w-xl items-center justify-around gap-4 divide-x divide-edge">
+		<div className="max-w-xl gap-4 flex items-center justify-around divide-x divide-edge">
 			<Statistic className="pr-10">
 				<Statistic.Label>Libraries</Statistic.Label>
 				<Statistic.CountUpNumber value={Number(stats.libraryCount)} />
diff --git a/packages/browser/src/scenes/settings/server/jobs/JobScheduler.tsx b/packages/browser/src/scenes/settings/server/jobs/JobScheduler.tsx
index 852a82281c..78e15b5801 100644
--- a/packages/browser/src/scenes/settings/server/jobs/JobScheduler.tsx
+++ b/packages/browser/src/scenes/settings/server/jobs/JobScheduler.tsx
@@ -256,7 +256,7 @@ export default function JobScheduler() {
 	}, [form, config])
 
 	return (
-		<div className="my-2 flex flex-col gap-6">
+		<div className="my-2 gap-6 flex flex-col">
 			<Alert id="futureSchedulerFeatures" variant="info" dismissible>
 				<Construction />
 				<AlertDescription>
@@ -265,7 +265,7 @@ export default function JobScheduler() {
 			</Alert>
 
 			<Form form={form} onSubmit={handleSubmit}>
-				<div className="flex w-full flex-col gap-2 md:flex-row md:items-end lg:w-2/3">
+				<div className="gap-2 md:flex-row md:items-end lg:w-2/3 flex w-full flex-col">
 					<Input
 						variant="primary"
 						type="number"
@@ -279,7 +279,7 @@ export default function JobScheduler() {
 						})}
 					/>
 
-					<div className="flex-shrink-0">
+					<div className="shrink-0">
 						<Label htmlFor="intervalPreset">Interval preset</Label>
 						<NativeSelect
 							value={intervalPreset}
@@ -293,7 +293,7 @@ export default function JobScheduler() {
 					</div>
 				</div>
 
-				<div className="flex w-full flex-col gap-4 md:flex-row md:items-end md:justify-between lg:w-2/3">
+				<div className="gap-4 md:flex-row md:items-end md:justify-between lg:w-2/3 flex w-full flex-col">
 					<ComboBox
 						label={t(getFieldKey('includedLibraryIds', 'label'))}
 						description={t(getFieldKey('includedLibraryIds', 'description'))}
@@ -314,7 +314,7 @@ export default function JobScheduler() {
 					variant="primary"
 					size="md"
 					disabled={!isConfigDifferent || isSubmitting}
-					className="flex-shrink-0 md:w-32"
+					className="md:w-32 shrink-0"
 				>
 					{t('common.saveChanges')}
 				</Button>
diff --git a/packages/browser/src/scenes/settings/server/jobs/JobSettingsScene.tsx b/packages/browser/src/scenes/settings/server/jobs/JobSettingsScene.tsx
index 88f354c8fe..23235aaae5 100644
--- a/packages/browser/src/scenes/settings/server/jobs/JobSettingsScene.tsx
+++ b/packages/browser/src/scenes/settings/server/jobs/JobSettingsScene.tsx
@@ -30,7 +30,7 @@ export default function JobSettingsScene() {
 				*/}
 
 			<ContentContainer>
-				<div className="flex flex-col gap-4">
+				<div className="gap-4 flex flex-col">
 					<div>
 						<Heading size="sm">{t('settingsScene.server/jobs.sections.scheduling.title')}</Heading>
 						<Text size="sm" variant="muted" className="mt-1">
@@ -43,7 +43,7 @@ export default function JobSettingsScene() {
 					</Suspense>
 				</div>
 
-				<div className="flex flex-col gap-4">
+				<div className="gap-4 flex flex-col">
 					<div className="flex items-end justify-between">
 						<div>
 							<Heading size="sm">{t('settingsScene.server/jobs.sections.history.title')}</Heading>
diff --git a/packages/browser/src/scenes/settings/server/jobs/JobTable.tsx b/packages/browser/src/scenes/settings/server/jobs/JobTable.tsx
index 0fdb7306af..b2c8a3182d 100644
--- a/packages/browser/src/scenes/settings/server/jobs/JobTable.tsx
+++ b/packages/browser/src/scenes/settings/server/jobs/JobTable.tsx
@@ -249,7 +249,7 @@ export default function JobTable() {
 	const EmptyState = useCallback(
 		() =>
 			isRefetching ? null : (
-				<div className="flex min-h-[150px] flex-col items-center justify-center gap-2">
+				<div className="gap-2 flex min-h-[150px] flex-col items-center justify-center">
 					<CircleSlash2 className="h-10 w-10 pb-2 pt-1 text-foreground-muted" />
 					<Heading size="sm">{t(`${LOCALE_BASE}.emptyHeading`)}</Heading>
 					<Text size="sm" variant="muted">
diff --git a/packages/browser/src/scenes/settings/server/logs/live-logs/LiveLogsFeed.tsx b/packages/browser/src/scenes/settings/server/logs/live-logs/LiveLogsFeed.tsx
index 9bbf666341..2e4ec1a512 100644
--- a/packages/browser/src/scenes/settings/server/logs/live-logs/LiveLogsFeed.tsx
+++ b/packages/browser/src/scenes/settings/server/logs/live-logs/LiveLogsFeed.tsx
@@ -33,10 +33,10 @@ export default function LiveLogsFeed() {
 	}, [data])
 
 	return (
-		<div className="h-72 rounded-md bg-background-surface p-4">
+		<div className="h-72 rounded-md p-4 bg-background-surface">
 			<div
 				ref={logContainerRef}
-				className="flex max-h-full flex-col gap-y-1.5 overflow-y-auto font-mono text-sm text-foreground-subtle"
+				className="gap-y-1.5 font-mono text-sm flex max-h-full flex-col overflow-y-auto text-foreground-subtle"
 			>
 				{data?.map(({ tailLogFile: log }, index) => (
 					<span key={`live-log-${index}`}>
diff --git a/packages/browser/src/scenes/settings/server/logs/live-logs/LiveLogsSection.tsx b/packages/browser/src/scenes/settings/server/logs/live-logs/LiveLogsSection.tsx
index f4b5b1725c..042f4d0864 100644
--- a/packages/browser/src/scenes/settings/server/logs/live-logs/LiveLogsSection.tsx
+++ b/packages/browser/src/scenes/settings/server/logs/live-logs/LiveLogsSection.tsx
@@ -6,7 +6,7 @@ import LiveLogsFeed from './LiveLogsFeed'
 export default function LiveLogsSection() {
 	const { t } = useLocaleContext()
 	return (
-		<div className="flex flex-col gap-4">
+		<div className="gap-4 flex flex-col">
 			<div>
 				<Heading size="sm">{t('settingsScene.server/logs.sections.liveLogs.title')}</Heading>
 				<Text size="sm" variant="muted" className="mt-1">
diff --git a/packages/browser/src/scenes/settings/server/logs/persisted-logs/PersistedLogsSection.tsx b/packages/browser/src/scenes/settings/server/logs/persisted-logs/PersistedLogsSection.tsx
index 5f136c98dc..62264dc663 100644
--- a/packages/browser/src/scenes/settings/server/logs/persisted-logs/PersistedLogsSection.tsx
+++ b/packages/browser/src/scenes/settings/server/logs/persisted-logs/PersistedLogsSection.tsx
@@ -9,7 +9,7 @@ export default function PersistedLogsSection() {
 	const { t } = useLocaleContext()
 
 	return (
-		<div className="flex flex-col gap-4">
+		<div className="gap-4 flex flex-col">
 			<div className="flex items-end justify-between">
 				<div>
 					<Heading size="sm">{t(getKey('title'))}</Heading>
diff --git a/packages/browser/src/scenes/settings/server/logs/persisted-logs/PersistedLogsTable.tsx b/packages/browser/src/scenes/settings/server/logs/persisted-logs/PersistedLogsTable.tsx
index 2162960855..06adb2eccc 100644
--- a/packages/browser/src/scenes/settings/server/logs/persisted-logs/PersistedLogsTable.tsx
+++ b/packages/browser/src/scenes/settings/server/logs/persisted-logs/PersistedLogsTable.tsx
@@ -118,7 +118,7 @@ export default function PersistedLogsTable() {
 				fullWidth
 				emptyRenderer={() =>
 					isLoading ? null : (
-						<div className="flex min-h-[150px] flex-col items-center justify-center gap-2">
+						<div className="gap-2 flex min-h-[150px] flex-col items-center justify-center">
 							<CircleSlash2 className="h-10 w-10 pb-2 pt-1 text-foreground-muted" />
 							<Heading size="sm">{t(`${LOCALE_BASE}.emptyHeading`)}</Heading>
 							<Text size="sm" variant="muted">
diff --git a/packages/browser/src/scenes/settings/server/users/UsersStats.tsx b/packages/browser/src/scenes/settings/server/users/UsersStats.tsx
index efd3b153a6..c250abfa12 100644
--- a/packages/browser/src/scenes/settings/server/users/UsersStats.tsx
+++ b/packages/browser/src/scenes/settings/server/users/UsersStats.tsx
@@ -34,24 +34,24 @@ export default function UsersStats() {
 	const [powerReader] = useMemo(() => data.topReaders, [data.topReaders])
 
 	return (
-		<div className="flex items-center gap-4 divide-x divide-edge-subtle overflow-x-scroll pb-8 scrollbar-hide">
-			<Statistic className="shrink-0 pr-5 md:pr-10">
+		<div className="gap-4 pb-8 scrollbar-hide flex items-center divide-x divide-edge-subtle overflow-x-scroll">
+			<Statistic className="pr-5 md:pr-10 shrink-0">
 				<Statistic.Label>Users</Statistic.Label>
 				<Statistic.CountUpNumber value={data.userCount} />
 			</Statistic>
 
-			<Statistic className="shrink-0 px-5 md:px-10">
+			<Statistic className="px-5 md:px-10 shrink-0">
 				<Statistic.Label>Books completed</Statistic.Label>
 				<Statistic.CountUpNumber value={data.finishedReadingSessionCount} />
 			</Statistic>
 
-			<Statistic className="shrink-0 px-5 md:px-10">
+			<Statistic className="px-5 md:px-10 shrink-0">
 				<Statistic.Label>Books in progress</Statistic.Label>
 				<Statistic.CountUpNumber value={data.activeReadingSessionCount} />
 			</Statistic>
 
 			{!!powerReader && (
-				<Statistic className="shrink-0 pl-5 md:pl-10">
+				<Statistic className="pl-5 md:pl-10 shrink-0">
 					<Statistic.Label>Power Reader</Statistic.Label>
 					<Statistic.StringValue>
 						{powerReader.username}{' '}
diff --git a/packages/browser/src/scenes/settings/server/users/create-or-update/AccountDetails.tsx b/packages/browser/src/scenes/settings/server/users/create-or-update/AccountDetails.tsx
index ef465366e5..87e5bce181 100644
--- a/packages/browser/src/scenes/settings/server/users/create-or-update/AccountDetails.tsx
+++ b/packages/browser/src/scenes/settings/server/users/create-or-update/AccountDetails.tsx
@@ -12,7 +12,7 @@ export default function AccountDetails() {
 	const [passwordVisible, setPasswordVisible] = useState(false)
 
 	return (
-		<div className="flex flex-col gap-4 pb-4 pt-1 md:max-w-md">
+		<div className="gap-4 pb-4 pt-1 md:max-w-md flex flex-col">
 			<Input
 				id="username"
 				variant="primary"
@@ -47,7 +47,7 @@ export default function AccountDetails() {
 				{...form.register('password')}
 			/>
 
-			<div className="flex items-center gap-1">
+			<div className="gap-1 flex items-center">
 				<Button
 					type="button"
 					onClick={() => form.setValue('password', generateRandomPassword())}
diff --git a/packages/browser/src/scenes/settings/server/users/create-or-update/CreateOrUpdateUserForm.tsx b/packages/browser/src/scenes/settings/server/users/create-or-update/CreateOrUpdateUserForm.tsx
index 7684d8f166..c123a823ea 100644
--- a/packages/browser/src/scenes/settings/server/users/create-or-update/CreateOrUpdateUserForm.tsx
+++ b/packages/browser/src/scenes/settings/server/users/create-or-update/CreateOrUpdateUserForm.tsx
@@ -153,7 +153,7 @@ export default function CreateOrUpdateUserForm({ user, existingUsernames }: Prop
 			<ContentContainer>
 				{renderErrors()}
 
-				<div className="flex flex-col gap-6">
+				<div className="gap-6 flex flex-col">
 					<div>
 						<Heading size="sm">Account details</Heading>
 						<Text size="sm" variant="muted" className="mt-1.5">
@@ -172,8 +172,8 @@ export default function CreateOrUpdateUserForm({ user, existingUsernames }: Prop
 					</>
 				)}
 
-				<div className="mt-6 flex w-full md:max-w-sm">
-					<Button type="submit" className="w-full md:max-w-sm" variant="primary">
+				<div className="mt-6 md:max-w-sm flex w-full">
+					<Button type="submit" className="md:max-w-sm w-full" variant="primary">
 						{t(
 							isCreating
 								? 'settingsScene.server/users.createOrUpdateForm.createSubmitButton'
diff --git a/packages/browser/src/scenes/settings/server/users/create-or-update/UserPermissionsTable.tsx b/packages/browser/src/scenes/settings/server/users/create-or-update/UserPermissionsTable.tsx
index 280ab54db6..4422ee689c 100644
--- a/packages/browser/src/scenes/settings/server/users/create-or-update/UserPermissionsTable.tsx
+++ b/packages/browser/src/scenes/settings/server/users/create-or-update/UserPermissionsTable.tsx
@@ -97,14 +97,14 @@ export default function UserPermissionsTable() {
 	})
 
 	return (
-		<div className="flex flex-col gap-4">
+		<div className="gap-4 flex flex-col">
 			<div>
 				<Heading size="sm">{t(getLocaleKey('heading'))}</Heading>
 				<Text size="sm" variant="muted" className="mt-1">
 					{renderDescription()}
 				</Text>
 			</div>
-			<div className="h-96 overflow-auto rounded-lg border border-edge">
+			<div className="h-96 rounded-lg overflow-auto border border-edge">
 				<table className="w-full">
 					<tbody>
 						{table.getRowModel().rows.map((row) => {
@@ -117,12 +117,12 @@ export default function UserPermissionsTable() {
 								return (
 									<tr
 										key={row.id}
-										className="sticky top-0 z-10 border-b border-edge bg-background backdrop-blur-sm"
+										className="top-0 backdrop-blur-sm sticky z-10 border-b border-edge bg-background"
 									>
-										<td className="bg-background-surface/50 px-4 py-3 font-semibold text-foreground">
+										<td className="px-4 py-3 font-semibold bg-background-surface/50 text-foreground">
 											{groupData.name}
 										</td>
-										<td className="bg-background-surface/50 px-4 py-3">
+										<td className="px-4 py-3 bg-background-surface/50">
 											{/* <input
 											type="checkbox"
 											className="h-4 w-4 rounded border-edge text-blue-600 focus:ring-blue-500"
diff --git a/packages/browser/src/scenes/settings/server/users/create-or-update/UserRestrictionsForm.tsx b/packages/browser/src/scenes/settings/server/users/create-or-update/UserRestrictionsForm.tsx
index ab0a392f20..63c6927a00 100644
--- a/packages/browser/src/scenes/settings/server/users/create-or-update/UserRestrictionsForm.tsx
+++ b/packages/browser/src/scenes/settings/server/users/create-or-update/UserRestrictionsForm.tsx
@@ -61,7 +61,7 @@ export default function UserRestrictionsForm() {
 	}
 
 	return (
-		<div className="flex flex-col gap-y-4">
+		<div className="gap-y-4 flex flex-col">
 			<div>
 				<Heading size="sm">Access control</Heading>
 				<Text size="sm" variant="muted" className="mt-1.5">
@@ -69,8 +69,8 @@ export default function UserRestrictionsForm() {
 				</Text>
 			</div>
 
-			<div className="flex flex-col gap-8">
-				<div className="flex flex-col gap-6 md:flex-row md:items-start">
+			<div className="gap-8 flex flex-col">
+				<div className="gap-6 md:flex-row md:items-start flex flex-col">
 					<Input
 						id="ageRestriction"
 						variant="primary"
diff --git a/packages/browser/src/scenes/settings/server/users/login-activity/LoginActivitySection.tsx b/packages/browser/src/scenes/settings/server/users/login-activity/LoginActivitySection.tsx
index dda55426d7..2e835f5f05 100644
--- a/packages/browser/src/scenes/settings/server/users/login-activity/LoginActivitySection.tsx
+++ b/packages/browser/src/scenes/settings/server/users/login-activity/LoginActivitySection.tsx
@@ -8,7 +8,7 @@ import LoginActivityTable from './LoginActivityTable'
 // TODO: move clear to top section
 export default function LoginActivitySection() {
 	return (
-		<div className="flex flex-col gap-y-4">
+		<div className="gap-y-4 flex flex-col">
 			<div className="flex items-end justify-between">
 				<div>
 					<Heading size="sm">Authentication history</Heading>
@@ -22,7 +22,7 @@ export default function LoginActivitySection() {
 				<ClearLoginActivityConfirmation />
 			</div>
 
-			<div className="flex flex-col gap-3">
+			<div className="gap-3 flex flex-col">
 				<Suspense>
 					<LoginActivityTable />
 				</Suspense>
diff --git a/packages/browser/src/scenes/settings/server/users/login-activity/LoginActivityTable.tsx b/packages/browser/src/scenes/settings/server/users/login-activity/LoginActivityTable.tsx
index 9a3c98732b..4f73f91286 100644
--- a/packages/browser/src/scenes/settings/server/users/login-activity/LoginActivityTable.tsx
+++ b/packages/browser/src/scenes/settings/server/users/login-activity/LoginActivityTable.tsx
@@ -58,12 +58,12 @@ export default function LoginActivityTable() {
 
 	if (!loginActivity?.length && !pagination.pageIndex) {
 		return (
-			<Card className="flex items-center justify-center border-dashed border-edge-subtle p-6">
-				<div className="flex flex-col space-y-3">
+			<Card className="p-6 flex items-center justify-center border-dashed border-edge-subtle">
+				<div className="space-y-3 flex flex-col">
 					<div className="relative flex justify-center">
-						<span className="flex items-center justify-center rounded-lg bg-background-surface p-2">
+						<span className="rounded-lg p-2 flex items-center justify-center bg-background-surface">
 							<Fingerprint className="h-6 w-6 text-foreground-muted" />
-							<Slash className="absolute h-6 w-6 scale-x-[-1] transform text-foreground opacity-80" />
+							<Slash className="h-6 w-6 absolute scale-x-[-1] transform text-foreground opacity-80" />
 						</span>
 					</div>
 
@@ -152,7 +152,7 @@ const baseColumns = [
 			<Text
 				size="sm"
 				variant="muted"
-				className="line-clamp-1 max-w-sm md:max-w-xl"
+				className="max-w-sm md:max-w-xl line-clamp-1"
 				title={activity.userAgent}
 			>
 				{activity.userAgent}
diff --git a/packages/browser/src/scenes/settings/server/users/user-table/DeleteUserModal.tsx b/packages/browser/src/scenes/settings/server/users/user-table/DeleteUserModal.tsx
index 29f69af1b3..e899da813f 100644
--- a/packages/browser/src/scenes/settings/server/users/user-table/DeleteUserModal.tsx
+++ b/packages/browser/src/scenes/settings/server/users/user-table/DeleteUserModal.tsx
@@ -52,7 +52,7 @@ export default function DeleteUserModal({ deletingUser, onClose }: Props) {
 					<Dialog.Close onClick={onClose} disabled={isPending} />
 				</Dialog.Header>
 
-				<Dialog.Footer className="w-full items-center gap-3 sm:justify-between sm:gap-0">
+				<Dialog.Footer className="gap-3 sm:justify-between sm:gap-0 w-full items-center">
 					<div className="shrink-0">
 						<CheckBox
 							variant="primary"
@@ -62,7 +62,7 @@ export default function DeleteUserModal({ deletingUser, onClose }: Props) {
 						/>
 					</div>
 
-					<div className="flex w-full flex-col-reverse space-y-2 space-y-reverse sm:flex-row sm:justify-end sm:space-x-2 sm:space-y-0">
+					<div className="space-y-2 sm:flex-row sm:justify-end sm:space-x-2 sm:space-y-0 flex w-full flex-col-reverse space-y-reverse">
 						<Button onClick={onClose} disabled={isPending}>
 							Cancel
 						</Button>
diff --git a/packages/browser/src/scenes/settings/server/users/user-table/UserTable.tsx b/packages/browser/src/scenes/settings/server/users/user-table/UserTable.tsx
index a42e64cc85..6bdaf3aa9f 100644
--- a/packages/browser/src/scenes/settings/server/users/user-table/UserTable.tsx
+++ b/packages/browser/src/scenes/settings/server/users/user-table/UserTable.tsx
@@ -107,7 +107,7 @@ export default function UserTable() {
 			...baseColumns,
 			columnHelper.display({
 				cell: ({ row: { original } }) => (
-					<div className="inline-flex items-end md:w-2">
+					<div className="md:w-2 inline-flex items-end">
 						<UserActionMenu
 							user={original}
 							onSelectForInspect={() => setInspectingUser(original)}
@@ -197,7 +197,7 @@ const baseColumns = [
 			</Text>
 		),
 		header: () => (
-			<div className="flex w-full items-center gap-2">
+			<div className="gap-2 flex w-full items-center">
 				<span>Sessions</span>
 				<ToolTip content="The number of non-expired login sessions for this user">
 					<HelpCircle className="h-3 w-3" />
diff --git a/packages/browser/src/scenes/settings/server/users/user-table/UserTableSection.tsx b/packages/browser/src/scenes/settings/server/users/user-table/UserTableSection.tsx
index 54bf83a5b9..882208f8f3 100644
--- a/packages/browser/src/scenes/settings/server/users/user-table/UserTableSection.tsx
+++ b/packages/browser/src/scenes/settings/server/users/user-table/UserTableSection.tsx
@@ -5,7 +5,7 @@ import UserTable from './UserTable'
 
 export default function UserTableSection() {
 	return (
-		<div className="flex flex-col gap-y-4">
+		<div className="gap-y-4 flex flex-col">
 			<div className="flex items-end justify-between">
 				<div>
 					<Heading size="sm">Existing accounts</Heading>
@@ -13,7 +13,7 @@ export default function UserTableSection() {
 						A list of all existing accounts on the server
 					</Text>
 				</div>
-				<div className="flex items-end gap-2">
+				<div className="gap-2 flex items-end">
 					<ButtonOrLink href="create" variant="secondary" size="sm">
 						Create user
 					</ButtonOrLink>
diff --git a/packages/browser/src/scenes/settings/server/users/user-table/UsernameRow.tsx b/packages/browser/src/scenes/settings/server/users/user-table/UsernameRow.tsx
index 4288cde197..6b73c859a5 100644
--- a/packages/browser/src/scenes/settings/server/users/user-table/UsernameRow.tsx
+++ b/packages/browser/src/scenes/settings/server/users/user-table/UsernameRow.tsx
@@ -7,7 +7,7 @@ type Props = {
 
 export default function UsernameRow({ username, avatarUrl }: Props) {
 	return (
-		<div className="flex items-center gap-3">
+		<div className="gap-3 flex items-center">
 			<Avatar className="h-7 w-7" src={avatarUrl || undefined} fallback={username} />
 			<Text size="sm">{username}</Text>
 		</div>
diff --git a/packages/browser/src/scenes/smartList/SmartListCard.tsx b/packages/browser/src/scenes/smartList/SmartListCard.tsx
index 699c7a1001..436bb38497 100644
--- a/packages/browser/src/scenes/smartList/SmartListCard.tsx
+++ b/packages/browser/src/scenes/smartList/SmartListCard.tsx
@@ -88,10 +88,10 @@ export default function SmartListCard({ data }: Props) {
 	return (
 		<Link to={paths.smartList(id)} className="block w-full">
 			<Card
-				className="flex h-32 w-full flex-col gap-y-4 rounded-lg border-none bg-background-surface p-4 transition-colors duration-150 hover:bg-background-surface-hover/80"
+				className="h-32 gap-y-4 rounded-lg p-4 flex w-full flex-col border-none bg-background-surface transition-colors duration-150 hover:bg-background-surface-hover/80"
 				onMouseEnter={() => prefetch({ id })}
 			>
-				<div className="flex flex-col gap-y-1.5">
+				<div className="gap-y-1.5 flex flex-col">
 					<Text>{name}</Text>
 					<Text variant="muted" size="sm">
 						{description}
diff --git a/packages/browser/src/scenes/smartList/UserSmartListHeader.tsx b/packages/browser/src/scenes/smartList/UserSmartListHeader.tsx
index fc7f0a245b..10899bfe27 100644
--- a/packages/browser/src/scenes/smartList/UserSmartListHeader.tsx
+++ b/packages/browser/src/scenes/smartList/UserSmartListHeader.tsx
@@ -41,7 +41,7 @@ export default function UserSmartListHeader() {
 
 	return (
 		<header
-			className={cn('flex w-full flex-col gap-y-4 p-4', {
+			className={cn('gap-y-4 p-4 flex w-full flex-col', {
 				'mx-auto': preferTopBar && !!layoutMaxWidthPx,
 			})}
 			style={{
diff --git a/packages/browser/src/scenes/smartList/UserSmartListLayout.tsx b/packages/browser/src/scenes/smartList/UserSmartListLayout.tsx
index aae84fa672..bef0027b88 100644
--- a/packages/browser/src/scenes/smartList/UserSmartListLayout.tsx
+++ b/packages/browser/src/scenes/smartList/UserSmartListLayout.tsx
@@ -128,7 +128,7 @@ export default function UserSmartListLayout() {
 					{displaySideBar && <SmartListSettingsSideBar />}
 
 					<SceneContainer
-						className={cn('relative flex flex-1 flex-col gap-4 md:pb-0', {
+						className={cn('gap-4 md:pb-0 relative flex flex-1 flex-col', {
 							'md:hide-scrollbar': !!enableHideScrollbar,
 							'p-0': !isSettings,
 							// pl-48 is for the sidebar, plus pl-4 for the padding
diff --git a/packages/browser/src/scenes/smartList/UserSmartListNavigation.tsx b/packages/browser/src/scenes/smartList/UserSmartListNavigation.tsx
index ccfdad561c..fb39cacef2 100644
--- a/packages/browser/src/scenes/smartList/UserSmartListNavigation.tsx
+++ b/packages/browser/src/scenes/smartList/UserSmartListNavigation.tsx
@@ -46,7 +46,7 @@ export default function UserSmartListNavigation() {
 		<div className="relative z-10 w-full border-b border-edge-subtle bg-background">
 			<nav
 				className={cn(
-					'-mb-px flex gap-x-4 overflow-x-scroll px-3 transition-colors duration-150 scrollbar-hide md:overflow-x-hidden',
+					'gap-x-4 px-3 md:overflow-x-hidden -mb-px scrollbar-hide flex overflow-x-scroll transition-colors duration-150',
 					{
 						'mx-auto': preferTopBar && !!layoutMaxWidthPx,
 					},
@@ -58,7 +58,7 @@ export default function UserSmartListNavigation() {
 						to={tab.to}
 						key={tab.to}
 						underline={false}
-						className={cn('whitespace-nowrap border-b-2 px-1 py-3 text-sm font-medium', {
+						className={cn('px-1 py-3 text-sm font-medium border-b-2 whitespace-nowrap', {
 							'border-edge-brand text-foreground-brand': tab.isActive,
 							'border-transparent text-foreground-muted': !tab.isActive,
 						})}
diff --git a/packages/browser/src/scenes/smartList/UserSmartListsScene.tsx b/packages/browser/src/scenes/smartList/UserSmartListsScene.tsx
index 62bafeb022..f5e16bf74d 100644
--- a/packages/browser/src/scenes/smartList/UserSmartListsScene.tsx
+++ b/packages/browser/src/scenes/smartList/UserSmartListsScene.tsx
@@ -102,8 +102,8 @@ export default function UserSmartListsScene() {
 
 		// TODO: prolly don't scrollarea on mobile... just scroll on the page
 		return (
-			<ScrollArea className="w-full pr-3 md:w-2/3 lg:max-w-xl">
-				<div className="flex-col space-y-2">
+			<ScrollArea className="pr-3 md:w-2/3 lg:max-w-xl w-full">
+				<div className="space-y-2 flex-col">
 					{smartLists.map((list) => (
 						<SmartListCard key={list.id} data={list} />
 					))}
@@ -116,7 +116,7 @@ export default function UserSmartListsScene() {
 	// TODO: can't decide if I like the border-b
 	return (
 		<>
-			<header className="flex h-32 w-full flex-col justify-center gap-y-2 border-b border-edge px-4">
+			<header className="h-32 gap-y-2 px-4 flex w-full flex-col justify-center border-b border-edge">
 				<div>
 					<Heading size="lg" bold>
 						Smart lists
@@ -130,8 +130,8 @@ export default function UserSmartListsScene() {
 			</header>
 
 			<SceneContainer className="relative h-full overflow-hidden">
-				<div className="sticky top-0 z-10 min-h-10 bg-background py-2 backdrop-blur-sm">
-					<div className="flex w-full flex-row items-center justify-between gap-x-2 pr-3 md:w-2/3 lg:max-w-xl">
+				<div className="top-0 min-h-10 py-2 backdrop-blur-sm sticky z-10 bg-background">
+					<div className="gap-x-2 pr-3 md:w-2/3 lg:max-w-xl flex w-full flex-row items-center justify-between">
 						<Input
 							placeholder={t(withLocaleKey('searchPlaceholder'))}
 							variant="primary"
diff --git a/packages/browser/src/scenes/smartList/items/table/BookLinksCell.tsx b/packages/browser/src/scenes/smartList/items/table/BookLinksCell.tsx
index ec0eec3e3a..6be282bae9 100644
--- a/packages/browser/src/scenes/smartList/items/table/BookLinksCell.tsx
+++ b/packages/browser/src/scenes/smartList/items/table/BookLinksCell.tsx
@@ -21,7 +21,7 @@ export default function BookLinksCell({ links }: Props) {
 	}
 
 	return (
-		<div className="flex flex-wrap items-center gap-1.5">
+		<div className="gap-1.5 flex flex-wrap items-center">
 			{links.map((href) => (
 				<a key={href} href={href} target="_blank" rel="noopener noreferrer">
 					<Badge size="sm">
diff --git a/packages/browser/src/scenes/smartList/items/table/CoverImageCell.tsx b/packages/browser/src/scenes/smartList/items/table/CoverImageCell.tsx
index 346471c9ea..5dac91ba8e 100644
--- a/packages/browser/src/scenes/smartList/items/table/CoverImageCell.tsx
+++ b/packages/browser/src/scenes/smartList/items/table/CoverImageCell.tsx
@@ -41,7 +41,7 @@ export default function CoverImageCell({ id, title }: Props) {
 		return (
 			<div
 				title={`${title} (Image failed to load)`}
-				className="flex h-20 w-auto items-center justify-center rounded-sm border-[0.5px] border-edge bg-sidebar shadow-sm"
+				className="h-20 rounded-sm shadow-sm flex w-auto items-center justify-center border-[0.5px] border-edge bg-sidebar"
 				style={{ aspectRatio: thumbnailRatio }}
 				onClick={attemptReload}
 			>
@@ -53,7 +53,7 @@ export default function CoverImageCell({ id, title }: Props) {
 	return (
 		<EntityImage
 			title={title}
-			className="h-20 w-auto rounded-sm object-cover"
+			className="h-20 rounded-sm w-auto object-cover"
 			style={{ aspectRatio: thumbnailRatio }}
 			src={sdk.media.thumbnailURL(id)}
 			onError={() => setShowFallback(true)}
diff --git a/packages/browser/src/scenes/smartList/items/table/FilterBottomDrawer.tsx b/packages/browser/src/scenes/smartList/items/table/FilterBottomDrawer.tsx
index 5e89d3cf66..16349e6b1c 100644
--- a/packages/browser/src/scenes/smartList/items/table/FilterBottomDrawer.tsx
+++ b/packages/browser/src/scenes/smartList/items/table/FilterBottomDrawer.tsx
@@ -33,7 +33,7 @@ export default function FilterBottomDrawer() {
 				</Drawer.Trigger>
 			</ToolTip>
 			<Drawer.Content>
-				<div className="mx-auto w-full max-w-2xl">
+				<div className="max-w-2xl mx-auto w-full">
 					<Drawer.Header>
 						<Drawer.Title>{t(withLocaleKey('heading'))}</Drawer.Title>
 						<Drawer.Description>{t(withLocaleKey('description'))}</Drawer.Description>
@@ -41,8 +41,8 @@ export default function FilterBottomDrawer() {
 				</div>
 
 				<div className="max-h-[70vh] w-full overflow-y-auto">
-					<div className="mx-auto w-full max-w-2xl">
-						<div className="flex flex-col gap-y-6 p-4 pb-0">
+					<div className="max-w-2xl mx-auto w-full">
+						<div className="gap-y-6 p-4 pb-0 flex flex-col">
 							<Accordion type="single" collapsible>
 								<Accordion.Item value="raw_filters" className="border-none">
 									<Accordion.Trigger noUnderline asLabel>
@@ -69,7 +69,7 @@ export default function FilterBottomDrawer() {
 					</div>
 				</div>
 
-				<div className="mx-auto w-full max-w-2xl">
+				<div className="max-w-2xl mx-auto w-full">
 					<Drawer.Footer className="w-full flex-row">
 						<Button className="w-full">{t(withLocaleKey('buttons.save'))}</Button>
 						<Drawer.Close asChild>
diff --git a/packages/browser/src/scenes/smartList/items/table/GroupedVirtualSmartListTable.tsx b/packages/browser/src/scenes/smartList/items/table/GroupedVirtualSmartListTable.tsx
index e355774bfd..eec23f08a3 100644
--- a/packages/browser/src/scenes/smartList/items/table/GroupedVirtualSmartListTable.tsx
+++ b/packages/browser/src/scenes/smartList/items/table/GroupedVirtualSmartListTable.tsx
@@ -261,7 +261,7 @@ export default function GroupedVirtualSmartListTable({ items }: Props) {
 			<TableHeaderActions />
 
 			<div
-				className="sticky top-0 z-30 flex w-full border-b border-edge bg-background-surface"
+				className="top-0 sticky z-30 flex w-full border-b border-edge bg-background-surface"
 				style={{ height: HEADER_HEIGHT }}
 			>
 				{groupTable.getHeaderGroups().map((headerGroup) => (
@@ -273,9 +273,9 @@ export default function GroupedVirtualSmartListTable({ items }: Props) {
 									key={header.id}
 									// TODO: Fix the hitbox for sorting, not the entire header just the content
 									className={cn(
-										'flex w-full items-center bg-background-surface px-4 py-2 text-sm font-medium text-foreground-subtle last:justify-end',
+										'px-4 py-2 text-sm font-medium flex w-full items-center bg-background-surface text-foreground-subtle last:justify-end',
 										{
-											'cursor-pointer select-none gap-x-2': isSortable,
+											'gap-x-2 cursor-pointer select-none': isSortable,
 										},
 									)}
 									onClick={header.column.getToggleSortingHandler()}
@@ -305,7 +305,7 @@ export default function GroupedVirtualSmartListTable({ items }: Props) {
 						const item = flatData[activeStickyGroupIndex]
 						if (item?.type !== 'group') return null
 						return item.row.getVisibleCells().map((cell) => (
-							<div key={cell.id} className="flex w-full items-center px-4 py-2 last:justify-end">
+							<div key={cell.id} className="px-4 py-2 flex w-full items-center last:justify-end">
 								{flexRender(cell.column.columnDef.cell, cell.getContext())}
 							</div>
 						))
@@ -333,9 +333,9 @@ export default function GroupedVirtualSmartListTable({ items }: Props) {
 										<div
 											key={header.id}
 											className={cn(
-												'flex items-center overflow-hidden px-4 py-2 text-xs text-foreground-muted',
+												'px-4 py-2 text-xs flex items-center overflow-hidden text-foreground-muted',
 												{
-													'cursor-pointer select-none gap-x-2': isSortable,
+													'gap-x-2 cursor-pointer select-none': isSortable,
 												},
 											)}
 											onClick={header.column.getToggleSortingHandler()}
@@ -388,7 +388,7 @@ export default function GroupedVirtualSmartListTable({ items }: Props) {
 								{item.row.getVisibleCells().map((cell) => (
 									<div
 										key={cell.id}
-										className="flex w-full items-center px-4 py-2 last:justify-end"
+										className="px-4 py-2 flex w-full items-center last:justify-end"
 									>
 										{flexRender(cell.column.columnDef.cell, cell.getContext())}
 									</div>
@@ -417,9 +417,9 @@ export default function GroupedVirtualSmartListTable({ items }: Props) {
 												<div
 													key={header.id}
 													className={cn(
-														'flex items-center overflow-hidden px-4 py-2 text-xs text-foreground-muted',
+														'px-4 py-2 text-xs flex items-center overflow-hidden text-foreground-muted',
 														{
-															'cursor-pointer select-none gap-x-2': isSortable,
+															'gap-x-2 cursor-pointer select-none': isSortable,
 														},
 													)}
 													onClick={header.column.getToggleSortingHandler()}
diff --git a/packages/browser/src/scenes/smartList/items/table/SavedViewSelector.tsx b/packages/browser/src/scenes/smartList/items/table/SavedViewSelector.tsx
index cc42079269..5b7fdc1008 100644
--- a/packages/browser/src/scenes/smartList/items/table/SavedViewSelector.tsx
+++ b/packages/browser/src/scenes/smartList/items/table/SavedViewSelector.tsx
@@ -111,7 +111,7 @@ export default function SavedViewSelector() {
 	return (
 		<NativeSelect
 			title={isDisabled ? translateKey('noViewsSaved') : translateKey('selectView')}
-			className="h-8 w-[185px] py-0"
+			className="h-8 py-0 w-[185px]"
 			options={finalOptions}
 			emptyOption={emptyOption}
 			disabled={isDisabled}
diff --git a/packages/browser/src/scenes/smartList/items/table/SmartListTableItem.tsx b/packages/browser/src/scenes/smartList/items/table/SmartListTableItem.tsx
index 97cfa55001..dd49b36007 100644
--- a/packages/browser/src/scenes/smartList/items/table/SmartListTableItem.tsx
+++ b/packages/browser/src/scenes/smartList/items/table/SmartListTableItem.tsx
@@ -15,7 +15,7 @@ export const SmartListTableItem = ({ row, style }: Props) => {
 			{row.getVisibleCells().map((cell) => (
 				<div
 					key={cell.id}
-					className="flex items-center overflow-hidden px-4 py-2"
+					className="px-4 py-2 flex items-center overflow-hidden"
 					style={{
 						width: cell.column.getSize(),
 						minWidth: cell.column.columnDef.minSize,
diff --git a/packages/browser/src/scenes/smartList/items/table/TableColumnsBottomDrawer.tsx b/packages/browser/src/scenes/smartList/items/table/TableColumnsBottomDrawer.tsx
index 2d9d0efc47..2f833ef6f2 100644
--- a/packages/browser/src/scenes/smartList/items/table/TableColumnsBottomDrawer.tsx
+++ b/packages/browser/src/scenes/smartList/items/table/TableColumnsBottomDrawer.tsx
@@ -189,19 +189,19 @@ export default function TableColumnsBottomDrawer() {
 				</Drawer.Trigger>
 			</ToolTip>
 			<Drawer.Content>
-				<div className="mx-auto w-full max-w-2xl">
+				<div className="max-w-2xl mx-auto w-full">
 					<Drawer.Header>
 						<Drawer.Title>Table configuration</Drawer.Title>
 						<Drawer.Description>Choose which columns to display or hide</Drawer.Description>
 					</Drawer.Header>
-					<div className="flex flex-col gap-y-6 p-4 pb-0">
+					<div className="gap-y-6 p-4 pb-0 flex flex-col">
 						{isGrouped && (
 							<div>
 								<Label>Group columns</Label>
 								<Text size="sm" variant="muted">
 									This only affects the parent table by which books are grouped
 								</Text>
-								<div className="mt-3 grid grid-cols-5 gap-x-2 gap-y-4">
+								<div className="mt-3 gap-x-2 gap-y-4 grid grid-cols-5">
 									{groupColumnOptions.map(({ label, value, isSelected }) => (
 										<CheckBox
 											id={value}
@@ -221,7 +221,7 @@ export default function TableColumnsBottomDrawer() {
 							<Text size="sm" variant="muted">
 								This only affects the nested book table(s)
 							</Text>
-							<div className="mt-3 grid grid-cols-5 gap-x-2 gap-y-4">
+							<div className="mt-3 gap-x-2 gap-y-4 grid grid-cols-5">
 								{bookColumnOptions.map(({ label, value, isSelected }) => (
 									<CheckBox
 										id={value}
@@ -236,7 +236,7 @@ export default function TableColumnsBottomDrawer() {
 						</div>
 
 						<div className="flex items-center justify-between">
-							<div className="flex flex-grow flex-col gap-2 text-left">
+							<div className="gap-2 flex grow flex-col text-left">
 								<Label htmlFor="enable_multi_sort">Enable multi-sort</Label>
 								<Text size="sm" variant="muted">
 									Sorting by a column removes the previous sort. This setting allows combining them,
diff --git a/packages/browser/src/scenes/smartList/items/table/TableHeaderActions.tsx b/packages/browser/src/scenes/smartList/items/table/TableHeaderActions.tsx
index ba2ed5d19d..8cba655238 100644
--- a/packages/browser/src/scenes/smartList/items/table/TableHeaderActions.tsx
+++ b/packages/browser/src/scenes/smartList/items/table/TableHeaderActions.tsx
@@ -25,7 +25,7 @@ export default function TableHeaderActions() {
 	)
 
 	return (
-		<header className="-mt-2 mb-2 flex w-full items-center gap-x-2 bg-background px-4">
+		<header className="-mt-2 mb-2 gap-x-2 px-4 flex w-full items-center bg-background">
 			<SavedViewSelector />
 			<FilterBottomDrawer />
 			<TableColumnsBottomDrawer />
diff --git a/packages/browser/src/scenes/smartList/items/table/ViewManagerDropdown.tsx b/packages/browser/src/scenes/smartList/items/table/ViewManagerDropdown.tsx
index b602914662..8a8128baa7 100644
--- a/packages/browser/src/scenes/smartList/items/table/ViewManagerDropdown.tsx
+++ b/packages/browser/src/scenes/smartList/items/table/ViewManagerDropdown.tsx
@@ -29,11 +29,11 @@ export default function ViewManagerDropdown() {
 				<Dropdown.Trigger asChild>
 					<Button
 						disabled={!workingView}
-						className="h-10 shrink-0 divide-opacity-30 bg-background-surface/50 px-0 py-0 hover:bg-background-surface/80 data-[state=open]:bg-background-surface"
+						className="h-10 divide-opacity-30 px-0 py-0 shrink-0 bg-background-surface/50 hover:bg-background-surface/80 data-[state=open]:bg-background-surface"
 					>
 						<div className="inline-flex h-full items-center divide-x divide-edge">
-							<span className="flex h-full items-center px-3 py-2">{t('common.save')}</span>
-							<span className="flex h-full items-center px-1 py-2">
+							<span className="px-3 py-2 flex h-full items-center">{t('common.save')}</span>
+							<span className="px-1 py-2 flex h-full items-center">
 								<ChevronDown className="h-4 w-4" />
 							</span>
 						</div>
diff --git a/packages/browser/src/scenes/smartList/items/table/VirtualSmartListTable.tsx b/packages/browser/src/scenes/smartList/items/table/VirtualSmartListTable.tsx
index 56c59f04cd..8abd79ce37 100644
--- a/packages/browser/src/scenes/smartList/items/table/VirtualSmartListTable.tsx
+++ b/packages/browser/src/scenes/smartList/items/table/VirtualSmartListTable.tsx
@@ -85,7 +85,7 @@ export default function VirtualSmartListTable({ books }: Props) {
 			<TableHeaderActions />
 
 			<div
-				className="sticky top-0 z-30 flex w-full border-b border-edge bg-background"
+				className="top-0 sticky z-30 flex w-full border-b border-edge bg-background"
 				style={{ height: HEADER_HEIGHT }}
 			>
 				{table.getHeaderGroups().map((headerGroup) => (
@@ -96,9 +96,9 @@ export default function VirtualSmartListTable({ books }: Props) {
 								<div
 									key={header.id}
 									className={cn(
-										'flex items-center overflow-hidden bg-background-surface px-4 py-2 text-sm font-medium text-foreground-subtle',
+										'px-4 py-2 text-sm font-medium flex items-center overflow-hidden bg-background-surface text-foreground-subtle',
 										{
-											'cursor-pointer select-none gap-x-2': isSortable,
+											'gap-x-2 cursor-pointer select-none': isSortable,
 										},
 									)}
 									onClick={header.column.getToggleSortingHandler()}
diff --git a/packages/browser/src/scenes/smartList/items/table/groupColumns.tsx b/packages/browser/src/scenes/smartList/items/table/groupColumns.tsx
index c6831c4a52..2f94dc59d9 100644
--- a/packages/browser/src/scenes/smartList/items/table/groupColumns.tsx
+++ b/packages/browser/src/scenes/smartList/items/table/groupColumns.tsx
@@ -23,7 +23,7 @@ const buildNameColumn = (isGroupedBySeries: boolean) =>
 			return (
 				<button
 					title={isExpanded ? 'Collapse' : 'Expand'}
-					className="flex items-center gap-x-1"
+					className="gap-x-1 flex items-center"
 					onClick={getToggleExpandedHandler()}
 					disabled={!getCanExpand()}
 				>
@@ -35,7 +35,7 @@ const buildNameColumn = (isGroupedBySeries: boolean) =>
 							},
 						)}
 					/>
-					<Text className="line-clamp-1 text-left text-sm md:text-base">{name}</Text>
+					<Text className="text-sm md:text-base line-clamp-1 text-left">{name}</Text>
 				</button>
 			)
 		},
@@ -45,7 +45,7 @@ const buildNameColumn = (isGroupedBySeries: boolean) =>
 			const isAllRowsExpanded = getIsAllRowsExpanded()
 
 			return (
-				<div className="flex items-center gap-x-1">
+				<div className="gap-x-1 flex items-center">
 					<button
 						onClick={(e) => {
 							// Don't update the sorting state when clicking the expand all button
diff --git a/packages/browser/src/scenes/smartList/items/table/mediaColumns.tsx b/packages/browser/src/scenes/smartList/items/table/mediaColumns.tsx
index 2e97cb7595..0472055cea 100644
--- a/packages/browser/src/scenes/smartList/items/table/mediaColumns.tsx
+++ b/packages/browser/src/scenes/smartList/items/table/mediaColumns.tsx
@@ -32,7 +32,7 @@ const nameColumn = columnHelper.accessor(({ resolvedName }) => resolvedName, {
 	}) => (
 		<Link
 			to={paths.bookOverview(id)}
-			className="line-clamp-2 text-sm text-opacity-100 no-underline hover:text-opacity-90"
+			className="text-sm line-clamp-2 no-underline hover:opacity-90"
 		>
 			{getValue()}
 		</Link>
diff --git a/packages/browser/src/scenes/smartList/settings/SmartListSettingsSideBar.tsx b/packages/browser/src/scenes/smartList/settings/SmartListSettingsSideBar.tsx
index 26b5dd1782..791b0b5a5d 100644
--- a/packages/browser/src/scenes/smartList/settings/SmartListSettingsSideBar.tsx
+++ b/packages/browser/src/scenes/smartList/settings/SmartListSettingsSideBar.tsx
@@ -26,24 +26,24 @@ export default function SmartListSettingsSideBar() {
 	return (
 		<div
 			className={cn(
-				'relative flex h-full w-48 shrink-0 flex-col border-edge bg-background px-2 py-4 text-foreground-subtle',
+				'w-48 px-2 py-4 relative flex h-full shrink-0 flex-col border-edge bg-background text-foreground-subtle',
 				primaryNavigationMode === 'TOPBAR'
-					? 'fixed top-12 z-50 h-screen border-r'
-					: 'fixed top-0 z-50 h-screen border-r',
+					? 'top-12 fixed z-50 h-screen border-r'
+					: 'top-0 fixed z-50 h-screen border-r',
 			)}
 		>
-			<div className="flex h-full flex-grow flex-col gap-4">
-				<div className="flex items-center space-x-2">
+			<div className="gap-4 flex h-full grow flex-col">
+				<div className="space-x-2 flex items-center">
 					<ButtonOrLink
 						href="."
 						variant="ghost"
-						className="h-[unset] w-[unset] shrink-0 border border-transparent p-1 text-foreground hover:border-edge-subtle/50 hover:bg-sidebar-surface/70"
+						className="p-1 h-[unset] w-[unset] shrink-0 border border-transparent text-foreground hover:border-edge-subtle/50 hover:bg-sidebar-surface/70"
 						size="sm"
 					>
 						<ArrowLeft className="h-4 w-4 transform" />
 					</ButtonOrLink>
 
-					<Label className="line-clamp-1 py-1">{list.name}</Label>
+					<Label className="py-1 line-clamp-1">{list.name}</Label>
 				</div>
 
 				{groups
@@ -63,7 +63,7 @@ export default function SmartListSettingsSideBar() {
 							<div key={groupLabel}>
 								{groupLabel && <Label>{groupLabel}</Label>}
 								<ul
-									className={cn('flex flex-col gap-y-0.5 text-sm', {
+									className={cn('gap-y-0.5 text-sm flex flex-col', {
 										'pt-2': groupLabel,
 									})}
 								>
@@ -93,7 +93,7 @@ export default function SmartListSettingsSideBar() {
 							size="icon"
 							title="Go home"
 							variant="ghost"
-							className="border border-transparent p-1.5 text-foreground hover:border-edge-subtle/50 hover:bg-sidebar-surface/70"
+							className="p-1.5 border border-transparent text-foreground hover:border-edge-subtle/50 hover:bg-sidebar-surface/70"
 							onClick={() => navigate(paths.home())}
 						>
 							<Home className="h-4 w-4 -scale-x-[1] transform" />
diff --git a/packages/browser/src/scenes/smartList/settings/access/AccessSettingsScene.tsx b/packages/browser/src/scenes/smartList/settings/access/AccessSettingsScene.tsx
index 505b8fee82..3708b0b30b 100644
--- a/packages/browser/src/scenes/smartList/settings/access/AccessSettingsScene.tsx
+++ b/packages/browser/src/scenes/smartList/settings/access/AccessSettingsScene.tsx
@@ -72,7 +72,7 @@ export default function AccessSettingsScene() {
 				target={visibility as EntityVisibility}
 			/>
 
-			<div className="flex flex-col gap-12">
+			<div className="gap-12 flex flex-col">
 				<Form form={form} onSubmit={handleSubmit} fieldsetClassName="flex flex-col gap-12">
 					<AccessSettings />
 
diff --git a/packages/browser/src/scenes/smartList/settings/danger/DangerSettingsScene.tsx b/packages/browser/src/scenes/smartList/settings/danger/DangerSettingsScene.tsx
index 6662f0bd5f..f8e09ad947 100644
--- a/packages/browser/src/scenes/smartList/settings/danger/DangerSettingsScene.tsx
+++ b/packages/browser/src/scenes/smartList/settings/danger/DangerSettingsScene.tsx
@@ -14,8 +14,8 @@ export default function DangerSettingsScene() {
 	const [showConfirmation, setShowConfirmation] = useState(false)
 
 	return (
-		<div className="flex flex-col gap-12">
-			<div className="flex flex-col space-y-4">
+		<div className="gap-12 flex flex-col">
+			<div className="space-y-4 flex flex-col">
 				<div>
 					<Heading size="sm">{t(getKey('heading'))}</Heading>
 					<Text size="sm" variant="muted" className="mt-1">
@@ -33,7 +33,7 @@ export default function DangerSettingsScene() {
 								type="button"
 								variant="danger"
 								onClick={() => setShowConfirmation(true)}
-								className="flex-shrink-0"
+								className="shrink-0"
 							>
 								Delete list
 							</Button>
diff --git a/packages/browser/src/styles/index.css b/packages/browser/src/styles/index.css
index 5575270ac5..8bce77d885 100644
--- a/packages/browser/src/styles/index.css
+++ b/packages/browser/src/styles/index.css
@@ -1,6 +1,5 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import 'tailwindcss';
+@import '@stump/components/tailwind/preset.css';
 
 body {
 	@apply h-full bg-background font-inter antialiased;
@@ -11,7 +10,6 @@ html {
 	@apply flex h-full flex-col overflow-hidden bg-background;
 }
 
-/* TODO: Upgrade tailwind and follow latest shadcn guides, I'm way dated */
 :root {
 	--spacing: 0.25rem;
 }
@@ -32,7 +30,7 @@ form {
 	@apply pointer-events-none z-50;
 }
 #nprogress .bar {
-	@apply fixed left-0 top-0 z-50 h-0.5 w-full bg-brand-500;
+	@apply left-0 top-0 h-0.5 fixed z-50 w-full bg-brand-500;
 }
 
 /* For Safari & Chrome only */
@@ -41,19 +39,17 @@ form {
 	height: 12px;
 }
 ::-webkit-scrollbar-track {
-	background: hsl(var(--twc-scrollbar));
+	background: var(--color-scrollbar);
 }
 ::-webkit-scrollbar-corner {
-	background: hsl(var(--twc-scrollbar));
+	background: var(--color-scrollbar);
 }
 ::-webkit-scrollbar-thumb {
-	background-color: hsl(var(--twc-scrollbar-thumb) / var(--twc-scrollbar-thumb-opacity));
+	background-color: var(--color-scrollbar-thumb);
 	border-radius: 6px;
 	border: 3px solid transparent;
 	background-clip: padding-box;
 }
 ::-webkit-scrollbar-thumb:hover {
-	background-color: hsl(
-		var(--twc-scrollbar-thumb-hover) / var(--twc-scrollbar-thumb-hover-opacity)
-	);
+	background-color: var(--color-scrollbar-thumb-hover);
 }
diff --git a/packages/components/package.json b/packages/components/package.json
index 6ac876df2d..5695a756fb 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -5,6 +5,7 @@
 		".": "./src/index.ts",
 		"./styles/overrides.css": "./src/styles/overrides.css",
 		"./tailwind": "./tailwind/index.ts",
+		"./tailwind/preset.css": "./tailwind/preset.css",
 		"./themes": "./themes/index.ts"
 	},
 	"scripts": {
@@ -42,7 +43,7 @@
 		"@tailwindcss/forms": "^0.5.7",
 		"autoprefixer": "^10.4.19",
 		"class-variance-authority": "^0.7.0",
-		"clsx": "^2.1.0",
+		"clsx": "^2.1.1",
 		"cmdk": "=1.1.1",
 		"date-fns": "^4.1.0",
 		"emoji-mart": "^5.5.2",
@@ -54,10 +55,8 @@
 		"react-hook-form": "^7.53.0",
 		"react-router": "^6.30.0",
 		"react-router-dom": "^6.30.0",
-		"tailwind-merge": "^1.14.0",
-		"tailwindcss": "^3.4.3",
-		"tailwindcss-animate": "^1.0.7",
-		"tailwindcss-autofill": "^1.0.2",
+		"tailwind-merge": "^3.5.0",
+		"tw-animate-css": "^1.4.0",
 		"tailwindcss-shadow-fill": "^1.0.1",
 		"tailwindcss-text-fill": "^0.2.0",
 		"use-count-up": "^3.0.1",
@@ -81,7 +80,9 @@
 		"@storybook/react-webpack5": "^7.6.17",
 		"@storybook/testing-library": "^0.2.2",
 		"@storybook/theming": "^7.6.17",
+		"@tailwindcss/postcss": "^4.2.2",
 		"@tailwindcss/typography": "^0.5.12",
+		"tailwindcss": "^4.2.2",
 		"@types/react": "^19.0.0",
 		"@types/react-dom": "^19.0.0",
 		"babel-loader": "^9.1.3",
@@ -92,8 +93,6 @@
 		"storybook-dark-mode": "^3.0.3",
 		"storybook-tailwind-dark-mode": "^1.0.22",
 		"style-loader": "^3.3.4",
-		"tailwind-scrollbar-hide": "^1.1.7",
-		"tw-colors": "^3.3.1",
 		"typescript": "^5.4.5",
 		"webpack": "5.89.0"
 	}
diff --git a/packages/components/postcss.config.js b/packages/components/postcss.config.js
index c67e55c2e8..5d28e04d61 100644
--- a/packages/components/postcss.config.js
+++ b/packages/components/postcss.config.js
@@ -1,3 +1,6 @@
+// TODO: Kill this file and swap to vite for stories
 module.exports = {
-	plugins: [require('tailwindcss'), require('autoprefixer')],
+	plugins: {
+		'@tailwindcss/postcss': {},
+	},
 }
diff --git a/packages/components/src/accordion/Accordion.tsx b/packages/components/src/accordion/Accordion.tsx
index 8738f77f8a..7bb3815e72 100644
--- a/packages/components/src/accordion/Accordion.tsx
+++ b/packages/components/src/accordion/Accordion.tsx
@@ -27,7 +27,7 @@ const AccordionTrigger = React.forwardRef<
 		<AccordionPrimitive.Trigger
 			ref={ref}
 			className={cn(
-				'flex flex-1 items-center justify-between py-4 text-sm font-medium transition-all [&[data-state=open]>svg]:rotate-180',
+				'py-4 text-sm font-medium flex flex-1 items-center justify-between transition-all [&[data-state=open]>svg]:rotate-180',
 				{
 					'text-sm font-medium leading-none text-foreground peer-disabled:cursor-not-allowed peer-disabled:opacity-70':
 						asLabel,
@@ -55,7 +55,7 @@ const AccordionContent = React.forwardRef<
 	<AccordionPrimitive.Content
 		ref={ref}
 		className={cn(
-			'overflow-hidden text-sm data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down',
+			'text-sm overflow-hidden data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down',
 			className,
 		)}
 		{...props}
diff --git a/packages/components/src/alert/Alert.tsx b/packages/components/src/alert/Alert.tsx
index ae88d6aa4b..0444348a9d 100644
--- a/packages/components/src/alert/Alert.tsx
+++ b/packages/components/src/alert/Alert.tsx
@@ -5,7 +5,7 @@ import * as React from 'react'
 import { cn } from '../utils'
 
 const alertVariants = cva(
-	'relative w-full rounded-lg border border-edge px-4 py-3 text-sm grid has-[>svg]:grid-cols-[calc(var(--spacing)*4)_1fr] grid-cols-[0_1fr] has-[>svg]:gap-x-3 gap-y-0.5 items-start [&>svg]:size-4 [&>svg]:translate-y-0.5 [&>svg]:text-current',
+	'relative w-full rounded-lg border border-edge px-4 py-3 text-sm grid has-[>svg]:grid-cols-[--spacing(4)_1fr] grid-cols-[0_1fr] has-[>svg]:gap-x-3 gap-y-0.5 items-start [&>svg]:size-4 [&>svg]:translate-y-0.5 [&>svg]:text-current',
 	{
 		variants: {
 			variant: {
@@ -74,7 +74,7 @@ function Alert({
 			{dismissible && (
 				<button
 					aria-label="Dismiss this alert"
-					className="absolute right-2 top-2 opacity-50 outline-none hover:opacity-100 group-hover:opacity-80"
+					className="right-2 top-2 absolute opacity-50 outline-none group-hover:opacity-80 hover:opacity-100"
 					onClick={onDismiss}
 				>
 					<X className="size-4" />
@@ -88,7 +88,7 @@ function AlertTitle({ className, ...props }: React.ComponentProps<'div'>) {
 	return (
 		<div
 			data-slot="alert-title"
-			className={cn('col-start-2 line-clamp-1 min-h-4 font-medium tracking-tight', className)}
+			className={cn('min-h-4 font-medium tracking-tight col-start-2 line-clamp-1', className)}
 			{...props}
 		/>
 	)
@@ -99,7 +99,7 @@ function AlertDescription({ className, ...props }: React.ComponentProps<'div'>)
 		<div
 			data-slot="alert-description"
 			className={cn(
-				'col-start-2 grid justify-items-start gap-1 text-sm text-foreground-muted [&_p]:leading-relaxed',
+				'gap-1 text-sm [&_p]:leading-relaxed col-start-2 grid justify-items-start text-foreground-muted',
 				className,
 			)}
 			{...props}
diff --git a/packages/components/src/breadcrumbs/Breadcrumbs.tsx b/packages/components/src/breadcrumbs/Breadcrumbs.tsx
index a642a5d08c..aca30a7646 100644
--- a/packages/components/src/breadcrumbs/Breadcrumbs.tsx
+++ b/packages/components/src/breadcrumbs/Breadcrumbs.tsx
@@ -35,7 +35,7 @@ export default function Breadcrumbs({
 
 				return (
 					<React.Fragment key={segment.label}>
-						{i > 0 && <span className="mx-1.5 text-foreground-muted md:mx-2">/</span>}
+						{i > 0 && <span className="mx-1.5 md:mx-2 text-foreground-muted">/</span>}
 						<Component
 							className={cx('line-clamp-1', { 'shrink-0': segment.noShrink })}
 							{...(segment.to ? { to: segment.to } : {})}
diff --git a/packages/components/src/calendar/DatePicker.tsx b/packages/components/src/calendar/DatePicker.tsx
index 03ea77ba3e..dc89ff0960 100644
--- a/packages/components/src/calendar/DatePicker.tsx
+++ b/packages/components/src/calendar/DatePicker.tsx
@@ -40,7 +40,7 @@ export function DatePicker({
 					className={cn(
 						'w-[280px]',
 						{
-							'flex flex-col gap-1.5': !!label,
+							'gap-1.5 flex flex-col': !!label,
 						},
 						className,
 					)}
@@ -51,7 +51,7 @@ export function DatePicker({
 						size="md"
 						type="button"
 						className={cn(
-							'w-full justify-start text-left font-normal',
+							'font-normal w-full justify-start text-left',
 							!selected && 'text-foreground-muted',
 						)}
 					>
@@ -60,7 +60,7 @@ export function DatePicker({
 					</Button>
 				</div>
 			</PopoverTrigger>
-			<PopoverContent className="w-auto p-0" align={popover?.align} portal={popover?.portal}>
+			<PopoverContent className="p-0 w-auto" align={popover?.align} portal={popover?.portal}>
 				<Calendar
 					mode="single"
 					selected={selected}
diff --git a/packages/components/src/card/Card.stories.tsx b/packages/components/src/card/Card.stories.tsx
index 64cfe3ea64..7c61d7c546 100644
--- a/packages/components/src/card/Card.stories.tsx
+++ b/packages/components/src/card/Card.stories.tsx
@@ -11,9 +11,9 @@ const StoryMeta: Meta<typeof Card> = {
 }
 
 const DemoChild = () => (
-	<div className="flex flex-col space-y-3 px-6 py-4 dark:text-gray-100">
+	<div className="space-y-3 px-6 py-4 flex flex-col dark:text-gray-100">
 		<div className="flex w-full items-center justify-between">
-			<span className="flex items-center space-x-3">
+			<span className="space-x-3 flex items-center">
 				<Library className="h-5 w-5" />
 				<Heading as="h1" size="sm">
 					Libraries
@@ -23,7 +23,7 @@ const DemoChild = () => (
 			<Link href="#">See More</Link>
 		</div>
 
-		<div className="flex h-full min-h-[10rem] w-full flex-1 items-center justify-center">
+		<div className="min-h-40 flex h-full w-full flex-1 items-center justify-center">
 			<span>Card Body!</span>
 		</div>
 	</div>
diff --git a/packages/components/src/card/Card.tsx b/packages/components/src/card/Card.tsx
index 00acd80fcf..c5d2e6e32c 100644
--- a/packages/components/src/card/Card.tsx
+++ b/packages/components/src/card/Card.tsx
@@ -24,7 +24,7 @@ export const CardGrid = forwardRef<HTMLDivElement, ComponentPropsWithoutRef<'div
 			<div
 				ref={ref}
 				className={cn(
-					'grid flex-1 grid-cols-2 items-start justify-center gap-4 sm:grid-cols-4 md:justify-start lg:grid-cols-4 xl:grid-cols-5 xl:gap-4 2xl:grid-cols-7 2xl:gap-2 3xl:grid-cols-8 4xl:grid-cols-10',
+					'gap-4 sm:grid-cols-4 md:justify-start lg:grid-cols-4 xl:grid-cols-5 xl:gap-4 2xl:grid-cols-7 2xl:gap-2 grid flex-1 grid-cols-2 items-start justify-center 3xl:grid-cols-8 4xl:grid-cols-10',
 					className,
 				)}
 				{...props}
diff --git a/packages/components/src/card/HoverCard.stories.tsx b/packages/components/src/card/HoverCard.stories.tsx
index 003e79613b..1fd0650bd6 100644
--- a/packages/components/src/card/HoverCard.stories.tsx
+++ b/packages/components/src/card/HoverCard.stories.tsx
@@ -18,7 +18,7 @@ const Demo = () => (
 		}
 	>
 		<React.Fragment>
-			<div className="flex justify-between space-x-4">
+			<div className="space-x-4 flex justify-between">
 				<div className="space-y-1">
 					<h4 className="text-sm font-semibold text-gray-900 dark:text-gray-50">@stumpapp</h4>
 					<p className="text-sm text-gray-800 dark:text-gray-100">A WIP media server</p>
diff --git a/packages/components/src/card/HoverCard.tsx b/packages/components/src/card/HoverCard.tsx
index 9c5f875032..4e0cdb5803 100644
--- a/packages/components/src/card/HoverCard.tsx
+++ b/packages/components/src/card/HoverCard.tsx
@@ -25,7 +25,7 @@ const HoverCardContent = React.forwardRef<
 		align={align}
 		sideOffset={sideOffset}
 		className={cn(
-			'z-50 w-64 rounded-md border border-edge bg-background-overlay p-4 shadow-md outline-none animate-in zoom-in-90',
+			'w-64 rounded-md p-4 shadow-md z-50 animate-in border border-edge bg-background-overlay outline-none zoom-in-90',
 			className,
 		)}
 		{...props}
diff --git a/packages/components/src/command/primitives.tsx b/packages/components/src/command/primitives.tsx
index 604549a661..92f587bef3 100644
--- a/packages/components/src/command/primitives.tsx
+++ b/packages/components/src/command/primitives.tsx
@@ -12,7 +12,7 @@ const Command = React.forwardRef<ElementRef<typeof CommandPrimitive>, CommandPro
 		<CommandPrimitive
 			ref={ref}
 			className={cn(
-				'flex h-full w-full flex-col overflow-hidden rounded-lg bg-background',
+				'rounded-lg flex h-full w-full flex-col overflow-hidden bg-background',
 				className,
 			)}
 			{...props}
@@ -25,8 +25,8 @@ type CommandDialogProps = DialogProps
 const CommandDialog = ({ children, ...props }: CommandDialogProps) => {
 	return (
 		<Dialog {...props}>
-			<Dialog.Content className="overflow-hidden p-0 shadow-2xl [&_[dialog-overlay]]:bg-red-100">
-				<Command className="[&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-foreground-muted [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">
+			<Dialog.Content className="p-0 shadow-2xl **:[[dialog-overlay]]:bg-red-100 overflow-hidden">
+				<Command className="**:[[cmdk-group-heading]]:px-2 **:[[cmdk-group-heading]]:font-medium [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 **:[[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 **:[[cmdk-input]]:h-12 **:[[cmdk-item]]:px-2 **:[[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5 **:[[cmdk-group-heading]]:text-foreground-muted">
 					{children}
 				</Command>
 			</Dialog.Content>
@@ -39,7 +39,7 @@ const CommandInput = React.forwardRef<
 	ComponentPropsWithoutRef<typeof CommandPrimitive.Input>
 >(({ className, ...props }, ref) => (
 	<div
-		className="flex items-center border-b border-b-edge px-4"
+		className="px-4 flex items-center border-b border-b-edge"
 		// eslint-disable-next-line react/no-unknown-property
 		cmdk-input-wrapper=""
 	>
@@ -47,7 +47,7 @@ const CommandInput = React.forwardRef<
 		<CommandPrimitive.Input
 			ref={ref}
 			className={cn(
-				'flex h-11 w-full rounded-md bg-transparent py-3 text-sm text-foreground-subtle outline-none placeholder:text-foreground-muted disabled:cursor-not-allowed disabled:opacity-50',
+				'h-11 rounded-md py-3 text-sm flex w-full bg-transparent text-foreground-subtle outline-none placeholder:text-foreground-muted disabled:cursor-not-allowed disabled:opacity-50',
 				className,
 			)}
 			{...props}
@@ -63,7 +63,7 @@ const CommandList = React.forwardRef<
 >(({ className, ...props }, ref) => (
 	<CommandPrimitive.List
 		ref={ref}
-		className={cn('max-h-[300px] overflow-y-auto overflow-x-hidden', className)}
+		className={cn('max-h-[300px] overflow-x-hidden overflow-y-auto', className)}
 		{...props}
 	/>
 ))
@@ -76,7 +76,7 @@ const CommandEmpty = React.forwardRef<
 >((props, ref) => (
 	<CommandPrimitive.Empty
 		ref={ref}
-		className="py-6 text-center text-sm text-foreground-subtle"
+		className="py-6 text-sm text-center text-foreground-subtle"
 		{...props}
 	/>
 ))
@@ -90,7 +90,7 @@ const CommandGroup = React.forwardRef<
 	<CommandPrimitive.Group
 		ref={ref}
 		className={cn(
-			'overflow-hidden px-2 py-3 text-foreground-subtle [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:pb-1.5 [&_[cmdk-group-heading]]:text-sm [&_[cmdk-group-heading]]:font-semibold [&_[cmdk-group-heading]]:text-foreground',
+			'px-2 py-3 **:[[cmdk-group-heading]]:px-2 **:[[cmdk-group-heading]]:pb-1.5 **:[[cmdk-group-heading]]:text-sm **:[[cmdk-group-heading]]:font-semibold overflow-hidden text-foreground-subtle **:[[cmdk-group-heading]]:text-foreground',
 			className,
 		)}
 		{...props}
@@ -118,7 +118,7 @@ const CommandItem = React.forwardRef<
 	<CommandPrimitive.Item
 		ref={ref}
 		className={cn(
-			'relative flex cursor-default select-none items-center rounded-md px-2 py-1.5 text-sm font-medium outline-none aria-selected:bg-background-surface data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50',
+			'rounded-md px-2 py-1.5 text-sm font-medium relative flex cursor-default items-center outline-none select-none aria-selected:bg-background-surface data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50',
 			className,
 		)}
 		{...props}
@@ -136,7 +136,7 @@ const CommandIcon = ({ icon: Icon, className, ...props }: CommandIconProps) => {
 const CommandShortcut = ({ className, ...props }: React.HTMLAttributes<HTMLSpanElement>) => {
 	return (
 		<span
-			className={cn('ml-auto text-xs tracking-widest text-foreground-muted', className)}
+			className={cn('text-xs tracking-widest ml-auto text-foreground-muted', className)}
 			{...props}
 		/>
 	)
diff --git a/packages/components/src/container/Divider.tsx b/packages/components/src/container/Divider.tsx
index 96e870ee92..7a80e77e4d 100644
--- a/packages/components/src/container/Divider.tsx
+++ b/packages/components/src/container/Divider.tsx
@@ -23,7 +23,7 @@ const Divider = forwardRef<ElementRef<typeof SeparatorPrimitive.Root>, DividerPr
 			orientation={orientation}
 			className={cn(
 				DIVIDER_VARIANTS[variant || 'default'] || DIVIDER_VARIANTS.default,
-				orientation === 'horizontal' ? 'h-[1px] w-full' : 'h-full w-[1px]',
+				orientation === 'horizontal' ? 'h-px w-full' : 'h-full w-px',
 				className,
 			)}
 			{...props}
diff --git a/packages/components/src/container/SplitContainer.tsx b/packages/components/src/container/SplitContainer.tsx
index 2f176c1711..0eb7958cfa 100644
--- a/packages/components/src/container/SplitContainer.tsx
+++ b/packages/components/src/container/SplitContainer.tsx
@@ -28,10 +28,10 @@ export const SplitContainer = forwardRef<HTMLDivElement, Props>(
 		return (
 			<div
 				ref={ref}
-				className={cn('grid space-y-5 md:grid-cols-12 md:space-y-0', className)}
+				className={cn('space-y-5 md:grid-cols-12 md:space-y-0 grid', className)}
 				{...props}
 			>
-				<div className="flex flex-col space-y-4 md:col-span-4">
+				<div className="space-y-4 md:col-span-4 flex flex-col">
 					{renderHeader()}
 					{renderContent()}
 				</div>
diff --git a/packages/components/src/context-menu/primitives.tsx b/packages/components/src/context-menu/primitives.tsx
index f08e738a0e..337106c75d 100644
--- a/packages/components/src/context-menu/primitives.tsx
+++ b/packages/components/src/context-menu/primitives.tsx
@@ -23,14 +23,14 @@ const ContextMenuPrimitiveSubTrigger = React.forwardRef<
 	<ContextMenu.SubTrigger
 		ref={ref}
 		className={cn(
-			'flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm font-medium outline-none focus:bg-gray-75 data-[state=open]:bg-gray-75 dark:focus:bg-gray-700 dark:data-[state=open]:bg-gray-700',
+			'rounded-sm px-2 py-1.5 text-sm font-medium flex cursor-default items-center outline-none select-none focus:bg-gray-75 data-[state=open]:bg-gray-75 dark:focus:bg-gray-700 dark:data-[state=open]:bg-gray-700',
 			inset && 'pl-8',
 			className,
 		)}
 		{...props}
 	>
 		{children}
-		<ChevronRight className="ml-auto h-4 w-4" />
+		<ChevronRight className="h-4 w-4 ml-auto" />
 	</ContextMenu.SubTrigger>
 ))
 ContextMenuPrimitiveSubTrigger.displayName = ContextMenu.SubTrigger.displayName
@@ -42,7 +42,7 @@ const ContextMenuPrimitiveSubContent = React.forwardRef<
 	<ContextMenu.SubContent
 		ref={ref}
 		className={cn(
-			'z-50 min-w-[8rem] overflow-hidden rounded-md border border-gray-100 bg-white p-1 shadow-md animate-in slide-in-from-left-1 dark:border-gray-700 dark:bg-gray-800 dark:text-gray-150',
+			'min-w-32 rounded-md bg-white p-1 shadow-md z-50 animate-in overflow-hidden border border-gray-100 slide-in-from-left-1 dark:border-gray-700 dark:bg-gray-800 dark:text-gray-150',
 			className,
 		)}
 		{...props}
@@ -58,7 +58,7 @@ const ContextMenuPrimitiveContent = React.forwardRef<
 		<ContextMenu.Content
 			ref={ref}
 			className={cn(
-				'z-50 min-w-[8rem] overflow-hidden rounded-md border border-gray-100 bg-white p-1 text-gray-800 shadow-md animate-in fade-in-80 dark:border-gray-800 dark:bg-gray-800 dark:text-gray-150',
+				'min-w-32 rounded-md bg-white p-1 shadow-md z-50 animate-in overflow-hidden border border-gray-100 text-gray-800 fade-in-80 dark:border-gray-800 dark:bg-gray-800 dark:text-gray-150',
 				className,
 			)}
 			{...props}
@@ -76,7 +76,7 @@ const ContextMenuPrimitiveItem = React.forwardRef<
 	<ContextMenu.Item
 		ref={ref}
 		className={cn(
-			'relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm font-medium outline-none focus:bg-gray-75 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 dark:focus:bg-gray-700',
+			'rounded-sm px-2 py-1.5 text-sm font-medium relative flex cursor-default items-center outline-none select-none focus:bg-gray-75 data-disabled:pointer-events-none data-disabled:opacity-50 dark:focus:bg-gray-700',
 			inset && 'pl-8',
 			className,
 		)}
@@ -92,13 +92,13 @@ const ContextMenuPrimitiveCheckboxItem = React.forwardRef<
 	<ContextMenu.CheckboxItem
 		ref={ref}
 		className={cn(
-			'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm font-medium outline-none focus:bg-gray-75 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 dark:focus:bg-gray-700',
+			'rounded-sm py-1.5 pl-8 pr-2 text-sm font-medium relative flex cursor-default items-center outline-none select-none focus:bg-gray-75 data-disabled:pointer-events-none data-disabled:opacity-50 dark:focus:bg-gray-700',
 			className,
 		)}
 		checked={checked}
 		{...props}
 	>
-		<span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
+		<span className="left-2 h-3.5 w-3.5 absolute flex items-center justify-center">
 			<ContextMenu.ItemIndicator>
 				<Check className="h-4 w-4" />
 			</ContextMenu.ItemIndicator>
@@ -115,12 +115,12 @@ const ContextMenuPrimitiveRadioItem = React.forwardRef<
 	<ContextMenu.RadioItem
 		ref={ref}
 		className={cn(
-			'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm font-medium outline-none focus:bg-gray-75 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 dark:focus:bg-gray-700',
+			'rounded-sm py-1.5 pl-8 pr-2 text-sm font-medium relative flex cursor-default items-center outline-none select-none focus:bg-gray-75 data-disabled:pointer-events-none data-disabled:opacity-50 dark:focus:bg-gray-700',
 			className,
 		)}
 		{...props}
 	>
-		<span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
+		<span className="left-2 h-3.5 w-3.5 absolute flex items-center justify-center">
 			<ContextMenu.ItemIndicator>
 				<Circle className="h-2 w-2 fill-current" />
 			</ContextMenu.ItemIndicator>
@@ -165,7 +165,7 @@ const ContextMenuPrimitiveShortcut = ({
 	...props
 }: React.HTMLAttributes<HTMLSpanElement>) => {
 	return (
-		<span className={cn('ml-auto text-xs tracking-widest text-gray-600', className)} {...props} />
+		<span className={cn('text-xs tracking-widest ml-auto text-gray-600', className)} {...props} />
 	)
 }
 ContextMenuPrimitiveShortcut.displayName = 'ContextMenuPrimitiveShortcut'
diff --git a/packages/components/src/dialog/primitives.tsx b/packages/components/src/dialog/primitives.tsx
index 71cb7f0fe7..d92646fda2 100644
--- a/packages/components/src/dialog/primitives.tsx
+++ b/packages/components/src/dialog/primitives.tsx
@@ -22,7 +22,7 @@ const DialogOverlay = React.forwardRef<
 >(({ className, ...props }, ref) => (
 	<DialogPrimitive.Overlay
 		className={cn(
-			'fixed inset-0 z-50 bg-black/50 backdrop-blur-sm transition-all duration-200 data-[state=closed]:animate-out data-[state=closed]:fade-out data-[state=open]:fade-in',
+			'inset-0 bg-black/50 backdrop-blur-sm fixed z-50 duration-100 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:animate-in data-[state=open]:fade-in-0',
 			className,
 		)}
 		{...props}
@@ -51,7 +51,7 @@ const DialogContent = React.forwardRef<
 		<DialogPrimitive.Content
 			ref={ref}
 			className={cn(
-				'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border border-edge bg-background-overlay p-4 shadow-lg !outline-none duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg md:w-full',
+				'max-w-lg gap-4 p-4 shadow-lg sm:rounded-lg md:w-full fixed top-[50%] left-[50%] z-50 grid w-full translate-x-[-50%] translate-y-[-50%] border border-edge bg-background-overlay duration-100 outline-none! data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95',
 				'bg-background',
 				DIALOG_CONTENT_SIZES[size] ?? DIALOG_CONTENT_SIZES.md,
 				className,
@@ -69,14 +69,14 @@ const DialogContent = React.forwardRef<
 DialogContent.displayName = DialogPrimitive.Content.displayName
 
 const DialogHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
-	<div className={cn('flex flex-col space-y-1 text-center sm:text-left', className)} {...props} />
+	<div className={cn('space-y-1 sm:text-left flex flex-col text-center', className)} {...props} />
 )
 DialogHeader.displayName = 'DialogHeader'
 
 const DialogFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
 	<div
 		className={cn(
-			'flex flex-col-reverse space-y-2 space-y-reverse sm:flex-row sm:justify-end sm:space-x-2 sm:space-y-0',
+			'space-y-2 sm:flex-row sm:justify-end sm:space-x-2 sm:space-y-0 flex flex-col-reverse space-y-reverse',
 			className,
 		)}
 		{...props}
@@ -115,7 +115,7 @@ const DialogClose = React.forwardRef<
 	<DialogPrimitive.Close
 		ref={ref}
 		className={cn(
-			'absolute right-4 top-4 rounded-sm text-foreground-subtle opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-edge-brand focus:ring-offset-2 focus:ring-offset-background disabled:pointer-events-none data-[state=open]:bg-background',
+			'right-4 top-4 rounded-sm absolute text-foreground-subtle opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-edge-brand focus:ring-offset-2 focus:ring-offset-background focus:outline-none disabled:pointer-events-none data-[state=open]:bg-background',
 			className,
 		)}
 		{...props}
diff --git a/packages/components/src/drawer/Drawer.tsx b/packages/components/src/drawer/Drawer.tsx
index 44035d1205..b5cd21373b 100644
--- a/packages/components/src/drawer/Drawer.tsx
+++ b/packages/components/src/drawer/Drawer.tsx
@@ -29,7 +29,7 @@ const DrawerOverlay: React.ForwardRefExoticComponent<
 >(({ className, ...props }, ref) => (
 	<DrawerPrimitive.Overlay
 		ref={ref}
-		className={cn('fixed inset-0 z-50 bg-black/80', className)}
+		className={cn('inset-0 bg-black/80 fixed z-50', className)}
 		{...props}
 	/>
 ))
@@ -47,7 +47,7 @@ const DrawerContent: typeof DrawerPrimitive.Content = React.forwardRef<
 		<DrawerPrimitive.Content
 			ref={ref}
 			className={cn(
-				'fixed inset-x-0 bottom-0 z-50 mt-24 flex h-auto flex-col rounded-t-[10px] border border-edge-subtle bg-background outline-none',
+				'inset-x-0 bottom-0 mt-24 fixed z-50 flex h-auto flex-col rounded-t-[10px] border border-edge-subtle bg-background outline-none',
 				className,
 			)}
 			{...props}
@@ -55,7 +55,7 @@ const DrawerContent: typeof DrawerPrimitive.Content = React.forwardRef<
 			{showTopIndicator && (
 				<button
 					type="button"
-					className="bg-muted/40 hover:bg-muted/50 mx-auto mt-4 h-2 w-[100px] scale-[99%] rounded-full outline-none transition-all duration-200 hover:scale-100 active:scale-[99%]"
+					className="bg-muted/40 hover:bg-muted/50 mt-4 h-2 mx-auto w-[100px] scale-[99%] rounded-full transition-all duration-200 outline-none hover:scale-100 active:scale-[99%]"
 				/>
 			)}
 			{children}
@@ -65,12 +65,12 @@ const DrawerContent: typeof DrawerPrimitive.Content = React.forwardRef<
 DrawerContent.displayName = 'DrawerContent'
 
 const DrawerHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
-	<div className={cn('grid gap-1.5 p-4 text-center sm:text-left', className)} {...props} />
+	<div className={cn('gap-1.5 p-4 sm:text-left grid text-center', className)} {...props} />
 )
 DrawerHeader.displayName = 'DrawerHeader'
 
 const DrawerFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
-	<div className={cn('mt-auto flex flex-col gap-2 p-4', className)} {...props} />
+	<div className={cn('gap-2 p-4 mt-auto flex flex-col', className)} {...props} />
 )
 DrawerFooter.displayName = 'DrawerFooter'
 
@@ -81,7 +81,7 @@ const DrawerTitle: typeof DrawerPrimitive.Title = React.forwardRef<
 	<DrawerPrimitive.Title
 		ref={ref}
 		className={cn(
-			'text-lg font-semibold leading-none tracking-tight text-foreground-subtle',
+			'text-lg font-semibold tracking-tight leading-none text-foreground-subtle',
 			className,
 		)}
 		{...props}
diff --git a/packages/components/src/dropdown/primitives.tsx b/packages/components/src/dropdown/primitives.tsx
index 6f782be653..9a511740aa 100644
--- a/packages/components/src/dropdown/primitives.tsx
+++ b/packages/components/src/dropdown/primitives.tsx
@@ -23,14 +23,14 @@ const DropdownSubTrigger = React.forwardRef<
 	<DropdownMenuPrimitive.SubTrigger
 		ref={ref}
 		className={cn(
-			'flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm font-medium outline-none focus:bg-background-surface/80 data-[disabled]:cursor-not-allowed data-[state=open]:bg-background-surface',
+			'rounded-sm px-2 py-1.5 text-sm font-medium flex cursor-default items-center outline-none select-none focus:bg-background-surface/80 data-disabled:cursor-not-allowed data-[state=open]:bg-background-surface',
 			inset && 'pl-8',
 			className,
 		)}
 		{...props}
 	>
 		{children}
-		<ChevronRight className="ml-auto h-4 w-4" />
+		<ChevronRight className="h-4 w-4 ml-auto" />
 	</DropdownMenuPrimitive.SubTrigger>
 ))
 DropdownSubTrigger.displayName = DropdownMenuPrimitive.SubTrigger.displayName
@@ -42,7 +42,7 @@ const DropdownSubContent = React.forwardRef<
 	<DropdownMenuPrimitive.SubContent
 		ref={ref}
 		className={cn(
-			'z-50 min-w-[8rem] rounded-md border border-edge bg-background p-1 text-foreground-subtle shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
+			'min-w-32 rounded-md p-1 shadow-md z-50 border border-edge bg-background text-foreground-subtle data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95',
 			className,
 		)}
 		sideOffset={6}
@@ -61,7 +61,7 @@ const DropdownContent = React.forwardRef<
 			ref={ref}
 			sideOffset={sideOffset}
 			className={cn(
-				'z-50 min-w-[8rem] rounded-md border border-edge bg-background p-1 text-foreground-subtle shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
+				'min-w-32 rounded-md p-1 shadow-md z-50 border border-edge bg-background text-foreground-subtle data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95',
 				className,
 			)}
 			{...props}
@@ -79,7 +79,7 @@ const DropdownItem = React.forwardRef<
 	<DropdownMenuPrimitive.Item
 		ref={ref}
 		className={cn(
-			'relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm font-medium outline-none focus:bg-background-surface/80 data-[disabled]:pointer-events-none data-[disabled]:cursor-not-allowed data-[disabled]:opacity-50',
+			'rounded-sm px-2 py-1.5 text-sm font-medium relative flex cursor-default items-center outline-none select-none focus:bg-background-surface/80 data-disabled:pointer-events-none data-disabled:cursor-not-allowed data-disabled:opacity-50',
 			inset && 'pl-8',
 			className,
 		)}
@@ -95,13 +95,13 @@ const DropdownCheckboxItem = React.forwardRef<
 	<DropdownMenuPrimitive.CheckboxItem
 		ref={ref}
 		className={cn(
-			'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm font-medium outline-none focus:bg-background-surface/80 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+			'rounded-sm py-1.5 pl-8 pr-2 text-sm font-medium relative flex cursor-default items-center outline-none select-none focus:bg-background-surface/80 data-disabled:pointer-events-none data-disabled:opacity-50',
 			className,
 		)}
 		checked={checked}
 		{...props}
 	>
-		<span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
+		<span className="left-2 h-3.5 w-3.5 absolute flex items-center justify-center">
 			<DropdownMenuPrimitive.ItemIndicator>
 				<Check className="h-4 w-4" />
 			</DropdownMenuPrimitive.ItemIndicator>
@@ -118,12 +118,12 @@ const DropdownRadioItem = React.forwardRef<
 	<DropdownMenuPrimitive.RadioItem
 		ref={ref}
 		className={cn(
-			'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm font-medium outline-none focus:bg-background-surface/80 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+			'rounded-sm py-1.5 pl-8 pr-2 text-sm font-medium relative flex cursor-default items-center outline-none select-none focus:bg-background-surface/80 data-disabled:pointer-events-none data-disabled:opacity-50',
 			className,
 		)}
 		{...props}
 	>
-		<span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
+		<span className="left-2 h-3.5 w-3.5 absolute flex items-center justify-center">
 			<DropdownMenuPrimitive.ItemIndicator>
 				<Circle className="h-2 w-2 fill-current" />
 			</DropdownMenuPrimitive.ItemIndicator>
@@ -161,7 +161,7 @@ DropdownSeparator.displayName = DropdownMenuPrimitive.Separator.displayName
 
 const DropdownShortcut = ({ className, ...props }: React.HTMLAttributes<HTMLSpanElement>) => {
 	return (
-		<span className={cn('ml-auto text-xs tracking-widest text-gray-500', className)} {...props} />
+		<span className={cn('text-xs tracking-widest ml-auto text-gray-500', className)} {...props} />
 	)
 }
 DropdownShortcut.displayName = 'DropdownMenuShortcut'
diff --git a/packages/components/src/emoji/EmojiPicker.tsx b/packages/components/src/emoji/EmojiPicker.tsx
index a5392e98ff..043ba22ad1 100644
--- a/packages/components/src/emoji/EmojiPicker.tsx
+++ b/packages/components/src/emoji/EmojiPicker.tsx
@@ -102,7 +102,7 @@ export default function EmojiPicker({
 						{renderTrigger()}
 					</Popover.Trigger>
 					<Popover.Content
-						className="!border-none !bg-transparent p-0 !shadow-none"
+						className="p-0 border-none! bg-transparent! shadow-none!"
 						{...contentProps}
 					>
 						<Picker data={data} onEmojiSelect={handleEmojiSelect} />
diff --git a/packages/components/src/form/Form.tsx b/packages/components/src/form/Form.tsx
index ca08e159c5..52d6c60a56 100644
--- a/packages/components/src/form/Form.tsx
+++ b/packages/components/src/form/Form.tsx
@@ -20,7 +20,7 @@ export function Form<T extends FieldValues>({
 		<FormProvider {...form}>
 			<form onSubmit={form.handleSubmit(onSubmit)} {...props}>
 				<fieldset
-					className={cn('flex min-w-0 flex-col gap-4', fieldsetClassName)}
+					className={cn('min-w-0 gap-4 flex flex-col', fieldsetClassName)}
 					disabled={form.formState.isSubmitting}
 				>
 					{children}
diff --git a/packages/components/src/image/primitives.tsx b/packages/components/src/image/primitives.tsx
index 7e7c582ef5..e7476b3114 100644
--- a/packages/components/src/image/primitives.tsx
+++ b/packages/components/src/image/primitives.tsx
@@ -12,7 +12,7 @@ const AvatarPrimitive = React.forwardRef<
 >(({ className, ...props }, ref) => (
 	<AvatarRadix.Root
 		ref={ref}
-		className={cn('relative flex h-10 w-10 shrink-0 overflow-hidden rounded-full', className)}
+		className={cn('h-10 w-10 relative flex shrink-0 overflow-hidden rounded-full', className)}
 		{...props}
 	/>
 ))
diff --git a/packages/components/src/input/CheckBox.tsx b/packages/components/src/input/CheckBox.tsx
index 89c03d1ff7..38403e199a 100644
--- a/packages/components/src/input/CheckBox.tsx
+++ b/packages/components/src/input/CheckBox.tsx
@@ -23,11 +23,11 @@ export const CheckBox = React.forwardRef<RawCheckBoxRef, CheckBoxProps>(
 			}
 
 			return (
-				<div className="grid gap-1.5 leading-none">
+				<div className="gap-1.5 grid leading-none">
 					{label && (
 						<Label
 							htmlFor={props.id}
-							className={cx({ 'cursor-not-allowed text-opacity-50': props.disabled })}
+							className={cx({ 'cursor-not-allowed opacity-50': props.disabled })}
 						>
 							{label}
 						</Label>
@@ -36,7 +36,7 @@ export const CheckBox = React.forwardRef<RawCheckBoxRef, CheckBoxProps>(
 						<Text
 							size="sm"
 							variant="muted"
-							className={cx({ 'cursor-not-allowed text-opacity-50': props.disabled })}
+							className={cx({ 'cursor-not-allowed opacity-50': props.disabled })}
 						>
 							{description}
 						</Text>
@@ -46,7 +46,7 @@ export const CheckBox = React.forwardRef<RawCheckBoxRef, CheckBoxProps>(
 		}
 
 		return (
-			<div className="flex items-start space-x-2">
+			<div className="space-x-2 flex items-start">
 				<RawCheckBox ref={ref} {...props} />
 				{renderContent()}
 			</div>
diff --git a/packages/components/src/input/Input.tsx b/packages/components/src/input/Input.tsx
index 6673b66d54..cf76b61a8c 100644
--- a/packages/components/src/input/Input.tsx
+++ b/packages/components/src/input/Input.tsx
@@ -51,7 +51,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
 		const renderLeftDecoration = () => {
 			if (leftDecoration) {
 				return (
-					<div className="absolute inset-y-0 left-0 flex items-center pl-3">{leftDecoration}</div>
+					<div className="inset-y-0 left-0 pl-3 absolute flex items-center">{leftDecoration}</div>
 				)
 			}
 
@@ -61,7 +61,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
 		const renderRightDecoration = () => {
 			if (rightDecoration) {
 				return (
-					<div className="absolute inset-y-0 right-0 flex items-center pr-3">{rightDecoration}</div>
+					<div className="inset-y-0 right-0 pr-3 absolute flex items-center">{rightDecoration}</div>
 				)
 			}
 
@@ -77,7 +77,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
 						{...(descriptionProps || {})}
 						className={cn(
 							{
-								'cursor-not-allowed text-opacity-50': props.disabled,
+								'cursor-not-allowed opacity-50': props.disabled,
 							},
 							descriptionProps?.className,
 						)}
@@ -110,7 +110,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
 		return (
 			<div
 				className={cn(
-					'grid w-full items-center gap-2',
+					'gap-2 grid w-full items-center',
 					{ 'max-w-sm': !fullWidth },
 					containerClassName,
 				)}
@@ -121,7 +121,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
 						{...(labelProps || {})}
 						className={cn(
 							{
-								'cursor-not-allowed text-opacity-50': props.disabled,
+								'cursor-not-allowed opacity-50': props.disabled,
 							},
 							labelProps?.className,
 						)}
diff --git a/packages/components/src/input/PasswordInput.tsx b/packages/components/src/input/PasswordInput.tsx
index 73836a4c6a..436c1f4371 100644
--- a/packages/components/src/input/PasswordInput.tsx
+++ b/packages/components/src/input/PasswordInput.tsx
@@ -18,7 +18,7 @@ export const PasswordInput = forwardRef<HTMLInputElement, Props>((props, ref) =>
 					title={showPassword ? 'Hide password' : 'Show password'}
 					type="button"
 					onClick={() => setShowPassword((prev) => !prev)}
-					className="absolute inset-y-0 right-0 flex items-center pr-3"
+					className="inset-y-0 right-0 pr-3 absolute flex items-center"
 				>
 					{showPassword ? (
 						<Eye className="h-4 w-4 text-foreground-muted" />
diff --git a/packages/components/src/input/Switch.tsx b/packages/components/src/input/Switch.tsx
index 37d3f67c3a..a097055666 100644
--- a/packages/components/src/input/Switch.tsx
+++ b/packages/components/src/input/Switch.tsx
@@ -13,7 +13,7 @@ export type SwitchProps = {
 
 export const Switch = React.forwardRef<RawSwitchRef, SwitchProps>(
 	({ label, containerClassName, ...props }, ref) => (
-		<div className={cn('flex items-center space-x-2', containerClassName)}>
+		<div className={cn('space-x-2 flex items-center', containerClassName)}>
 			<RawSwitch {...props} ref={ref} />
 			<Label htmlFor={props.id}>{label}</Label>
 		</div>
diff --git a/packages/components/src/input/TextArea.tsx b/packages/components/src/input/TextArea.tsx
index 989aa2a7c5..b1d2d34063 100644
--- a/packages/components/src/input/TextArea.tsx
+++ b/packages/components/src/input/TextArea.tsx
@@ -20,7 +20,7 @@ export type TextAreaProps = {
 const TextArea = React.forwardRef<RawTextAreaRef, TextAreaProps>(
 	({ label, description, containerClassName, errorMessage, variant, isInvalid, ...props }, ref) => {
 		return (
-			<div className={cn('grid items-center gap-1.5', containerClassName)}>
+			<div className={cn('gap-1.5 grid items-center', containerClassName)}>
 				{label && <Label htmlFor={props.id}>{label}</Label>}
 				<RawTextArea
 					variant={variant}
diff --git a/packages/components/src/input/WideSwitch.tsx b/packages/components/src/input/WideSwitch.tsx
index 997fc281bc..587591e3b7 100644
--- a/packages/components/src/input/WideSwitch.tsx
+++ b/packages/components/src/input/WideSwitch.tsx
@@ -19,11 +19,11 @@ export function WideSwitch({
 }: WideSwitchProps) {
 	return (
 		<label htmlFor={formId} className="flex items-center justify-between" title={title}>
-			<div className="flex flex-grow flex-col gap-2 text-left">
+			<div className="gap-2 flex grow flex-col text-left">
 				<Text
 					size="sm"
 					variant="label"
-					className={cn({ 'cursor-not-allowed select-none text-foreground-muted': disabled })}
+					className={cn({ 'cursor-not-allowed text-foreground-muted select-none': disabled })}
 				>
 					{label}
 				</Text>
@@ -31,7 +31,7 @@ export function WideSwitch({
 					size="sm"
 					variant="muted"
 					className={cn('max-w-[80%]', {
-						'cursor-not-allowed select-none text-foreground-muted': disabled,
+						'cursor-not-allowed text-foreground-muted select-none': disabled,
 					})}
 				>
 					{description}
diff --git a/packages/components/src/input/raw/RawInput.tsx b/packages/components/src/input/raw/RawInput.tsx
index feecde29c3..e3e9b64a41 100644
--- a/packages/components/src/input/raw/RawInput.tsx
+++ b/packages/components/src/input/raw/RawInput.tsx
@@ -8,7 +8,7 @@ export const RAW_INPUT_BASE_CLASSES = [
 	'enabled:hover:bg-background-surface bg-transparent focus:bg-transparent',
 	'border-edge-subtle border outline-none',
 	'focus:ring-offset-background focus:outline-none focus:ring-2 focus:ring-edge-brand focus:ring-offset-2 focus:ring-offset-background',
-	'text-foreground-subtle placeholder:text-foreground-muted text-sm light:placeholder:text-opacity-70',
+	'text-foreground-subtle placeholder:text-foreground-muted text-sm light:placeholder:opacity-70',
 	'disabled:cursor-not-allowed disabled:opacity-50',
 ]
 export const RAW_INPUT_SIZE_VARIANTS = {
diff --git a/packages/components/src/input/raw/RawSwitch.tsx b/packages/components/src/input/raw/RawSwitch.tsx
index 28a4386f93..9ef5e1159e 100644
--- a/packages/components/src/input/raw/RawSwitch.tsx
+++ b/packages/components/src/input/raw/RawSwitch.tsx
@@ -53,7 +53,7 @@ export const RawSwitch = React.forwardRef<RawSwitchRef, RawSwitchProps>(
 			>
 				<SwitchPrimitives.Thumb
 					className={cn(
-						'pointer-events-none block rounded-full bg-white shadow-lg ring-0 transition-transform',
+						'bg-white shadow-lg pointer-events-none block rounded-full ring-0 transition-transform',
 						{
 							'h-5 w-5 data-[state=checked]:translate-x-5 data-[state=unchecked]:translate-x-0':
 								size === 'default',
diff --git a/packages/components/src/navigation/NavigationMenu.tsx b/packages/components/src/navigation/NavigationMenu.tsx
index 630310dae4..f644ffb0da 100644
--- a/packages/components/src/navigation/NavigationMenu.tsx
+++ b/packages/components/src/navigation/NavigationMenu.tsx
@@ -31,7 +31,7 @@ const NavigationMenuList = React.forwardRef<
 >(({ className, ...props }, ref) => (
 	<NavigationMenuPrimitive.List
 		ref={ref}
-		className={cn('group flex flex-1 list-none items-center justify-center space-x-1', className)}
+		className={cn('group space-x-1 flex flex-1 list-none items-center justify-center', className)}
 		{...props}
 	/>
 ))
@@ -40,7 +40,7 @@ NavigationMenuList.displayName = NavigationMenuPrimitive.List.displayName
 const NavigationMenuItem = NavigationMenuPrimitive.Item
 
 const navigationMenuTriggerStyle = cva(
-	'group inline-flex h-9 w-max items-center justify-center rounded-md bg-sidebar text-foreground-subtle hover:bg-sidebar-surface-hover px-4 py-2 text-sm font-medium transition-colors focus:outline-none disabled:pointer-events-none disabled:opacity-50 data-[active]:bg-sidebar-surface data-[state=open]:bg-sidebar-surface',
+	'group inline-flex h-9 w-max items-center justify-center rounded-md bg-sidebar text-foreground-subtle hover:bg-sidebar-surface-hover px-4 py-2 text-sm font-medium transition-colors focus:outline-none disabled:pointer-events-none disabled:opacity-50 data-active:bg-sidebar-surface data-[state=open]:bg-sidebar-surface',
 )
 
 const NavigationMenuTrigger = React.forwardRef<
@@ -54,7 +54,7 @@ const NavigationMenuTrigger = React.forwardRef<
 		className={cn(
 			navigationMenuTriggerStyle(),
 			'group',
-			{ 'h-[2.35rem] w-[2.35rem] p-0 px-0 py-0': !showChevron },
+			{ 'p-0 px-0 py-0 h-[2.35rem] w-[2.35rem]': !showChevron },
 			className,
 		)}
 		{...props}
@@ -62,7 +62,7 @@ const NavigationMenuTrigger = React.forwardRef<
 		{children}{' '}
 		{showChevron && (
 			<ChevronDown
-				className="relative top-[1px] ml-1 h-3 w-3 transition duration-300 group-data-[state=open]:rotate-180"
+				className="ml-1 h-3 w-3 relative top-px transition duration-300 group-data-[state=open]:rotate-180"
 				aria-hidden="true"
 			/>
 		)}
@@ -77,7 +77,7 @@ const NavigationMenuContent = React.forwardRef<
 	<NavigationMenuPrimitive.Content
 		ref={ref}
 		className={cn(
-			'left-0 top-0 w-full data-[motion^=from-]:animate-in data-[motion^=to-]:animate-out data-[motion^=from-]:fade-in data-[motion^=to-]:fade-out data-[motion=from-end]:slide-in-from-right-52 data-[motion=from-start]:slide-in-from-left-52 data-[motion=to-end]:slide-out-to-right-52 data-[motion=to-start]:slide-out-to-left-52 md:absolute md:w-auto',
+			'left-0 top-0 md:absolute md:w-auto w-full data-[motion=from-end]:slide-in-from-right-52 data-[motion=from-start]:slide-in-from-left-52 data-[motion=to-end]:slide-out-to-right-52 data-[motion=to-start]:slide-out-to-left-52 data-[motion^=from-]:animate-in data-[motion^=from-]:fade-in data-[motion^=to-]:animate-out data-[motion^=to-]:fade-out',
 			className,
 		)}
 		{...props}
@@ -98,14 +98,14 @@ const NavigationMenuViewport = React.forwardRef<
 	<div
 		className={cn(
 			'absolute top-full flex justify-center',
-			{ 'left-auto right-0': align === 'right' },
+			{ 'right-0 left-auto': align === 'right' },
 			{ 'left-0 right-auto': align === 'left' },
 			containerClassName,
 		)}
 	>
 		<NavigationMenuPrimitive.Viewport
 			className={cn(
-				'origin-top-center relative mt-1.5 h-[var(--radix-navigation-menu-viewport-height)] w-full overflow-hidden rounded-md border border-edge-subtle bg-background shadow data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-90 md:w-[var(--radix-navigation-menu-viewport-width)]',
+				'origin-top-center mt-1.5 rounded-md shadow md:w-(--radix-navigation-menu-viewport-width) relative h-(--radix-navigation-menu-viewport-height) w-full overflow-hidden border border-edge-subtle bg-background data-[state=closed]:animate-out data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:zoom-in-90',
 				className,
 			)}
 			ref={ref}
@@ -122,12 +122,12 @@ const NavigationMenuIndicator = React.forwardRef<
 	<NavigationMenuPrimitive.Indicator
 		ref={ref}
 		className={cn(
-			'top-full z-[1] flex h-1.5 items-end justify-center overflow-hidden data-[state=visible]:animate-in data-[state=hidden]:animate-out data-[state=hidden]:fade-out data-[state=visible]:fade-in',
+			'h-1.5 top-full z-1 flex items-end justify-center overflow-hidden data-[state=hidden]:animate-out data-[state=hidden]:fade-out data-[state=visible]:animate-in data-[state=visible]:fade-in',
 			className,
 		)}
 		{...props}
 	>
-		<div className="relative top-[60%] h-2 w-2 rotate-45 rounded-tl-sm bg-edge shadow-md" />
+		<div className="h-2 w-2 rounded-tl-sm shadow-md relative top-[60%] rotate-45 bg-edge" />
 	</NavigationMenuPrimitive.Indicator>
 ))
 NavigationMenuIndicator.displayName = NavigationMenuPrimitive.Indicator.displayName
diff --git a/packages/components/src/popover/Popover.tsx b/packages/components/src/popover/Popover.tsx
index 8615e890f5..eed5a51e1e 100644
--- a/packages/components/src/popover/Popover.tsx
+++ b/packages/components/src/popover/Popover.tsx
@@ -30,7 +30,7 @@ const PopoverContent = React.forwardRef<
 				align={align}
 				sideOffset={sideOffset}
 				className={cn(
-					'z-50 rounded-md border border-edge bg-background p-4 shadow-md outline-none animate-in data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
+					'rounded-md p-4 shadow-md z-50 animate-in border border-edge bg-background outline-none data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
 					POPOVER_SIZE_VARIANTS[size || 'default'] ?? POPOVER_SIZE_VARIANTS.default,
 					className,
 				)}
diff --git a/packages/components/src/preformatted/Preformatted.tsx b/packages/components/src/preformatted/Preformatted.tsx
index 662a3674a1..630f1dd54c 100644
--- a/packages/components/src/preformatted/Preformatted.tsx
+++ b/packages/components/src/preformatted/Preformatted.tsx
@@ -9,7 +9,7 @@ export function Preformatted({ title, content }: PreformattedProps) {
 	const memoContent = useMemo(() => JSON.stringify(content, null, 2), [content])
 
 	const formatted = (
-		<div className="rounded-sm bg-background-surface p-4">
+		<div className="rounded-sm p-4 bg-background-surface">
 			<pre className="text-xs text-foreground-subtle">{memoContent}</pre>
 		</div>
 	)
@@ -19,8 +19,8 @@ export function Preformatted({ title, content }: PreformattedProps) {
 	}
 
 	return (
-		<div className="flex flex-col pb-0">
-			<div className="flex h-10 items-center bg-background-surface px-4">
+		<div className="pb-0 flex flex-col">
+			<div className="h-10 px-4 flex items-center bg-background-surface">
 				<Text size="sm" className="font-medium">
 					{title}
 				</Text>
diff --git a/packages/components/src/progress/FullScreenLoader.tsx b/packages/components/src/progress/FullScreenLoader.tsx
index 959ff58796..7e094b5fdb 100644
--- a/packages/components/src/progress/FullScreenLoader.tsx
+++ b/packages/components/src/progress/FullScreenLoader.tsx
@@ -1,7 +1,7 @@
 export function FullScreenLoader() {
 	return (
-		<div className="min-w-screen flex min-h-screen items-center justify-center p-5">
-			<div className="flex animate-pulse space-x-2">
+		<div className="p-5 flex min-h-screen min-w-screen items-center justify-center">
+			<div className="animate-pulse space-x-2 flex">
 				<div className="h-3 w-3 rounded-full bg-gray-500 dark:bg-gray-400"></div>
 				<div className="h-3 w-3 rounded-full bg-gray-500 dark:bg-gray-400"></div>
 				<div className="h-3 w-3 rounded-full bg-gray-500 dark:bg-gray-400"></div>
diff --git a/packages/components/src/progress/ProgressSpinner.tsx b/packages/components/src/progress/ProgressSpinner.tsx
index 00f91ac779..512bdfb221 100644
--- a/packages/components/src/progress/ProgressSpinner.tsx
+++ b/packages/components/src/progress/ProgressSpinner.tsx
@@ -43,7 +43,7 @@ export const ProgressSpinner = forwardRef<ElementRef<'svg'>, ProgressSpinnerProp
 				className={cn(
 					spinnerVariants({ className, size, variant }),
 					{
-						'fill-gray-700 dark:fill-gray-100 dark:text-zinc-500':
+						'dark:text-zinc-500 fill-gray-700 dark:fill-gray-100':
 							buttonContext?.variant === 'primary',
 					},
 
diff --git a/packages/components/src/radio/RadioCardItem.tsx b/packages/components/src/radio/RadioCardItem.tsx
index 00cc903ffd..ca6858dfdc 100644
--- a/packages/components/src/radio/RadioCardItem.tsx
+++ b/packages/components/src/radio/RadioCardItem.tsx
@@ -36,26 +36,26 @@ export function RadioCardItem({
 		<Label
 			htmlFor={value}
 			className={cn(
-				'relative cursor-pointer rounded-lg border bg-background-surface p-4 font-normal transition-colors duration-150 focus:outline-none',
+				'rounded-lg p-4 font-normal relative cursor-pointer border bg-background-surface transition-colors duration-150 focus:outline-none',
 				disabled ? 'cursor-not-allowed opacity-70' : 'hover:bg-background-surface-hover/70',
 				{
 					'border-edge-brand bg-background-surface/75 ring-2 ring-edge-brand': isActive,
 				},
 				{ 'hover:bg-background-surface-hover': isActive && !disabled },
 				{
-					'border-edge-subtle border-opacity-70 hover:border-opacity-100': !isActive,
+					'border-opacity-70 hover:border-opacity-100 border-edge-subtle': !isActive,
 				},
 				className,
 			)}
 		>
 			<div
 				className={cn(
-					'block sm:flex sm:items-center sm:justify-between',
+					'sm:flex sm:items-center sm:justify-between block',
 					{ 'pb-4': !!children },
 					innerContainerClassName,
 				)}
 			>
-				<div className={cn('flex flex-shrink-0 items-center space-x-2', radioContainerClassName)}>
+				<div className={cn('space-x-2 flex shrink-0 items-center', radioContainerClassName)}>
 					<RadioGroup.Item value={value} id={value} className="border-edge-subtle" />
 					<Text variant="label" className="font-normal">
 						{label}
diff --git a/packages/components/src/radio/primitives.tsx b/packages/components/src/radio/primitives.tsx
index dee8751ea8..9dc24ebcdc 100644
--- a/packages/components/src/radio/primitives.tsx
+++ b/packages/components/src/radio/primitives.tsx
@@ -14,7 +14,7 @@ export const RadioGroup = React.forwardRef<
 >(({ className, ...props }, ref) => {
 	return (
 		<RadioGroupContext.Provider value={{ disabled: props.disabled }}>
-			<RadioGroupPrimitive.Root className={cn('grid gap-2', className)} {...props} ref={ref} />
+			<RadioGroupPrimitive.Root className={cn('gap-2 grid', className)} {...props} ref={ref} />
 		</RadioGroupContext.Provider>
 	)
 }) as typeof RadioGroupPrimitive.Root & RadioGroupSubComponents
@@ -32,7 +32,7 @@ const RadioGroupItem = React.forwardRef<
 		<RadioGroupPrimitive.Item
 			ref={ref}
 			className={cn(
-				'h-4 w-4 rounded-full border border-edge ring-offset-background focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-brand-400',
+				'h-4 w-4 rounded-full border border-edge ring-offset-background focus:ring-2 focus:ring-offset-2 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-brand-400',
 				className,
 			)}
 			{...props}
diff --git a/packages/components/src/scroll-area/ScrollArea.tsx b/packages/components/src/scroll-area/ScrollArea.tsx
index 25b9837186..0e5359e798 100644
--- a/packages/components/src/scroll-area/ScrollArea.tsx
+++ b/packages/components/src/scroll-area/ScrollArea.tsx
@@ -30,9 +30,9 @@ const ScrollBar = React.forwardRef<
 		ref={ref}
 		orientation={orientation}
 		className={cn(
-			'flex touch-none select-none transition-colors',
-			orientation === 'vertical' && 'h-full w-2.5 border-l border-l-transparent p-[1px]',
-			orientation === 'horizontal' && 'h-2.5 border-t border-t-transparent p-[1px]',
+			'flex touch-none transition-colors select-none',
+			orientation === 'vertical' && 'w-2.5 h-full border-l border-l-transparent p-px',
+			orientation === 'horizontal' && 'h-2.5 border-t border-t-transparent p-px',
 			className,
 		)}
 		{...props}
diff --git a/packages/components/src/select/ComboBox.tsx b/packages/components/src/select/ComboBox.tsx
index 86871425fd..612eb7b1fc 100644
--- a/packages/components/src/select/ComboBox.tsx
+++ b/packages/components/src/select/ComboBox.tsx
@@ -162,9 +162,9 @@ export function ComboBox({
 	const renderEmptyState = () => {
 		if (onAddOption && filter) {
 			return (
-				<div className="overflow-hidden px-4">
+				<div className="px-4 overflow-hidden">
 					<Button
-						className="h-[unset] shrink-0 text-ellipsis text-wrap break-all text-brand"
+						className="text-brand h-[unset] shrink-0 text-wrap break-all text-ellipsis"
 						onClick={() => {
 							onAddOption({ label: filter, value: filter })
 							handleChange(filter)
@@ -247,7 +247,7 @@ export function ComboBox({
 				<Popover.Content
 					className={cn(
 						{ [SIZE_VARIANTS[size || 'default']]: !!size },
-						'z-[1000] mt-1 max-h-96 overflow-y-auto p-0',
+						'mt-1 max-h-96 p-0 z-1000 overflow-y-auto',
 						wrapperClassName,
 					)}
 					// eslint-disable-next-line react-hooks/refs
diff --git a/packages/components/src/select/NativeSelect.tsx b/packages/components/src/select/NativeSelect.tsx
index 8483f2f2ed..b4f2a24677 100644
--- a/packages/components/src/select/NativeSelect.tsx
+++ b/packages/components/src/select/NativeSelect.tsx
@@ -28,11 +28,11 @@ export const NativeSelect = forwardRef<HTMLSelectElement, NativeSelectProps>(
 					[
 						'bg-transparent focus:bg-transparent enabled:hover:bg-background-surface',
 						'border border-edge-subtle',
-						'focus:outline-none focus:ring-2 focus:ring-edge-brand focus:ring-offset-2 focus:ring-offset-background',
+						'focus:ring-2 focus:ring-edge-brand focus:ring-offset-2 focus:ring-offset-background focus:outline-none',
 						'text-sm text-foreground-subtle placeholder:text-foreground-muted',
 						'disabled:cursor-not-allowed disabled:opacity-50',
 					],
-					'flex w-full items-center justify-between rounded-md bg-transparent px-3 pl-3 pr-10 transition-all duration-150',
+					'rounded-md px-3 pl-3 pr-10 flex w-full items-center justify-between bg-transparent transition-all duration-150',
 					{
 						[SELECT_SIZES[size ?? 'default']]: size,
 					},
diff --git a/packages/components/src/select/primitives.tsx b/packages/components/src/select/primitives.tsx
index 69299ba454..fc12ff8a1c 100644
--- a/packages/components/src/select/primitives.tsx
+++ b/packages/components/src/select/primitives.tsx
@@ -16,7 +16,7 @@ const SelectPrimitiveTrigger = React.forwardRef<
 	<SelectRadix.Trigger
 		ref={ref}
 		className={cn(
-			'focus:ring-background-400 flex h-10 w-full items-center justify-between rounded-md border border-edge bg-transparent px-3 py-2 text-sm placeholder:text-foreground-muted focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50',
+			'focus:ring-background-400 h-10 rounded-md px-3 py-2 text-sm flex w-full items-center justify-between border border-edge bg-transparent placeholder:text-foreground-muted focus:ring-2 focus:ring-offset-2 focus:ring-offset-background focus:outline-none disabled:cursor-not-allowed disabled:opacity-50',
 			className,
 		)}
 		{...props}
@@ -35,7 +35,7 @@ const SelectPrimitiveContent = React.forwardRef<
 		<SelectRadix.Content
 			ref={ref}
 			className={cn(
-				'relative z-50 min-w-[8rem] overflow-hidden rounded-md border border-edge bg-background text-foreground-subtle shadow-md animate-in fade-in-80',
+				'min-w-32 rounded-md shadow-md relative z-50 animate-in overflow-hidden border border-edge bg-background text-foreground-subtle fade-in-80',
 				className,
 			)}
 			{...props}
@@ -65,12 +65,12 @@ const SelectPrimitiveItem = React.forwardRef<
 	<SelectRadix.Item
 		ref={ref}
 		className={cn(
-			'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm font-medium outline-none focus:bg-background-surface data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+			'rounded-sm py-1.5 pl-8 pr-2 text-sm font-medium relative flex cursor-default items-center outline-none select-none focus:bg-background-surface data-disabled:pointer-events-none data-disabled:opacity-50',
 			className,
 		)}
 		{...props}
 	>
-		<span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
+		<span className="left-2 h-3.5 w-3.5 absolute flex items-center justify-center">
 			<SelectRadix.ItemIndicator>
 				<Check className="h-4 w-4" />
 			</SelectRadix.ItemIndicator>
diff --git a/packages/components/src/sheet/primitives.tsx b/packages/components/src/sheet/primitives.tsx
index b515bd7b02..8e3f26107c 100644
--- a/packages/components/src/sheet/primitives.tsx
+++ b/packages/components/src/sheet/primitives.tsx
@@ -22,7 +22,7 @@ const SheetOverlay = React.forwardRef<ElementRef<typeof SheetPrimitive.Overlay>,
 	({ className, ...props }, ref) => (
 		<SheetPrimitive.Overlay
 			className={cn(
-				'fixed inset-0 z-50 bg-black/80 backdrop-blur-sm data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
+				'inset-0 bg-black/80 backdrop-blur-sm fixed z-50 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:animate-in data-[state=open]:fade-in-0',
 				className,
 			)}
 			{...props}
@@ -139,7 +139,7 @@ const SheetContent = React.forwardRef<ElementRef<typeof SheetPrimitive.Content>,
 			>
 				{children}
 				{closeIcon && (
-					<SheetPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 focus:ring-offset-background disabled:pointer-events-none data-[state=open]:bg-background">
+					<SheetPrimitive.Close className="right-4 top-4 rounded-sm absolute opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 focus:ring-offset-background focus:outline-none disabled:pointer-events-none data-[state=open]:bg-background">
 						<X className="h-4 w-4 text-foreground-subtle" />
 						<span className="sr-only">Close</span>
 					</SheetPrimitive.Close>
@@ -152,7 +152,7 @@ SheetContent.displayName = SheetPrimitive.Content.displayName
 
 const SheetHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
 	<div
-		className={cn('flex flex-col space-y-2 pb-2 pt-4 text-center sm:text-left', className)}
+		className={cn('space-y-2 pb-2 pt-4 sm:text-left flex flex-col text-center', className)}
 		{...props}
 	/>
 )
@@ -160,7 +160,7 @@ SheetHeader.displayName = 'SheetHeader'
 
 const SheetFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
 	<div
-		className={cn('flex flex-col-reverse px-4 sm:flex-row sm:justify-end sm:space-x-2', className)}
+		className={cn('px-4 sm:flex-row sm:justify-end sm:space-x-2 flex flex-col-reverse', className)}
 		{...props}
 	/>
 )
diff --git a/packages/components/src/slider/Slider.tsx b/packages/components/src/slider/Slider.tsx
index ad71f02193..f0bebc02c5 100644
--- a/packages/components/src/slider/Slider.tsx
+++ b/packages/components/src/slider/Slider.tsx
@@ -9,15 +9,15 @@ const Slider = forwardRef<
 >(({ className, ...props }, ref) => (
 	<SliderPrimitive.Root
 		ref={ref}
-		className={cn('relative flex w-full touch-none select-none items-center', className)}
+		className={cn('relative flex w-full touch-none items-center select-none', className)}
 		{...props}
 	>
-		<SliderPrimitive.Track className="relative h-1.5 w-full grow overflow-hidden rounded-full bg-fill-brand-secondary">
+		<SliderPrimitive.Track className="h-1.5 relative w-full grow overflow-hidden rounded-full bg-fill-brand-secondary">
 			<SliderPrimitive.Range className="absolute h-full bg-fill-brand" />
 		</SliderPrimitive.Track>
 		<SliderPrimitive.Thumb
 			data-testid="sliderThumb"
-			className="block h-4 w-4 rounded-full border border-edge bg-fill-brand shadow transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-edge-brand disabled:pointer-events-none disabled:opacity-50"
+			className="h-4 w-4 shadow block rounded-full border border-edge bg-fill-brand transition-colors focus-visible:ring-1 focus-visible:ring-edge-brand focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50"
 		/>
 	</SliderPrimitive.Root>
 ))
diff --git a/packages/components/src/styles/tailwind.css b/packages/components/src/styles/tailwind.css
index b5c61c9567..0ad5d7bcba 100644
--- a/packages/components/src/styles/tailwind.css
+++ b/packages/components/src/styles/tailwind.css
@@ -1,3 +1,2 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import 'tailwindcss';
+@import '../../tailwind/preset.css';
diff --git a/packages/components/src/tabs/Tabs.tsx b/packages/components/src/tabs/Tabs.tsx
index f2779273b8..8a13a57cb7 100644
--- a/packages/components/src/tabs/Tabs.tsx
+++ b/packages/components/src/tabs/Tabs.tsx
@@ -34,7 +34,7 @@ const TabsList = React.forwardRef<
 			<TabsPrimitive.List
 				ref={ref}
 				className={cn(
-					'inline-flex items-center justify-center rounded-md border border-edge-subtle/80 bg-transparent p-1',
+					'rounded-md p-1 inline-flex items-center justify-center border border-edge-subtle/80 bg-transparent',
 					{ 'gap-1': activeOnHover },
 					className,
 				)}
@@ -53,7 +53,7 @@ const TabsTrigger = React.forwardRef<
 		{({ variant, activeOnHover }) => (
 			<TabsPrimitive.Trigger
 				className={cn(
-					'inline-flex min-w-[100px] items-center justify-center rounded-[0.185rem] px-3 py-1.5 text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 data-[state=active]:shadow-sm',
+					'px-3 py-1.5 text-sm font-medium data-[state=active]:shadow-sm inline-flex min-w-[100px] items-center justify-center rounded-[0.185rem] transition-all disabled:pointer-events-none disabled:opacity-50',
 					TABS_CONTENT_VARIANTS[variant] || TABS_CONTENT_VARIANTS.default,
 					{
 						'hover:data-[state=inactive]:bg-background-surface': activeOnHover && !props.disabled,
@@ -76,7 +76,7 @@ const TabsContent = React.forwardRef<
 	ComponentPropsWithoutRef<typeof TabsPrimitive.Content>
 >(({ className, ...props }, ref) => (
 	<TabsPrimitive.Content
-		className={cn('mt-2 rounded-md border border-edge-subtle p-6', className)}
+		className={cn('mt-2 rounded-md p-6 border border-edge-subtle', className)}
 		{...props}
 		ref={ref}
 	/>
diff --git a/packages/components/src/text/Heading.tsx b/packages/components/src/text/Heading.tsx
index 09cc9029fd..76261aaa9d 100644
--- a/packages/components/src/text/Heading.tsx
+++ b/packages/components/src/text/Heading.tsx
@@ -27,7 +27,7 @@ const headingVariants = cva(HEADING_BASE_CLASSES, {
 		},
 		variant: {
 			default: 'text-foreground',
-			gradient: 'bg-gradient-to-r from-brand-600 to-brand-500 bg-clip-text text-transparent',
+			gradient: 'bg-linear-to-r from-brand-600 to-brand-500 bg-clip-text text-transparent',
 		},
 	},
 })
diff --git a/packages/components/src/text/Separator.tsx b/packages/components/src/text/Separator.tsx
index a07c2f1cfd..34dc9931ea 100644
--- a/packages/components/src/text/Separator.tsx
+++ b/packages/components/src/text/Separator.tsx
@@ -14,7 +14,7 @@ const Separator = React.forwardRef<
 		orientation={orientation}
 		className={cn(
 			'bg-slate-200 dark:bg-slate-700',
-			orientation === 'horizontal' ? 'h-[1px] w-full' : 'h-full w-[1px]',
+			orientation === 'horizontal' ? 'h-px w-full' : 'h-full w-px',
 			className,
 		)}
 		{...props}
diff --git a/packages/components/src/text/Text.tsx b/packages/components/src/text/Text.tsx
index a6894cc910..7192b6c54d 100644
--- a/packages/components/src/text/Text.tsx
+++ b/packages/components/src/text/Text.tsx
@@ -43,7 +43,7 @@ export type TextProps = {
 
 const Text = React.forwardRef<ElementRef<'p'>, TextProps>(
 	({ className, variant, size, ...props }, ref) => (
-		<p ref={ref} className={cn(textVariants({ className, size, variant }))} {...props} />
+		<p ref={ref} className={cn(textVariants({ size, variant }), className)} {...props} />
 	),
 )
 Text.displayName = 'Text'
diff --git a/packages/components/src/toast/primitives.tsx b/packages/components/src/toast/primitives.tsx
index acaf02471d..a54d13c4fa 100644
--- a/packages/components/src/toast/primitives.tsx
+++ b/packages/components/src/toast/primitives.tsx
@@ -15,7 +15,7 @@ const ToastViewport = React.forwardRef<
 	<ToastPrimitives.Viewport
 		ref={ref}
 		className={cn(
-			'fixed top-0 z-[100] flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px]',
+			'top-0 p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px] fixed z-100 flex max-h-screen w-full flex-col-reverse',
 			className,
 		)}
 		{...props}
@@ -24,7 +24,7 @@ const ToastViewport = React.forwardRef<
 ToastViewport.displayName = ToastPrimitives.Viewport.displayName
 
 const toastVariants = cva(
-	'data-[swipe=move]:transition-none grow-1 group relative pointer-events-auto flex w-full items-center justify-between space-x-4 overflow-hidden rounded-md border p-6 pr-8 shadow-lg transition-all data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full mt-4 data-[state=closed]:slide-out-to-right-full dark:border-gray-700 last:mt-0 sm:last:mt-4',
+	'data-[swipe=move]:transition-none grow group relative pointer-events-auto flex w-full items-center justify-between space-x-4 overflow-hidden rounded-md border p-6 pr-8 shadow-lg transition-all data-[swipe=move]:translate-x-(--radix-toast-swipe-move-x) data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-(--radix-toast-swipe-end-x) data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full mt-4 data-[state=closed]:slide-out-to-right-full dark:border-gray-700 last:mt-0 sm:last:mt-4',
 	{
 		defaultVariants: {
 			variant: 'default',
@@ -59,7 +59,7 @@ const ToastAction = React.forwardRef<
 	<ToastPrimitives.Action
 		ref={ref}
 		className={cn(
-			'inline-flex h-8 shrink-0 items-center justify-center rounded-md border border-gray-200 bg-transparent px-3 text-sm font-medium transition-colors hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 group-[.danger]:border-red-100 group-[.danger]:hover:border-gray-50 group-[.danger]:hover:bg-red-100 group-[.danger]:hover:text-red-600 group-[.danger]:focus:ring-red-400 group-[.danger]:focus:ring-offset-red-600 dark:border-gray-700 dark:text-gray-100 dark:hover:bg-gray-700 dark:hover:text-gray-100 dark:focus:ring-gray-400 dark:focus:ring-offset-gray-900 dark:data-[state=open]:bg-gray-800',
+			'h-8 rounded-md px-3 text-sm font-medium group-[.danger]:border-red-100 group-[.danger]:hover:bg-red-100 group-[.danger]:hover:text-red-600 group-[.danger]:focus:ring-red-400 group-[.danger]:focus:ring-offset-red-600 inline-flex shrink-0 items-center justify-center border border-gray-200 bg-transparent transition-colors hover:bg-gray-100 group-[.danger]:hover:border-gray-50 focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 focus:outline-none disabled:pointer-events-none disabled:opacity-50 dark:border-gray-700 dark:text-gray-100 dark:hover:bg-gray-700 dark:hover:text-gray-100 dark:focus:ring-gray-400 dark:focus:ring-offset-gray-900 dark:data-[state=open]:bg-gray-800',
 			className,
 		)}
 		{...props}
@@ -74,7 +74,7 @@ const ToastClose = React.forwardRef<
 	<ToastPrimitives.Close
 		ref={ref}
 		className={cn(
-			'absolute right-2 top-2 rounded-md p-1 text-gray-500 opacity-0 transition-opacity hover:text-gray-900 focus:opacity-100 focus:outline-none focus:ring-2 group-hover:opacity-100 group-[.danger]:text-red-300 group-[.danger]:hover:text-red-50 group-[.danger]:focus:ring-red-400 group-[.danger]:focus:ring-offset-red-600 dark:hover:text-gray-50',
+			'right-2 top-2 rounded-md p-1 group-[.danger]:text-red-300 group-[.danger]:hover:text-red-50 group-[.danger]:focus:ring-red-400 group-[.danger]:focus:ring-offset-red-600 absolute text-gray-500 opacity-0 transition-opacity group-hover:opacity-100 hover:text-gray-900 focus:opacity-100 focus:ring-2 focus:outline-none dark:hover:text-gray-50',
 			className,
 		)}
 		toast-close=""
diff --git a/packages/components/src/tooltip/primitives.tsx b/packages/components/src/tooltip/primitives.tsx
index 0d349b0c1e..d29772e3ad 100644
--- a/packages/components/src/tooltip/primitives.tsx
+++ b/packages/components/src/tooltip/primitives.tsx
@@ -17,7 +17,7 @@ const TooltipContent = React.forwardRef<
 		ref={ref}
 		sideOffset={sideOffset}
 		className={cn(
-			'z-50 overflow-hidden rounded-md border border-edge-subtle bg-background-surface px-3 py-1.5 text-sm text-foreground-subtle shadow-md animate-in fade-in-50 data-[side=bottom]:slide-in-from-top-1 data-[side=left]:slide-in-from-right-1 data-[side=right]:slide-in-from-left-1 data-[side=top]:slide-in-from-bottom-1',
+			'rounded-md px-3 py-1.5 text-sm shadow-md z-50 animate-in overflow-hidden border border-edge-subtle bg-background-surface text-foreground-subtle fade-in-50 data-[side=bottom]:slide-in-from-top-1 data-[side=left]:slide-in-from-right-1 data-[side=right]:slide-in-from-left-1 data-[side=top]:slide-in-from-bottom-1',
 			className,
 		)}
 		{...props}
diff --git a/packages/components/tailwind.config.ts b/packages/components/tailwind.config.ts
deleted file mode 100644
index 833fd70c5d..0000000000
--- a/packages/components/tailwind.config.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type { Config } from 'tailwindcss'
-
-import stumpPreset, { getContent } from './tailwind'
-
-export default {
-	content: getContent({ relativePath: 'packages/components' }),
-	presets: [stumpPreset],
-} satisfies Config
diff --git a/packages/components/tailwind/index.ts b/packages/components/tailwind/index.ts
index d188ff2a1a..0c7e0fff73 100644
--- a/packages/components/tailwind/index.ts
+++ b/packages/components/tailwind/index.ts
@@ -1,22 +1,5 @@
-import path from 'path'
-
-export { default } from './preset'
-
-type ContentHandler = {
-	/**
-	 * The path of the project which is loading the tailwind plugin,
-	 * relative to the root of the monorepo.
-	 */
-	relativePath?: string
-}
-/**
- * A helper to populate the content array for the tailwind config
- */
-export const getContent = ({ relativePath }: ContentHandler) => {
-	const basePath = relativePath ? `../../${relativePath}` : __dirname
-	return [
-		'../../packages/browser/src/**/*.{js,ts,jsx,tsx,html}',
-		'../../packages/*/src/**/*.{js,ts,jsx,tsx,html}',
-		path.join(basePath, './src/**/*.(js|jsx|ts|tsx)'),
-	]
-}
+// This module is kept for backward compatibility.
+// Tailwind v4 configuration is now CSS-based.
+// Import the preset directly in your CSS entry point:
+//   @import "@stump/components/tailwind/preset.css"
+export {}
diff --git a/packages/components/tailwind/preset.css b/packages/components/tailwind/preset.css
new file mode 100644
index 0000000000..c083b01c92
--- /dev/null
+++ b/packages/components/tailwind/preset.css
@@ -0,0 +1,129 @@
+@import './themes.css';
+@import 'tw-animate-css';
+
+@plugin '@tailwindcss/typography';
+
+@source '../src/**/*.{ts,tsx,js,jsx}';
+@source '../../browser/src/**/*.{ts,tsx,js,jsx}';
+
+/* MARK: safelist fonts */
+@source inline(
+	'font-inter font-opendyslexic font-atkinsonhyperlegiblenext font-charis font-literata font-bitter font-librebaskerville font-nunito font-hinamincho'
+);
+
+@theme {
+	/* MARK: brand colors */
+	--color-brand-50: #f4e8e0;
+	--color-brand-100: #efddd1;
+	--color-brand-200: #e4c6b3;
+	--color-brand-300: #d9af95;
+	--color-brand-400: #cf9977;
+	--color-brand-500: #c48259;
+	--color-brand-600: #a9663c;
+	--color-brand-700: #7f4d2d;
+	--color-brand-800: #56341f;
+	--color-brand-900: #2d1b10;
+
+	/* MARK: gray colors */
+	--color-gray-50: #f6f6f7;
+	--color-gray-75: #e9eaeb;
+	--color-gray-100: #d3d5d7;
+	--color-gray-150: #c8cacd;
+	--color-gray-200: #bec0c4;
+	--color-gray-250: #b2b5b9;
+	--color-gray-300: #a8acb0;
+	--color-gray-350: #9da1a6;
+	--color-gray-400: #93979d;
+	--color-gray-450: #898d94;
+	--color-gray-500: #7d828a;
+	--color-gray-550: #71757d;
+	--color-gray-600: #62666d;
+	--color-gray-650: #565a5f;
+	--color-gray-700: #484b4f;
+	--color-gray-750: #3c3e42;
+	--color-gray-800: #2d2f32;
+	--color-gray-850: #252729;
+	--color-gray-900: #202224;
+	--color-gray-950: #1b1c1e;
+	--color-gray-975: #161719;
+	--color-gray-1000: #101112;
+
+	/* MARK: fonts */
+	--font-inter: 'Inter', ui-sans-serif, system-ui, sans-serif;
+	--font-opendyslexic: 'OpenDyslexic', ui-sans-serif, system-ui, sans-serif;
+	--font-atkinsonhyperlegiblenext:
+		'Atkinson Hyperlegible Next', ui-sans-serif, system-ui, sans-serif;
+	--font-charis: 'Charis', ui-serif, Georgia, serif;
+	--font-literata: 'Literata', ui-serif, Georgia, serif;
+	--font-bitter: 'Bitter', ui-serif, Georgia, serif;
+	--font-librebaskerville: 'Libre Baskerville', ui-serif, Georgia, serif;
+	--font-nunito: 'Nunito', ui-sans-serif, system-ui, sans-serif;
+	--font-hinamincho: 'Hina Mincho', ui-serif, Georgia, serif;
+
+	/* MARK: custom sizes */
+	--text-xxs: 0.65rem;
+	--origin-left-to-right-indeterminate: 0% 50%;
+
+	/* MARK: custom breakpoints */
+	--breakpoint-tablet: 640px;
+	--breakpoint-3xl: 1600px;
+	--breakpoint-4xl: 1920px;
+
+	/* TODO: This makes it v3 compatible but maybe kill it */
+	--default-ring-color: var(--color-brand-500);
+
+	/* MARK: animations */
+	--animate-accordion-down: accordion-down 0.2s ease-out;
+	--animate-accordion-up: accordion-up 0.2s ease-out;
+	--animate-indeterminate-progress: indeterminate-progress 1s infinite linear;
+
+	@keyframes accordion-down {
+		from {
+			height: 0;
+		}
+		to {
+			height: var(--radix-accordion-content-height);
+		}
+	}
+
+	@keyframes accordion-up {
+		from {
+			height: var(--radix-accordion-content-height);
+		}
+		to {
+			height: 0;
+		}
+	}
+
+	@keyframes indeterminate-progress {
+		0% {
+			transform: translateX(0) scaleX(0);
+		}
+		40% {
+			transform: translateX(0) scaleX(0.4);
+		}
+		100% {
+			transform: translateX(100%) scaleX(0.5);
+		}
+	}
+}
+
+@utility scrollbar-hide {
+	scrollbar-width: none;
+	&::-webkit-scrollbar {
+		display: none;
+	}
+}
+
+@custom-variant autofill (&:autofill, &:-webkit-autofill);
+
+@layer base {
+	/* TODO: preserve v3 default border color behavior but maybe kill? */
+	*,
+	::after,
+	::before,
+	::backdrop,
+	::file-selector-button {
+		border-color: var(--color-gray-200, currentColor);
+	}
+}
diff --git a/packages/components/tailwind/preset.ts b/packages/components/tailwind/preset.ts
deleted file mode 100644
index 46ba96944f..0000000000
--- a/packages/components/tailwind/preset.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import typographyPlugin from '@tailwindcss/typography'
-// @ts-expect-error: no types
-import scrollbarPlugin from 'tailwind-scrollbar-hide'
-import { Config } from 'tailwindcss'
-import defaultTheme from 'tailwindcss/defaultTheme'
-import animatePlugin from 'tailwindcss-animate'
-// @ts-expect-error: no types
-import autofillPlugin from 'tailwindcss-autofill'
-import { createThemes } from 'tw-colors'
-
-import { sharedColors, themes } from '../themes'
-
-export default {
-	content: ['./src/**/*.{js,ts,jsx,tsx,html}'],
-	plugins: [scrollbarPlugin, typographyPlugin, animatePlugin, autofillPlugin, createThemes(themes)],
-	safelist: [
-		{
-			pattern: /font-.*/,
-		},
-	],
-	theme: {
-		extend: {
-			animation: {
-				'accordion-down': 'accordion-down 0.2s ease-out',
-				'accordion-up': 'accordion-up 0.2s ease-out',
-				'indeterminate-progress': 'indeterminate-progress 1s infinite linear',
-			},
-			colors: {
-				brand: sharedColors.brand,
-				gray: sharedColors.gray,
-			},
-			fontFamily: {
-				inter: ['Inter', ...defaultTheme.fontFamily.sans],
-				opendyslexic: ['OpenDyslexic', ...defaultTheme.fontFamily.sans],
-				atkinsonhyperlegiblenext: ['Atkinson Hyperlegible Next', ...defaultTheme.fontFamily.sans],
-				charis: ['Charis', ...defaultTheme.fontFamily.serif],
-				literata: ['Literata', ...defaultTheme.fontFamily.serif],
-				bitter: ['Bitter', ...defaultTheme.fontFamily.serif],
-				librebaskerville: ['Libre Baskerville', ...defaultTheme.fontFamily.serif],
-				nunito: ['Nunito', ...defaultTheme.fontFamily.sans],
-				hinamincho: ['Hina Mincho', ...defaultTheme.fontFamily.serif],
-			},
-			fontSize: {
-				xxs: '0.65rem',
-			},
-			lineHeight: {
-				none: '1',
-			},
-			keyframes: {
-				'accordion-down': {
-					from: { height: '0' },
-					to: { height: 'var(--radix-accordion-content-height)' },
-				},
-				'accordion-up': {
-					from: { height: 'var(--radix-accordion-content-height)' },
-					to: { height: '0' },
-				},
-				'indeterminate-progress': {
-					'0%': { transform: ' translateX(0) scaleX(0)' },
-					'100%': { transform: 'translateX(100%) scaleX(0.5)' },
-					'40%': { transform: 'translateX(0) scaleX(0.4)' },
-				},
-			},
-			ringColor: {
-				DEFAULT: sharedColors.brand['500'],
-			},
-			screens: {
-				'3xl': '1600px',
-				'4xl': '1920px',
-				tablet: '640px',
-			},
-			transformOrigin: {
-				'left-to-right-indeterminate': '0% 50%',
-			},
-		},
-	},
-	variants: {
-		extend: {
-			backgroundImage: ['dark'],
-		},
-	},
-} satisfies Config
diff --git a/packages/components/tailwind/themes.css b/packages/components/tailwind/themes.css
new file mode 100644
index 0000000000..db69d27fbc
--- /dev/null
+++ b/packages/components/tailwind/themes.css
@@ -0,0 +1,535 @@
+@theme {
+	/* MARK: backgrounds */
+	--color-background: #161719;
+	--color-background-inverse: #ffffff;
+	--color-background-overlay: #1d1b1b;
+	--color-background-overlay-hover: #222020;
+	--color-background-surface: #1b1c1d;
+	--color-background-surface-hover: #242628;
+	--color-background-surface-secondary: #1f2123;
+
+	/* MARK: edges */
+	--color-edge: #1f2123;
+	--color-edge-brand: #cf9977;
+	--color-edge-danger: #b02a29;
+	--color-edge-info: #3f89ca;
+	--color-edge-strong: #ffffff;
+	--color-edge-subtle: #292c30;
+	--color-edge-success: #2e7d32;
+	--color-edge-warning: #d8a219;
+
+	/* MARK: fills */
+	--color-fill-brand: #c48259;
+	--color-fill-brand-hover: #cf9977;
+	--color-fill-brand-secondary: #c4825926;
+	--color-fill-danger: #e53935;
+	--color-fill-danger-hover: #ea5c59;
+	--color-fill-danger-secondary: #e5393526;
+	--color-fill-disabled: #71757d;
+	--color-fill-info: #3f89ca;
+	--color-fill-info-hover: #5f9dd3;
+	--color-fill-info-secondary: #3f89ca26;
+	--color-fill-success: #43a047;
+	--color-fill-success-hover: #54b859;
+	--color-fill-success-secondary: #43a04726;
+	--color-fill-warning: #f59e0b;
+	--color-fill-warning-hover: #f7ae32;
+	--color-fill-warning-secondary: #f59e0b26;
+	--color-fill-on-black: #242628;
+	--color-fill-on-black-muted: #242628;
+
+	/* MARK: foregrounds */
+	--color-foreground: #f5f3ef;
+	--color-foreground-brand: #c48259;
+	--color-foreground-disabled: #898d94;
+	--color-foreground-muted: #898d94;
+	--color-foreground-subtle: #e9eaeb;
+	--color-foreground-on-inverse: #161719;
+	--color-foreground-on-black: #e9eaeb;
+	--color-foreground-on-black-muted: #b0b3b7;
+
+	/* MARK: sidebars */
+	--color-sidebar: #151517;
+	--color-sidebar-inverse: #ffffff;
+	--color-sidebar-overlay: #151517;
+	--color-sidebar-overlay-hover: #17171a;
+	--color-sidebar-surface: #19191b;
+	--color-sidebar-surface-hover: #1e1e20;
+	--color-sidebar-surface-secondary: #1b1b1e;
+
+	/* MARK: scrollbars */
+	--color-scrollbar: #161719;
+	--color-scrollbar-thumb: hsla(0, 0%, 100%, 0.4);
+	--color-scrollbar-thumb-hover: hsla(0, 0%, 100%, 0.3);
+
+	/* MARK: thumbnails */
+	--color-thumbnail-border: rgba(233, 234, 235, 0.1);
+	--color-thumbnail-placeholder: #1f2123;
+	--color-thumbnail-stack-series: #3d3a3a;
+	--color-thumbnail-stack-library-start: #2e2b2b;
+	--color-thumbnail-stack-library-end: #3d3a3a;
+}
+
+@layer base {
+	/* MARK: dark theme */
+	.dark {
+		--color-background: #161719;
+		--color-background-inverse: #ffffff;
+		--color-background-overlay: #1d1b1b;
+		--color-background-overlay-hover: #222020;
+		--color-background-surface: #1b1c1d;
+		--color-background-surface-hover: #242628;
+		--color-background-surface-secondary: #1f2123;
+
+		--color-edge: #1f2123;
+		--color-edge-brand: #cf9977;
+		--color-edge-danger: #b02a29;
+		--color-edge-info: #3f89ca;
+		--color-edge-strong: #ffffff;
+		--color-edge-subtle: #292c30;
+		--color-edge-success: #2e7d32;
+		--color-edge-warning: #d8a219;
+
+		--color-fill-brand: #c48259;
+		--color-fill-brand-hover: #cf9977;
+		--color-fill-brand-secondary: #c4825926;
+		--color-fill-danger: #e53935;
+		--color-fill-danger-hover: #ea5c59;
+		--color-fill-danger-secondary: #e5393526;
+		--color-fill-disabled: #71757d;
+		--color-fill-info: #3f89ca;
+		--color-fill-info-hover: #5f9dd3;
+		--color-fill-info-secondary: #3f89ca26;
+		--color-fill-success: #43a047;
+		--color-fill-success-hover: #54b859;
+		--color-fill-success-secondary: #43a04726;
+		--color-fill-warning: #f59e0b;
+		--color-fill-warning-hover: #f7ae32;
+		--color-fill-warning-secondary: #f59e0b26;
+		--color-fill-on-black: #242628;
+		--color-fill-on-black-muted: #242628;
+
+		--color-foreground: #f5f3ef;
+		--color-foreground-brand: #c48259;
+		--color-foreground-disabled: #898d94;
+		--color-foreground-muted: #898d94;
+		--color-foreground-subtle: #e9eaeb;
+		--color-foreground-on-inverse: #161719;
+		--color-foreground-on-black: #e9eaeb;
+		--color-foreground-on-black-muted: #b0b3b7;
+
+		--color-sidebar: #151517;
+		--color-sidebar-inverse: #ffffff;
+		--color-sidebar-overlay: #151517;
+		--color-sidebar-overlay-hover: #17171a;
+		--color-sidebar-surface: #19191b;
+		--color-sidebar-surface-hover: #1e1e20;
+		--color-sidebar-surface-secondary: #1b1b1e;
+
+		--color-scrollbar: #161719;
+		--color-scrollbar-thumb: hsla(0, 0%, 100%, 0.4);
+		--color-scrollbar-thumb-hover: hsla(0, 0%, 100%, 0.3);
+
+		--color-thumbnail-border: rgba(233, 234, 235, 0.1);
+		--color-thumbnail-placeholder: #1f2123;
+		--color-thumbnail-stack-series: #3d3a3a;
+		--color-thumbnail-stack-library-start: #2e2b2b;
+		--color-thumbnail-stack-library-end: #3d3a3a;
+	}
+
+	/* MARK: light theme */
+	.light {
+		--color-background: #ffffff;
+		--color-background-inverse: #161719;
+		--color-background-overlay: #f6f6f7;
+		--color-background-overlay-hover: #e9eaeb;
+		--color-background-surface: #f7f7f8;
+		--color-background-surface-hover: #ececee;
+		--color-background-surface-secondary: #f2f2f3;
+
+		--color-edge: #e9eaeb;
+		--color-edge-brand: #cf9977;
+		--color-edge-danger: #b02a29;
+		--color-edge-info: #3f89ca;
+		--color-edge-strong: #ffffff;
+		--color-edge-subtle: #d3d5d7;
+		--color-edge-success: #2e7d32;
+		--color-edge-warning: #d8a219;
+
+		--color-fill-brand: #c48259;
+		--color-fill-brand-hover: #a9663c;
+		--color-fill-brand-secondary: #c4825926;
+		--color-fill-danger: #e53935;
+		--color-fill-danger-hover: #c81e1a;
+		--color-fill-danger-secondary: #e5393526;
+		--color-fill-disabled: #71757d;
+		--color-fill-info: #3f89ca;
+		--color-fill-info-hover: #2d6ca4;
+		--color-fill-info-secondary: #3f89ca26;
+		--color-fill-success: #43a047;
+		--color-fill-success-hover: #327835;
+		--color-fill-success-secondary: #43a04726;
+		--color-fill-warning: #f59e0b;
+		--color-fill-warning-hover: #c07c08;
+		--color-fill-warning-secondary: #f59e0b26;
+		--color-fill-on-black: #242628;
+		--color-fill-on-black-muted: #242628;
+
+		--color-foreground: #000000;
+		--color-foreground-brand: #c48259;
+		--color-foreground-disabled: #93979d;
+		--color-foreground-muted: #5b5f65;
+		--color-foreground-subtle: #26272a;
+		--color-foreground-on-inverse: #f5f3ef;
+		--color-foreground-on-black: #e9eaeb;
+		--color-foreground-on-black-muted: #b0b3b7;
+
+		--color-sidebar: #f9f9f9;
+		--color-sidebar-inverse: #000000;
+		--color-sidebar-overlay: #ffffff;
+		--color-sidebar-overlay-hover: #f6f6f7;
+		--color-sidebar-surface: #f6f6f7;
+		--color-sidebar-surface-hover: #ebebed;
+		--color-sidebar-surface-secondary: #f1f1f2;
+
+		--color-scrollbar: #f2f2f3;
+		--color-scrollbar-thumb: hsla(0, 0%, 0%, 0.3);
+		--color-scrollbar-thumb-hover: hsla(0, 0%, 0%, 0.5);
+
+		--color-thumbnail-border: rgba(31, 33, 35, 0.1);
+		--color-thumbnail-placeholder: #f2f2f2;
+		--color-thumbnail-stack-series: #d4b7a7;
+		--color-thumbnail-stack-library-start: #ad9282;
+		--color-thumbnail-stack-library-end: #d4b7a7;
+	}
+
+	/* MARK: bronze theme */
+	.bronze {
+		--color-background: #ffffff;
+		--color-background-inverse: #161719;
+		--color-background-overlay: #fbfaf9;
+		--color-background-overlay-hover: #ede8e4;
+		--color-background-surface: #ede8e4;
+		--color-background-surface-hover: #e0d6cf;
+		--color-background-surface-secondary: #d3c4ba;
+
+		--color-edge: #ede8e4;
+		--color-edge-brand: #cf9977;
+		--color-edge-danger: #b02a29;
+		--color-edge-info: #3f89ca;
+		--color-edge-strong: #ffffff;
+		--color-edge-subtle: #d3c4ba;
+		--color-edge-success: #2e7d32;
+		--color-edge-warning: #d8a219;
+
+		--color-fill-brand: #c48259;
+		--color-fill-brand-hover: #a9663c;
+		--color-fill-brand-secondary: #c4825926;
+		--color-fill-danger: #e53935;
+		--color-fill-danger-hover: #c81e1a;
+		--color-fill-danger-secondary: #e5393526;
+		--color-fill-disabled: #71757d;
+		--color-fill-info: #3f89ca;
+		--color-fill-info-hover: #2d6ca4;
+		--color-fill-info-secondary: #3f89ca26;
+		--color-fill-success: #43a047;
+		--color-fill-success-hover: #327835;
+		--color-fill-success-secondary: #43a04726;
+		--color-fill-warning: #f59e0b;
+		--color-fill-warning-hover: #c07c08;
+		--color-fill-warning-secondary: #f59e0b26;
+		--color-fill-on-black: #242628;
+		--color-fill-on-black-muted: #242628;
+
+		--color-foreground: #000000;
+		--color-foreground-brand: #c48259;
+		--color-foreground-disabled: #93979d;
+		--color-foreground-muted: #5b5f65;
+		--color-foreground-subtle: #26272a;
+		--color-foreground-on-inverse: #f5f3ef;
+		--color-foreground-on-black: #e9eaeb;
+		--color-foreground-on-black-muted: #b0b3b7;
+
+		--color-sidebar: #f3f0ed;
+		--color-sidebar-inverse: #000000;
+		--color-sidebar-overlay: #ffffff;
+		--color-sidebar-overlay-hover: #f5f2f0;
+		--color-sidebar-surface: #ede8e4;
+		--color-sidebar-surface-hover: #e0d6cf;
+		--color-sidebar-surface-secondary: #d3c4ba;
+
+		--color-scrollbar: #ede8e4;
+		--color-scrollbar-thumb: hsla(0, 0%, 0%, 0.3);
+		--color-scrollbar-thumb-hover: hsla(0, 0%, 0%, 0.5);
+
+		--color-thumbnail-border: rgba(31, 33, 35, 0.1);
+		--color-thumbnail-placeholder: #ede8e4;
+		--color-thumbnail-stack-series: #d3c4ba;
+		--color-thumbnail-stack-library-start: #c4b5a9;
+		--color-thumbnail-stack-library-end: #d3c4ba;
+	}
+
+	/* MARK: ocean theme */
+	.ocean {
+		--color-background: #0b3d4d;
+		--color-background-inverse: #e8f9ff;
+		--color-background-overlay: #12455b;
+		--color-background-overlay-hover: #155a73;
+		--color-background-surface: #165564;
+		--color-background-surface-hover: #186070;
+		--color-background-surface-secondary: #227e95;
+
+		--color-edge: #165c72;
+		--color-edge-brand: #0a9396;
+		--color-edge-danger: #d62828;
+		--color-edge-info: #0096c7;
+		--color-edge-strong: #e8f9ff;
+		--color-edge-subtle: #125a6d;
+		--color-edge-success: #2e7d32;
+		--color-edge-warning: #ffba08;
+
+		--color-fill-brand: #0a9396;
+		--color-fill-brand-hover: #0a9396;
+		--color-fill-brand-secondary: #0a939626;
+		--color-fill-danger: #e63946;
+		--color-fill-danger-hover: #ec4a53;
+		--color-fill-danger-secondary: #e6394626;
+		--color-fill-disabled: #577590;
+		--color-fill-info: #0096c7;
+		--color-fill-info-hover: #0096c7;
+		--color-fill-info-secondary: #0096c726;
+		--color-fill-success: #43aa8b;
+		--color-fill-success-hover: #4fbba9;
+		--color-fill-success-secondary: #43aa8b26;
+		--color-fill-warning: #f77f00;
+		--color-fill-warning-hover: #ff8c00;
+		--color-fill-warning-secondary: #f77f0026;
+		--color-fill-on-black: #242628;
+		--color-fill-on-black-muted: #242628;
+
+		--color-foreground: #edf2f4;
+		--color-foreground-brand: #0a9396;
+		--color-foreground-disabled: #94a1ac;
+		--color-foreground-muted: #94a1ac;
+		--color-foreground-subtle: #d9e4ea;
+		--color-foreground-on-inverse: #0b3d4d;
+		--color-foreground-on-black: #edf2f4;
+		--color-foreground-on-black-muted: #b0b3b7;
+
+		--color-sidebar: #0a3644;
+		--color-sidebar-inverse: #e8f9ff;
+		--color-sidebar-overlay: #0b3d4d;
+		--color-sidebar-overlay-hover: #155a73;
+		--color-sidebar-surface: #12455b;
+		--color-sidebar-surface-hover: #14576f;
+		--color-sidebar-surface-secondary: #1b6b7d;
+
+		--color-scrollbar: #0a3644;
+		--color-scrollbar-thumb: hsla(0, 0%, 100%, 0.4);
+		--color-scrollbar-thumb-hover: hsla(0, 0%, 100%, 0.3);
+
+		--color-thumbnail-border: rgba(233, 234, 235, 0.1);
+		--color-thumbnail-placeholder: #165564;
+		--color-thumbnail-stack-series: #0a9396;
+		--color-thumbnail-stack-library-start: #125a6d;
+		--color-thumbnail-stack-library-end: #227e95;
+	}
+
+	/* MARK: cosmic theme */
+	.cosmic {
+		--color-background: #1c0f45;
+		--color-background-inverse: #f4f2ff;
+		--color-background-overlay: #28175e;
+		--color-background-overlay-hover: #311e75;
+		--color-background-surface: #24135a;
+		--color-background-surface-hover: #321e77;
+		--color-background-surface-secondary: #2a1969;
+
+		--color-edge: #2a1969;
+		--color-edge-brand: #bb86fc;
+		--color-edge-danger: #ff4757;
+		--color-edge-info: #3498db;
+		--color-edge-strong: #f4f2ff;
+		--color-edge-subtle: #311e75;
+		--color-edge-success: #2ecc71;
+		--color-edge-warning: #f39c12;
+
+		--color-fill-brand: #8e44ad;
+		--color-fill-brand-hover: #a15bbf;
+		--color-fill-brand-secondary: #8e44ad26;
+		--color-fill-danger: #ff4757;
+		--color-fill-danger-hover: #ff707c;
+		--color-fill-danger-secondary: #ff475726;
+		--color-fill-disabled: #6c567b;
+		--color-fill-info: #3498db;
+		--color-fill-info-hover: #57aae1;
+		--color-fill-info-secondary: #3498db26;
+		--color-fill-success: #2ecc71;
+		--color-fill-success-hover: #4cd787;
+		--color-fill-success-secondary: #2ecc7126;
+		--color-fill-warning: #f39c12;
+		--color-fill-warning-hover: #f5ac39;
+		--color-fill-warning-secondary: #f39c1226;
+		--color-fill-on-black: #242628;
+		--color-fill-on-black-muted: #242628;
+
+		--color-foreground: #f4f2ff;
+		--color-foreground-brand: #bb86fc;
+		--color-foreground-disabled: #a29bcc;
+		--color-foreground-muted: #a29bcc;
+		--color-foreground-subtle: #d1c5e5;
+		--color-foreground-on-inverse: #1c0f45;
+		--color-foreground-on-black: #f4f2ff;
+		--color-foreground-on-black-muted: #a29bcc;
+
+		--color-sidebar: #130a30;
+		--color-sidebar-inverse: #f4f2ff;
+		--color-sidebar-overlay: #1c0f45;
+		--color-sidebar-overlay-hover: #311e75;
+		--color-sidebar-surface: #251556;
+		--color-sidebar-surface-hover: #28175e;
+		--color-sidebar-surface-secondary: #2a1969;
+
+		--color-scrollbar: #1f0a39;
+		--color-scrollbar-thumb: hsla(0, 0%, 100%, 0.4);
+		--color-scrollbar-thumb-hover: hsla(0, 0%, 100%, 0.3);
+
+		--color-thumbnail-border: rgba(233, 234, 235, 0.1);
+		--color-thumbnail-placeholder: #24135a;
+		--color-thumbnail-stack-series: #bb86fc;
+		--color-thumbnail-stack-library-start: #6c567b;
+		--color-thumbnail-stack-library-end: #8e44ad;
+	}
+
+	/* MARK: autumn theme */
+	.autumn {
+		--color-background: #2c1a12;
+		--color-background-inverse: #fffbf3;
+		--color-background-overlay: #3b2d23;
+		--color-background-overlay-hover: #4d3f33;
+		--color-background-surface: #422f25;
+		--color-background-surface-hover: #5a3f33;
+		--color-background-surface-secondary: #4b382d;
+
+		--color-edge: #4b382d;
+		--color-edge-brand: #d0802d;
+		--color-edge-danger: #c53030;
+		--color-edge-info: #3b82f6;
+		--color-edge-strong: #fffbf3;
+		--color-edge-subtle: #4d3f33;
+		--color-edge-success: #5b8b41;
+		--color-edge-warning: #f59e0b;
+
+		--color-fill-brand: #d08732;
+		--color-fill-brand-hover: #d0802d;
+		--color-fill-brand-secondary: #d0873226;
+		--color-fill-danger: #e25837;
+		--color-fill-danger-hover: #e35f40;
+		--color-fill-danger-secondary: #e2583726;
+		--color-fill-disabled: #726a63;
+		--color-fill-info: #3b82f6;
+		--color-fill-info-hover: #5a9cf6;
+		--color-fill-info-secondary: #3b82f626;
+		--color-fill-success: #7bc96f;
+		--color-fill-success-hover: #8cd37f;
+		--color-fill-success-secondary: #7bc96f26;
+		--color-fill-warning: #ffb703;
+		--color-fill-warning-hover: #ffb70326;
+		--color-fill-warning-secondary: #ffb70326;
+		--color-fill-on-black: #242628;
+		--color-fill-on-black-muted: #242628;
+
+		--color-foreground: #f7f0e4;
+		--color-foreground-brand: #d0802d;
+		--color-foreground-disabled: #a29a8d;
+		--color-foreground-muted: #a29a8d;
+		--color-foreground-subtle: #e5dcc5;
+		--color-foreground-on-inverse: #2c1a12;
+		--color-foreground-on-black: #f7f0e4;
+		--color-foreground-on-black-muted: #a29a8d;
+
+		--color-sidebar: #25160f;
+		--color-sidebar-inverse: #fffbf3;
+		--color-sidebar-overlay: #2c1a12;
+		--color-sidebar-overlay-hover: #4d3f33;
+		--color-sidebar-surface: #35281f;
+		--color-sidebar-surface-hover: #3b2d23;
+		--color-sidebar-surface-secondary: #4b382d;
+
+		--color-scrollbar: #4b382d;
+		--color-scrollbar-thumb: hsla(0, 0%, 100%, 0.4);
+		--color-scrollbar-thumb-hover: hsla(0, 0%, 100%, 0.3);
+
+		--color-thumbnail-border: rgba(233, 234, 235, 0.1);
+		--color-thumbnail-placeholder: #422f25;
+		--color-thumbnail-stack-series: #d0802d;
+		--color-thumbnail-stack-library-start: #5a3f33;
+		--color-thumbnail-stack-library-end: #d08732;
+	}
+
+	/* MARK: pumpkin theme */
+	.pumpkin {
+		--color-background: #0c0c0c;
+		--color-background-inverse: #ffffff;
+		--color-background-overlay: #1a1a1a;
+		--color-background-overlay-hover: #333333;
+		--color-background-surface: #131313;
+		--color-background-surface-hover: #161616;
+		--color-background-surface-secondary: #ff6600;
+
+		--color-edge: #631c0370;
+		--color-edge-brand: #631c0390;
+		--color-edge-danger: #b02a29;
+		--color-edge-info: #3f89ca;
+		--color-edge-strong: #ffffff;
+		--color-edge-subtle: #631c0380;
+		--color-edge-success: #2e7d32;
+		--color-edge-warning: #d8a219;
+
+		--color-fill-brand: #481e14;
+		--color-fill-brand-hover: #34160e;
+		--color-fill-brand-secondary: #481e1480;
+		--color-fill-danger: #e53935;
+		--color-fill-danger-hover: #ea5c59;
+		--color-fill-danger-secondary: #e5393526;
+		--color-fill-disabled: #71757d;
+		--color-fill-info: #ff6600;
+		--color-fill-info-hover: #ac7fdc;
+		--color-fill-info-secondary: #ff660040;
+		--color-fill-success: #43a047;
+		--color-fill-success-hover: #54b859;
+		--color-fill-success-secondary: #43a04726;
+		--color-fill-warning: #f59e0b;
+		--color-fill-warning-hover: #f7ae32;
+		--color-fill-warning-secondary: #f59e0b26;
+		--color-fill-on-black: #242628;
+		--color-fill-on-black-muted: #242628;
+
+		--color-foreground: #f0c4ae;
+		--color-foreground-brand: #c48259;
+		--color-foreground-disabled: #898d94;
+		--color-foreground-muted: #e7a17f;
+		--color-foreground-subtle: #ecb69a;
+		--color-foreground-on-inverse: #161719;
+		--color-foreground-on-black: #f0c4ae;
+		--color-foreground-on-black-muted: #e7a17f;
+
+		--color-sidebar: #090909;
+		--color-sidebar-inverse: #ffffff;
+		--color-sidebar-overlay: #1a1a1a;
+		--color-sidebar-overlay-hover: #333333;
+		--color-sidebar-surface: #131313;
+		--color-sidebar-surface-hover: #161616;
+		--color-sidebar-surface-secondary: #00000040;
+
+		--color-scrollbar: #0c0c0c;
+		--color-scrollbar-thumb: hsla(0, 0%, 100%, 0.4);
+		--color-scrollbar-thumb-hover: hsla(0, 0%, 100%, 0.3);
+
+		--color-thumbnail-border: rgba(233, 234, 235, 0.1);
+		--color-thumbnail-placeholder: #131313;
+		--color-thumbnail-stack-series: #ff6600;
+		--color-thumbnail-stack-library-start: #481e14;
+		--color-thumbnail-stack-library-end: #631c03;
+	}
+}
diff --git a/prettier.config.js b/prettier.config.js
index 5fe8e229b2..02079806c7 100644
--- a/prettier.config.js
+++ b/prettier.config.js
@@ -4,7 +4,7 @@ module.exports = {
 	semi: false,
 	singleQuote: true,
 	tabWidth: 2,
-	tailwindConfig: './packages/components/tailwind.config.ts',
+	tailwindStylesheet: './packages/components/tailwind/preset.css',
 	trailingComma: 'all',
 	useTabs: true,
 }
diff --git a/yarn.lock b/yarn.lock
index c81ae38a3f..06568701e8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1161,27 +1161,6 @@
     pirates "^4.0.6"
     source-map-support "^0.5.16"
 
-"@babel/runtime@7.1.2":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.1.2.tgz#81c89935f4647706fc54541145e6b4ecfef4b8e3"
-  integrity sha512-Y3SCjmhSupzFB6wcv1KmmFucH6gDVnI30WjOcicV10ju0cZjak3Jcs67YLIXBrmZYw1xCrVeJPbycFwrqNyxpg==
-  dependencies:
-    regenerator-runtime "^0.12.0"
-
-"@babel/runtime@7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.2.0.tgz#b03e42eeddf5898e00646e4c840fa07ba8dcad7f"
-  integrity sha512-oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg==
-  dependencies:
-    regenerator-runtime "^0.12.0"
-
-"@babel/runtime@7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.4.tgz#73d12ba819e365fcf7fd152aed56d6df97d21c83"
-  integrity sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g==
-  dependencies:
-    regenerator-runtime "^0.12.0"
-
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.6", "@babel/runtime@^7.20.0", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.9", "@babel/runtime@^7.25.0", "@babel/runtime@^7.26.10":
   version "7.28.4"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326"
@@ -1196,7 +1175,20 @@
     "@babel/parser" "^7.27.2"
     "@babel/types" "^7.27.1"
 
-"@babel/traverse--for-generate-function-map@npm:@babel/traverse@^7.25.3", "@babel/traverse@^7.14.0", "@babel/traverse@^7.18.9", "@babel/traverse@^7.23.0", "@babel/traverse@^7.23.2", "@babel/traverse@^7.25.3", "@babel/traverse@^7.26.10", "@babel/traverse@^7.27.1", "@babel/traverse@^7.28.0", "@babel/traverse@^7.28.3", "@babel/traverse@^7.28.4", "@babel/traverse@^7.28.5":
+"@babel/traverse--for-generate-function-map@npm:@babel/traverse@^7.25.3":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.5.tgz#450cab9135d21a7a2ca9d2d35aa05c20e68c360b"
+  integrity sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==
+  dependencies:
+    "@babel/code-frame" "^7.27.1"
+    "@babel/generator" "^7.28.5"
+    "@babel/helper-globals" "^7.28.0"
+    "@babel/parser" "^7.28.5"
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.28.5"
+    debug "^4.3.1"
+
+"@babel/traverse@^7.14.0", "@babel/traverse@^7.18.9", "@babel/traverse@^7.23.0", "@babel/traverse@^7.23.2", "@babel/traverse@^7.25.3", "@babel/traverse@^7.26.10", "@babel/traverse@^7.27.1", "@babel/traverse@^7.28.0", "@babel/traverse@^7.28.3", "@babel/traverse@^7.28.4", "@babel/traverse@^7.28.5":
   version "7.28.5"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.5.tgz#450cab9135d21a7a2ca9d2d35aa05c20e68c360b"
   integrity sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==
@@ -1352,6 +1344,14 @@
     "@emnapi/wasi-threads" "1.1.0"
     tslib "^2.4.0"
 
+"@emnapi/core@^1.8.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.9.1.tgz#2143069c744ca2442074f8078462e51edd63c7bd"
+  integrity sha512-mukuNALVsoix/w1BJwFzwXBN/dHeejQtuVzcDsfOEsdpCumXb/E9j8w11h5S54tT1xhifGfbbSm/ICrObRb3KA==
+  dependencies:
+    "@emnapi/wasi-threads" "1.2.0"
+    tslib "^2.4.0"
+
 "@emnapi/runtime@^1.1.0", "@emnapi/runtime@^1.4.3":
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.7.1.tgz#a73784e23f5d57287369c808197288b52276b791"
@@ -1359,6 +1359,13 @@
   dependencies:
     tslib "^2.4.0"
 
+"@emnapi/runtime@^1.8.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.9.1.tgz#115ff2a0d589865be6bd8e9d701e499c473f2a8d"
+  integrity sha512-VYi5+ZVLhpgK4hQ0TAjiQiZ6ol0oe4mBx7mVv7IflsiEp0OWoVsp/+f9Vc1hOhE0TtkORVrI1GvzyreqpgWtkA==
+  dependencies:
+    tslib "^2.4.0"
+
 "@emnapi/wasi-threads@1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz#60b2102fddc9ccb78607e4a3cf8403ea69be41bf"
@@ -1366,6 +1373,13 @@
   dependencies:
     tslib "^2.4.0"
 
+"@emnapi/wasi-threads@1.2.0", "@emnapi/wasi-threads@^1.1.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.2.0.tgz#a19d9772cc3d195370bf6e2a805eec40aa75e18e"
+  integrity sha512-N10dEJNSsUx41Z6pZsXU8FjPjpBEplgH24sfkmITrBED1/U2Esum9F3lfLrMjKHHjmi557zQn7kR9R+XWXu5Rg==
+  dependencies:
+    tslib "^2.4.0"
+
 "@emoji-mart/react@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@emoji-mart/react/-/react-1.1.1.tgz#ddad52f93a25baf31c5383c3e7e4c6e05554312a"
@@ -3708,6 +3722,13 @@
     "@emnapi/runtime" "^1.4.3"
     "@tybys/wasm-util" "^0.10.0"
 
+"@napi-rs/wasm-runtime@^1.1.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.2.tgz#e25454b4d44cfabd21d1bc801705359870e33ecc"
+  integrity sha512-sNXv5oLJ7ob93xkZ1XnxisYhGYXfaG9f65/ZgYuAu3qt7b3NadcOEhLvx28hv31PgX8SZJRYrAIPQilQmFpLVw==
+  dependencies:
+    "@tybys/wasm-util" "^0.10.1"
+
 "@ndelangen/get-tarball@^3.0.7":
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/@ndelangen/get-tarball/-/get-tarball-3.0.9.tgz#727ff4454e65f34707e742a59e5e6b1f525d8964"
@@ -7144,13 +7165,131 @@
   dependencies:
     mini-svg-data-uri "^1.2.3"
 
-"@tailwindcss/typography@^0.5.10", "@tailwindcss/typography@^0.5.12":
+"@tailwindcss/node@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/node/-/node-4.2.2.tgz#840e904226dc1b379609de8a72323fc211568993"
+  integrity sha512-pXS+wJ2gZpVXqFaUEjojq7jzMpTGf8rU6ipJz5ovJV6PUGmlJ+jvIwGrzdHdQ80Sg+wmQxUFuoW1UAAwHNEdFA==
+  dependencies:
+    "@jridgewell/remapping" "^2.3.5"
+    enhanced-resolve "^5.19.0"
+    jiti "^2.6.1"
+    lightningcss "1.32.0"
+    magic-string "^0.30.21"
+    source-map-js "^1.2.1"
+    tailwindcss "4.2.2"
+
+"@tailwindcss/oxide-android-arm64@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.2.2.tgz#61d9ec5c18394fe7a972e99e19e6065e833da77c"
+  integrity sha512-dXGR1n+P3B6748jZO/SvHZq7qBOqqzQ+yFrXpoOWWALWndF9MoSKAT3Q0fYgAzYzGhxNYOoysRvYlpixRBBoDg==
+
+"@tailwindcss/oxide-darwin-arm64@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.2.2.tgz#9ad7b141789dae235c85d2f7874592bf869f636e"
+  integrity sha512-iq9Qjr6knfMpZHj55/37ouZeykwbDqF21gPFtfnhCCKGDcPI/21FKC9XdMO/XyBM7qKORx6UIhGgg6jLl7BZlg==
+
+"@tailwindcss/oxide-darwin-x64@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.2.2.tgz#a5899f1fbe55c4eddcbc871b835d5183ba34658c"
+  integrity sha512-BlR+2c3nzc8f2G639LpL89YY4bdcIdUmiOOkv2GQv4/4M0vJlpXEa0JXNHhCHU7VWOKWT/CjqHdTP8aUuDJkuw==
+
+"@tailwindcss/oxide-freebsd-x64@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.2.2.tgz#76185bb1bea9af915a5b9f465323861646587e21"
+  integrity sha512-YUqUgrGMSu2CDO82hzlQ5qSb5xmx3RUrke/QgnoEx7KvmRJHQuZHZmZTLSuuHwFf0DJPybFMXMYf+WJdxHy/nQ==
+
+"@tailwindcss/oxide-linux-arm-gnueabihf@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.2.2.tgz#74c17c69b2015f7600d566ab0990aaac8701128e"
+  integrity sha512-FPdhvsW6g06T9BWT0qTwiVZYE2WIFo2dY5aCSpjG/S/u1tby+wXoslXS0kl3/KXnULlLr1E3NPRRw0g7t2kgaQ==
+
+"@tailwindcss/oxide-linux-arm64-gnu@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.2.2.tgz#38a846d9d5795bc3b57951172044d8dbb3c79aa6"
+  integrity sha512-4og1V+ftEPXGttOO7eCmW7VICmzzJWgMx+QXAJRAhjrSjumCwWqMfkDrNu1LXEQzNAwz28NCUpucgQPrR4S2yw==
+
+"@tailwindcss/oxide-linux-arm64-musl@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.2.2.tgz#f4cc4129c17d3f2bcb01efef4d7a2f381e5e3f53"
+  integrity sha512-oCfG/mS+/+XRlwNjnsNLVwnMWYH7tn/kYPsNPh+JSOMlnt93mYNCKHYzylRhI51X+TbR+ufNhhKKzm6QkqX8ag==
+
+"@tailwindcss/oxide-linux-x64-gnu@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.2.2.tgz#7c4a00b0829e12736bd72ec74e1c08205448cc2e"
+  integrity sha512-rTAGAkDgqbXHNp/xW0iugLVmX62wOp2PoE39BTCGKjv3Iocf6AFbRP/wZT/kuCxC9QBh9Pu8XPkv/zCZB2mcMg==
+
+"@tailwindcss/oxide-linux-x64-musl@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.2.2.tgz#711756d7bbe97e221fc041b63a4f385b85ba4321"
+  integrity sha512-XW3t3qwbIwiSyRCggeO2zxe3KWaEbM0/kW9e8+0XpBgyKU4ATYzcVSMKteZJ1iukJ3HgHBjbg9P5YPRCVUxlnQ==
+
+"@tailwindcss/oxide-wasm32-wasi@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.2.2.tgz#ed6d28567b7abb8505f824457c236d2cd07ee18e"
+  integrity sha512-eKSztKsmEsn1O5lJ4ZAfyn41NfG7vzCg496YiGtMDV86jz1q/irhms5O0VrY6ZwTUkFy/EKG3RfWgxSI3VbZ8Q==
+  dependencies:
+    "@emnapi/core" "^1.8.1"
+    "@emnapi/runtime" "^1.8.1"
+    "@emnapi/wasi-threads" "^1.1.0"
+    "@napi-rs/wasm-runtime" "^1.1.1"
+    "@tybys/wasm-util" "^0.10.1"
+    tslib "^2.8.1"
+
+"@tailwindcss/oxide-win32-arm64-msvc@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.2.2.tgz#f2d0360e5bc06fe201537fb08193d3780e7dd24f"
+  integrity sha512-qPmaQM4iKu5mxpsrWZMOZRgZv1tOZpUm+zdhhQP0VhJfyGGO3aUKdbh3gDZc/dPLQwW4eSqWGrrcWNBZWUWaXQ==
+
+"@tailwindcss/oxide-win32-x64-msvc@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.2.2.tgz#10fc71b73883f9c3999b5b8c338fd96a45240dcb"
+  integrity sha512-1T/37VvI7WyH66b+vqHj/cLwnCxt7Qt3WFu5Q8hk65aOvlwAhs7rAp1VkulBJw/N4tMirXjVnylTR72uI0HGcA==
+
+"@tailwindcss/oxide@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide/-/oxide-4.2.2.tgz#c6534cb4b22650df605a58258235523a6abd7de8"
+  integrity sha512-qEUA07+E5kehxYp9BVMpq9E8vnJuBHfJEC0vPC5e7iL/hw7HR61aDKoVoKzrG+QKp56vhNZe4qwkRmMC0zDLvg==
+  optionalDependencies:
+    "@tailwindcss/oxide-android-arm64" "4.2.2"
+    "@tailwindcss/oxide-darwin-arm64" "4.2.2"
+    "@tailwindcss/oxide-darwin-x64" "4.2.2"
+    "@tailwindcss/oxide-freebsd-x64" "4.2.2"
+    "@tailwindcss/oxide-linux-arm-gnueabihf" "4.2.2"
+    "@tailwindcss/oxide-linux-arm64-gnu" "4.2.2"
+    "@tailwindcss/oxide-linux-arm64-musl" "4.2.2"
+    "@tailwindcss/oxide-linux-x64-gnu" "4.2.2"
+    "@tailwindcss/oxide-linux-x64-musl" "4.2.2"
+    "@tailwindcss/oxide-wasm32-wasi" "4.2.2"
+    "@tailwindcss/oxide-win32-arm64-msvc" "4.2.2"
+    "@tailwindcss/oxide-win32-x64-msvc" "4.2.2"
+
+"@tailwindcss/postcss@^4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/postcss/-/postcss-4.2.2.tgz#56570116b136f32c135357544fec6776a6a49dfd"
+  integrity sha512-n4goKQbW8RVXIbNKRB/45LzyUqN451deQK0nzIeauVEqjlI49slUlgKYJM2QyUzap/PcpnS7kzSUmPb1sCRvYQ==
+  dependencies:
+    "@alloc/quick-lru" "^5.2.0"
+    "@tailwindcss/node" "4.2.2"
+    "@tailwindcss/oxide" "4.2.2"
+    postcss "^8.5.6"
+    tailwindcss "4.2.2"
+
+"@tailwindcss/typography@^0.5.12":
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.19.tgz#ecb734af2569681eb40932f09f60c2848b909456"
   integrity sha512-w31dd8HOx3k9vPtcQh5QHP9GwKcgbMp87j58qi6xgiBnFFtKEAgCWnDw4qUT8aHwkCp8bKvb/KGKWWHedP0AAg==
   dependencies:
     postcss-selector-parser "6.0.10"
 
+"@tailwindcss/vite@^4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/vite/-/vite-4.2.2.tgz#49240a41691c34b78ed4a80d07a39301f1a5129f"
+  integrity sha512-mEiF5HO1QqCLXoNEfXVA1Tzo+cYsrqV7w9Juj2wdUFyW07JRenqMG225MvPwr3ZD9N1bFQj46X7r33iHxLUW0w==
+  dependencies:
+    "@tailwindcss/node" "4.2.2"
+    "@tailwindcss/oxide" "4.2.2"
+    tailwindcss "4.2.2"
+
 "@tanstack/query-core@5.90.12":
   version "5.90.12"
   resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.90.12.tgz#e1f5f47e72ef7d0fc794325936921c700352515e"
@@ -7411,7 +7550,7 @@
     "@tufjs/canonical-json" "2.0.0"
     minimatch "^9.0.5"
 
-"@tybys/wasm-util@^0.10.0":
+"@tybys/wasm-util@^0.10.0", "@tybys/wasm-util@^0.10.1":
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.1.tgz#ecddd3205cf1e2d5274649ff0eedd2991ed7f414"
   integrity sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==
@@ -8852,7 +8991,7 @@ abort-controller@^3.0.0:
   dependencies:
     event-target-shim "^5.0.0"
 
-accepts@^1.3.7, accepts@^1.3.8, accepts@~1.3.5, accepts@~1.3.8:
+accepts@^1.3.7, accepts@^1.3.8, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
   integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
@@ -8959,16 +9098,6 @@ ajv-keywords@^5.1.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@6.10.0:
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
-  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
 ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
@@ -8989,17 +9118,6 @@ ajv@^8.0.0, ajv@^8.11.0, ajv@^8.6.0, ajv@^8.9.0:
     json-schema-traverse "^1.0.0"
     require-from-string "^2.0.2"
 
-amqplib@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/amqplib/-/amqplib-0.5.2.tgz#d2d7313c7ffaa4d10bcf1e6252de4591b6cc7b63"
-  integrity sha512-l9mCs6LbydtHqRniRwYkKdqxVa6XMz3Vw1fh+2gJaaVgTM6Jk3o8RccAKWKtlhT1US5sWrFh+KKxsVUALURSIA==
-  dependencies:
-    bitsyntax "~0.0.4"
-    bluebird "^3.4.6"
-    buffer-more-ints "0.0.2"
-    readable-stream "1.x >=1.1.9"
-    safe-buffer "^5.0.1"
-
 anser@^1.4.9:
   version "1.4.10"
   resolved "https://registry.yarnpkg.com/anser/-/anser-1.4.10.tgz#befa3eddf282684bd03b63dcda3927aef8c2e35b"
@@ -9115,11 +9233,6 @@ app-root-dir@^1.0.2:
   resolved "https://registry.yarnpkg.com/app-root-dir/-/app-root-dir-1.0.2.tgz#38187ec2dea7577fff033ffcb12172692ff6e118"
   integrity sha512-jlpIfsOoNoafl92Sz//64uQHGSyMrD2vYG5d8o2a4qGvyNCvXur7bzIsWtAC/6flI2RYAp3kv8rsfBtaLm7w0g==
 
-app-root-path@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.1.0.tgz#98bf6599327ecea199309866e8140368fd2e646a"
-  integrity sha512-z5BqVjscbjmJBybKlICogJR2jCr2q/Ixu7Pvui5D4y97i7FLsJlvEG9XOR/KJRlkxxZz7UaaS2TMwQh1dRJ2dA==
-
 aproba@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
@@ -9271,20 +9384,6 @@ array.prototype.flatmap@^1.3.2, array.prototype.flatmap@^1.3.3:
     es-abstract "^1.23.5"
     es-shim-unscopables "^1.0.2"
 
-array.prototype.reduce@^1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.8.tgz#42f97f5078daedca687d4463fd3c05cbfd83da57"
-  integrity sha512-DwuEqgXFBwbmZSRqt3BpQigWNUoqw9Ml2dTWdF3B2zQlQX4OeUE0zyuzX0fX0IbTvjdkZbcBTU3idgpO78qkTw==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.4"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.9"
-    es-array-method-boxes-properly "^1.0.0"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.1.1"
-    is-string "^1.1.1"
-
 array.prototype.tosorted@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz#fe954678ff53034e717ea3352a03f0b0b86f7ffc"
@@ -9319,11 +9418,6 @@ asap@~2.0.3, asap@~2.0.6:
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
 
-asn1@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
-  integrity sha512-6i37w/+EhlWlGUJff3T/Q8u1RGmP5wgbiwYnOnbOqvtrPxT63/sYFyP9RcpxtxGymtfA075IvmOnL7ycNOWl3w==
-
 assert@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/assert/-/assert-2.1.0.tgz#6d92a238d05dc02e7427c881fb8be81c8448b2dd"
@@ -9372,13 +9466,6 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
   integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
-async-retry@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.2.3.tgz#a6521f338358d322b1a0012b79030c6f411d1ce0"
-  integrity sha512-tfDb02Th6CE6pJUF2gjW5ZVjsgwlucVXOEQMvEX9JgSJMs9gAX+Nz3xRuJBKuUYjTSYORqvDBORdAQ3LU59g7Q==
-  dependencies:
-    retry "0.12.0"
-
 async@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
@@ -9404,7 +9491,7 @@ auto-bind@~4.0.0:
   resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-4.0.0.tgz#e3589fc6c2da8f7ca43ba9f84fa52a744fc997fb"
   integrity sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==
 
-autoprefixer@^10.4.16, autoprefixer@^10.4.19:
+autoprefixer@^10.4.19:
   version "10.4.22"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.22.tgz#90b27ab55ec0cf0684210d1f056f7d65dac55f16"
   integrity sha512-ARe0v/t9gO28Bznv6GgqARmVqcWOV3mfgUPn9becPHMiD3o9BwlRgaeccZnwTpZ7Zwqrm+c1sUSsMxIzQzc8Xg==
@@ -9651,14 +9738,6 @@ babel-preset-jest@^29.6.3:
     babel-plugin-jest-hoist "^29.6.3"
     babel-preset-current-node-syntax "^1.0.0"
 
-babel-runtime@6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
-
 bail@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/bail/-/bail-2.0.2.tgz#d26f5cd8fe5d6f832a31517b9f7c356040ba6d5d"
@@ -9684,13 +9763,6 @@ baseline-browser-mapping@^2.9.0:
   resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.9.2.tgz#0ae89ec3e10e07c368b77def89db8044409461d1"
   integrity sha512-PxSsosKQjI38iXkmb3d0Y32efqyA0uW4s41u4IVBsLlWLhCiYNpH/AfNOVWRqCQBlD8TFJTz6OUWNd4DFJCnmw==
 
-basic-auth@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
-  integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
-  dependencies:
-    safe-buffer "5.1.2"
-
 before-after-hook@^2.2.0:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c"
@@ -9736,13 +9808,6 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
   integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
 
-bitsyntax@~0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/bitsyntax/-/bitsyntax-0.0.4.tgz#eb10cc6f82b8c490e3e85698f07e83d46e0cba82"
-  integrity sha512-Pav3HSZXD2NLQOWfJldY3bpJLt8+HS2nUo5Z1bLLmHg2vCE/cM1qfEvNjlYo7GgYQPneNr715Bh42i01ZHZPvw==
-  dependencies:
-    buffer-more-ints "0.0.2"
-
 bl@^4.0.3, bl@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
@@ -9752,27 +9817,6 @@ bl@^4.0.3, bl@^4.1.0:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-bluebird@^3.4.6:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
-body-parser@1.18.3:
-  version "1.18.3"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
-  integrity sha512-YQyoqQG3sO8iCmf8+hyVpgHHOv0/hCEFiS4zTGUwTA1HjAFX66wRcNQrVCeJq9pgESMRvUAOvSil5MJlmccuKQ==
-  dependencies:
-    bytes "3.0.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "~1.6.3"
-    iconv-lite "0.4.23"
-    on-finished "~2.3.0"
-    qs "6.5.2"
-    raw-body "2.3.3"
-    type-is "~1.6.16"
-
 body-parser@~1.20.3:
   version "1.20.4"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.4.tgz#f8e20f4d06ca8a50a71ed329c15dccad1cdc547f"
@@ -9888,21 +9932,11 @@ buffer-crc32@~0.2.3:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
 
-buffer-equal-constant-time@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
-  integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
-
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer-more-ints@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz#26b3885d10fa13db7fc01aae3aab870199e0124c"
-  integrity sha512-PDgX2QJgUc5+Jb2xAoBFP5MxhtVUmZHR33ak+m/SDxRdCrbnX1BggRIaxiW7ImwfmO4iJeCQKN18ToSXWGjYkA==
-
 buffer@^5.4.3, buffer@^5.5.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
@@ -9923,11 +9957,6 @@ byte-size@8.1.1:
   resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-8.1.1.tgz#3424608c62d59de5bfda05d31e0313c6174842ae"
   integrity sha512-tUkzZWK0M/qdoLEqikxBWe4kumyuwjl3HO6zHTr4yEI23EojPtLYXdG1+AQY7MN0cGyNDvEaJ8wiYQm6P2bPxg==
 
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==
-
 bytes@3.1.2, bytes@~3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
@@ -10053,15 +10082,6 @@ chai@^5.2.0:
     loupe "^3.1.0"
     pathval "^2.0.0"
 
-chalk@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
 chalk@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
@@ -10191,7 +10211,7 @@ chevrotain@~11.0.3:
     "@chevrotain/utils" "11.0.3"
     lodash-es "4.17.21"
 
-chokidar@^3.5.3, chokidar@^3.6.0:
+chokidar@^3.5.3:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
   integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
@@ -10415,12 +10435,7 @@ clone@^1.0.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
-clsx@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.0.0.tgz#12658f3fd98fafe62075595a5c30e43d18f3d00b"
-  integrity sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==
-
-clsx@^2.0.0, clsx@^2.1.0, clsx@^2.1.1:
+clsx@2.1.1, clsx@^2.0.0, clsx@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
   integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==
@@ -10577,15 +10592,6 @@ commander@^8.3.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
-commands-events@1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/commands-events/-/commands-events-1.0.4.tgz#772123d7f175b2984474bce37a722f4c2d3d2830"
-  integrity sha512-HdP/+1Anoc7z+6L2h7nd4Imz54+LW+BjMGt30riBZrZ3ZeP/8el93wD8Jj8ltAaqVslqNgjX6qlhSBJwuDSmpg==
-  dependencies:
-    "@babel/runtime" "7.2.0"
-    formats "1.0.0"
-    uuidv4 "2.0.0"
-
 comment-json@^4.2.5:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/comment-json/-/comment-json-4.4.1.tgz#0757e3ba31a9e56f3f6e00bdaae114384ac8bcf3"
@@ -10623,31 +10629,13 @@ compare-func@^2.0.0:
     array-ify "^1.0.0"
     dot-prop "^5.1.0"
 
-comparejs@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/comparejs/-/comparejs-1.0.0.tgz#1f61a4c2c19c5aed08983952e88bd1fe8924e3df"
-  integrity sha512-Ue/Zd9aOucHzHXwaCe4yeHR7jypp7TKrIBZ5yls35nPNiVXlW14npmNVKM1ZaLlQTKZ6/4ewA//gYKHHIwCpOw==
-
-compressible@~2.0.14, compressible@~2.0.18:
+compressible@~2.0.18:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
   integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
   dependencies:
     mime-db ">= 1.43.0 < 2"
 
-compression@1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
-  integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==
-  dependencies:
-    accepts "~1.3.5"
-    bytes "3.0.0"
-    compressible "~2.0.14"
-    debug "2.6.9"
-    on-headers "~1.0.1"
-    safe-buffer "5.1.2"
-    vary "~1.1.2"
-
 compression@^1.7.4:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/compression/-/compression-1.8.1.tgz#4a45d909ac16509195a9a28bd91094889c180d79"
@@ -10745,11 +10733,6 @@ constants-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
   integrity sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==
 
-content-disposition@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
-  integrity sha512-kRGRZw3bLlFISDBgwTSA1TMBFN6J6GWDeubmDE3AF+3+yXL8hTWv8r5rkLbqYXY4RjPk/EzHnClI3zQf1cFmHA==
-
 content-disposition@~0.5.4:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
@@ -10757,11 +10740,6 @@ content-disposition@~0.5.4:
   dependencies:
     safe-buffer "5.2.1"
 
-content-type@1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-
 content-type@~1.0.4, content-type@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
@@ -10845,21 +10823,11 @@ convert-source-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-cookie-signature@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
-
 cookie-signature@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.7.tgz#ab5dd7ab757c54e60f37ef6550f481c426d10454"
   integrity sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==
 
-cookie@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-  integrity sha512-+IJOX0OqlHCszo2mBUq+SrEbCj6w7Kpffqx60zYbPTFaO4+yYgRjHwcZNpWvaTylDHaV7PPmBHzSecZiMhtPgw==
-
 cookie@~0.7.1:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7"
@@ -10884,11 +10852,6 @@ core-js-pure@^3.23.3:
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.47.0.tgz#1104df8a3b6eb9189fcc559b5a65b90f66e7e887"
   integrity sha512-BcxeDbzUrRnXGYIVAGFtcGQVNpFcUhVjr6W7F8XktvQW2iJP9e66GP6xdKotCRFlrxBvNIBrhwKteRXqMV86Nw==
 
-core-js@^2.4.0:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
-  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
-
 core-js@^3.18.3, core-js@^3.8.2:
   version "3.47.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.47.0.tgz#436ef07650e191afeb84c24481b298bd60eb4a17"
@@ -10899,14 +10862,6 @@ core-util-is@^1.0.3, core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
-cors@2.8.5:
-  version "2.8.5"
-  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
-  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
-  dependencies:
-    object-assign "^4"
-    vary "^1"
-
 cose-base@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/cose-base/-/cose-base-1.0.3.tgz#650334b41b869578a543358b80cda7e0abe0a60a"
@@ -11005,15 +10960,6 @@ crypto-random-string@^2.0.0:
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
   integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
-crypto2@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/crypto2/-/crypto2-2.0.0.tgz#5539f45b283d8c2bdca0ea4faf8b34014a4ea2cd"
-  integrity sha512-jdXdAgdILldLOF53md25FiQ6ybj2kUFTiRjs7msKTUoZrzgT/M1FPX5dYGJjbbwFls+RJIiZxNTC02DE/8y0ZQ==
-  dependencies:
-    babel-runtime "6.26.0"
-    node-rsa "0.4.2"
-    util.promisify "1.0.0"
-
 css-in-js-utils@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-3.1.0.tgz#640ae6a33646d401fc720c54fc61c42cd76ae2bb"
@@ -11483,15 +11429,6 @@ dataloader@^2.2.3:
   resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.2.3.tgz#42d10b4913515f5b37c6acedcb4960d6ae1b1517"
   integrity sha512-y2krtASINtPFS1rSDjacrFgn1dcUuoREVabwlOGOe4SdxenREqwjwjElAdwvbGM7kgZz9a3KVicWR7vcz8rnzA==
 
-datasette@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/datasette/-/datasette-1.0.1.tgz#c8786bbd36be6606179e7a2525430b9dbd9395e8"
-  integrity sha512-aJdlCBToEJUP4M57r67r4V6tltwGKa3qetnjpBtXYIlqbX9tM9jsoDMxb4xd9AGjpp3282oHRmqI5Z8TVAU0Mg==
-  dependencies:
-    comparejs "1.0.0"
-    eventemitter2 "5.0.1"
-    lodash "4.17.5"
-
 date-fns@^2.30.0:
   version "2.30.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
@@ -11658,7 +11595,7 @@ define-lazy-prop@^2.0.0:
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
   integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
-define-properties@^1.1.2, define-properties@^1.1.3, define-properties@^1.2.1:
+define-properties@^1.1.3, define-properties@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
   integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
@@ -11708,11 +11645,6 @@ depd@2.0.0, depd@~2.0.0:
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
 
-depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
-
 dependency-graph@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27"
@@ -11733,11 +11665,6 @@ destroy@1.2.0, destroy@~1.2.0:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
-destroy@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==
-
 detect-indent@^6.0.0, detect-indent@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
@@ -11949,13 +11876,6 @@ dotenv@~16.4.5:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.7.tgz#0e20c5b82950140aa99be360a8a5f52335f53c26"
   integrity sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==
 
-draht@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/draht/-/draht-1.0.1.tgz#c4c8879923d2130dfa9c5930e956c85d62b1e975"
-  integrity sha512-yNNHL864dniNmIE9ZKD++mKypiAUAvVZtyV0QrbXH/ak3ebzFqo5xsmRBRqV8pZVhImOSBiyq500Wcmrf44zAg==
-  dependencies:
-    eventemitter2 "5.0.1"
-
 drizzle-kit@^0.31.5:
   version "0.31.8"
   resolved "https://registry.yarnpkg.com/drizzle-kit/-/drizzle-kit-0.31.8.tgz#feef5850eab22a01a0f919247c66efb648d57734"
@@ -12000,13 +11920,6 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
-ecdsa-sig-formatter@1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
-  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
-  dependencies:
-    safe-buffer "^5.0.1"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -12100,6 +12013,14 @@ enhanced-resolve@^5.15.0, enhanced-resolve@^5.17.3:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
+enhanced-resolve@^5.19.0:
+  version "5.20.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.20.1.tgz#eeeb3966bea62c348c40a0cc9e7912e2557d0be0"
+  integrity sha512-Qohcme7V1inbAfvjItgw0EaxVX5q2rdVEZHRBrEQdRZTssLDGsL8Lwrznl8oQ/6kuTJONLaDcGjkNP247XEhcA==
+  dependencies:
+    graceful-fs "^4.2.4"
+    tapable "^2.3.0"
+
 enquirer@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
@@ -12241,11 +12162,6 @@ es-abstract@^1.17.5, es-abstract@^1.23.2, es-abstract@^1.23.3, es-abstract@^1.23
     unbox-primitive "^1.1.0"
     which-typed-array "^1.1.19"
 
-es-array-method-boxes-properly@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
-  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
-
 es-define-property@^1.0.0, es-define-property@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
@@ -13024,11 +12940,6 @@ event-target-shim@^5.0.0:
   resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
   integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
 
-eventemitter2@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-5.0.1.tgz#6197a095d5fb6b57e8942f6fd7eaad63a09c9452"
-  integrity sha512-5EM1GHXycJBS6mauYAbVKT1cVs7POKWb2NXD4Vyt8dDqeZa7LaDK1/sjtL+Zb0lzTpSNil4596Dyu97hz37QLg==
-
 eventemitter3@^4.0.4:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
@@ -13347,42 +13258,6 @@ exponential-backoff@^3.1.1:
   resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.3.tgz#51cf92c1c0493c766053f9d3abee4434c244d2f6"
   integrity sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==
 
-"express@4.16.4 ":
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
-  integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
-  dependencies:
-    accepts "~1.3.5"
-    array-flatten "1.1.1"
-    body-parser "1.18.3"
-    content-disposition "0.5.2"
-    content-type "~1.0.4"
-    cookie "0.3.1"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "~1.1.2"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "1.1.1"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.4"
-    qs "6.5.2"
-    range-parser "~1.2.0"
-    safe-buffer "5.1.2"
-    send "0.16.2"
-    serve-static "1.13.2"
-    setprototypeof "1.1.0"
-    statuses "~1.4.0"
-    type-is "~1.6.16"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
 express@^4.17.3:
   version "4.22.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.22.1.tgz#1de23a09745a4fffdb39247b344bb5eaff382069"
@@ -13449,11 +13324,6 @@ extract-zip@^1.6.6:
     mkdirp "^0.5.4"
     yauzl "^2.10.0"
 
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -13464,7 +13334,7 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
   integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
 
-fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.2:
+fast-glob@^3.2.9, fast-glob@^3.3.0:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818"
   integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==
@@ -13631,19 +13501,6 @@ filter-obj@^1.1.0:
   resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b"
   integrity sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==
 
-finalhandler@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
-  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    statuses "~1.4.0"
-    unpipe "~1.0.0"
-
 finalhandler@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
@@ -13696,11 +13553,6 @@ find-cache-dir@^4.0.0:
     common-path-prefix "^3.0.0"
     pkg-dir "^7.0.0"
 
-find-root@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
-  integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
-
 find-up@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -13746,26 +13598,6 @@ find-yarn-workspace-root@^2.0.0:
   dependencies:
     micromatch "^4.0.2"
 
-flaschenpost@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/flaschenpost/-/flaschenpost-1.1.3.tgz#2c1e7bf4eecf9f30333dd672b427a174c2d37449"
-  integrity sha512-1VAYPvDsVBGFJyUrOa/6clnJwZYC3qVq9nJLcypy6lvaaNbo1wOQiH8HQ+4Fw/k51pVG7JHzSf5epb8lmIW86g==
-  dependencies:
-    "@babel/runtime" "7.2.0"
-    app-root-path "2.1.0"
-    babel-runtime "6.26.0"
-    chalk "2.4.1"
-    find-root "1.1.0"
-    lodash "4.17.11"
-    moment "2.22.2"
-    processenv "1.1.0"
-    split2 "3.0.0"
-    stack-trace "0.0.10"
-    stringify-object "3.3.0"
-    untildify "3.0.3"
-    util.promisify "1.0.0"
-    varname "2.0.3"
-
 flat-cache@^3.0.4:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
@@ -13872,11 +13704,6 @@ format@^0.2.0:
   resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
   integrity sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==
 
-formats@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/formats/-/formats-1.0.0.tgz#327154084786eac09d3b839cab28d150b982b163"
-  integrity sha512-For0Y8egwEK96JgJo4NONErPhtl7H2QzeB2NYGmzeGeJ8a1JZqPgLYOtM3oJRCYhmgsdDFd6KGRYyfe37XY4Yg==
-
 formdata-polyfill@^4.0.10:
   version "4.0.10"
   resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423"
@@ -14486,14 +14313,6 @@ has-unicode@2.0.1, has-unicode@^2.0.1:
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
 
-hase@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/hase/-/hase-2.0.0.tgz#344aed71d00826c45d0a37cdf94fe7faf7154c60"
-  integrity sha512-L83pBR/oZvQQNjv4kw9aUpTqBxERPiY7B42jsmkt1VDeUaRVhYkEIKzkCqrppjtxHe2EZqzZJzuhMXsWsxYIsw==
-  dependencies:
-    "@babel/runtime" "7.1.2"
-    amqplib "0.5.2"
-
 hasown@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
@@ -14872,16 +14691,6 @@ http-cache-semantics@^4.1.1:
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz#205f4db64f8562b76a4ff9235aa5279839a09dd5"
   integrity sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==
 
-http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
-
 http-errors@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
@@ -14972,13 +14781,6 @@ i18next@^23.11.2:
   dependencies:
     "@babel/runtime" "^7.23.2"
 
-iconv-lite@0.4.23:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
-  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
 iconv-lite@0.6, iconv-lite@0.6.3, iconv-lite@^0.6.2:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
@@ -15113,16 +14915,11 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3, inherits@~2.0.4:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@~2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-inherits@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
-
 ini@^1.3.2, ini@^1.3.4, ini@^1.3.8, ini@~1.3.0:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
@@ -15713,11 +15510,6 @@ is64bit@^2.0.0:
   dependencies:
     system-architecture "^0.1.0"
 
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
-
 isarray@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
@@ -16251,12 +16043,12 @@ jimp-compact@0.16.1:
   resolved "https://registry.yarnpkg.com/jimp-compact/-/jimp-compact-0.16.1.tgz#9582aea06548a2c1e04dd148d7c3ab92075aefa3"
   integrity sha512-dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww==
 
-jiti@^1.17.1, jiti@^1.19.1, jiti@^1.20.0, jiti@^1.21.7:
+jiti@^1.17.1, jiti@^1.19.1, jiti@^1.20.0:
   version "1.21.7"
   resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.7.tgz#9dd81043424a3d28458b193d965f0d18a2300ba9"
   integrity sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==
 
-jiti@^2.0.0:
+jiti@^2.0.0, jiti@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.6.1.tgz#178ef2fc9a1a594248c20627cd820187a4d78d92"
   integrity sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==
@@ -16369,13 +16161,6 @@ json-buffer@3.0.1:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
   integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
-json-lines@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-lines/-/json-lines-1.0.0.tgz#4ac6d7531deec3b928516c7f86897b548f82711d"
-  integrity sha512-ytuLZb4RBQb3bTRsG/QBenyIo5oHLpjeCVph3s2NnoAsZE9K6h+uR+OWpEOWV1UeHdX63tYctGppBpGAc+JNMA==
-  dependencies:
-    timer2 "1.0.0"
-
 json-parse-better-errors@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
@@ -16486,22 +16271,6 @@ jsonpointer@^5.0.0:
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.1.tgz#2110e0af0900fd37467b5907ecd13a7884a1b559"
   integrity sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==
 
-jsonwebtoken@8.5.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.0.tgz#ebd0ca2a69797816e1c5af65b6c759787252947e"
-  integrity sha512-IqEycp0znWHNA11TpYi77bVgyBO/pGESDh7Ajhas+u0ttkGkKYIIAjniL4Bw5+oVejVF+SYkaI7XKfwCCyeTuA==
-  dependencies:
-    jws "^3.2.1"
-    lodash.includes "^4.3.0"
-    lodash.isboolean "^3.0.3"
-    lodash.isinteger "^4.0.4"
-    lodash.isnumber "^3.0.3"
-    lodash.isplainobject "^4.0.6"
-    lodash.isstring "^4.0.1"
-    lodash.once "^4.0.0"
-    ms "^2.1.1"
-    semver "^5.6.0"
-
 "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.5:
   version "3.3.5"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a"
@@ -16532,23 +16301,6 @@ just-diff@^6.0.0:
   resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-6.0.2.tgz#03b65908543ac0521caf6d8eb85035f7d27ea285"
   integrity sha512-S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA==
 
-jwa@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.2.tgz#16011ac6db48de7b102777e57897901520eec7b9"
-  integrity sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw==
-  dependencies:
-    buffer-equal-constant-time "^1.0.1"
-    ecdsa-sig-formatter "1.0.11"
-    safe-buffer "^5.0.1"
-
-jws@^3.2.1:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.3.tgz#5ac0690b460900a27265de24520526853c0b8ca1"
-  integrity sha512-byiJ0FLRdLdSVSReO/U4E7RoEyOCKnEnEPMjq3HxWtvzLsV08/i5RQKsFVNkCldrCaPr2vDNAOMsfs8T/Hze7g==
-  dependencies:
-    jwa "^1.4.2"
-    safe-buffer "^5.0.1"
-
 katex@^0.16.0, katex@^0.16.22, katex@^0.16.9:
   version "0.16.25"
   resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.25.tgz#61699984277e3bdb3e89e0e446b83cd0a57d87db"
@@ -16771,6 +16523,11 @@ lightningcss-android-arm64@1.30.2:
   resolved "https://registry.yarnpkg.com/lightningcss-android-arm64/-/lightningcss-android-arm64-1.30.2.tgz#6966b7024d39c94994008b548b71ab360eb3a307"
   integrity sha512-BH9sEdOCahSgmkVhBLeU7Hc9DWeZ1Eb6wNS6Da8igvUwAe0sqROHddIlvU06q3WyXVEOYDZ6ykBZQnjTbmo4+A==
 
+lightningcss-android-arm64@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz#f033885116dfefd9c6f54787523e3514b61e1968"
+  integrity sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==
+
 lightningcss-darwin-arm64@1.27.0:
   version "1.27.0"
   resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.27.0.tgz#565bd610533941cba648a70e105987578d82f996"
@@ -16781,6 +16538,11 @@ lightningcss-darwin-arm64@1.30.2:
   resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.2.tgz#a5fa946d27c029e48c7ff929e6e724a7de46eb2c"
   integrity sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA==
 
+lightningcss-darwin-arm64@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz#50b71871b01c8199584b649e292547faea7af9b5"
+  integrity sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==
+
 lightningcss-darwin-x64@1.27.0:
   version "1.27.0"
   resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.27.0.tgz#c906a267237b1c7fe08bff6c5ac032c099bc9482"
@@ -16791,6 +16553,11 @@ lightningcss-darwin-x64@1.30.2:
   resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.2.tgz#5ce87e9cd7c4f2dcc1b713f5e8ee185c88d9b7cd"
   integrity sha512-oBZgKchomuDYxr7ilwLcyms6BCyLn0z8J0+ZZmfpjwg9fRVZIR5/GMXd7r9RH94iDhld3UmSjBM6nXWM2TfZTQ==
 
+lightningcss-darwin-x64@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz#35f3e97332d130b9ca181e11b568ded6aebc6d5e"
+  integrity sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==
+
 lightningcss-freebsd-x64@1.27.0:
   version "1.27.0"
   resolved "https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.27.0.tgz#a7c3c4d6ee18dffeb8fa69f14f8f9267f7dc0c34"
@@ -16801,6 +16568,11 @@ lightningcss-freebsd-x64@1.30.2:
   resolved "https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.2.tgz#6ae1d5e773c97961df5cff57b851807ef33692a5"
   integrity sha512-c2bH6xTrf4BDpK8MoGG4Bd6zAMZDAXS569UxCAGcA7IKbHNMlhGQ89eRmvpIUGfKWNVdbhSbkQaWhEoMGmGslA==
 
+lightningcss-freebsd-x64@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz#9777a76472b64ed6ff94342ad64c7bafd794a575"
+  integrity sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==
+
 lightningcss-linux-arm-gnueabihf@1.27.0:
   version "1.27.0"
   resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.27.0.tgz#c7c16432a571ec877bf734fe500e4a43d48c2814"
@@ -16811,6 +16583,11 @@ lightningcss-linux-arm-gnueabihf@1.30.2:
   resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.2.tgz#62c489610c0424151a6121fa99d77731536cdaeb"
   integrity sha512-eVdpxh4wYcm0PofJIZVuYuLiqBIakQ9uFZmipf6LF/HRj5Bgm0eb3qL/mr1smyXIS1twwOxNWndd8z0E374hiA==
 
+lightningcss-linux-arm-gnueabihf@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz#13ae652e1ab73b9135d7b7da172f666c410ad53d"
+  integrity sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==
+
 lightningcss-linux-arm64-gnu@1.27.0:
   version "1.27.0"
   resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.27.0.tgz#cfd9e18df1cd65131da286ddacfa3aee6862a752"
@@ -16821,6 +16598,11 @@ lightningcss-linux-arm64-gnu@1.30.2:
   resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.2.tgz#2a3661b56fe95a0cafae90be026fe0590d089298"
   integrity sha512-UK65WJAbwIJbiBFXpxrbTNArtfuznvxAJw4Q2ZGlU8kPeDIWEX1dg3rn2veBVUylA2Ezg89ktszWbaQnxD/e3A==
 
+lightningcss-linux-arm64-gnu@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz#417858795a94592f680123a1b1f9da8a0e1ef335"
+  integrity sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==
+
 lightningcss-linux-arm64-musl@1.27.0:
   version "1.27.0"
   resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.27.0.tgz#6682ff6b9165acef9a6796bd9127a8e1247bb0ed"
@@ -16831,6 +16613,11 @@ lightningcss-linux-arm64-musl@1.30.2:
   resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.2.tgz#d7ddd6b26959245e026bc1ad9eb6aa983aa90e6b"
   integrity sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA==
 
+lightningcss-linux-arm64-musl@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz#6be36692e810b718040802fd809623cffe732133"
+  integrity sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==
+
 lightningcss-linux-x64-gnu@1.27.0:
   version "1.27.0"
   resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.27.0.tgz#714221212ad184ddfe974bbb7dbe9300dfde4bc0"
@@ -16841,6 +16628,11 @@ lightningcss-linux-x64-gnu@1.30.2:
   resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.2.tgz#5a89814c8e63213a5965c3d166dff83c36152b1a"
   integrity sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w==
 
+lightningcss-linux-x64-gnu@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz#0b7803af4eb21cfd38dd39fe2abbb53c7dd091f6"
+  integrity sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==
+
 lightningcss-linux-x64-musl@1.27.0:
   version "1.27.0"
   resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.27.0.tgz#247958daf622a030a6dc2285afa16b7184bdf21e"
@@ -16851,6 +16643,11 @@ lightningcss-linux-x64-musl@1.30.2:
   resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.2.tgz#808c2e91ce0bf5d0af0e867c6152e5378c049728"
   integrity sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA==
 
+lightningcss-linux-x64-musl@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz#88dc8ba865ddddb1ac5ef04b0f161804418c163b"
+  integrity sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==
+
 lightningcss-win32-arm64-msvc@1.27.0:
   version "1.27.0"
   resolved "https://registry.yarnpkg.com/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.27.0.tgz#64cfe473c264ef5dc275a4d57a516d77fcac6bc9"
@@ -16861,6 +16658,11 @@ lightningcss-win32-arm64-msvc@1.30.2:
   resolved "https://registry.yarnpkg.com/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.2.tgz#ab4a8a8a2e6a82a4531e8bbb6bf0ff161ee6625a"
   integrity sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ==
 
+lightningcss-win32-arm64-msvc@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz#4f30ba3fa5e925f5b79f945e8cc0d176c3b1ab38"
+  integrity sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==
+
 lightningcss-win32-x64-msvc@1.27.0:
   version "1.27.0"
   resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.27.0.tgz#237d0dc87d9cdc9cf82536bcbc07426fa9f3f422"
@@ -16871,6 +16673,30 @@ lightningcss-win32-x64-msvc@1.30.2:
   resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.2.tgz#f01f382c8e0a27e1c018b0bee316d210eac43b6e"
   integrity sha512-5g1yc73p+iAkid5phb4oVFMB45417DkRevRbt/El/gKXJk4jid+vPFF/AXbxn05Aky8PapwzZrdJShv5C0avjw==
 
+lightningcss-win32-x64-msvc@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz#141aa5605645064928902bb4af045fa7d9f4220a"
+  integrity sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==
+
+lightningcss@1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.32.0.tgz#b85aae96486dcb1bf49a7c8571221273f4f1e4a9"
+  integrity sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==
+  dependencies:
+    detect-libc "^2.0.3"
+  optionalDependencies:
+    lightningcss-android-arm64 "1.32.0"
+    lightningcss-darwin-arm64 "1.32.0"
+    lightningcss-darwin-x64 "1.32.0"
+    lightningcss-freebsd-x64 "1.32.0"
+    lightningcss-linux-arm-gnueabihf "1.32.0"
+    lightningcss-linux-arm64-gnu "1.32.0"
+    lightningcss-linux-arm64-musl "1.32.0"
+    lightningcss-linux-x64-gnu "1.32.0"
+    lightningcss-linux-x64-musl "1.32.0"
+    lightningcss-win32-arm64-msvc "1.32.0"
+    lightningcss-win32-x64-msvc "1.32.0"
+
 lightningcss@^1.30.1:
   version "1.30.2"
   resolved "https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.30.2.tgz#4ade295f25d140f487d37256f4cd40dc607696d0"
@@ -16913,19 +16739,11 @@ lilconfig@^2.1.0:
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
   integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==
 
-lilconfig@^3.0.0, lilconfig@^3.1.1, lilconfig@^3.1.3:
+lilconfig@^3.0.0, lilconfig@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.3.tgz#a1bcfd6257f9585bf5ae14ceeebb7b559025e4c4"
   integrity sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==
 
-limes@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/limes/-/limes-2.0.0.tgz#32b9fa0c62fe728262c8b2316ca3496ede7153fe"
-  integrity sha512-evWD0pnTgPX7QueaSoJl5JBUL30T1ZVzo34ke97tIKmeagqhBTYK/JkKL0vtG3MpNApw8ZY9TlbybfwEz9knBA==
-  dependencies:
-    "@babel/runtime" "7.3.4"
-    jsonwebtoken "8.5.0"
-
 lines-and-columns@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.3.tgz#b2f0badedb556b747020ab8ea7f0373e22efac1b"
@@ -17082,66 +16900,26 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
-lodash.foreach@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
-  integrity sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==
-
 lodash.groupby@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.groupby/-/lodash.groupby-4.6.0.tgz#0b08a1dcf68397c397855c3239783832df7403d1"
   integrity sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw==
 
-lodash.includes@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
-  integrity sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==
-
-lodash.isboolean@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
-  integrity sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==
-
 lodash.isequal@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
   integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
 
-lodash.isinteger@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
-  integrity sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==
-
 lodash.ismatch@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
   integrity sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==
 
-lodash.isnumber@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
-  integrity sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==
-
-lodash.isplainobject@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-  integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==
-
-lodash.isstring@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-  integrity sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==
-
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash.once@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
-  integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==
-
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
@@ -17162,16 +16940,6 @@ lodash.upperfirst@^4.3.1:
   resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce"
   integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==
 
-lodash@4.17.11:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
-
-lodash@4.17.5:
-  version "4.17.5"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
-  integrity sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==
-
 lodash@^4.17.20, lodash@^4.17.21, lodash@~4.17.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
@@ -17296,13 +17064,6 @@ lucide-react@=0.428.0:
   resolved "https://registry.yarnpkg.com/lucide-react/-/lucide-react-0.428.0.tgz#dfd96d682c74f78c2961040036d8c1265ccce039"
   integrity sha512-rGrzslfEcgqwh+TLBC5qJ8wvVIXhLvAIXVFKNHndYyb1utSxxn9rXOC+1CNJLi6yNOooyPqIs6+3YCp6uSiEvg==
 
-lusca@1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/lusca/-/lusca-1.6.1.tgz#f7445e50c720030f5ee53d1336e9e53d1786c34f"
-  integrity sha512-+JzvUMH/rsE/4XfHdDOl70bip0beRcHSviYATQM0vtls59uVtdn1JMu4iD7ZShBpAmFG8EnaA+PrYG9sECMIOQ==
-  dependencies:
-    tsscmp "^1.0.5"
-
 lz-string@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941"
@@ -17315,7 +17076,7 @@ magic-string@^0.25.0, magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.8"
 
-magic-string@^0.30.17, magic-string@^0.30.5:
+magic-string@^0.30.17, magic-string@^0.30.21, magic-string@^0.30.5:
   version "0.30.21"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.21.tgz#56763ec09a0fa8091df27879fd94d19078c00d91"
   integrity sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==
@@ -17749,11 +17510,6 @@ meow@^8.1.2:
     type-fest "^0.18.0"
     yargs-parser "^20.2.3"
 
-merge-descriptors@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
-
 merge-descriptors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5"
@@ -18438,11 +18194,6 @@ mime-types@^2.1.12, mime-types@^2.1.25, mime-types@^2.1.27, mime-types@^2.1.31,
   dependencies:
     mime-db "1.52.0"
 
-mime@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
-
 mime@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
@@ -18663,22 +18414,6 @@ modify-values@^1.0.1:
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
-moment@2.22.2:
-  version "2.22.2"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
-  integrity sha512-LRvkBHaJGnrcWvqsElsOhHCzj8mU39wLx5pQ0pc6s153GynCTsPdGdqsVNKAQD9sKnWj11iF7TZx9fpLwdD3fw==
-
-morgan@1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz#0a8d16734a1d9afbc824b99df87e738e58e2da59"
-  integrity sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==
-  dependencies:
-    basic-auth "~2.0.0"
-    debug "2.6.9"
-    depd "~1.1.2"
-    on-finished "~2.3.0"
-    on-headers "~1.0.1"
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -18877,11 +18612,6 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-nocache@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/nocache/-/nocache-2.0.0.tgz#202b48021a0c4cbde2df80de15a17443c8b43980"
-  integrity sha512-YdKcy2x0dDwOh+8BEuHvA+mnOKAhmMQDgKBOCUGaLpewdmsRYguYZSom3yA+/OrE61O/q+NMQANnun65xpI1Hw==
-
 node-abort-controller@^3.0.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548"
@@ -18961,18 +18691,6 @@ node-releases@^2.0.27:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.27.tgz#eedca519205cf20f650f61d56b070db111231e4e"
   integrity sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==
 
-node-rsa@0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/node-rsa/-/node-rsa-0.4.2.tgz#d6391729ec16a830ed5a38042b3157d2d5d72530"
-  integrity sha512-Bvso6Zi9LY4otIZefYrscsUpo2mUpiAVIEmSZV2q41sP8tHZoert3Yu6zv4f/RXJqMNZQKCtnhDugIuCma23YA==
-  dependencies:
-    asn1 "0.2.3"
-
-node-statsd@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/node-statsd/-/node-statsd-0.1.1.tgz#27a59348763d0af7a037ac2a031fef3f051013d3"
-  integrity sha512-QDf6R8VXF56QVe1boek8an/Rb3rSNaxoFWb7Elpsv2m1+Noua1yy0F1FpKpK5VluF8oymWM4w764A4KsYL4pDg==
-
 nopt@^8.0.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-8.1.0.tgz#b11d38caf0f8643ce885818518064127f602eae3"
@@ -19280,7 +18998,7 @@ ob1@0.83.3:
   dependencies:
     flow-enums-runtime "^0.0.6"
 
-object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
@@ -19340,19 +19058,6 @@ object.fromentries@^2.0.8:
     es-abstract "^1.23.2"
     es-object-atoms "^1.0.0"
 
-object.getownpropertydescriptors@^2.0.3:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz#2f1fe0606ec1a7658154ccd4f728504f69667923"
-  integrity sha512-qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A==
-  dependencies:
-    array.prototype.reduce "^1.0.6"
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.2"
-    es-object-atoms "^1.0.0"
-    gopd "^1.0.1"
-    safe-array-concat "^1.1.2"
-
 object.groupby@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e"
@@ -19391,11 +19096,6 @@ on-finished@~2.3.0:
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
-  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
-
 on-headers@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.1.0.tgz#59da4f91c45f5f989c6e4bcedc5a3b0aed70ff65"
@@ -19843,16 +19543,11 @@ parse5@^7.0.0, parse5@^7.1.1:
   dependencies:
     entities "^6.0.0"
 
-parseurl@~1.3.2, parseurl@~1.3.3:
+parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
-partof@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/partof/-/partof-1.0.0.tgz#d9d7946a14a7d9d9738a59e7c88f478ec5c964ca"
-  integrity sha512-+TXdhKCySpJDynCxgAPoGVyAkiK3QPusQ63/BdU5t68QcYzyU6zkP/T7F3gkMQBVUYqdWEADKa6Kx5zg8QIKrg==
-
 pascal-case@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb"
@@ -19975,11 +19670,6 @@ path-scurry@^2.0.2:
     lru-cache "^11.0.0"
     minipass "^7.1.2"
 
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
-
 path-to-regexp@~0.1.12:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
@@ -20186,13 +19876,6 @@ postcss-load-config@^4.0.1:
     lilconfig "^3.0.0"
     yaml "^2.3.4"
 
-"postcss-load-config@^4.0.2 || ^5.0 || ^6.0":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-6.0.1.tgz#6fd7dcd8ae89badcf1b2d644489cbabf83aa8096"
-  integrity sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==
-  dependencies:
-    lilconfig "^3.1.1"
-
 postcss-loader@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.3.0.tgz#2c4de9657cd4f07af5ab42bd60a673004da1b8cc"
@@ -20274,7 +19957,7 @@ postcss-modules-values@^4.0.0:
   dependencies:
     icss-utils "^5.0.0"
 
-postcss-nested@^6.0.1, postcss-nested@^6.2.0:
+postcss-nested@^6.0.1:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.2.0.tgz#4c2d22ab5f20b9cb61e2c5c5915950784d068131"
   integrity sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==
@@ -20289,7 +19972,7 @@ postcss-selector-parser@6.0.10:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.1.1, postcss-selector-parser@^6.1.2:
+postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.1.1:
   version "6.1.2"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de"
   integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==
@@ -20327,7 +20010,7 @@ postcss@^7.0.14, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.5, postcss@^7.0.
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-postcss@^8.4.23, postcss@^8.4.27, postcss@^8.4.31, postcss@^8.4.33, postcss@^8.4.38, postcss@^8.4.47, postcss@^8.5.6:
+postcss@^8.4.23, postcss@^8.4.27, postcss@^8.4.31, postcss@^8.4.33, postcss@^8.4.38, postcss@^8.5.6:
   version "8.5.6"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.6.tgz#2825006615a619b4f62a9e7426cc120b349a8f3c"
   integrity sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==
@@ -20465,13 +20148,6 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
 
-processenv@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/processenv/-/processenv-1.1.0.tgz#3867422468954f1af82ce7bfb944c8adadd5cdf7"
-  integrity sha512-SymqIsn8GjEUy8nG7HiyEjgbfk1xFosRIakUX1NHLpriq3vVpKniGrr9RdMWCaGYWByIovbRt2f/WvmP/IOApQ==
-  dependencies:
-    babel-runtime "6.26.0"
-
 proggy@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/proggy/-/proggy-3.0.0.tgz#874e91fed27fe00a511758e83216a6b65148bd6c"
@@ -20553,7 +20229,7 @@ protocols@^2.0.0, protocols@^2.0.1:
   resolved "https://registry.yarnpkg.com/protocols/-/protocols-2.0.2.tgz#822e8fcdcb3df5356538b3e91bfd890b067fd0a4"
   integrity sha512-hHVTzba3wboROl0/aWRRG9dMytgH6ow//STBZh43l/wQgmMhYhOFi0EHWAPtoCz9IAUymsyP0TSBHkhgMEGNnQ==
 
-proxy-addr@~2.0.4, proxy-addr@~2.0.7:
+proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
   integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
@@ -20634,11 +20310,6 @@ qrcode-terminal@0.11.0:
   resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.11.0.tgz#ffc6c28a2fc0bfb47052b47e23f4f446a5fbdb9e"
   integrity sha512-Uu7ii+FQy4Qf82G4xu7ShHhjhGahEpCWc3x8UavY3CTcWV+ufmmCtwkr7ZKsX42jdL0kr1B5FKUeqJvAn51jzQ==
 
-qs@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
-
 qs@^6.10.0, qs@^6.12.1, qs@^6.12.3, qs@~6.14.0:
   version "6.14.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.0.tgz#c63fa40680d2c5c941412a0e899c89af60c0a930"
@@ -20697,7 +20368,7 @@ randombytes@^2.1.0:
   dependencies:
     safe-buffer "^5.1.0"
 
-range-parser@^1.2.1, range-parser@~1.2.0, range-parser@~1.2.1:
+range-parser@^1.2.1, range-parser@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
@@ -20733,16 +20404,6 @@ ranges-sort@^6.1.0:
   resolved "https://registry.yarnpkg.com/ranges-sort/-/ranges-sort-6.1.0.tgz#509603d61dd4bcc6ecbd51ff0621e7990aa8bc38"
   integrity sha512-esvEBNDhydnuojWhXkiZnHv4infMKaeD4NsCqce++uYxnRIAXIS6R3iAMNVLqxaPZn+4+h5dhEPXCuBgpExakg==
 
-raw-body@2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
-  integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
-  dependencies:
-    bytes "3.0.0"
-    http-errors "1.6.3"
-    iconv-lite "0.4.23"
-    unpipe "1.0.0"
-
 raw-body@~2.5.3:
   version "2.5.3"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.3.tgz#11c6650ee770a7de1b494f197927de0c923822e2"
@@ -21371,16 +21032,6 @@ read@^4.0.0:
   dependencies:
     mute-stream "^2.0.0"
 
-"readable-stream@1.x >=1.1.9":
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readable-stream@^2.0.0, readable-stream@^2.2.2, readable-stream@~2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
@@ -21505,16 +21156,6 @@ regenerate@^1.4.2:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
-  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
-
-regenerator-runtime@^0.12.0:
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
-  integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
-
 regenerator-runtime@^0.13.2:
   version "0.13.11"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
@@ -21886,7 +21527,7 @@ resolve.exports@2.0.3, resolve.exports@^2.0.0, resolve.exports@^2.0.3:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.3.tgz#41955e6f1b4013b7586f873749a635dea07ebe3f"
   integrity sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==
 
-resolve@^1.1.7, resolve@^1.10.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.22.10, resolve@^1.22.2, resolve@^1.22.4, resolve@^1.22.8:
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.22.10, resolve@^1.22.2, resolve@^1.22.4:
   version "1.22.11"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.11.tgz#aad857ce1ffb8bfa9b0b1ac29f1156383f68c262"
   integrity sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==
@@ -21972,7 +21613,7 @@ retext@^9.0.0:
     retext-stringify "^4.0.0"
     unified "^11.0.0"
 
-retry@0.12.0, retry@^0.12.0:
+retry@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
   integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
@@ -22127,7 +21768,7 @@ rxjs@^7.5.5, rxjs@^7.8.1, rxjs@^7.8.2:
   dependencies:
     tslib "^2.1.0"
 
-safe-array-concat@^1.1.2, safe-array-concat@^1.1.3:
+safe-array-concat@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz#c9e54ec4f603b0bbb8e7e5007a5ee7aecd1538c3"
   integrity sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==
@@ -22138,16 +21779,16 @@ safe-array-concat@^1.1.2, safe-array-concat@^1.1.3:
     has-symbols "^1.1.0"
     isarray "^2.0.5"
 
-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
 safe-push-apply@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/safe-push-apply/-/safe-push-apply-1.0.0.tgz#01850e981c1602d398c85081f360e4e6d03d27f5"
@@ -22265,25 +21906,6 @@ semver@~7.6.3:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
 
-send@0.16.2:
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
-  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
-  dependencies:
-    debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "~1.6.2"
-    mime "1.4.1"
-    ms "2.0.0"
-    on-finished "~2.3.0"
-    range-parser "~1.2.0"
-    statuses "~1.4.0"
-
 send@0.19.0:
   version "0.19.0"
   resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
@@ -22343,16 +21965,6 @@ serialize-javascript@^6.0.1, serialize-javascript@^6.0.2:
   dependencies:
     randombytes "^2.1.0"
 
-serve-static@1.13.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
-  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.2"
-    send "0.16.2"
-
 serve-static@^1.16.2, serve-static@~1.16.2:
   version "1.16.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296"
@@ -22414,11 +22026,6 @@ setimmediate@^1.0.5:
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
   integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
 
-setprototypeof@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
-
 setprototypeof@1.2.0, setprototypeof@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
@@ -22429,11 +22036,6 @@ sf-symbols-typescript@^2.0.0, sf-symbols-typescript@^2.1.0:
   resolved "https://registry.yarnpkg.com/sf-symbols-typescript/-/sf-symbols-typescript-2.2.0.tgz#926d6e0715e3d8784cadf7658431e36581254208"
   integrity sha512-TPbeg0b7ylrswdGCji8FRGFAKuqbpQlLbL8SOle3j1iHSs5Ob5mhvMAxWN2UItOjgALAB5Zp3fmMfj8mbWvXKw==
 
-sha-1@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/sha-1/-/sha-1-0.1.1.tgz#2a39304bf41bbab11dd9efb7474ec25b1a92c257"
-  integrity sha512-dexizf3hB7d4Jq6Cd0d/NYQiqgEqIfZIpuMfwPfvSb6h06DZKmHyUe55jYwpHC12R42wpqXO6ouhiBpRzIcD/g==
-
 shallow-clone@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
@@ -22782,13 +22384,6 @@ split-on-first@^1.0.0:
   resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
   integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==
 
-split2@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/split2/-/split2-3.0.0.tgz#55057cd560687a7ef6464471597404577ff1735d"
-  integrity sha512-Cp7G+nUfKJyHCrAI8kze3Q00PFGEG1pMgrAlTFlDbn+GW24evSZHJuMl+iUJx1w/NTRDeBiTgvwnf6YOt94FMw==
-  dependencies:
-    readable-stream "^3.0.0"
-
 split2@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f"
@@ -22841,11 +22436,6 @@ stack-generator@^2.0.5:
   dependencies:
     stackframe "^1.3.4"
 
-stack-trace@0.0.10:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
-  integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==
-
 stack-utils@^2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
@@ -22892,16 +22482,11 @@ statuses@2.0.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
   integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
 
-"statuses@>= 1.4.0 < 2", statuses@~1.5.0:
+statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
-statuses@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
-
 statuses@~2.0.1, statuses@~2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.2.tgz#8f75eecef765b5e1cfcdc080da59409ed424e382"
@@ -22912,13 +22497,6 @@ std-env@^3.9.0:
   resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.10.0.tgz#d810b27e3a073047b2b5e40034881f5ea6f9c83b"
   integrity sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==
 
-stethoskop@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stethoskop/-/stethoskop-1.0.0.tgz#b838e8f6f78f8e66f86139524e8058e4a2f78b62"
-  integrity sha512-4JnZ+UmTs9SFfDjSHFlD/EoXcb1bfwntkt4h1ipNGrpxtRzmHTxOmdquCJvIrVu608Um7a09cGX0ZSOSllWJNQ==
-  dependencies:
-    node-statsd "0.1.1"
-
 stop-iteration-iterator@^1.0.0, stop-iteration-iterator@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz#f481ff70a548f6124d0312c3aa14cbfa7aa542ad"
@@ -23027,7 +22605,16 @@ string-trim-spaces-only@^5.1.0:
   resolved "https://registry.yarnpkg.com/string-trim-spaces-only/-/string-trim-spaces-only-5.1.0.tgz#d68e328f4f11cbb96642334ae1582bf3c02582f5"
   integrity sha512-632znq4SGCNM7Vw7QITbx05oej+Xly2s7OtDxN9jvNbOoWcQuA5fq14CAS5TlpiiB04LDETzJj9fk851PnWLgg==
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -23129,11 +22716,6 @@ string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.2.0"
 
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
-
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -23149,7 +22731,7 @@ stringify-entities@^4.0.0:
     character-entities-html4 "^2.0.0"
     character-entities-legacy "^3.0.0"
 
-stringify-object@3.3.0, stringify-object@^3.3.0:
+stringify-object@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
   integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==
@@ -23158,7 +22740,7 @@ stringify-object@3.3.0, stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -23179,6 +22761,13 @@ strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1, strip-ansi@^7.1.0:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz#132875abde678c7ea8d691533f2e7e22bb744dba"
@@ -23299,7 +22888,7 @@ stylis@^4.3.0, stylis@^4.3.6:
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.6.tgz#7c7b97191cb4f195f03ecab7d52f7902ed378320"
   integrity sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==
 
-sucrase@^3.32.0, sucrase@^3.35.0, sucrase@~3.35.1:
+sucrase@^3.32.0, sucrase@~3.35.1:
   version "3.35.1"
   resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.1.tgz#4619ea50393fe8bd0ae5071c26abd9b2e346bfe1"
   integrity sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==
@@ -23401,64 +22990,16 @@ tabbable@^6.0.0:
   resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.3.0.tgz#2e0e6163935387cdeacd44e9334616ca0115a8d3"
   integrity sha512-EIHvdY5bPLuWForiR/AN2Bxngzpuwn1is4asboytXtpTgsArc+WmSJKVLlhdh71u7jFcryDqB2A8lQvj78MkyQ==
 
-tailwind-merge@^1.14.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-1.14.0.tgz#e677f55d864edc6794562c63f5001f45093cdb8b"
-  integrity sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==
-
-tailwind-merge@^2.2.1:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.6.0.tgz#ac5fb7e227910c038d458f396b7400d93a3142d5"
-  integrity sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==
-
-tailwind-scrollbar-hide@^1.1.7:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/tailwind-scrollbar-hide/-/tailwind-scrollbar-hide-1.3.1.tgz#09d9d1ec16bd34bcdb0e4bdd2750de1fb027d25f"
-  integrity sha512-eUAvPTltKnAGHbCBRpOk5S7+UZTkFZgDKmZLZ6jZXXs4V7mRXvwshBjeMwrv3vmiWqm3IGEDFVKzUSm1JuoXKw==
-
-tailwind@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tailwind/-/tailwind-4.0.0.tgz#070b5e5f1c2c190e4c0d1280a46b36c7369ea46e"
-  integrity sha512-LlUNoD/5maFG1h5kQ6/hXfFPdcnYw+1Z7z+kUD/W/E71CUMwcnrskxiBM8c3G8wmPsD1VvCuqGYMHviI8+yrmg==
-  dependencies:
-    "@babel/runtime" "7.3.4"
-    ajv "6.10.0"
-    app-root-path "2.1.0"
-    async-retry "1.2.3"
-    body-parser "1.18.3"
-    commands-events "1.0.4"
-    compression "1.7.3"
-    content-type "1.0.4"
-    cors "2.8.5"
-    crypto2 "2.0.0"
-    datasette "1.0.1"
-    draht "1.0.1"
-    express "4.16.4 "
-    flaschenpost "1.1.3"
-    hase "2.0.0"
-    json-lines "1.0.0"
-    limes "2.0.0"
-    lodash "4.17.11"
-    lusca "1.6.1"
-    morgan "1.9.1"
-    nocache "2.0.0"
-    partof "1.0.0"
-    processenv "1.1.0"
-    stethoskop "1.0.0"
-    timer2 "1.0.0"
-    uuidv4 "3.0.1"
-    ws "6.2.0"
+tailwind-merge@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-3.5.0.tgz#06502f4496ba15151445d97d916a26564d50d1ca"
+  integrity sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==
 
 tailwindcss-animate@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/tailwindcss-animate/-/tailwindcss-animate-1.0.7.tgz#318b692c4c42676cc9e67b19b78775742388bef4"
   integrity sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==
 
-tailwindcss-autofill@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/tailwindcss-autofill/-/tailwindcss-autofill-1.0.2.tgz#8f4c4ef68bf1f8ed08fbb98ede20a8a9e6cca025"
-  integrity sha512-gbm/ZKvU7EW2kzSoyCREwsNSQlsgEmNWnagggz6dGl1QgtM9RkmeWRicAY+eSnI9VFnfYCQOAthW9gDKZjda4Q==
-
 tailwindcss-shadow-fill@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tailwindcss-shadow-fill/-/tailwindcss-shadow-fill-1.0.1.tgz#80ebaf75ee0a9df3004ac3b2df526a96cb3bef73"
@@ -23501,33 +23042,10 @@ tailwindcss@3.3.5:
     resolve "^1.22.2"
     sucrase "^3.32.0"
 
-tailwindcss@^3.3.3, tailwindcss@^3.4.3:
-  version "3.4.18"
-  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.18.tgz#9fa9650aace186644b608242f1e57d2d55593301"
-  integrity sha512-6A2rnmW5xZMdw11LYjhcI5846rt9pbLSabY5XPxo+XWdxwZaFEn47Go4NzFiHu9sNNmr/kXivP1vStfvMaK1GQ==
-  dependencies:
-    "@alloc/quick-lru" "^5.2.0"
-    arg "^5.0.2"
-    chokidar "^3.6.0"
-    didyoumean "^1.2.2"
-    dlv "^1.1.3"
-    fast-glob "^3.3.2"
-    glob-parent "^6.0.2"
-    is-glob "^4.0.3"
-    jiti "^1.21.7"
-    lilconfig "^3.1.3"
-    micromatch "^4.0.8"
-    normalize-path "^3.0.0"
-    object-hash "^3.0.0"
-    picocolors "^1.1.1"
-    postcss "^8.4.47"
-    postcss-import "^15.1.0"
-    postcss-js "^4.0.1"
-    postcss-load-config "^4.0.2 || ^5.0 || ^6.0"
-    postcss-nested "^6.2.0"
-    postcss-selector-parser "^6.1.2"
-    resolve "^1.22.8"
-    sucrase "^3.35.0"
+tailwindcss@4.2.2, tailwindcss@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-4.2.2.tgz#688fb0751c8ca9044e890546510a2ee817308e87"
+  integrity sha512-KWBIxs1Xb6NoLdMVqhbhgwZf2PGBpPEiwOqgI4pFIYbNTfBXiKYyWoTsXgBQ9WFg/OlhnvHaY+AEpW7wSmFo2Q==
 
 tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1, tapable@^2.3.0:
   version "2.3.0"
@@ -23713,11 +23231,6 @@ timeout-signal@^2.0.0:
   resolved "https://registry.yarnpkg.com/timeout-signal/-/timeout-signal-2.0.0.tgz#23207ea448d50258bb0defe3beea4a467643abba"
   integrity sha512-YBGpG4bWsHoPvofT6y/5iqulfXIiIErl5B0LdtHT1mGXDFTAhhRrbUpTvBgYbovr+3cKblya2WAOcpoy90XguA==
 
-timer2@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/timer2/-/timer2-1.0.0.tgz#7a2441569c6564cb891f605788eef0377d89f5de"
-  integrity sha512-UOZql+P2ET0da+B7V3/RImN3IhC5ghb+9cpecfUhmYGIm0z73dDr3A781nBLnFYmRzeT1AmoT4w9Lgr8n7n7xg==
-
 tiny-invariant@^1.3.1, tiny-invariant@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
@@ -23979,11 +23492,6 @@ tslib@~2.6.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
   integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
 
-tsscmp@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
-  integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==
-
 tsx@^4.20.5:
   version "4.21.0"
   resolved "https://registry.yarnpkg.com/tsx/-/tsx-4.21.0.tgz#32aa6cf17481e336f756195e6fe04dae3e6308b1"
@@ -24003,14 +23511,10 @@ tuf-js@^4.0.0:
     debug "^4.4.1"
     make-fetch-happen "^15.0.0"
 
-tw-colors@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/tw-colors/-/tw-colors-3.3.2.tgz#ddf32c6bf53632152b0809775f24514b66e51ace"
-  integrity sha512-TosYI43Jec/KO4NPzDoBlccPPtPMYholoRUSVYGmzCGa1Zek9exDQIQ+6UViHqqK6Nti/4wBzEGyRTxMSNnSXQ==
-  dependencies:
-    color "^4.2.3"
-    flat "^5.0.2"
-    lodash.foreach "^4.5.0"
+tw-animate-css@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/tw-animate-css/-/tw-animate-css-1.4.0.tgz#b4a06f68244cba39428aa47e65e6e4c0babc21ee"
+  integrity sha512-7bziOlRqH0hJx80h/3mbicLW7o8qLsH5+RaLR2t+OHM3D0JlWGODQKQ4cxbK7WlvmUxpcj6Kgu6EKqjrGFe3QQ==
 
 tween-functions@^1.2.0:
   version "1.2.0"
@@ -24082,7 +23586,7 @@ type-fest@^2.19.0, type-fest@~2.19:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"
   integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==
 
-type-is@~1.6.16, type-is@~1.6.18:
+type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
   integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
@@ -24437,7 +23941,7 @@ unixify@^1.0.0:
   dependencies:
     normalize-path "^2.1.1"
 
-unpipe@1.0.0, unpipe@~1.0.0:
+unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
@@ -24477,11 +23981,6 @@ unrs-resolver@^1.6.2:
     "@unrs/resolver-binding-win32-ia32-msvc" "1.11.1"
     "@unrs/resolver-binding-win32-x64-msvc" "1.11.1"
 
-untildify@3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"
-  integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==
-
 untildify@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
@@ -24606,14 +24105,6 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-util.promisify@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
-  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
-  dependencies:
-    define-properties "^1.1.2"
-    object.getownpropertydescriptors "^2.0.3"
-
 util@^0.12.4, util@^0.12.5:
   version "0.12.5"
   resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc"
@@ -24635,11 +24126,6 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
-uuid@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
-
 uuid@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-11.1.0.tgz#9549028be1753bb934fc96e2bca09bb4105ae912"
@@ -24655,21 +24141,6 @@ uuid@^9.0.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
   integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
 
-uuidv4@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/uuidv4/-/uuidv4-2.0.0.tgz#3ec764288f9e9c4e40f8027ad309c2c528be2976"
-  integrity sha512-sAUlwUVepcVk6bwnaW/oi6LCwMdueako5QQzRr90ioAVVcms6p1mV0PaSxK8gyAC4CRvKddsk217uUpZUbKd2Q==
-  dependencies:
-    sha-1 "0.1.1"
-    uuid "3.3.2"
-
-uuidv4@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/uuidv4/-/uuidv4-3.0.1.tgz#31751b0ab78f50c9e42dbf231693210b3435b673"
-  integrity sha512-PPzksdWRl2a5C9hrs3OOYrArTeyoR0ftJ3jtOy+BnVHkT2UlrrzPNt9nTdiGuxmQItHM/AcTXahwZZC57Njojg==
-  dependencies:
-    uuid "3.3.2"
-
 v8-compile-cache-lib@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
@@ -24707,12 +24178,7 @@ validate-npm-package-name@^7.0.0:
   resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-7.0.0.tgz#3b4fe12b4abfb8b0be010d0e75b1fe2b52295bc6"
   integrity sha512-bwVk/OK+Qu108aJcMAEiU4yavHUI7aN20TgZNBj9MR2iU1zPUl1Z1Otr7771ExfYTPTvfN8ZJ1pbr5Iklgt4xg==
 
-varname@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/varname/-/varname-2.0.3.tgz#05e8dc64fbb6e59170de44aad4ddeab8ab87b68e"
-  integrity sha512-+DofT9mJAUALhnr9ipZ5Z2icwaEZ7DAajOZT4ffXy3MQqnXtG3b7atItLQEJCkfcJTOf9WcsywneOEibD4eqJg==
-
-vary@^1, vary@~1.1.2:
+vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
@@ -25401,7 +24867,7 @@ workbox-window@7.4.0, workbox-window@^7.4.0:
     "@types/trusted-types" "^2.0.2"
     workbox-core "7.4.0"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -25419,6 +24885,15 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
@@ -25475,13 +24950,6 @@ write-file-atomic@^6.0.0:
     imurmurhash "^0.1.4"
     signal-exit "^4.0.1"
 
-ws@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.0.tgz#13806d9913b2a5f3cbb9ba47b563c002cbc7c526"
-  integrity sha512-deZYUNlt2O4buFCa3t5bKLf8A7FPP/TVjwOeVNpw818Ma5nk4MLXls2eoEGS39o8119QIYxTrTDoPQ5B/gTD6w==
-  dependencies:
-    async-limiter "~1.0.0"
-
 ws@^6.1.0, ws@^6.2.3:
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.3.tgz#ccc96e4add5fd6fedbc491903075c85c5a11d9ee"

From 77c7aa734f844145345d5391690cfd32c1693608 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Mar 2026 17:20:50 -0700
Subject: [PATCH 02/32] :arrow_up: Bump i18next from 23.16.8 to 26.0.1 (#1004)

Bumps [i18next](https://github.com/i18next/i18next) from 23.16.8 to 26.0.1.
- [Release notes](https://github.com/i18next/i18next/releases)
- [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/i18next/i18next/compare/v23.16.8...v26.0.1)

---
updated-dependencies:
- dependency-name: i18next
  dependency-version: 26.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 packages/browser/package.json |  2 +-
 yarn.lock                     | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/browser/package.json b/packages/browser/package.json
index c30f76965e..52bb17615c 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -36,7 +36,7 @@
 		"colorjs.io": "^0.5.2",
 		"epubjs": "^0.3.93",
 		"framer-motion": "^10.18.0",
-		"i18next": "^23.11.2",
+		"i18next": "^26.0.1",
 		"immer": "^10.0.4",
 		"is-valid-glob": "^1.0.0",
 		"lodash": "^4.17.21",
diff --git a/yarn.lock b/yarn.lock
index ad6b8d7b46..940c304708 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1182,10 +1182,10 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.6", "@babel/runtime@^7.20.0", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.9", "@babel/runtime@^7.25.0", "@babel/runtime@^7.26.10":
-  version "7.28.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326"
-  integrity sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.6", "@babel/runtime@^7.20.0", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.9", "@babel/runtime@^7.25.0", "@babel/runtime@^7.26.10", "@babel/runtime@^7.29.2":
+  version "7.29.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.29.2.tgz#9a6e2d05f4b6692e1801cd4fb176ad823930ed5e"
+  integrity sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==
 
 "@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.25.0", "@babel/template@^7.27.1", "@babel/template@^7.27.2", "@babel/template@^7.3.3":
   version "7.27.2"
@@ -14965,12 +14965,12 @@ hyphenate-style-name@^1.0.3:
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.1.0.tgz#1797bf50369588b47b72ca6d5e65374607cf4436"
   integrity sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==
 
-i18next@^23.11.2:
-  version "23.16.8"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.16.8.tgz#3ae1373d344c2393f465556f394aba5a9233b93a"
-  integrity sha512-06r/TitrM88Mg5FdUXAKL96dJMzgqLE5dv3ryBAra4KCwD9mJ4ndOTS95ZuymIGoE+2hzfdaMak2X11/es7ZWg==
+i18next@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-26.0.1.tgz#de5df38603b96f6863933f1a0a4937b6451c5960"
+  integrity sha512-vtz5sXU4+nkCm8yEU+JJ6yYIx0mkg9e68W0G0PXpnOsmzLajNsW5o28DJMqbajxfsfq0gV3XdrBudsDQnwxfsQ==
   dependencies:
-    "@babel/runtime" "^7.23.2"
+    "@babel/runtime" "^7.29.2"
 
 iconv-lite@0.4.23:
   version "0.4.23"

From 49a8d141c7ecda69e95185085accb05b4e6feb5a Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Tue, 31 Mar 2026 18:02:47 -0700
Subject: [PATCH 03/32] =?UTF-8?q?=F0=9F=90=9B=20Fix=20manifest=20cleanup?=
 =?UTF-8?q?=20in=20docker=20build=20(#991)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/actions/build-docker/action.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/actions/build-docker/action.yml b/.github/actions/build-docker/action.yml
index c625a068b2..90d1c87386 100644
--- a/.github/actions/build-docker/action.yml
+++ b/.github/actions/build-docker/action.yml
@@ -81,9 +81,15 @@ runs:
         sudo apt-get install -y podman buildah
       shell: bash
 
-    - name: Remove existing images
+    - name: Remove existing images and manifests
       run: |
-        podman rmi ${{ env.LOCAL_IMAGES }} || true
+        podman images --format "{{.Repository}}:{{.Tag}}" \
+          | grep "^localhost/stump:" \
+          | xargs -r podman rmi --force 2>/dev/null || true
+
+        for tag in ${{ env.FORMATTED_TAGS }}; do
+          buildah manifest rm "stump:$tag" 2>/dev/null || true
+        done
       shell: bash
 
     - name: Run buildah build

From e1502278ad58d4f8cb8478c26dc487e5cf78964f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Mar 2026 18:47:26 -0700
Subject: [PATCH 04/32] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20zustand=20fro?=
 =?UTF-8?q?m=204.5.7=20to=205.0.12=20(#997)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* :arrow_up: Bump zustand from 4.5.7 to 5.0.12

Bumps [zustand](https://github.com/pmndrs/zustand) from 4.5.7 to 5.0.12.
- [Release notes](https://github.com/pmndrs/zustand/releases)
- [Commits](https://github.com/pmndrs/zustand/compare/4.5.7...v5.0.12)

---
updated-dependencies:
- dependency-name: zustand
  dependency-version: 5.0.12
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix lint

* what a fucking chore this was

* more testing and finding missed spots

* more missed spots, fix toaster colors

* fix app font

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
---
 apps/expo/app/(tabs)/library/index.tsx        | 22 +++--
 apps/expo/app/_layout.tsx                     |  5 +-
 apps/expo/app/server/[id]/books/index.tsx     | 14 ++--
 apps/expo/app/server/[id]/series/[id].tsx     | 14 ++--
 apps/expo/app/server/[id]/series/index.tsx    | 14 ++--
 .../preferences/AllowDownscaling.tsx          | 11 ++-
 .../appSettings/preferences/AppLanguage.tsx   | 11 ++-
 .../preferences/AppPrimaryColor.tsx           | 11 ++-
 .../preferences/AutoSyncLocalData.tsx         | 11 ++-
 .../preferences/DisableDismissGesture.tsx     | 11 ++-
 .../preferences/EnableDebugAnalytics.tsx      | 13 +--
 .../appSettings/preferences/MaskURLs.tsx      | 11 ++-
 .../preferences/PerformanceMonitor.tsx        | 11 ++-
 .../preferences/PreferMinimalReader.tsx       | 13 +--
 .../preferences/PreferNativePdf.tsx           | 11 ++-
 .../preferences/ReduceAnimations.tsx          | 11 ++-
 .../preferences/ThumbnailPlaceholder.tsx      | 11 ++-
 .../preferences/ThumbnailRatio.tsx            | 11 ++-
 .../preferences/ThumbnailResizeMode.tsx       | 11 ++-
 .../appSettings/stump/BookClubsEnabled.tsx    | 13 +--
 .../book/filterHeader/Characters.tsx          | 11 ++-
 .../book/reader/epub/CustomizeThemeSheet.tsx  | 11 ++-
 .../book/reader/epub/ReadiumReader.tsx        | 83 ++++++++++---------
 .../book/reader/epub/controls/ColumnCount.tsx | 12 ++-
 .../book/reader/epub/controls/FontConfig.tsx  | 20 +++--
 .../reader/epub/controls/FontSizeSlider.tsx   | 11 ++-
 .../book/reader/epub/controls/ImageFilter.tsx | 12 ++-
 .../book/reader/epub/controls/PageMargins.tsx | 12 ++-
 .../reader/epub/controls/PublisherStyles.tsx  | 11 ++-
 .../epub/controls/ReadingProgression.tsx      | 12 ++-
 .../book/reader/epub/controls/ThemeSelect.tsx | 23 +++--
 .../epub/controls/TypographySettings.tsx      | 30 ++++---
 .../controls/customTheme/CustomizeTheme.tsx   | 15 ++--
 .../customTheme/ThemeHeaderPreview.tsx        | 35 ++++----
 .../components/book/reader/pdf/PdfReader.tsx  | 17 ++--
 .../book/reader/pdf/PdfReaderFooter.tsx       | 11 ++-
 .../book/reader/settings/ReaderSettings.tsx   | 26 +++---
 .../book/reader/shared/ControlsBackdrop.tsx   | 11 ++-
 .../CollectionStackedThumbnails.tsx           | 11 ++-
 .../localLibrary/DownloadRowItem.tsx          | 25 +++---
 .../localLibrary/DownloadsHeaderMenu.tsx      | 11 +--
 .../search/SearchHistoryAndFavorites.tsx      | 16 +++-
 .../selection/SelectionLeftScreenHeader.tsx   | 12 +--
 apps/expo/lib/hooks/db/downloads.ts           |  5 +-
 apps/expo/lib/hooks/sync/utils.ts             |  4 +-
 apps/expo/lib/hooks/useLayoutMode.ts          |  9 +-
 apps/expo/lib/hooks/usePreferences.ts         | 11 ++-
 apps/expo/package.json                        |  3 +-
 apps/expo/stores/epub.ts                      | 11 ++-
 apps/expo/stores/reader.ts                    | 35 ++++----
 apps/expo/stores/savedServer.ts               | 19 +++--
 apps/expo/stores/search.ts                    | 16 ++--
 packages/browser/package.json                 |  2 +-
 packages/browser/src/App.tsx                  | 17 ++--
 packages/browser/src/AppLayout.tsx            | 21 ++---
 packages/browser/src/AppRouter.tsx            |  5 +-
 packages/browser/src/components/Toaster.tsx   |  6 +-
 .../src/components/book/table/BookTable.tsx   | 10 ++-
 .../src/components/container/useGridSize.ts   |  4 +-
 .../components/filters/URLFilterContainer.tsx | 11 ++-
 .../readers/imageBased/useImageSizes.ts       |  3 +-
 .../series/SeriesExplorationLayout.tsx        | 12 ++-
 .../components/series/table/SeriesTable.tsx   | 10 ++-
 packages/browser/src/hooks/useCoreEvent.ts    | 13 +--
 packages/browser/src/hooks/useLayoutMode.ts   |  9 +-
 packages/browser/src/hooks/usePreferences.ts  | 11 ++-
 .../scenes/book/reader/useBookPreferences.ts  | 15 ++--
 .../src/scenes/bookSearch/BookSearchScene.tsx | 16 ++--
 .../error/ServerConnectionErrorScene.tsx      | 11 ++-
 .../library/tabs/books/LibraryBooksScene.tsx  | 16 ++--
 .../tabs/series/LibrarySeriesScene.tsx        | 16 ++--
 .../series/tabs/books/SeriesBooksScene.tsx    | 16 ++--
 .../src/scenes/settings/SettingsLayout.tsx    |  9 +-
 .../features/DiscordPresenceSwitch.tsx        | 11 ++-
 .../settings/app/reader/DefaultFontFamily.tsx | 11 ++-
 .../settings/app/reader/DefaultFontSize.tsx   | 11 ++-
 .../settings/app/reader/DefaultLineHeight.tsx | 11 ++-
 .../app/reader/DefaultReadingDirection.tsx    | 11 ++-
 .../app/reader/PreloadPagesSection.tsx        | 11 ++-
 .../app/reader/ReaderDefaultSettingsScene.tsx | 11 ++-
 packages/browser/src/stores/user.ts           |  4 +-
 packages/browser/src/styles/index.css         |  2 +-
 packages/client/package.json                  |  2 +-
 yarn.lock                                     |  7 +-
 84 files changed, 681 insertions(+), 435 deletions(-)

diff --git a/apps/expo/app/(tabs)/library/index.tsx b/apps/expo/app/(tabs)/library/index.tsx
index 9760fd77d7..083692cb38 100644
--- a/apps/expo/app/(tabs)/library/index.tsx
+++ b/apps/expo/app/(tabs)/library/index.tsx
@@ -7,6 +7,7 @@ import { useCallback, useEffect, useMemo } from 'react'
 import { View } from 'react-native'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import { match } from 'ts-pattern'
+import { useShallow } from 'zustand/react/shallow'
 
 import {
 	CuratedDownloadsHeader,
@@ -23,12 +24,14 @@ import { useSelectionStore } from '~/stores/selection'
 
 export default function Screen() {
 	// Note: The id is a workaround for https://github.com/drizzle-team/drizzle-orm/issues/2660
-	const { id, increment, sortConfig, sourceFilter } = useDownloadsState((state) => ({
-		id: state.fetchCounter,
-		increment: state.increment,
-		sortConfig: state.sort,
-		sourceFilter: state.sourceFilter,
-	}))
+	const { id, increment, sortConfig, sourceFilter } = useDownloadsState(
+		useShallow((state) => ({
+			id: state.fetchCounter,
+			increment: state.increment,
+			sortConfig: state.sort,
+			sourceFilter: state.sourceFilter,
+		})),
+	)
 
 	const orderFn = match(sortConfig.direction)
 		.with('ASC', () => asc)
@@ -115,7 +118,8 @@ export default function Screen() {
 		return indices
 	}, [sortConfig, artificiallyGroupedData])
 
-	const selectionStore = useSelectionStore((state) => state)
+	const setItemIdents = useSelectionStore((state) => state.setItemIdents)
+	const registerCustomActions = useSelectionStore((state) => state.registerCustomActions)
 
 	const customSelectionActions = useMemo(
 		() => ({
@@ -135,8 +139,8 @@ export default function Screen() {
 			const allIds =
 				data?.filter((item) => typeof item !== 'string').map((item) => item.downloaded_files.id) ||
 				[]
-			selectionStore.setItemIdents(allIds)
-			selectionStore.registerCustomActions(customSelectionActions)
+			setItemIdents(allIds)
+			registerCustomActions(customSelectionActions)
 		},
 		// eslint-disable-next-line react-compiler/react-compiler
 		// eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/apps/expo/app/_layout.tsx b/apps/expo/app/_layout.tsx
index 3057a6d217..9439d63aed 100644
--- a/apps/expo/app/_layout.tsx
+++ b/apps/expo/app/_layout.tsx
@@ -17,6 +17,7 @@ import { GestureHandlerRootView } from 'react-native-gesture-handler'
 import { KeyboardProvider } from 'react-native-keyboard-controller'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { Toaster } from 'sonner-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import darkSplash from '~/assets/splash/dark.json'
 import lightSplash from '~/assets/splash/light.json'
@@ -77,11 +78,11 @@ export default function RootLayout() {
 	useFileImportListener()
 
 	const { performanceMonitor, animationEnabled, disableDismissGesture } = usePreferencesStore(
-		(state) => ({
+		useShallow((state) => ({
 			animationEnabled: !state.reduceAnimations,
 			performanceMonitor: state.performanceMonitor,
 			disableDismissGesture: state.disableDismissGesture,
-		}),
+		})),
 	)
 	const isReading = useReaderStore((state) => state.isReading)
 	const isReadingEbook = useEpubLocationStore((state) => !!state.book)
diff --git a/apps/expo/app/server/[id]/books/index.tsx b/apps/expo/app/server/[id]/books/index.tsx
index 71c98ff652..b04cce7f83 100644
--- a/apps/expo/app/server/[id]/books/index.tsx
+++ b/apps/expo/app/server/[id]/books/index.tsx
@@ -5,6 +5,7 @@ import { Suspense, useCallback, useRef } from 'react'
 import { Platform } from 'react-native'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import { useStore } from 'zustand'
+import { useShallow } from 'zustand/react/shallow'
 
 import { useActiveServer } from '~/components/activeServer'
 import { BookGridItem } from '~/components/book'
@@ -50,11 +51,14 @@ export default function Screen() {
 	// eslint-disable-next-line react-hooks/refs
 	const store = useRef(createBookFilterStore(initialFilters)).current
 
-	const { filters, sort, resetFilters } = useStore(store, (state) => ({
-		filters: state.filters,
-		sort: state.sort,
-		resetFilters: state.resetFilters,
-	}))
+	const { filters, sort, resetFilters } = useStore(
+		store,
+		useShallow((state) => ({
+			filters: state.filters,
+			sort: state.sort,
+			resetFilters: state.resetFilters,
+		})),
+	)
 
 	const { data, hasNextPage, fetchNextPage, refetch, isRefetching } = useInfiniteSuspenseGraphQL(
 		query,
diff --git a/apps/expo/app/server/[id]/series/[id].tsx b/apps/expo/app/server/[id]/series/[id].tsx
index a405548f11..a563e006b6 100644
--- a/apps/expo/app/server/[id]/series/[id].tsx
+++ b/apps/expo/app/server/[id]/series/[id].tsx
@@ -8,6 +8,7 @@ import { useCallback, useEffect, useMemo, useRef } from 'react'
 import { Platform } from 'react-native'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import { useStore } from 'zustand'
+import { useShallow } from 'zustand/react/shallow'
 
 import { BookGridItem } from '~/components/book'
 import { IBookGridItemFragment } from '~/components/book/BookGridItem'
@@ -96,11 +97,14 @@ export default function Screen() {
 
 	// eslint-disable-next-line react-hooks/refs
 	const store = useRef(createBookFilterStore()).current
-	const { filters, sort, resetFilters } = useStore(store, (state) => ({
-		filters: state.filters,
-		sort: state.sort,
-		resetFilters: state.resetFilters,
-	}))
+	const { filters, sort, resetFilters } = useStore(
+		store,
+		useShallow((state) => ({
+			filters: state.filters,
+			sort: state.sort,
+			resetFilters: state.resetFilters,
+		})),
+	)
 
 	const { data, hasNextPage, fetchNextPage, refetch } = useInfiniteSuspenseGraphQL(
 		booksQuery,
diff --git a/apps/expo/app/server/[id]/series/index.tsx b/apps/expo/app/server/[id]/series/index.tsx
index 662218b8d4..afb1b1ba4a 100644
--- a/apps/expo/app/server/[id]/series/index.tsx
+++ b/apps/expo/app/server/[id]/series/index.tsx
@@ -5,6 +5,7 @@ import { graphql } from '@stump/graphql'
 import { useCallback, useRef } from 'react'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import { useStore } from 'zustand'
+import { useShallow } from 'zustand/react/shallow'
 
 import { useActiveServer } from '~/components/activeServer'
 import { useGridItemSize } from '~/components/grid/useGridItemSize'
@@ -50,11 +51,14 @@ export default function Screen() {
 	// eslint-disable-next-line react-hooks/refs
 	const store = useRef(createSeriesFilterStore()).current
 
-	const { filters, sort, resetFilters } = useStore(store, (state) => ({
-		filters: state.filters,
-		sort: state.sort,
-		resetFilters: state.resetFilters,
-	}))
+	const { filters, sort, resetFilters } = useStore(
+		store,
+		useShallow((state) => ({
+			filters: state.filters,
+			sort: state.sort,
+			resetFilters: state.resetFilters,
+		})),
+	)
 
 	const { data, hasNextPage, fetchNextPage, refetch } = useInfiniteSuspenseGraphQL(
 		query,
diff --git a/apps/expo/components/appSettings/preferences/AllowDownscaling.tsx b/apps/expo/components/appSettings/preferences/AllowDownscaling.tsx
index fa608fdf08..35f6b754d6 100644
--- a/apps/expo/components/appSettings/preferences/AllowDownscaling.tsx
+++ b/apps/expo/components/appSettings/preferences/AllowDownscaling.tsx
@@ -1,5 +1,6 @@
 import { ImageDown } from 'lucide-react-native'
 import { View } from 'react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Switch } from '~/components/ui'
 import { usePreferencesStore } from '~/stores'
@@ -7,10 +8,12 @@ import { usePreferencesStore } from '~/stores'
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function AllowDownscaling() {
-	const { allowDownscaling, patch } = usePreferencesStore((state) => ({
-		allowDownscaling: state.allowDownscaling,
-		patch: state.patch,
-	}))
+	const { allowDownscaling, patch } = usePreferencesStore(
+		useShallow((state) => ({
+			allowDownscaling: state.allowDownscaling,
+			patch: state.patch,
+		})),
+	)
 
 	return (
 		<AppSettingsRow
diff --git a/apps/expo/components/appSettings/preferences/AppLanguage.tsx b/apps/expo/components/appSettings/preferences/AppLanguage.tsx
index 6a4598c1d2..46166536ac 100644
--- a/apps/expo/components/appSettings/preferences/AppLanguage.tsx
+++ b/apps/expo/components/appSettings/preferences/AppLanguage.tsx
@@ -2,6 +2,7 @@ import { type AllowedLocale, initDateFnsLocale, isLocale, localeNames } from '@s
 import * as Localization from 'expo-localization'
 import { Languages } from 'lucide-react-native'
 import { useMemo } from 'react'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Picker } from '~/components/ui/picker/picker'
 import { PickerOption } from '~/components/ui/picker/types'
@@ -17,10 +18,12 @@ const localeOptions: PickerOption<AllowedLocale>[] = Object.entries(localeNames)
 )
 
 export default function AppLanguage() {
-	const { locale, patch } = usePreferencesStore((state) => ({
-		locale: state.locale,
-		patch: state.patch,
-	}))
+	const { locale, patch } = usePreferencesStore(
+		useShallow((state) => ({
+			locale: state.locale,
+			patch: state.patch,
+		})),
+	)
 
 	const deviceLocale = useMemo(() => {
 		const tag = Localization.getLocales()[0]?.languageTag ?? 'en-US'
diff --git a/apps/expo/components/appSettings/preferences/AppPrimaryColor.tsx b/apps/expo/components/appSettings/preferences/AppPrimaryColor.tsx
index 95262bf9f0..2f44e5bde2 100644
--- a/apps/expo/components/appSettings/preferences/AppPrimaryColor.tsx
+++ b/apps/expo/components/appSettings/preferences/AppPrimaryColor.tsx
@@ -1,6 +1,7 @@
 import { ColorPicker, Host } from '@expo/ui/swift-ui'
 import { Pipette } from 'lucide-react-native'
 import { Platform } from 'react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { useColors } from '~/lib/constants'
 import { usePreferencesStore } from '~/stores'
@@ -9,10 +10,12 @@ import AppSettingsRow from '../AppSettingsRow'
 
 // TODO: A picker is probably a bit too much, maybe a set of presets?
 export default function AppPrimaryColor() {
-	const store = usePreferencesStore((state) => ({
-		accentColor: state.accentColor,
-		patch: state.patch,
-	}))
+	const store = usePreferencesStore(
+		useShallow((state) => ({
+			accentColor: state.accentColor,
+			patch: state.patch,
+		})),
+	)
 
 	const onColorChange = (color: string) => {
 		store.patch({ accentColor: color })
diff --git a/apps/expo/components/appSettings/preferences/AutoSyncLocalData.tsx b/apps/expo/components/appSettings/preferences/AutoSyncLocalData.tsx
index 5fbd82868e..ca9ea2a071 100644
--- a/apps/expo/components/appSettings/preferences/AutoSyncLocalData.tsx
+++ b/apps/expo/components/appSettings/preferences/AutoSyncLocalData.tsx
@@ -1,5 +1,6 @@
 import { RefreshCw } from 'lucide-react-native'
 import { View } from 'react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Switch } from '~/components/ui'
 import { usePreferencesStore } from '~/stores'
@@ -7,10 +8,12 @@ import { usePreferencesStore } from '~/stores'
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function AutoSyncLocalData() {
-	const { autoSyncLocalData, patch } = usePreferencesStore((state) => ({
-		autoSyncLocalData: state.autoSyncLocalData,
-		patch: state.patch,
-	}))
+	const { autoSyncLocalData, patch } = usePreferencesStore(
+		useShallow((state) => ({
+			autoSyncLocalData: state.autoSyncLocalData,
+			patch: state.patch,
+		})),
+	)
 
 	return (
 		<AppSettingsRow
diff --git a/apps/expo/components/appSettings/preferences/DisableDismissGesture.tsx b/apps/expo/components/appSettings/preferences/DisableDismissGesture.tsx
index 6af6ab8faf..e09a347256 100644
--- a/apps/expo/components/appSettings/preferences/DisableDismissGesture.tsx
+++ b/apps/expo/components/appSettings/preferences/DisableDismissGesture.tsx
@@ -1,5 +1,6 @@
 import { ArrowRightFromLine } from 'lucide-react-native'
 import { View } from 'react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Switch } from '~/components/ui'
 import { usePreferencesStore } from '~/stores'
@@ -7,10 +8,12 @@ import { usePreferencesStore } from '~/stores'
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function DisableDismissGesture() {
-	const { disableDismissGesture, patch } = usePreferencesStore((state) => ({
-		disableDismissGesture: state.disableDismissGesture,
-		patch: state.patch,
-	}))
+	const { disableDismissGesture, patch } = usePreferencesStore(
+		useShallow((state) => ({
+			disableDismissGesture: state.disableDismissGesture,
+			patch: state.patch,
+		})),
+	)
 
 	return (
 		<AppSettingsRow
diff --git a/apps/expo/components/appSettings/preferences/EnableDebugAnalytics.tsx b/apps/expo/components/appSettings/preferences/EnableDebugAnalytics.tsx
index 5c37208518..c07e46606c 100644
--- a/apps/expo/components/appSettings/preferences/EnableDebugAnalytics.tsx
+++ b/apps/expo/components/appSettings/preferences/EnableDebugAnalytics.tsx
@@ -1,5 +1,6 @@
 import { Bug } from 'lucide-react-native'
 import { View } from 'react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Switch } from '~/components/ui'
 import { usePreferencesStore } from '~/stores'
@@ -7,10 +8,12 @@ import { usePreferencesStore } from '~/stores'
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function EnableDebugAnalytics() {
-	const { enableDebugAnalytics, patch } = usePreferencesStore((state) => ({
-		enableDebugAnalytics: state.enableDebugAnalytics,
-		patch: state.patch,
-	}))
+	const { enableDebugAnalytics, patch } = usePreferencesStore(
+		useShallow((state) => ({
+			enableDebugAnalytics: state.enableDebugAnalytics,
+			patch: state.patch,
+		})),
+	)
 
 	return (
 		<AppSettingsRow
@@ -19,7 +22,7 @@ export default function EnableDebugAnalytics() {
 			description="Send additional debug-related events to help troubleshoot issues"
 			onPress={() => patch({ enableDebugAnalytics: !enableDebugAnalytics })}
 		>
-			<View className="flex flex-row items-center gap-2">
+			<View className="gap-2 flex flex-row items-center">
 				<Switch
 					checked={enableDebugAnalytics}
 					onCheckedChange={(checked) => patch({ enableDebugAnalytics: checked })}
diff --git a/apps/expo/components/appSettings/preferences/MaskURLs.tsx b/apps/expo/components/appSettings/preferences/MaskURLs.tsx
index cdfd121ec9..63b4b0d9c1 100644
--- a/apps/expo/components/appSettings/preferences/MaskURLs.tsx
+++ b/apps/expo/components/appSettings/preferences/MaskURLs.tsx
@@ -1,5 +1,6 @@
 import { Link } from 'lucide-react-native'
 import { View } from 'react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Switch } from '~/components/ui'
 import { usePreferencesStore } from '~/stores'
@@ -7,10 +8,12 @@ import { usePreferencesStore } from '~/stores'
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function MaskURLs() {
-	const { maskURLs, setMaskURLs } = usePreferencesStore((state) => ({
-		maskURLs: state.maskURLs,
-		setMaskURLs: state.setMaskURLs,
-	}))
+	const { maskURLs, setMaskURLs } = usePreferencesStore(
+		useShallow((state) => ({
+			maskURLs: state.maskURLs,
+			setMaskURLs: state.setMaskURLs,
+		})),
+	)
 
 	return (
 		<AppSettingsRow icon={Link} title="Mask URLs" onPress={() => setMaskURLs(!maskURLs)}>
diff --git a/apps/expo/components/appSettings/preferences/PerformanceMonitor.tsx b/apps/expo/components/appSettings/preferences/PerformanceMonitor.tsx
index 5956ce97b6..6128a55114 100644
--- a/apps/expo/components/appSettings/preferences/PerformanceMonitor.tsx
+++ b/apps/expo/components/appSettings/preferences/PerformanceMonitor.tsx
@@ -1,5 +1,6 @@
 import { Gauge } from 'lucide-react-native'
 import { View } from 'react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Switch } from '~/components/ui'
 import { usePreferencesStore } from '~/stores'
@@ -7,10 +8,12 @@ import { usePreferencesStore } from '~/stores'
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function PerformanceMonitor() {
-	const { performanceMonitor, patch } = usePreferencesStore((state) => ({
-		performanceMonitor: state.performanceMonitor,
-		patch: state.patch,
-	}))
+	const { performanceMonitor, patch } = usePreferencesStore(
+		useShallow((state) => ({
+			performanceMonitor: state.performanceMonitor,
+			patch: state.patch,
+		})),
+	)
 
 	return (
 		<AppSettingsRow
diff --git a/apps/expo/components/appSettings/preferences/PreferMinimalReader.tsx b/apps/expo/components/appSettings/preferences/PreferMinimalReader.tsx
index 6e04828a9b..78371872fb 100644
--- a/apps/expo/components/appSettings/preferences/PreferMinimalReader.tsx
+++ b/apps/expo/components/appSettings/preferences/PreferMinimalReader.tsx
@@ -1,5 +1,6 @@
 import { Spotlight } from 'lucide-react-native'
 import { View } from 'react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Switch } from '~/components/ui'
 import { usePreferencesStore } from '~/stores'
@@ -7,10 +8,12 @@ import { usePreferencesStore } from '~/stores'
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function PreferMinimalReader() {
-	const { preferMinimalReader, patch } = usePreferencesStore((state) => ({
-		preferMinimalReader: state.preferMinimalReader,
-		patch: state.patch,
-	}))
+	const { preferMinimalReader, patch } = usePreferencesStore(
+		useShallow((state) => ({
+			preferMinimalReader: state.preferMinimalReader,
+			patch: state.patch,
+		})),
+	)
 
 	return (
 		<AppSettingsRow
@@ -18,7 +21,7 @@ export default function PreferMinimalReader() {
 			title="Prefer Minimal Reader"
 			onPress={() => patch({ preferMinimalReader: !preferMinimalReader })}
 		>
-			<View className="flex flex-row items-center gap-2">
+			<View className="gap-2 flex flex-row items-center">
 				<Switch
 					checked={preferMinimalReader}
 					onCheckedChange={(checked) => patch({ preferMinimalReader: checked })}
diff --git a/apps/expo/components/appSettings/preferences/PreferNativePdf.tsx b/apps/expo/components/appSettings/preferences/PreferNativePdf.tsx
index e83e1476da..89dc048eeb 100644
--- a/apps/expo/components/appSettings/preferences/PreferNativePdf.tsx
+++ b/apps/expo/components/appSettings/preferences/PreferNativePdf.tsx
@@ -1,5 +1,6 @@
 import { FileDown } from 'lucide-react-native'
 import { View } from 'react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Switch } from '~/components/ui'
 import { usePreferencesStore } from '~/stores'
@@ -7,10 +8,12 @@ import { usePreferencesStore } from '~/stores'
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function PreferNativePdf() {
-	const { preferNativePdf, patch } = usePreferencesStore((state) => ({
-		preferNativePdf: state.preferNativePdf,
-		patch: state.patch,
-	}))
+	const { preferNativePdf, patch } = usePreferencesStore(
+		useShallow((state) => ({
+			preferNativePdf: state.preferNativePdf,
+			patch: state.patch,
+		})),
+	)
 
 	return (
 		<AppSettingsRow
diff --git a/apps/expo/components/appSettings/preferences/ReduceAnimations.tsx b/apps/expo/components/appSettings/preferences/ReduceAnimations.tsx
index d156882968..21ed3a66d6 100644
--- a/apps/expo/components/appSettings/preferences/ReduceAnimations.tsx
+++ b/apps/expo/components/appSettings/preferences/ReduceAnimations.tsx
@@ -1,5 +1,6 @@
 import { Rabbit } from 'lucide-react-native'
 import { View } from 'react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Switch } from '~/components/ui'
 import { usePreferencesStore } from '~/stores'
@@ -7,10 +8,12 @@ import { usePreferencesStore } from '~/stores'
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function ReduceAnimations() {
-	const { reduceAnimations, patch } = usePreferencesStore((state) => ({
-		reduceAnimations: state.reduceAnimations,
-		patch: state.patch,
-	}))
+	const { reduceAnimations, patch } = usePreferencesStore(
+		useShallow((state) => ({
+			reduceAnimations: state.reduceAnimations,
+			patch: state.patch,
+		})),
+	)
 
 	return (
 		<AppSettingsRow
diff --git a/apps/expo/components/appSettings/preferences/ThumbnailPlaceholder.tsx b/apps/expo/components/appSettings/preferences/ThumbnailPlaceholder.tsx
index 4e89ac4679..1c3d01f7f0 100644
--- a/apps/expo/components/appSettings/preferences/ThumbnailPlaceholder.tsx
+++ b/apps/expo/components/appSettings/preferences/ThumbnailPlaceholder.tsx
@@ -1,4 +1,5 @@
 import { Palette } from 'lucide-react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { ThumbnailPlaceholderType } from '~/components/image/ThumbnailPlaceholder'
 import { Picker } from '~/components/ui/picker/picker'
@@ -9,10 +10,12 @@ import AppSettingsRow from '../AppSettingsRow'
 // TODO(android): Use non-native dropdown
 
 export default function ThumbnailPlaceholder() {
-	const { thumbnailPlaceholder, patch } = usePreferencesStore((state) => ({
-		thumbnailPlaceholder: state.thumbnailPlaceholder,
-		patch: state.patch,
-	}))
+	const { thumbnailPlaceholder, patch } = usePreferencesStore(
+		useShallow((state) => ({
+			thumbnailPlaceholder: state.thumbnailPlaceholder,
+			patch: state.patch,
+		})),
+	)
 
 	return (
 		<AppSettingsRow icon={Palette} title="Thumbnail Placeholder">
diff --git a/apps/expo/components/appSettings/preferences/ThumbnailRatio.tsx b/apps/expo/components/appSettings/preferences/ThumbnailRatio.tsx
index daf93e32cc..0d3c5c7f0a 100644
--- a/apps/expo/components/appSettings/preferences/ThumbnailRatio.tsx
+++ b/apps/expo/components/appSettings/preferences/ThumbnailRatio.tsx
@@ -1,4 +1,5 @@
 import { Ruler } from 'lucide-react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Picker } from '~/components/ui/picker/picker'
 import { usePreferencesStore } from '~/stores'
@@ -6,10 +7,12 @@ import { usePreferencesStore } from '~/stores'
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function ThumbnailRatio() {
-	const { thumbnailRatio, patch } = usePreferencesStore((state) => ({
-		thumbnailRatio: state.thumbnailRatio,
-		patch: state.patch,
-	}))
+	const { thumbnailRatio, patch } = usePreferencesStore(
+		useShallow((state) => ({
+			thumbnailRatio: state.thumbnailRatio,
+			patch: state.patch,
+		})),
+	)
 
 	const ratioToStringMap: Record<number, string> = {
 		[5 / 8]: '1 : 1.6',
diff --git a/apps/expo/components/appSettings/preferences/ThumbnailResizeMode.tsx b/apps/expo/components/appSettings/preferences/ThumbnailResizeMode.tsx
index 7861e5fa58..80bb6d7d31 100644
--- a/apps/expo/components/appSettings/preferences/ThumbnailResizeMode.tsx
+++ b/apps/expo/components/appSettings/preferences/ThumbnailResizeMode.tsx
@@ -1,4 +1,5 @@
 import { Maximize } from 'lucide-react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Picker } from '~/components/ui/picker/picker'
 import { usePreferencesStore } from '~/stores'
@@ -6,10 +7,12 @@ import { usePreferencesStore } from '~/stores'
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function ThumbnailResizeMode() {
-	const { thumbnailResizeMode, patch } = usePreferencesStore((state) => ({
-		thumbnailResizeMode: state.thumbnailResizeMode,
-		patch: state.patch,
-	}))
+	const { thumbnailResizeMode, patch } = usePreferencesStore(
+		useShallow((state) => ({
+			thumbnailResizeMode: state.thumbnailResizeMode,
+			patch: state.patch,
+		})),
+	)
 
 	return (
 		<AppSettingsRow icon={Maximize} title="Thumbnail Resize">
diff --git a/apps/expo/components/appSettings/stump/BookClubsEnabled.tsx b/apps/expo/components/appSettings/stump/BookClubsEnabled.tsx
index 1cd4e9b3d2..ed3077bbe7 100644
--- a/apps/expo/components/appSettings/stump/BookClubsEnabled.tsx
+++ b/apps/expo/components/appSettings/stump/BookClubsEnabled.tsx
@@ -1,5 +1,6 @@
 import { Users } from 'lucide-react-native'
 import { View } from 'react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Switch } from '~/components/ui'
 import { usePreferencesStore } from '~/stores'
@@ -7,10 +8,12 @@ import { usePreferencesStore } from '~/stores'
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function BookClubsEnabled() {
-	const { bookClubsEnabled, patch } = usePreferencesStore((state) => ({
-		bookClubsEnabled: state.bookClubsEnabled,
-		patch: state.patch,
-	}))
+	const { bookClubsEnabled, patch } = usePreferencesStore(
+		useShallow((state) => ({
+			bookClubsEnabled: state.bookClubsEnabled,
+			patch: state.patch,
+		})),
+	)
 
 	return (
 		<AppSettingsRow
@@ -18,7 +21,7 @@ export default function BookClubsEnabled() {
 			title="Book Club Features"
 			onPress={() => patch({ bookClubsEnabled: !bookClubsEnabled })}
 		>
-			<View className="flex flex-row items-center gap-2">
+			<View className="gap-2 flex flex-row items-center">
 				<Switch
 					checked={bookClubsEnabled}
 					onCheckedChange={(checked) => patch({ bookClubsEnabled: checked })}
diff --git a/apps/expo/components/book/filterHeader/Characters.tsx b/apps/expo/components/book/filterHeader/Characters.tsx
index 4c2c6eb951..ee8e0b51d2 100644
--- a/apps/expo/components/book/filterHeader/Characters.tsx
+++ b/apps/expo/components/book/filterHeader/Characters.tsx
@@ -5,6 +5,7 @@ import setProperty from 'lodash/set'
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { FlatList, View } from 'react-native'
 import { match, P } from 'ts-pattern'
+import { useShallow } from 'zustand/react/shallow'
 
 import {
 	FilterHeaderButton,
@@ -53,10 +54,12 @@ export default function Characters() {
 	const sheetRef = useRef<FilterSheetRef>(null)
 	const [searchQuery, setSearchQuery] = useState('')
 
-	const { filters, setFilters } = useBookFilterStore((store) => ({
-		filters: store.filters,
-		setFilters: store.setFilters,
-	}))
+	const { filters, setFilters } = useBookFilterStore(
+		useShallow((store) => ({
+			filters: store.filters,
+			setFilters: store.setFilters,
+		})),
+	)
 
 	const characterFilter = useMemo(
 		() => filters.metadata?.characters?.likeAnyOf,
diff --git a/apps/expo/components/book/reader/epub/CustomizeThemeSheet.tsx b/apps/expo/components/book/reader/epub/CustomizeThemeSheet.tsx
index c6fa76ef94..5c34a618a8 100644
--- a/apps/expo/components/book/reader/epub/CustomizeThemeSheet.tsx
+++ b/apps/expo/components/book/reader/epub/CustomizeThemeSheet.tsx
@@ -1,5 +1,6 @@
 import { TrueSheet } from '@lodev09/react-native-true-sheet'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
+import { useShallow } from 'zustand/react/shallow'
 
 import { IS_IOS_24_PLUS, useColors } from '~/lib/constants'
 import { useColorScheme } from '~/lib/useColorScheme'
@@ -9,10 +10,12 @@ import { CustomizeTheme } from './controls/customTheme'
 
 export default function CustomizeThemeSheet() {
 	const sheetRef = useEpubSheetStore((state) => state.customizeThemeSheetRef)
-	const { mode, name } = useEpubSheetStore((state) => ({
-		mode: state.customizeThemeMode,
-		name: state.customizeThemeName,
-	}))
+	const { mode, name } = useEpubSheetStore(
+		useShallow((state) => ({
+			mode: state.customizeThemeMode,
+			name: state.customizeThemeName,
+		})),
+	)
 	const closeSheet = useEpubSheetStore((state) => state.closeSheet)
 
 	const { colorScheme } = useColorScheme()
diff --git a/apps/expo/components/book/reader/epub/ReadiumReader.tsx b/apps/expo/components/book/reader/epub/ReadiumReader.tsx
index d0eb1f9c39..8fdeb7495f 100644
--- a/apps/expo/components/book/reader/epub/ReadiumReader.tsx
+++ b/apps/expo/components/book/reader/epub/ReadiumReader.tsx
@@ -5,6 +5,7 @@ import setProperty from 'lodash/set'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { View } from 'react-native'
 import { initialWindowMetrics, useSafeAreaInsets } from 'react-native-safe-area-context'
+import { useShallow } from 'zustand/react/shallow'
 
 import { FullScreenLoader } from '~/components/ui'
 import { verifyFileReadable } from '~/lib/filesystem'
@@ -109,30 +110,32 @@ export default function ReadiumReader({
 		fontWeight: rawFontWeight,
 		columnCount: rawColumnCount,
 		...preferences
-	} = useReaderStore((state) => ({
-		fontSize: state.globalSettings.fontSize,
-		fontFamily: state.globalSettings.fontFamily,
-		fontWeight: state.globalSettings.fontWeight,
-		lineHeight: state.globalSettings.lineHeight,
-		brightness: state.globalSettings.brightness,
-		publisherStyles: state.globalSettings.allowPublisherStyles,
-		pageMargins: state.globalSettings.pageMargins,
-		columnCount: state.globalSettings.columnCount,
-		imageFilter: state.globalSettings.imageFilter,
-		textAlign: state.globalSettings.textAlign,
-		typeScale: state.globalSettings.typeScale,
-		paragraphIndent: state.globalSettings.paragraphIndent,
-		paragraphSpacing: state.globalSettings.paragraphSpacing,
-		wordSpacing: state.globalSettings.wordSpacing,
-		letterSpacing: state.globalSettings.letterSpacing,
-		hyphens: state.globalSettings.hyphens,
-		ligatures: state.globalSettings.ligatures,
-		textNormalization: state.globalSettings.textNormalization,
-		verticalText: state.globalSettings.verticalText,
-		readingDirection: (state.globalSettings.readingDirection?.toLowerCase() === 'ltr'
-			? 'ltr'
-			: 'rtl') as 'ltr' | 'rtl',
-	}))
+	} = useReaderStore(
+		useShallow((state) => ({
+			fontSize: state.globalSettings.fontSize,
+			fontFamily: state.globalSettings.fontFamily,
+			fontWeight: state.globalSettings.fontWeight,
+			lineHeight: state.globalSettings.lineHeight,
+			brightness: state.globalSettings.brightness,
+			publisherStyles: state.globalSettings.allowPublisherStyles,
+			pageMargins: state.globalSettings.pageMargins,
+			columnCount: state.globalSettings.columnCount,
+			imageFilter: state.globalSettings.imageFilter,
+			textAlign: state.globalSettings.textAlign,
+			typeScale: state.globalSettings.typeScale,
+			paragraphIndent: state.globalSettings.paragraphIndent,
+			paragraphSpacing: state.globalSettings.paragraphSpacing,
+			wordSpacing: state.globalSettings.wordSpacing,
+			letterSpacing: state.globalSettings.letterSpacing,
+			hyphens: state.globalSettings.hyphens,
+			ligatures: state.globalSettings.ligatures,
+			textNormalization: state.globalSettings.textNormalization,
+			verticalText: state.globalSettings.verticalText,
+			readingDirection: (state.globalSettings.readingDirection?.toLowerCase() === 'ltr'
+				? 'ltr'
+				: 'rtl') as 'ltr' | 'rtl',
+		})),
+	)
 	const { colors } = useEpubTheme()
 
 	// Readium uses a scale factor  (1.0 = 400)
@@ -175,21 +178,23 @@ export default function ReadiumReader({
 		[],
 	)
 
-	const store = useEpubLocationStore((store) => ({
-		setBook: store.setBook,
-		onTocChange: store.onTocChange,
-		onBookLoad: store.onBookLoad,
-		onLocationChange: store.onLocationChange,
-		cleanup: store.onUnload,
-		setBookmarks: store.setBookmarks,
-		annotations: store.annotations,
-		setAnnotations: store.setAnnotations,
-		addAnnotation: store.addAnnotation,
-		updateAnnotation: store.updateAnnotation,
-		removeAnnotation: store.removeAnnotation,
-		getAnnotation: store.getAnnotation,
-		positions: store.positions,
-	}))
+	const store = useEpubLocationStore(
+		useShallow((store) => ({
+			setBook: store.setBook,
+			onTocChange: store.onTocChange,
+			onBookLoad: store.onBookLoad,
+			onLocationChange: store.onLocationChange,
+			cleanup: store.onUnload,
+			setBookmarks: store.setBookmarks,
+			annotations: store.annotations,
+			setAnnotations: store.setAnnotations,
+			addAnnotation: store.addAnnotation,
+			updateAnnotation: store.updateAnnotation,
+			removeAnnotation: store.removeAnnotation,
+			getAnnotation: store.getAnnotation,
+			positions: store.positions,
+		})),
+	)
 
 	const sdkCtx = useSDKSafe()
 
diff --git a/apps/expo/components/book/reader/epub/controls/ColumnCount.tsx b/apps/expo/components/book/reader/epub/controls/ColumnCount.tsx
index 16dccd4be9..844e8a3feb 100644
--- a/apps/expo/components/book/reader/epub/controls/ColumnCount.tsx
+++ b/apps/expo/components/book/reader/epub/controls/ColumnCount.tsx
@@ -1,3 +1,5 @@
+import { useShallow } from 'zustand/react/shallow'
+
 import { Card } from '~/components/ui'
 import { Picker } from '~/components/ui/picker/picker'
 import type { PickerOption } from '~/components/ui/picker/types'
@@ -10,10 +12,12 @@ const COLUMN_OPTIONS: PickerOption[] = [
 ]
 
 export default function ColumnCount() {
-	const store = useReaderStore((state) => ({
-		columnCount: state.globalSettings.columnCount ?? 'auto',
-		setSettings: state.setGlobalSettings,
-	}))
+	const store = useReaderStore(
+		useShallow((state) => ({
+			columnCount: state.globalSettings.columnCount ?? 'auto',
+			setSettings: state.setGlobalSettings,
+		})),
+	)
 
 	const handleChange = (value: string) => {
 		const columnCount = value === 'auto' ? 'auto' : (parseInt(value, 10) as 1 | 2)
diff --git a/apps/expo/components/book/reader/epub/controls/FontConfig.tsx b/apps/expo/components/book/reader/epub/controls/FontConfig.tsx
index eb4f033281..fb7e9238dd 100644
--- a/apps/expo/components/book/reader/epub/controls/FontConfig.tsx
+++ b/apps/expo/components/book/reader/epub/controls/FontConfig.tsx
@@ -1,3 +1,5 @@
+import { useShallow } from 'zustand/react/shallow'
+
 import { Card, Stepper, Switch } from '~/components/ui'
 import { Picker } from '~/components/ui/picker/picker'
 import type { PickerOption } from '~/components/ui/picker/types'
@@ -20,14 +22,16 @@ const FONT_WEIGHT_OPTIONS: PickerOption[] = [
 ]
 
 export default function FontConfig() {
-	const store = useReaderStore((state) => ({
-		fontFamily: state.globalSettings.fontFamily ?? '',
-		fontSize: state.globalSettings.fontSize ?? 16,
-		fontWeight: state.globalSettings.fontWeight ?? 400,
-		textNormalization: state.globalSettings.textNormalization ?? false,
-		verticalText: state.globalSettings.verticalText ?? false,
-		setSettings: state.setGlobalSettings,
-	}))
+	const store = useReaderStore(
+		useShallow((state) => ({
+			fontFamily: state.globalSettings.fontFamily ?? '',
+			fontSize: state.globalSettings.fontSize ?? 16,
+			fontWeight: state.globalSettings.fontWeight ?? 400,
+			textNormalization: state.globalSettings.textNormalization ?? false,
+			verticalText: state.globalSettings.verticalText ?? false,
+			setSettings: state.setGlobalSettings,
+		})),
+	)
 
 	const ensureNumber = (value: string, cb: (num: number) => void) => {
 		const parsed = parseInt(value, 10)
diff --git a/apps/expo/components/book/reader/epub/controls/FontSizeSlider.tsx b/apps/expo/components/book/reader/epub/controls/FontSizeSlider.tsx
index c1bdc53cf0..e4a60f3c16 100644
--- a/apps/expo/components/book/reader/epub/controls/FontSizeSlider.tsx
+++ b/apps/expo/components/book/reader/epub/controls/FontSizeSlider.tsx
@@ -2,6 +2,7 @@ import Slider from '@react-native-community/slider'
 import * as Haptics from 'expo-haptics'
 import { useState } from 'react'
 import { View } from 'react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Text } from '~/components/ui'
 import { useColors } from '~/lib/constants'
@@ -10,10 +11,12 @@ import { useReaderStore } from '~/stores/reader'
 export default function FontSizeSlider() {
 	const colors = useColors()
 
-	const store = useReaderStore((state) => ({
-		fontSize: state.globalSettings.fontSize,
-		setFontSize: state.setGlobalSettings,
-	}))
+	const store = useReaderStore(
+		useShallow((state) => ({
+			fontSize: state.globalSettings.fontSize,
+			setFontSize: state.setGlobalSettings,
+		})),
+	)
 
 	const [value, setValue] = useState(() => sizeToScale(store.fontSize || 16))
 
diff --git a/apps/expo/components/book/reader/epub/controls/ImageFilter.tsx b/apps/expo/components/book/reader/epub/controls/ImageFilter.tsx
index fef868c6a6..19ae11e283 100644
--- a/apps/expo/components/book/reader/epub/controls/ImageFilter.tsx
+++ b/apps/expo/components/book/reader/epub/controls/ImageFilter.tsx
@@ -1,3 +1,5 @@
+import { useShallow } from 'zustand/react/shallow'
+
 import { Card } from '~/components/ui'
 import { Picker } from '~/components/ui/picker/picker'
 import type { PickerOption } from '~/components/ui/picker/types'
@@ -11,10 +13,12 @@ const IMAGE_FILTER_OPTIONS: PickerOption[] = [
 ]
 
 export default function ImageFilter() {
-	const store = useReaderStore((state) => ({
-		imageFilter: state.globalSettings.imageFilter,
-		setSettings: state.setGlobalSettings,
-	}))
+	const store = useReaderStore(
+		useShallow((state) => ({
+			imageFilter: state.globalSettings.imageFilter,
+			setSettings: state.setGlobalSettings,
+		})),
+	)
 
 	const handleChange = (value: string) => {
 		const imageFilter = value === 'none' ? undefined : (value as ImageFilterType)
diff --git a/apps/expo/components/book/reader/epub/controls/PageMargins.tsx b/apps/expo/components/book/reader/epub/controls/PageMargins.tsx
index 87be3a9ddb..d98234f896 100644
--- a/apps/expo/components/book/reader/epub/controls/PageMargins.tsx
+++ b/apps/expo/components/book/reader/epub/controls/PageMargins.tsx
@@ -1,11 +1,15 @@
+import { useShallow } from 'zustand/react/shallow'
+
 import { Card, Stepper } from '~/components/ui'
 import { useReaderStore } from '~/stores'
 
 export default function PageMargins() {
-	const store = useReaderStore((state) => ({
-		pageMargins: state.globalSettings.pageMargins ?? 1.0,
-		setSettings: state.setGlobalSettings,
-	}))
+	const store = useReaderStore(
+		useShallow((state) => ({
+			pageMargins: state.globalSettings.pageMargins ?? 1.0,
+			setSettings: state.setGlobalSettings,
+		})),
+	)
 
 	return (
 		<Card.Row label="Page Margins">
diff --git a/apps/expo/components/book/reader/epub/controls/PublisherStyles.tsx b/apps/expo/components/book/reader/epub/controls/PublisherStyles.tsx
index 4a3d2ae985..c13809a632 100644
--- a/apps/expo/components/book/reader/epub/controls/PublisherStyles.tsx
+++ b/apps/expo/components/book/reader/epub/controls/PublisherStyles.tsx
@@ -1,13 +1,16 @@
 import { View } from 'react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Switch, Text } from '~/components/ui'
 import { useReaderStore } from '~/stores'
 
 export default function PublisherStyles() {
-	const store = useReaderStore((state) => ({
-		allowPublisherStyles: state.globalSettings.allowPublisherStyles,
-		setAllowPublisherStyles: state.setGlobalSettings,
-	}))
+	const store = useReaderStore(
+		useShallow((state) => ({
+			allowPublisherStyles: state.globalSettings.allowPublisherStyles,
+			setAllowPublisherStyles: state.setGlobalSettings,
+		})),
+	)
 
 	return (
 		<View className="w-full flex-row items-center justify-between px-6 py-4">
diff --git a/apps/expo/components/book/reader/epub/controls/ReadingProgression.tsx b/apps/expo/components/book/reader/epub/controls/ReadingProgression.tsx
index 2d61cac98b..93b9d653f4 100644
--- a/apps/expo/components/book/reader/epub/controls/ReadingProgression.tsx
+++ b/apps/expo/components/book/reader/epub/controls/ReadingProgression.tsx
@@ -1,3 +1,5 @@
+import { useShallow } from 'zustand/react/shallow'
+
 import { Card } from '~/components/ui'
 import { Picker } from '~/components/ui/picker/picker'
 import type { PickerOption } from '~/components/ui/picker/types'
@@ -10,10 +12,12 @@ const READING_DIRECTION_OPTIONS: PickerOption<ReadingDirection>[] = [
 ]
 
 export default function ReadingProgression() {
-	const store = useReaderStore((state) => ({
-		readingDirection: state.globalSettings.readingDirection ?? 'ltr',
-		setSettings: state.setGlobalSettings,
-	}))
+	const store = useReaderStore(
+		useShallow((state) => ({
+			readingDirection: state.globalSettings.readingDirection ?? 'ltr',
+			setSettings: state.setGlobalSettings,
+		})),
+	)
 
 	return (
 		<Card.Row label="Reading Direction">
diff --git a/apps/expo/components/book/reader/epub/controls/ThemeSelect.tsx b/apps/expo/components/book/reader/epub/controls/ThemeSelect.tsx
index c2311e6652..ffe6b75be3 100644
--- a/apps/expo/components/book/reader/epub/controls/ThemeSelect.tsx
+++ b/apps/expo/components/book/reader/epub/controls/ThemeSelect.tsx
@@ -2,6 +2,7 @@ import { Plus } from 'lucide-react-native'
 import { useCallback, useMemo } from 'react'
 import { Alert, Pressable, ScrollView, View } from 'react-native'
 import * as ContextMenu from 'zeego/context-menu'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Icon } from '~/components/ui/icon'
 import { IS_IOS_24_PLUS } from '~/lib/constants'
@@ -15,10 +16,12 @@ import { ThemePreview } from './customTheme/ThemePreview'
 
 export default function ThemeSelect() {
 	const { colorScheme } = useColorScheme()
-	const { themes, selectedTheme } = useEpubThemesStore((store) => ({
-		themes: store.themes,
-		selectedTheme: store.selectedTheme,
-	}))
+	const { themes, selectedTheme } = useEpubThemesStore(
+		useShallow((store) => ({
+			themes: store.themes,
+			selectedTheme: store.selectedTheme,
+		})),
+	)
 
 	const activeTheme = useMemo(
 		() => resolveThemeName(themes, selectedTheme || '', colorScheme),
@@ -58,11 +61,13 @@ type ThemePreviewButtonProps = {
 }
 
 const ThemePreviewButton = ({ name, config, isActive, themeNames }: ThemePreviewButtonProps) => {
-	const { onSelect, deleteTheme, addTheme } = useEpubThemesStore((store) => ({
-		onSelect: store.selectTheme,
-		deleteTheme: store.deleteTheme,
-		addTheme: store.addTheme,
-	}))
+	const { onSelect, deleteTheme, addTheme } = useEpubThemesStore(
+		useShallow((store) => ({
+			onSelect: store.selectTheme,
+			deleteTheme: store.deleteTheme,
+			addTheme: store.addTheme,
+		})),
+	)
 	const openCustomizeTheme = useEpubSheetStore((state) => state.openCustomizeTheme)
 
 	const handleDuplicate = useCallback(() => {
diff --git a/apps/expo/components/book/reader/epub/controls/TypographySettings.tsx b/apps/expo/components/book/reader/epub/controls/TypographySettings.tsx
index 75d5547095..f2605ef2d4 100644
--- a/apps/expo/components/book/reader/epub/controls/TypographySettings.tsx
+++ b/apps/expo/components/book/reader/epub/controls/TypographySettings.tsx
@@ -1,3 +1,5 @@
+import { useShallow } from 'zustand/react/shallow'
+
 import { Card, Stepper, Switch } from '~/components/ui'
 import { Picker } from '~/components/ui/picker/picker'
 import type { PickerOption } from '~/components/ui/picker/types'
@@ -15,19 +17,21 @@ const TEXT_ALIGN_OPTIONS: PickerOption<TextAlignment>[] = [
 ]
 
 export default function TypographySettings() {
-	const store = useReaderStore((state) => ({
-		allowPublisherStyles: state.globalSettings.allowPublisherStyles ?? true,
-		textAlign: state.globalSettings.textAlign ?? 'justify',
-		typeScale: state.globalSettings.typeScale ?? 1.0,
-		lineHeight: state.globalSettings.lineHeight ?? 1.5,
-		paragraphIndent: state.globalSettings.paragraphIndent,
-		paragraphSpacing: state.globalSettings.paragraphSpacing,
-		wordSpacing: state.globalSettings.wordSpacing,
-		letterSpacing: state.globalSettings.letterSpacing,
-		hyphens: state.globalSettings.hyphens,
-		ligatures: state.globalSettings.ligatures,
-		setSettings: state.setGlobalSettings,
-	}))
+	const store = useReaderStore(
+		useShallow((state) => ({
+			allowPublisherStyles: state.globalSettings.allowPublisherStyles ?? true,
+			textAlign: state.globalSettings.textAlign ?? 'justify',
+			typeScale: state.globalSettings.typeScale ?? 1.0,
+			lineHeight: state.globalSettings.lineHeight ?? 1.5,
+			paragraphIndent: state.globalSettings.paragraphIndent,
+			paragraphSpacing: state.globalSettings.paragraphSpacing,
+			wordSpacing: state.globalSettings.wordSpacing,
+			letterSpacing: state.globalSettings.letterSpacing,
+			hyphens: state.globalSettings.hyphens,
+			ligatures: state.globalSettings.ligatures,
+			setSettings: state.setGlobalSettings,
+		})),
+	)
 
 	const isDisabled = store.allowPublisherStyles
 
diff --git a/apps/expo/components/book/reader/epub/controls/customTheme/CustomizeTheme.tsx b/apps/expo/components/book/reader/epub/controls/customTheme/CustomizeTheme.tsx
index 33e6e78ac4..4a0bd51c8f 100644
--- a/apps/expo/components/book/reader/epub/controls/customTheme/CustomizeTheme.tsx
+++ b/apps/expo/components/book/reader/epub/controls/customTheme/CustomizeTheme.tsx
@@ -1,6 +1,7 @@
 import { Fragment, useCallback, useEffect, useState } from 'react'
 import { Alert, Pressable, ScrollView, View } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Input, Text } from '~/components/ui'
 import { useColorScheme } from '~/lib/useColorScheme'
@@ -32,12 +33,14 @@ export default function CustomizeTheme({ onCancel, mode = 'edit', theme: namedTh
 	const { colorScheme } = useColorScheme()
 	const insets = useSafeAreaInsets()
 
-	const { themes, selectedTheme, addTheme, selectTheme } = useEpubThemesStore((store) => ({
-		themes: store.themes,
-		selectedTheme: store.selectedTheme,
-		addTheme: store.addTheme,
-		selectTheme: store.selectTheme,
-	}))
+	const { themes, selectedTheme, addTheme, selectTheme } = useEpubThemesStore(
+		useShallow((store) => ({
+			themes: store.themes,
+			selectedTheme: store.selectedTheme,
+			addTheme: store.addTheme,
+			selectTheme: store.selectTheme,
+		})),
+	)
 
 	const isCreateMode = mode === 'create'
 	const themeToEdit = namedTheme || selectedTheme || ''
diff --git a/apps/expo/components/book/reader/epub/controls/customTheme/ThemeHeaderPreview.tsx b/apps/expo/components/book/reader/epub/controls/customTheme/ThemeHeaderPreview.tsx
index da250d0ea3..f4f325457c 100644
--- a/apps/expo/components/book/reader/epub/controls/customTheme/ThemeHeaderPreview.tsx
+++ b/apps/expo/components/book/reader/epub/controls/customTheme/ThemeHeaderPreview.tsx
@@ -1,6 +1,7 @@
 import { ReadingDirection } from '@stump/graphql'
 import { useCallback, useEffect, useState } from 'react'
 import { Pressable, TextStyle, View } from 'react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Text } from '~/components/ui'
 import { IS_IOS_24_PLUS } from '~/lib/constants'
@@ -24,24 +25,28 @@ type Props = {
 
 export const ThemeHeaderPreview = ({ customTheme: customThemeProp, onCancel, onSaved }: Props) => {
 	const { colorScheme } = useColorScheme()
-	const { themes, selectedTheme } = useEpubThemesStore((store) => ({
-		themes: store.themes,
-		selectedTheme: store.selectedTheme,
-	}))
+	const { themes, selectedTheme } = useEpubThemesStore(
+		useShallow((store) => ({
+			themes: store.themes,
+			selectedTheme: store.selectedTheme,
+		})),
+	)
 	// Note: A majority of style options which apply if publisher styles are false are not easily
 	// represented here in the preview, so they are excluded
 	const { fontSize, fontFamily, fontWeight, allowPublisherStyles, ...storedPreferences } =
-		useReaderStore((state) => ({
-			fontSize: state.globalSettings.fontSize,
-			fontFamily: state.globalSettings.fontFamily,
-			fontWeight: state.globalSettings.fontWeight,
-			lineHeight: state.globalSettings.lineHeight,
-			textAlign: state.globalSettings.textAlign,
-			letterSpacing: state.globalSettings.letterSpacing,
-			typeScale: state.globalSettings.typeScale,
-			allowPublisherStyles: state.globalSettings.allowPublisherStyles,
-			readingDirection: state.globalSettings.readingDirection,
-		}))
+		useReaderStore(
+			useShallow((state) => ({
+				fontSize: state.globalSettings.fontSize,
+				fontFamily: state.globalSettings.fontFamily,
+				fontWeight: state.globalSettings.fontWeight,
+				lineHeight: state.globalSettings.lineHeight,
+				textAlign: state.globalSettings.textAlign,
+				letterSpacing: state.globalSettings.letterSpacing,
+				typeScale: state.globalSettings.typeScale,
+				allowPublisherStyles: state.globalSettings.allowPublisherStyles,
+				readingDirection: state.globalSettings.readingDirection,
+			})),
+		)
 
 	const typeScale = allowPublisherStyles ? 1.0 : (storedPreferences.typeScale ?? 1.0)
 	const lineHeight = allowPublisherStyles ? 1.5 : (storedPreferences.lineHeight ?? 1.5)
diff --git a/apps/expo/components/book/reader/pdf/PdfReader.tsx b/apps/expo/components/book/reader/pdf/PdfReader.tsx
index 4470aeef78..16229a5ec4 100644
--- a/apps/expo/components/book/reader/pdf/PdfReader.tsx
+++ b/apps/expo/components/book/reader/pdf/PdfReader.tsx
@@ -1,6 +1,7 @@
 import { ReadingDirection, ReadingMode } from '@stump/graphql'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { View } from 'react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { FullScreenLoader } from '~/components/ui'
 import { useDownload } from '~/lib/hooks'
@@ -122,13 +123,15 @@ export default function PdfReader({ book, initialPage, onPageChanged, ...ctx }:
 		[],
 	)
 
-	const store = usePdfStore((store) => ({
-		storeBook: store.storeBook,
-		resetStore: store.resetStore,
-		storeActions: store.storeActions,
-		setCurrentPage: store.setCurrentPage,
-		onLoaded: store.onLoaded,
-	}))
+	const store = usePdfStore(
+		useShallow((store) => ({
+			storeBook: store.storeBook,
+			resetStore: store.resetStore,
+			storeActions: store.storeActions,
+			setCurrentPage: store.setCurrentPage,
+			onLoaded: store.onLoaded,
+		})),
+	)
 
 	useEffect(() => {
 		if (localUri) return
diff --git a/apps/expo/components/book/reader/pdf/PdfReaderFooter.tsx b/apps/expo/components/book/reader/pdf/PdfReaderFooter.tsx
index 20f7d13fe5..5ae2a8970b 100644
--- a/apps/expo/components/book/reader/pdf/PdfReaderFooter.tsx
+++ b/apps/expo/components/book/reader/pdf/PdfReaderFooter.tsx
@@ -1,5 +1,6 @@
 import { useMemo } from 'react'
 import Animated from 'react-native-reanimated'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Text } from '~/components/ui'
 import { usePdfStore } from '~/stores/pdf'
@@ -12,10 +13,12 @@ export const FOOTER_HEIGHT = 48
 // const elapsedSeconds = useBookReadTime(book.id)
 
 export function PdfReaderFooter() {
-	const position = usePdfStore((state) => ({
-		page: state.currentPage,
-		totalPages: state.book?.pages,
-	}))
+	const position = usePdfStore(
+		useShallow((state) => ({
+			page: state.currentPage,
+			totalPages: state.book?.pages,
+		})),
+	)
 	const { secondaryStyle } = useReaderAnimations()
 
 	const formattedPosition = useMemo(() => {
diff --git a/apps/expo/components/book/reader/settings/ReaderSettings.tsx b/apps/expo/components/book/reader/settings/ReaderSettings.tsx
index 8abb11b98a..81e92e25fe 100644
--- a/apps/expo/components/book/reader/settings/ReaderSettings.tsx
+++ b/apps/expo/components/book/reader/settings/ReaderSettings.tsx
@@ -19,16 +19,20 @@ type Props = {
 // TODO(android): Use non-native dropdown for all of these
 
 export default function ReaderSettings({ forBook, forServer }: Props) {
-	const store = useReaderStore((state) => state)
+	const bookSettingsMap = useReaderStore((state) => state.bookSettings)
+	const globalSettings = useReaderStore((state) => state.globalSettings)
+	const addBookSettings = useReaderStore((state) => state.addBookSettings)
+	const setBookSettingsFn = useReaderStore((state) => state.setBookSettings)
+	const setGlobalSettings = useReaderStore((state) => state.setGlobalSettings)
 
 	const bookSettings = useMemo(
-		() => (forBook ? store.bookSettings[forBook] : undefined),
-		[store.bookSettings, forBook],
+		() => (forBook ? bookSettingsMap[forBook] : undefined),
+		[bookSettingsMap, forBook],
 	)
 
 	const activeSettings = useMemo(
-		() => bookSettings || store.globalSettings,
-		[bookSettings, store.globalSettings],
+		() => bookSettings || globalSettings,
+		[bookSettings, globalSettings],
 	)
 
 	const setBookPreferences = useCallback(
@@ -36,27 +40,27 @@ export default function ReaderSettings({ forBook, forServer }: Props) {
 			if (!forBook || !forServer) return
 
 			if (!bookSettings) {
-				store.addBookSettings(forBook, {
-					...store.globalSettings,
+				addBookSettings(forBook, {
+					...globalSettings,
 					...updates,
 					serverID: forServer,
 				})
 			} else {
-				store.setBookSettings(forBook, { ...updates, serverID: forServer })
+				setBookSettingsFn(forBook, { ...updates, serverID: forServer })
 			}
 		},
-		[forBook, bookSettings, store, forServer],
+		[forBook, bookSettings, addBookSettings, globalSettings, setBookSettingsFn, forServer],
 	)
 
 	const onPreferenceChange = useCallback(
 		(partial: Partial<GlobalSettings>) => {
 			if (!forBook || !forServer) {
-				store.setGlobalSettings(partial)
+				setGlobalSettings(partial)
 			} else {
 				setBookPreferences(partial)
 			}
 		},
-		[forBook, forServer, setBookPreferences, store],
+		[forBook, forServer, setBookPreferences, setGlobalSettings],
 	)
 
 	const allowDownscaling = activeSettings.allowDownscaling ?? true
diff --git a/apps/expo/components/book/reader/shared/ControlsBackdrop.tsx b/apps/expo/components/book/reader/shared/ControlsBackdrop.tsx
index ce651e0c7a..8f53d27398 100644
--- a/apps/expo/components/book/reader/shared/ControlsBackdrop.tsx
+++ b/apps/expo/components/book/reader/shared/ControlsBackdrop.tsx
@@ -3,6 +3,7 @@ import { Easing, Pressable } from 'react-native'
 import { easeGradient } from 'react-native-easing-gradient'
 import LinearGradient from 'react-native-linear-gradient'
 import Animated from 'react-native-reanimated'
+import { useShallow } from 'zustand/react/shallow'
 
 import { cn } from '~/lib/utils'
 import { useReaderStore } from '~/stores'
@@ -10,10 +11,12 @@ import { useReaderStore } from '~/stores'
 import { useReaderAnimations } from './readerAnimations'
 
 export default function ControlsBackdrop() {
-	const controls = useReaderStore((state) => ({
-		isVisible: state.showControls,
-		setVisible: state.setShowControls,
-	}))
+	const controls = useReaderStore(
+		useShallow((state) => ({
+			isVisible: state.showControls,
+			setVisible: state.setShowControls,
+		})),
+	)
 	const { secondaryStyle } = useReaderAnimations()
 
 	const { colors: gradientColors, locations: gradientLocations } = useMemo(
diff --git a/apps/expo/components/image/collection-image/CollectionStackedThumbnails.tsx b/apps/expo/components/image/collection-image/CollectionStackedThumbnails.tsx
index d4e260bf0a..4b40e195c9 100644
--- a/apps/expo/components/image/collection-image/CollectionStackedThumbnails.tsx
+++ b/apps/expo/components/image/collection-image/CollectionStackedThumbnails.tsx
@@ -17,6 +17,7 @@ import {
 import { Easing, View } from 'react-native'
 import { easeGradient } from 'react-native-easing-gradient'
 import LinearGradient from 'react-native-linear-gradient'
+import { useShallow } from 'zustand/react/shallow'
 
 import { BorderAndShadow } from '~/components/BorderAndShadow'
 import { useColors } from '~/lib/constants'
@@ -40,10 +41,12 @@ export default function CollectionStackedThumbnails({ thumbnailData, layoutNumbe
 	const { sdk } = useSDK()
 	const colors = useColors()
 	const { itemWidth: cardWidth } = useCollectionItemSize()
-	const { thumbnailRatio, accentColor } = usePreferencesStore((state) => ({
-		thumbnailRatio: state.thumbnailRatio,
-		accentColor: state.accentColor,
-	}))
+	const { thumbnailRatio, accentColor } = usePreferencesStore(
+		useShallow((state) => ({
+			thumbnailRatio: state.thumbnailRatio,
+			accentColor: state.accentColor,
+		})),
+	)
 	const { isDarkColorScheme } = useColorScheme()
 
 	const baseThumbnailWidth = cardWidth * 0.282
diff --git a/apps/expo/components/localLibrary/DownloadRowItem.tsx b/apps/expo/components/localLibrary/DownloadRowItem.tsx
index 3aa0565c31..f284df1b29 100644
--- a/apps/expo/components/localLibrary/DownloadRowItem.tsx
+++ b/apps/expo/components/localLibrary/DownloadRowItem.tsx
@@ -5,6 +5,7 @@ import { BookOpenCheck, CheckCircle2, CircleMinus, Info, Trash } from 'lucide-re
 import { useCallback, useEffect, useMemo, useRef } from 'react'
 import { Alert, Platform, View } from 'react-native'
 import Animated, { useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated'
+import { useShallow } from 'zustand/react/shallow'
 
 import { epubProgress, imageMeta, syncStatus } from '~/db'
 import { useColors } from '~/lib/constants'
@@ -52,12 +53,16 @@ export default function DownloadRowItem({ downloadedFile }: Props) {
 
 	const { width, height } = useDownloadRowItemSize()
 
-	const selectionStore = useSelectionStore((state) => ({
-		isSelectionMode: state.isSelecting,
-		setIsSelecting: state.setIsSelecting,
-		onSelectItem: (id: string) => state.toggleSelection(id),
-		isSelected: state.isSelected(downloadedFile.id),
-	}))
+	const selectionStore = useSelectionStore(
+		useShallow((state) => ({
+			isSelectionMode: state.isSelecting,
+			setIsSelecting: state.setIsSelecting,
+			toggleSelection: state.toggleSelection,
+			isSelected: state.isSelected(downloadedFile.id),
+		})),
+	)
+
+	const onSelectItem = (id: string) => selectionStore.toggleSelection(id)
 
 	const iconOpacity = useSharedValue(1)
 	const overlayOpacity = useSharedValue(0)
@@ -79,9 +84,9 @@ export default function DownloadRowItem({ downloadedFile }: Props) {
 	const onPress = useCallback(
 		() =>
 			selectionStore.isSelectionMode
-				? selectionStore.onSelectItem(downloadedFile.id)
+				? onSelectItem(downloadedFile.id)
 				: router.navigate(`/offline/${downloadedFile.id}/read`),
-		[router, downloadedFile.id, selectionStore],
+		[router, downloadedFile.id, selectionStore, onSelectItem],
 	)
 
 	const progression = useMemo(() => {
@@ -105,8 +110,8 @@ export default function DownloadRowItem({ downloadedFile }: Props) {
 
 	const handleSelect = useCallback(() => {
 		selectionStore.setIsSelecting(true)
-		selectionStore.onSelectItem(downloadedFile.id)
-	}, [selectionStore, downloadedFile.id])
+		onSelectItem(downloadedFile.id)
+	}, [selectionStore, downloadedFile.id, onSelectItem])
 
 	const handleMarkAsComplete = useCallback(() => {
 		Alert.alert(
diff --git a/apps/expo/components/localLibrary/DownloadsHeaderMenu.tsx b/apps/expo/components/localLibrary/DownloadsHeaderMenu.tsx
index c0d440d790..17caff20e9 100644
--- a/apps/expo/components/localLibrary/DownloadsHeaderMenu.tsx
+++ b/apps/expo/components/localLibrary/DownloadsHeaderMenu.tsx
@@ -14,13 +14,10 @@ import { useDownloadsState } from './store'
 export default function DownloadsHeaderMenu() {
 	const problemsSheetRef = useRef<TrueSheet>(null)
 
-	const { isCuratedDownloadsEnabled, setIsCuratedDownloadsEnabled } = usePreferencesStore(
-		(state) => ({
-			isCuratedDownloadsEnabled: state.showCuratedDownloads,
-			setIsCuratedDownloadsEnabled: (value: boolean) =>
-				state.patch({ showCuratedDownloads: value }),
-		}),
-	)
+	const isCuratedDownloadsEnabled = usePreferencesStore((state) => state.showCuratedDownloads)
+	const patch = usePreferencesStore((state) => state.patch)
+	const setIsCuratedDownloadsEnabled = (value: boolean) => patch({ showCuratedDownloads: value })
+
 	const { deleteAllDownloads } = useDownload()
 
 	const refetchDownloads = useDownloadsState((state) => state.increment)
diff --git a/apps/expo/components/search/SearchHistoryAndFavorites.tsx b/apps/expo/components/search/SearchHistoryAndFavorites.tsx
index 46dbe735ea..5728778d44 100644
--- a/apps/expo/components/search/SearchHistoryAndFavorites.tsx
+++ b/apps/expo/components/search/SearchHistoryAndFavorites.tsx
@@ -1,5 +1,6 @@
 import { Bookmark, BookmarkX, Clock, Trash } from 'lucide-react-native'
 import { Pressable, ScrollView, View } from 'react-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { useActiveServer } from '~/components/activeServer'
 import { Icon, ListLabel, Text } from '~/components/ui'
@@ -19,7 +20,14 @@ export function SearchHistoryAndFavorites({ onSelect }: Props) {
 	} = useActiveServer()
 	const { favoriteSearches, searchHistory } = useCuratedSearch()
 	const { favoriteSearch, unfavoriteSearch, clearSearchHistory, removeFromHistory } =
-		useSearchStore()
+		useSearchStore(
+			useShallow((state) => ({
+				favoriteSearch: state.favoriteSearch,
+				unfavoriteSearch: state.unfavoriteSearch,
+				clearSearchHistory: state.clearSearchHistory,
+				removeFromHistory: state.removeFromHistory,
+			})),
+		)
 	const colors = useColors()
 
 	const hasFavorites = favoriteSearches.length > 0
@@ -28,7 +36,7 @@ export function SearchHistoryAndFavorites({ onSelect }: Props) {
 
 	if (!hasFavorites && !hasHistory) {
 		return (
-			<View className="flex-1 items-center justify-center px-4 pt-20">
+			<View className="px-4 pt-20 flex-1 items-center justify-center">
 				<Text size="lg" className="text-center text-foreground-muted">
 					Your favorites and recent searches will appear here
 				</Text>
@@ -63,7 +71,7 @@ export function SearchHistoryAndFavorites({ onSelect }: Props) {
 									},
 								]}
 							>
-								<View className="flex-row items-center gap-3 py-3">
+								<View className="`gap-3 py-3 flex-row items-center">
 									<Icon as={Bookmark} size={16} color={colors.fill.brand.DEFAULT} />
 									<Text className="flex-1">{record.query}</Text>
 								</View>
@@ -120,7 +128,7 @@ export function SearchHistoryAndFavorites({ onSelect }: Props) {
 									},
 								]}
 							>
-								<View className="flex-row items-center gap-3 py-3">
+								<View className="gap-3 py-3 flex-row items-center">
 									<Icon as={Clock} size={16} color={colors.foreground.muted} />
 									<Text className="flex-1">{record.query}</Text>
 								</View>
diff --git a/apps/expo/components/selection/SelectionLeftScreenHeader.tsx b/apps/expo/components/selection/SelectionLeftScreenHeader.tsx
index 92ecbdc1bd..459063f33c 100644
--- a/apps/expo/components/selection/SelectionLeftScreenHeader.tsx
+++ b/apps/expo/components/selection/SelectionLeftScreenHeader.tsx
@@ -7,15 +7,15 @@ import { useSelectionStore } from '~/stores/selection'
 import { Icon } from '../ui/icon'
 
 export default function SelectionLeftScreenHeader() {
-	const selectionStore = useSelectionStore((state) => state)
-
-	const isSelectAll = selectionStore.isSelectAll()
+	const isSelectAll = useSelectionStore((state) => state.isSelectAll())
+	const clearSelection = useSelectionStore((state) => state.clearSelection)
+	const selectAll = useSelectionStore((state) => state.selectAll)
 
 	const onSelect = () => {
 		if (isSelectAll) {
-			selectionStore.clearSelection()
-		} else if (selectionStore.selectAll) {
-			selectionStore.selectAll()
+			clearSelection()
+		} else if (selectAll) {
+			selectAll()
 		}
 	}
 
diff --git a/apps/expo/lib/hooks/db/downloads.ts b/apps/expo/lib/hooks/db/downloads.ts
index f1c8ac2850..ab7cc89d4b 100644
--- a/apps/expo/lib/hooks/db/downloads.ts
+++ b/apps/expo/lib/hooks/db/downloads.ts
@@ -5,6 +5,7 @@ import { useLiveQuery } from 'drizzle-orm/expo-sqlite'
 import * as FileSystem from 'expo-file-system/legacy'
 import { useCallback, useEffect } from 'react'
 import { toast } from 'sonner-native'
+import { useShallow } from 'zustand/react/shallow'
 
 import { useActiveServerSafe } from '~/components/activeServer'
 import { useDownloadsState } from '~/components/localLibrary/store'
@@ -68,7 +69,9 @@ export function useDownload({ serverId }: UseDownloadParams = {}) {
 	const activeServerCtx = useActiveServerSafe()
 	const serverID = serverId ?? activeServerCtx?.activeServer.id
 
-	const allServerIds = useSavedServerStore((state) => state.servers.map((srv) => srv.id))
+	const allServerIds = useSavedServerStore(
+		useShallow((state) => state.servers.map((srv) => srv.id)),
+	)
 
 	const queryClient = useQueryClient()
 
diff --git a/apps/expo/lib/hooks/sync/utils.ts b/apps/expo/lib/hooks/sync/utils.ts
index 954006b311..4d24ee7747 100644
--- a/apps/expo/lib/hooks/sync/utils.ts
+++ b/apps/expo/lib/hooks/sync/utils.ts
@@ -10,8 +10,10 @@ import { getInstancesForServers } from '../../sdk/auth'
 export function useServerInstances() {
 	const { savedServers, getServerConfig, saveServerToken, getServerToken } = useSavedServers()
 
+	const cachedInstances = useCacheStore((state) => state.sdks)
 	const onCacheInstance = useCacheStore((state) => state.addSDK)
-	const getCachedInstance = useCacheStore((state) => (id: string) => state.sdks[id])
+
+	const getCachedInstance = useCallback((id: string) => cachedInstances[id], [cachedInstances])
 
 	const getFullServer = useCallback(
 		async (serverId: string) => {
diff --git a/apps/expo/lib/hooks/useLayoutMode.ts b/apps/expo/lib/hooks/useLayoutMode.ts
index 62a55b69f6..c5637713de 100644
--- a/apps/expo/lib/hooks/useLayoutMode.ts
+++ b/apps/expo/lib/hooks/useLayoutMode.ts
@@ -1,12 +1,15 @@
 import { InterfaceLayout } from '@stump/graphql'
 import { useEffect, useMemo, useState } from 'react'
+import { useShallow } from 'zustand/react/shallow'
 
 import { useUserStore } from '~/stores'
 
 export function useLayoutMode() {
-	const { userPreferences } = useUserStore((state) => ({
-		userPreferences: state.userPreferences,
-	}))
+	const { userPreferences } = useUserStore(
+		useShallow((state) => ({
+			userPreferences: state.userPreferences,
+		})),
+	)
 
 	const preferredLayoutMode = useMemo(
 		() => userPreferences?.preferredLayoutMode,
diff --git a/apps/expo/lib/hooks/usePreferences.ts b/apps/expo/lib/hooks/usePreferences.ts
index d4d407c9e6..551996cdb9 100644
--- a/apps/expo/lib/hooks/usePreferences.ts
+++ b/apps/expo/lib/hooks/usePreferences.ts
@@ -1,14 +1,17 @@
 import { useUpdatePreferences } from '@stump/client'
 import { UpdateUserPreferences, UserPreferences } from '@stump/sdk'
 import { useCallback } from 'react'
+import { useShallow } from 'zustand/react/shallow'
 
 import { useUserStore } from '~/stores'
 
 export function usePreferences() {
-	const { preferences, setPreferences } = useUserStore((state) => ({
-		preferences: state.userPreferences,
-		setPreferences: state.setUserPreferences,
-	}))
+	const { preferences, setPreferences } = useUserStore(
+		useShallow((state) => ({
+			preferences: state.userPreferences,
+			setPreferences: state.setUserPreferences,
+		})),
+	)
 
 	const { update: mutate } = useUpdatePreferences({
 		onSuccess: setPreferences,
diff --git a/apps/expo/package.json b/apps/expo/package.json
index 0b79c566e1..0436a6a756 100644
--- a/apps/expo/package.json
+++ b/apps/expo/package.json
@@ -16,6 +16,7 @@
 		"open:ios": "xed ios",
 		"open:android": "open -a \"Android Studio\" android",
 		"postinstall": "npx tailwindcss -i ./global.css -o ./node_modules/.cache/nativewind/global.css",
+		"format": "eslint --fix . && prettier --config ../../prettier.config.js --ignore-path ../../.prettierignore --write .",
 		"nuke": "rimraf .expo node_modules ios android"
 	},
 	"dependencies": {
@@ -121,7 +122,7 @@
 		"ts-pattern": "^5.6.2",
 		"url-join": "^5.0.0",
 		"zeego": "^3.0.6",
-		"zustand": "^4.5.2"
+		"zustand": "^5.0.12"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.26.0",
diff --git a/apps/expo/stores/epub.ts b/apps/expo/stores/epub.ts
index 72a6beea2f..8d3259d806 100644
--- a/apps/expo/stores/epub.ts
+++ b/apps/expo/stores/epub.ts
@@ -1,6 +1,7 @@
 import { useMemo } from 'react'
 import { create } from 'zustand'
 import { createJSONStorage, persist } from 'zustand/middleware'
+import { useShallow } from 'zustand/react/shallow'
 
 import { BookmarkRef, EbookReaderBookRef } from '~/components/book/reader/image/context'
 import { COLORS } from '~/lib/constants'
@@ -404,10 +405,12 @@ export const resolveThemeName = (
 
 export const useEpubTheme = () => {
 	const { colorScheme } = useColorScheme()
-	const { themes, selectedTheme } = useEpubThemesStore((store) => ({
-		themes: store.themes,
-		selectedTheme: store.selectedTheme,
-	}))
+	const { themes, selectedTheme } = useEpubThemesStore(
+		useShallow((store) => ({
+			themes: store.themes,
+			selectedTheme: store.selectedTheme,
+		})),
+	)
 
 	return useMemo(
 		() => resolveTheme(themes, selectedTheme || '', colorScheme),
diff --git a/apps/expo/stores/reader.ts b/apps/expo/stores/reader.ts
index 224814830a..2593dcef4d 100644
--- a/apps/expo/stores/reader.ts
+++ b/apps/expo/stores/reader.ts
@@ -3,6 +3,7 @@ import { ReadingDirection, ReadingImageScaleFit, ReadingMode } from '@stump/grap
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { create } from 'zustand'
 import { createJSONStorage, persist } from 'zustand/middleware'
+import { useShallow } from 'zustand/react/shallow'
 
 import { useActiveServerSafe } from '~/components/activeServer'
 import { ImageReaderBookRef } from '~/components/book/reader/image/context'
@@ -172,33 +173,37 @@ export const useBookPreferences = ({ book, ...params }: Params) => {
 		throw new Error('No active server ID found for book preferences')
 	}
 
-	const store = useReaderStore((state) => state)
+	const bookSettingsMap = useReaderStore((state) => state.bookSettings)
+	const globalSettings = useReaderStore((state) => state.globalSettings)
+	const addBookSettings = useReaderStore((state) => state.addBookSettings)
+	const setBookSettingsFn = useReaderStore((state) => state.setBookSettings)
+	const setGlobalSettings = useReaderStore((state) => state.setGlobalSettings)
 
-	const bookSettings = useMemo(() => store.bookSettings[book.id], [store.bookSettings, book.id])
+	const bookSettings = useMemo(() => bookSettingsMap[book.id], [bookSettingsMap, book.id])
 
 	const setBookPreferences = useCallback(
 		(updates: Partial<BookPreferences>) => {
 			if (!bookSettings) {
-				store.addBookSettings(book.id, {
-					...store.globalSettings,
+				addBookSettings(book.id, {
+					...globalSettings,
 					...updates,
 					serverID,
 				})
 			} else {
-				store.setBookSettings(book.id, { ...updates, serverID })
+				setBookSettingsFn(book.id, { ...updates, serverID })
 			}
 		},
-		[book.id, bookSettings, store, serverID],
+		[book.id, bookSettings, addBookSettings, globalSettings, setBookSettingsFn, serverID],
 	)
 
 	return {
-		globalSettings: store.globalSettings,
+		globalSettings,
 		preferences: {
-			...store.globalSettings,
-			...(bookSettings || store.globalSettings),
+			...globalSettings,
+			...(bookSettings || globalSettings),
 		},
 		setBookPreferences,
-		updateGlobalSettings: store.setGlobalSettings,
+		updateGlobalSettings: setGlobalSettings,
 	}
 }
 
@@ -272,10 +277,12 @@ export const useBookTimer = (id: string, params: UseBookTimerParams = defaultPar
 }
 
 export const useHideSystemBars = () => {
-	const { isReading, showControls } = useReaderStore((state) => ({
-		isReading: state.isReading,
-		showControls: state.showControls,
-	}))
+	const { isReading, showControls } = useReaderStore(
+		useShallow((state) => ({
+			isReading: state.isReading,
+			showControls: state.showControls,
+		})),
+	)
 
 	// when reading, hideNavigationBar keep the android and iPad nav bar hidden
 	return { hideStatusBar: isReading && !showControls, hideNavigationBar: isReading }
diff --git a/apps/expo/stores/savedServer.ts b/apps/expo/stores/savedServer.ts
index f22966b9eb..c7e6463baf 100644
--- a/apps/expo/stores/savedServer.ts
+++ b/apps/expo/stores/savedServer.ts
@@ -5,6 +5,7 @@ import { useCallback } from 'react'
 import { z } from 'zod'
 import { create } from 'zustand'
 import { createJSONStorage, persist } from 'zustand/middleware'
+import { useShallow } from 'zustand/react/shallow'
 
 import { useCacheStore } from './cache'
 import { ZustandMMKVStorage } from './store'
@@ -178,11 +179,19 @@ export const useSavedServers = () => {
 		setDefaultServer,
 		showStumpServers,
 		setShowStumpServers,
-	} = useSavedServerStore((state) => state)
+	} = useSavedServerStore(
+		useShallow((state) => ({
+			servers: state.servers,
+			addServer: state.addServer,
+			editServer: state.editServer,
+			removeServer: state.removeServer,
+			setDefaultServer: state.setDefaultServer,
+			showStumpServers: state.showStumpServers,
+			setShowStumpServers: state.setShowStumpServers,
+		})),
+	)
 
-	const cacheStore = useCacheStore((state) => ({
-		removeInstanceFromCache: state.removeSDK,
-	}))
+	const removeInstanceFromCache = useCacheStore((state) => state.removeSDK)
 
 	const getServerConfig = async (id: ServerID) => {
 		const config = await SecureStore.getItemAsync(formatPrefix('config', id))
@@ -303,7 +312,7 @@ export const useSavedServers = () => {
 	 */
 	const deleteServerToken = async (id: ServerID) => {
 		await SecureStore.deleteItemAsync(formatPrefix('token', id))
-		cacheStore.removeInstanceFromCache(id)
+		removeInstanceFromCache(id)
 		queryClient.removeQueries({ predicate: ({ queryKey }) => queryKey.includes(id) })
 	}
 
diff --git a/apps/expo/stores/search.ts b/apps/expo/stores/search.ts
index f4d04f383e..34e29e2dd6 100644
--- a/apps/expo/stores/search.ts
+++ b/apps/expo/stores/search.ts
@@ -1,5 +1,6 @@
 import { create } from 'zustand'
 import { createJSONStorage, persist } from 'zustand/middleware'
+import { useShallow } from 'zustand/react/shallow'
 
 import { useActiveServer } from '~/components/activeServer'
 
@@ -85,9 +86,14 @@ export function useCuratedSearch() {
 	const {
 		activeServer: { id: serverId },
 	} = useActiveServer()
-	const curatedSearches = useSearchStore((state) => ({
-		searchHistory: state.searchHistory.filter((record) => record.serverId === serverId),
-		favoriteSearches: state.favoriteSearches.filter((record) => record.serverId === serverId),
-	}))
-	return curatedSearches
+	const { searchHistory, favoriteSearches } = useSearchStore(
+		useShallow((state) => ({
+			searchHistory: state.searchHistory,
+			favoriteSearches: state.favoriteSearches,
+		})),
+	)
+	return {
+		searchHistory: searchHistory.filter((record) => record.serverId === serverId),
+		favoriteSearches: favoriteSearches.filter((record) => record.serverId === serverId),
+	}
 }
diff --git a/packages/browser/package.json b/packages/browser/package.json
index a960a4ada5..879571579f 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -79,7 +79,7 @@
 		"url-join": "^5.0.0",
 		"use-count-up": "^3.0.1",
 		"zod": "^3.23.8",
-		"zustand": "^4.5.2"
+		"zustand": "^5.0.12"
 	},
 	"devDependencies": {
 		"@babel/preset-env": "^7.25.4",
diff --git a/packages/browser/src/App.tsx b/packages/browser/src/App.tsx
index e88b05200f..863bd1de59 100644
--- a/packages/browser/src/App.tsx
+++ b/packages/browser/src/App.tsx
@@ -31,16 +31,13 @@ const RouterContainer = (props: StumpClientProps) => {
 
 	const [mounted, setMounted] = useState(false)
 
-	const { setUser, userPreferences } = useUserStore((store) => ({
-		setUser: store.setUser,
-		userPreferences: store.userPreferences,
-	}))
-	const { baseUrl, setBaseUrl, setPlatform, setIsConnectedWithServer } = useAppStore((store) => ({
-		baseUrl: store.baseUrl,
-		setBaseUrl: store.setBaseUrl,
-		setIsConnectedWithServer: store.setIsConnectedWithServer,
-		setPlatform: store.setPlatform,
-	}))
+	const setUser = useUserStore((state) => state.setUser)
+	const userPreferences = useUserStore((state) => state.userPreferences)
+
+	const baseUrl = useAppStore((state) => state.baseUrl)
+	const setBaseUrl = useAppStore((state) => state.setBaseUrl)
+	const setPlatform = useAppStore((state) => state.setPlatform)
+	const setIsConnectedWithServer = useAppStore((state) => state.setIsConnectedWithServer)
 
 	useEffect(() => {
 		if (!baseUrl && props.baseUrl) {
diff --git a/packages/browser/src/AppLayout.tsx b/packages/browser/src/AppLayout.tsx
index b1d23e2506..23d147d47a 100644
--- a/packages/browser/src/AppLayout.tsx
+++ b/packages/browser/src/AppLayout.tsx
@@ -32,17 +32,14 @@ export function AppLayout() {
 	const { showBoundary } = useErrorBoundary()
 
 	const { sdk } = useSDK()
-	const { showConfetti, setShowConfetti, onConnectionWithServerChanged } = useAppStore((state) => ({
-		onConnectionWithServerChanged: state.setIsConnectedWithServer,
-		platform: state.platform,
-		setShowConfetti: state.setShowConfetti,
-		showConfetti: state.showConfetti,
-	}))
-	const { storeUser, setUser, checkUserPermission } = useUserStore((state) => ({
-		checkUserPermission: state.checkUserPermission,
-		setUser: state.setUser,
-		storeUser: state.user,
-	}))
+
+	const showConfetti = useAppStore((state) => state.showConfetti)
+	const setShowConfetti = useAppStore((state) => state.setShowConfetti)
+	const onConnectionWithServerChanged = useAppStore((state) => state.setIsConnectedWithServer)
+
+	const storeUser = useUserStore((state) => state.user)
+	const checkUserPermission = useUserStore((state) => state.checkUserPermission)
+	const setUser = useUserStore((state) => state.setUser)
 
 	const { isDarkVariant, shouldUseGradient } = useTheme()
 	const [initialize, instance] = useOverlayScrollbars({
@@ -258,8 +255,6 @@ export function AppLayout() {
 					</main>
 				</div>
 
-				{/* TODO(relay): Restore */}
-				{/* {platform !== 'browser' && <ServerStatusOverlay />} */}
 				{showJobOverlay && <JobOverlay />}
 			</Suspense>
 		</AppContext.Provider>
diff --git a/packages/browser/src/AppRouter.tsx b/packages/browser/src/AppRouter.tsx
index b3ea08cd3a..4afe6e500a 100644
--- a/packages/browser/src/AppRouter.tsx
+++ b/packages/browser/src/AppRouter.tsx
@@ -26,10 +26,7 @@ type AppRouterProps = {
 
 export function AppRouter({ basePath }: AppRouterProps = {}) {
 	const locale = useUserStore((store) => store.userPreferences?.locale)
-
-	const { baseUrl } = useAppStore((store) => ({
-		baseUrl: store.baseUrl,
-	}))
+	const baseUrl = useAppStore((state) => state.baseUrl)
 
 	if (!baseUrl) {
 		throw new Error('Base URL is not set')
diff --git a/packages/browser/src/components/Toaster.tsx b/packages/browser/src/components/Toaster.tsx
index 444502b7e8..21abb424a1 100644
--- a/packages/browser/src/components/Toaster.tsx
+++ b/packages/browser/src/components/Toaster.tsx
@@ -6,9 +6,9 @@ const Toaster = ({ ...props }: ToasterProps) => {
 			className="toaster group"
 			style={
 				{
-					'--normal-bg': 'hsl(var(--twc-background))',
-					'--normal-text': 'hsl(var(--twc-foreground))',
-					'--normal-border': 'hsl(var(--twc-edge))',
+					'--normal-bg': 'var(--color-background)',
+					'--normal-text': 'var(--color-foreground)',
+					'--normal-border': 'var(--color-edge)',
 				} as React.CSSProperties
 			}
 			{...props}
diff --git a/packages/browser/src/components/book/table/BookTable.tsx b/packages/browser/src/components/book/table/BookTable.tsx
index 865a828563..f9e70c07fa 100644
--- a/packages/browser/src/components/book/table/BookTable.tsx
+++ b/packages/browser/src/components/book/table/BookTable.tsx
@@ -1,6 +1,7 @@
 import { FragmentType } from '@stump/graphql'
 import { OnChangeFn, SortingState } from '@tanstack/react-table'
 import { useCallback, useMemo } from 'react'
+import { useShallow } from 'zustand/react/shallow'
 
 import { orderingToTableSort, tableSortToOrdering, useFilterContext } from '@/components/filters'
 import { EntityTable, EntityTableProps } from '@/components/table'
@@ -16,9 +17,12 @@ type Props = Omit<EntityTableProps<FragmentType<typeof BookCardFragment>>, 'colu
 
 // Note: I needed global for book search page
 export default function BookTable({ layoutKey = 'global', ...props }: Props) {
-	const configuration = useBooksLayout(layoutKey, (state) => ({
-		columns: state.columns,
-	}))
+	const configuration = useBooksLayout(
+		layoutKey,
+		useShallow((state) => ({
+			columns: state.columns,
+		})),
+	)
 	const { ordering, setOrdering } = useFilterContext()
 
 	const columns = useMemo(
diff --git a/packages/browser/src/components/container/useGridSize.ts b/packages/browser/src/components/container/useGridSize.ts
index a61859f9e6..f6d40a3cfd 100644
--- a/packages/browser/src/components/container/useGridSize.ts
+++ b/packages/browser/src/components/container/useGridSize.ts
@@ -1,7 +1,7 @@
 import { useMemo } from 'react'
 import { useWindowSize } from 'rooks'
 import { create } from 'zustand'
-import { persist } from 'zustand/middleware'
+import { createJSONStorage, persist } from 'zustand/middleware'
 
 import { usePreferences } from '@/hooks/usePreferences'
 
@@ -97,7 +97,7 @@ export const useGridSizeStore = create<IGridSizeStore>()(
 		}),
 		{
 			name: 'stump:entity-card-density',
-			getStorage: () => localStorage,
+			storage: createJSONStorage(() => localStorage),
 		},
 	),
 )
diff --git a/packages/browser/src/components/filters/URLFilterContainer.tsx b/packages/browser/src/components/filters/URLFilterContainer.tsx
index 6e3ca2af97..f53aa66fee 100644
--- a/packages/browser/src/components/filters/URLFilterContainer.tsx
+++ b/packages/browser/src/components/filters/URLFilterContainer.tsx
@@ -4,6 +4,7 @@ import { forwardRef, Suspense, useEffect, useMemo } from 'react'
 import useScrollbarSize from 'react-scrollbar-size'
 import { useMediaMatch } from 'rooks'
 import { create } from 'zustand'
+import { useShallow } from 'zustand/react/shallow'
 
 import { SIDEBAR_WIDTH } from '@/components/navigation/sidebar'
 import { TablePaginationProps } from '@/components/table'
@@ -26,10 +27,12 @@ const URLFilterContainer = forwardRef<HTMLDivElement, Props>(
 			preferences: { enableHideScrollbar, primaryNavigationMode },
 		} = usePreferences()
 		const { width } = useScrollbarSize()
-		const { storedWidth, storeWidth } = useWidthStore((state) => ({
-			storeWidth: state.setWidth,
-			storedWidth: state.width,
-		}))
+		const { storedWidth, storeWidth } = useWidthStore(
+			useShallow((state) => ({
+				storeWidth: state.setWidth,
+				storedWidth: state.width,
+			})),
+		)
 
 		const storeOffset = useFooterOffsetStore((state) => state.setFooterOffset)
 
diff --git a/packages/browser/src/components/readers/imageBased/useImageSizes.ts b/packages/browser/src/components/readers/imageBased/useImageSizes.ts
index 6a51b3c700..d6a5e15039 100644
--- a/packages/browser/src/components/readers/imageBased/useImageSizes.ts
+++ b/packages/browser/src/components/readers/imageBased/useImageSizes.ts
@@ -7,7 +7,8 @@ import { IImageBaseReaderContext, ImagePageDimensionRef } from './context'
 type Params = Pick<IImageBaseReaderContext, 'book'>
 
 export function useImageSizes({ book: { id, analysisData } }: Params) {
-	const cachedSizes = useSizeStore((state) => state.cache[id]?.imageSizes || {})
+	const cache = useSizeStore((state) => state.cache)
+	const cachedSizes = useMemo(() => cache[id]?.imageSizes ?? {}, [cache, id])
 	const storeSize = useSizeStore((state) => state.storeSize)
 
 	const [initialSizes] = useState(
diff --git a/packages/browser/src/components/series/SeriesExplorationLayout.tsx b/packages/browser/src/components/series/SeriesExplorationLayout.tsx
index de782fa852..36a806b30b 100644
--- a/packages/browser/src/components/series/SeriesExplorationLayout.tsx
+++ b/packages/browser/src/components/series/SeriesExplorationLayout.tsx
@@ -1,14 +1,18 @@
 import { IconButton, ToolTip } from '@stump/components'
 import { InterfaceLayout } from '@stump/graphql'
 import { LayoutGrid, Table } from 'lucide-react'
+import { useShallow } from 'zustand/react/shallow'
 
 import { useSeriesLayout } from '@/stores/layout'
 
 export default function SeriesExplorationLayout() {
-	const { layout, setLayout } = useSeriesLayout('global', (state) => ({
-		layout: state.layout,
-		setLayout: state.setLayout,
-	}))
+	const { layout, setLayout } = useSeriesLayout(
+		'global',
+		useShallow((state) => ({
+			layout: state.layout,
+			setLayout: state.setLayout,
+		})),
+	)
 
 	return (
 		<div className="gap-1 flex shrink-0 items-center">
diff --git a/packages/browser/src/components/series/table/SeriesTable.tsx b/packages/browser/src/components/series/table/SeriesTable.tsx
index 8a47955fd8..1a8ea79869 100644
--- a/packages/browser/src/components/series/table/SeriesTable.tsx
+++ b/packages/browser/src/components/series/table/SeriesTable.tsx
@@ -1,5 +1,6 @@
 import { OnChangeFn, SortingState } from '@tanstack/react-table'
 import { useCallback, useMemo } from 'react'
+import { useShallow } from 'zustand/react/shallow'
 
 import { orderingToTableSort, tableSortToOrdering, useFilterContext } from '@/components/filters'
 import { EntityTable, EntityTableProps } from '@/components/table'
@@ -13,9 +14,12 @@ type Props = Omit<EntityTableProps<SeriesCardData>, 'columns' | 'options'> & {
 }
 
 export default function SeriesTable({ layoutKey = 'global', ...props }: Props) {
-	const configuration = useSeriesLayout(layoutKey, (state) => ({
-		columns: state.columns,
-	}))
+	const configuration = useSeriesLayout(
+		layoutKey,
+		useShallow((state) => ({
+			columns: state.columns,
+		})),
+	)
 	const { ordering, setOrdering } = useFilterContext()
 
 	const columns = useMemo(
diff --git a/packages/browser/src/hooks/useCoreEvent.ts b/packages/browser/src/hooks/useCoreEvent.ts
index d7ed9c3d0a..1656a33168 100644
--- a/packages/browser/src/hooks/useCoreEvent.ts
+++ b/packages/browser/src/hooks/useCoreEvent.ts
@@ -5,6 +5,7 @@ import { QueryClient, useQueryClient } from '@tanstack/react-query'
 import { useCallback, useEffect } from 'react'
 import { toast } from 'sonner'
 import { match, P } from 'ts-pattern'
+import { useShallow } from 'zustand/react/shallow'
 
 const subscription = graphql(`
 	subscription UseCoreEvent {
@@ -65,11 +66,13 @@ type Params = {
 
 // TODO: Attempt reconnect with re-auth
 export function useCoreEvent({ liveRefetch, onConnectionWithServerChanged }: Params) {
-	const store = useJobStore((state) => ({
-		addJob: state.addJob,
-		removeJob: state.removeJob,
-		upsertJob: state.upsertJob,
-	}))
+	const store = useJobStore(
+		useShallow((state) => ({
+			addJob: state.addJob,
+			removeJob: state.removeJob,
+			upsertJob: state.upsertJob,
+		})),
+	)
 	const client = useQueryClient()
 
 	const { sdk } = useSDK()
diff --git a/packages/browser/src/hooks/useLayoutMode.ts b/packages/browser/src/hooks/useLayoutMode.ts
index 89e624c31c..ebe5d15fd9 100644
--- a/packages/browser/src/hooks/useLayoutMode.ts
+++ b/packages/browser/src/hooks/useLayoutMode.ts
@@ -1,12 +1,15 @@
 import { InterfaceLayout } from '@stump/graphql'
 import { useEffect, useMemo, useState } from 'react'
+import { useShallow } from 'zustand/react/shallow'
 
 import { useUserStore } from '@/stores'
 
 export function useLayoutMode() {
-	const { userPreferences } = useUserStore((state) => ({
-		userPreferences: state.userPreferences,
-	}))
+	const { userPreferences } = useUserStore(
+		useShallow((state) => ({
+			userPreferences: state.userPreferences,
+		})),
+	)
 
 	const preferredLayoutMode = useMemo(
 		() => userPreferences?.preferredLayoutMode,
diff --git a/packages/browser/src/hooks/usePreferences.ts b/packages/browser/src/hooks/usePreferences.ts
index e37571d338..ed1892df39 100644
--- a/packages/browser/src/hooks/usePreferences.ts
+++ b/packages/browser/src/hooks/usePreferences.ts
@@ -2,6 +2,7 @@ import { useGraphQLMutation } from '@stump/client'
 import { graphql, UpdateUserPreferencesInput, UserPreferences } from '@stump/graphql'
 import omit from 'lodash/omit'
 import { useCallback } from 'react'
+import { useShallow } from 'zustand/react/shallow'
 
 import { useUserStore } from '@/stores'
 
@@ -14,10 +15,12 @@ const mutation = graphql(`
 `)
 
 export function usePreferences() {
-	const { preferences, setPreferences } = useUserStore((state) => ({
-		preferences: state.userPreferences,
-		setPreferences: state.setUserPreferences,
-	}))
+	const { preferences, setPreferences } = useUserStore(
+		useShallow((state) => ({
+			preferences: state.userPreferences,
+			setPreferences: state.setUserPreferences,
+		})),
+	)
 
 	const { mutate } = useGraphQLMutation(mutation, {
 		onSuccess: (_, { input }) => {
diff --git a/packages/browser/src/scenes/book/reader/useBookPreferences.ts b/packages/browser/src/scenes/book/reader/useBookPreferences.ts
index 67d20ebffb..77cba3a285 100644
--- a/packages/browser/src/scenes/book/reader/useBookPreferences.ts
+++ b/packages/browser/src/scenes/book/reader/useBookPreferences.ts
@@ -2,6 +2,7 @@ import { BookPreferences, ReaderSettings, ReaderStore } from '@stump/client'
 import { PickSelect } from '@stump/components'
 import { BookReaderSceneQuery, ReadingImageScaleFit } from '@stump/graphql'
 import { useCallback, useMemo } from 'react'
+import { useShallow } from 'zustand/react/shallow'
 
 import { ImageReaderBookRef } from '@/components/readers/imageBased/context'
 import { useReaderStore } from '@/stores'
@@ -24,12 +25,14 @@ export function useBookPreferences({ book }: Params): Return {
 		setBookPreferences: storedSetBookPreferences,
 		settings,
 		setSettings,
-	} = useReaderStore((state) => ({
-		bookPreferences: state.bookPreferences,
-		setBookPreferences: state.setBookPreferences,
-		setSettings: state.setSettings,
-		settings: state.settings,
-	}))
+	} = useReaderStore(
+		useShallow((state) => ({
+			bookPreferences: state.bookPreferences,
+			setBookPreferences: state.setBookPreferences,
+			setSettings: state.setSettings,
+			settings: state.settings,
+		})),
+	)
 
 	const storedBookPreferences = useMemo(() => allPreferences[book.id], [allPreferences, book.id])
 
diff --git a/packages/browser/src/scenes/bookSearch/BookSearchScene.tsx b/packages/browser/src/scenes/bookSearch/BookSearchScene.tsx
index bff49c649b..65d0750d0f 100644
--- a/packages/browser/src/scenes/bookSearch/BookSearchScene.tsx
+++ b/packages/browser/src/scenes/bookSearch/BookSearchScene.tsx
@@ -4,6 +4,7 @@ import { graphql, InterfaceLayout, MediaFilterInput, MediaOrderBy } from '@stump
 import { useQueryClient } from '@tanstack/react-query'
 import { Suspense, useCallback, useEffect, useMemo, useState } from 'react'
 import { Helmet } from 'react-helmet'
+import { useShallow } from 'zustand/react/shallow'
 
 import { BookCard, BookTable } from '@/components/book'
 import { defaultBookColumnSort } from '@/components/book/table'
@@ -156,12 +157,15 @@ function BookSearchScene() {
 		[setPage],
 	)
 
-	const { layoutMode, setLayout, columns, setColumns } = useBooksLayout('global', (state) => ({
-		columns: state.columns,
-		layoutMode: state.layout,
-		setColumns: state.setColumns,
-		setLayout: state.setLayout,
-	}))
+	const { layoutMode, setLayout, columns, setColumns } = useBooksLayout(
+		'global',
+		useShallow((state) => ({
+			columns: state.columns,
+			layoutMode: state.layout,
+			setColumns: state.setColumns,
+			setLayout: state.setLayout,
+		})),
+	)
 
 	const {
 		preferences: { enableAlphabetSelect },
diff --git a/packages/browser/src/scenes/error/ServerConnectionErrorScene.tsx b/packages/browser/src/scenes/error/ServerConnectionErrorScene.tsx
index a12309ddbf..626817fd7e 100644
--- a/packages/browser/src/scenes/error/ServerConnectionErrorScene.tsx
+++ b/packages/browser/src/scenes/error/ServerConnectionErrorScene.tsx
@@ -5,6 +5,7 @@ import { ArrowRight } from 'lucide-react'
 import { useEffect, useState } from 'react'
 import { Navigate, useLocation } from 'react-router'
 import { toast } from 'sonner'
+import { useShallow } from 'zustand/react/shallow'
 
 import { useAppStore } from '@/stores'
 
@@ -15,10 +16,12 @@ export default function ServerConnectionErrorScene() {
 	const [goHome, setGoHome] = useState(false)
 	const [showServers, setShowServers] = useState(false)
 
-	const { baseURL, platform } = useAppStore((store) => ({
-		baseURL: store.baseUrl,
-		platform: store.platform,
-	}))
+	const { baseURL, platform } = useAppStore(
+		useShallow((store) => ({
+			baseURL: store.baseUrl,
+			platform: store.platform,
+		})),
+	)
 	const isDesktop = platform !== 'browser'
 
 	const localeKey = `serverSOS.${isDesktop ? 'desktop' : 'web'}.message`
diff --git a/packages/browser/src/scenes/library/tabs/books/LibraryBooksScene.tsx b/packages/browser/src/scenes/library/tabs/books/LibraryBooksScene.tsx
index 4755598980..11b393b773 100644
--- a/packages/browser/src/scenes/library/tabs/books/LibraryBooksScene.tsx
+++ b/packages/browser/src/scenes/library/tabs/books/LibraryBooksScene.tsx
@@ -4,6 +4,7 @@ import { graphql, InterfaceLayout, MediaFilterInput, MediaOrderBy } from '@stump
 import { useQueryClient } from '@tanstack/react-query'
 import { Suspense, useCallback, useEffect, useMemo, useState } from 'react'
 import { Helmet } from 'react-helmet'
+import { useShallow } from 'zustand/react/shallow'
 
 import { BookCard, BookTable } from '@/components/book'
 import { defaultBookColumnSort } from '@/components/book/table'
@@ -178,12 +179,15 @@ function LibraryBooksScene() {
 
 	const layoutKey = `library-${library.id}-books`
 
-	const { layoutMode, setLayout, columns, setColumns } = useBooksLayout(layoutKey, (state) => ({
-		columns: state.columns,
-		layoutMode: state.layout,
-		setColumns: state.setColumns,
-		setLayout: state.setLayout,
-	}))
+	const { layoutMode, setLayout, columns, setColumns } = useBooksLayout(
+		layoutKey,
+		useShallow((state) => ({
+			columns: state.columns,
+			layoutMode: state.layout,
+			setColumns: state.setColumns,
+			setLayout: state.setLayout,
+		})),
+	)
 
 	const {
 		preferences: { enableAlphabetSelect },
diff --git a/packages/browser/src/scenes/library/tabs/series/LibrarySeriesScene.tsx b/packages/browser/src/scenes/library/tabs/series/LibrarySeriesScene.tsx
index b83874580c..10406a31fe 100644
--- a/packages/browser/src/scenes/library/tabs/series/LibrarySeriesScene.tsx
+++ b/packages/browser/src/scenes/library/tabs/series/LibrarySeriesScene.tsx
@@ -11,6 +11,7 @@ import {
 import { useQueryClient } from '@tanstack/react-query'
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { Helmet } from 'react-helmet'
+import { useShallow } from 'zustand/react/shallow'
 
 import { DynamicCardGrid, GridSizeSlider } from '@/components/container'
 import {
@@ -263,12 +264,15 @@ export default function LibrarySeriesScene() {
 	)
 	const layoutKey = `library-${id}-series`
 
-	const { layoutMode, setLayout, columns, setColumns } = useSeriesLayout(layoutKey, (state) => ({
-		columns: state.columns,
-		layoutMode: state.layout,
-		setColumns: state.setColumns,
-		setLayout: state.setLayout,
-	}))
+	const { layoutMode, setLayout, columns, setColumns } = useSeriesLayout(
+		layoutKey,
+		useShallow((state) => ({
+			columns: state.columns,
+			layoutMode: state.layout,
+			setColumns: state.setColumns,
+			setLayout: state.setLayout,
+		})),
+	)
 
 	const { sdk } = useSDK()
 	const { data, isLoading } = useGraphQL(
diff --git a/packages/browser/src/scenes/series/tabs/books/SeriesBooksScene.tsx b/packages/browser/src/scenes/series/tabs/books/SeriesBooksScene.tsx
index 6d3d958ca9..44b22034f3 100644
--- a/packages/browser/src/scenes/series/tabs/books/SeriesBooksScene.tsx
+++ b/packages/browser/src/scenes/series/tabs/books/SeriesBooksScene.tsx
@@ -4,6 +4,7 @@ import { graphql, InterfaceLayout, MediaFilterInput, MediaOrderBy } from '@stump
 import { useQueryClient } from '@tanstack/react-query'
 import { Suspense, useCallback, useEffect, useMemo, useState } from 'react'
 import { Helmet } from 'react-helmet'
+import { useShallow } from 'zustand/react/shallow'
 
 import { BookTable } from '@/components/book'
 import BookCard from '@/components/book/BookCard'
@@ -176,12 +177,15 @@ function SeriesBooksScene() {
 	const {
 		preferences: { enableAlphabetSelect },
 	} = usePreferences()
-	const { layoutMode, setLayout, columns, setColumns } = useBooksLayout(layoutKey, (state) => ({
-		columns: state.columns,
-		layoutMode: state.layout,
-		setColumns: state.setColumns,
-		setLayout: state.setLayout,
-	}))
+	const { layoutMode, setLayout, columns, setColumns } = useBooksLayout(
+		layoutKey,
+		useShallow((state) => ({
+			columns: state.columns,
+			layoutMode: state.layout,
+			setColumns: state.setColumns,
+			setLayout: state.setLayout,
+		})),
+	)
 
 	const resolvedFilters = useMemo(
 		() => [
diff --git a/packages/browser/src/scenes/settings/SettingsLayout.tsx b/packages/browser/src/scenes/settings/SettingsLayout.tsx
index 959db03ae2..2ffbf07c07 100644
--- a/packages/browser/src/scenes/settings/SettingsLayout.tsx
+++ b/packages/browser/src/scenes/settings/SettingsLayout.tsx
@@ -2,6 +2,7 @@ import { cn, cx } from '@stump/components'
 import { Suspense } from 'react'
 import { Navigate, Outlet } from 'react-router-dom'
 import { useMediaMatch } from 'rooks'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Container } from '@/components/container'
 import { usePreferences } from '@/hooks'
@@ -13,9 +14,11 @@ import SettingsSideBar from './SettingsSideBar'
 export default function SettingsLayout() {
 	const isMobile = useMediaMatch('(max-width: 768px)')
 
-	const { user } = useUserStore((store) => ({
-		user: store.user,
-	}))
+	const { user } = useUserStore(
+		useShallow((store) => ({
+			user: store.user,
+		})),
+	)
 	const {
 		preferences: {
 			enableDoubleSidebar,
diff --git a/packages/browser/src/scenes/settings/app/desktop/features/DiscordPresenceSwitch.tsx b/packages/browser/src/scenes/settings/app/desktop/features/DiscordPresenceSwitch.tsx
index 9102ded1dc..c956ba88c2 100644
--- a/packages/browser/src/scenes/settings/app/desktop/features/DiscordPresenceSwitch.tsx
+++ b/packages/browser/src/scenes/settings/app/desktop/features/DiscordPresenceSwitch.tsx
@@ -2,6 +2,7 @@ import { Button, Label, RawSwitch, Text, ToolTip } from '@stump/components'
 import { useLocaleContext } from '@stump/i18n'
 import { RefreshCcw } from 'lucide-react'
 import { toast } from 'sonner'
+import { useShallow } from 'zustand/react/shallow'
 
 import { usePreferences } from '@/hooks/usePreferences'
 import { useTauriRPC } from '@/hooks/useTauriRPC'
@@ -10,10 +11,12 @@ import { useUserStore } from '@/stores'
 export default function DiscordPresenceSwitch() {
 	const { setDiscordPresence } = useTauriRPC()
 	const { t } = useLocaleContext()
-	const { userPreferences, setUserPreferences } = useUserStore((state) => ({
-		setUserPreferences: state.setUserPreferences,
-		userPreferences: state.userPreferences,
-	}))
+	const { userPreferences, setUserPreferences } = useUserStore(
+		useShallow((state) => ({
+			setUserPreferences: state.setUserPreferences,
+			userPreferences: state.userPreferences,
+		})),
+	)
 	const { update } = usePreferences()
 
 	/**
diff --git a/packages/browser/src/scenes/settings/app/reader/DefaultFontFamily.tsx b/packages/browser/src/scenes/settings/app/reader/DefaultFontFamily.tsx
index 75f986520e..684368caa3 100644
--- a/packages/browser/src/scenes/settings/app/reader/DefaultFontFamily.tsx
+++ b/packages/browser/src/scenes/settings/app/reader/DefaultFontFamily.tsx
@@ -2,6 +2,7 @@ import { ComboBox, Label } from '@stump/components'
 import { useLocaleContext } from '@stump/i18n'
 import { isSupportedFont } from '@stump/sdk'
 import { useCallback } from 'react'
+import { useShallow } from 'zustand/react/shallow'
 
 import { SUPPORTED_FONT_OPTIONS } from '@/scenes/settings/app/preferences/FontSelect'
 import { useReaderStore } from '@/stores'
@@ -11,10 +12,12 @@ export default function DefaultFontFamily() {
 	const {
 		settings: { fontFamily },
 		setSettings,
-	} = useReaderStore((state) => ({
-		setSettings: state.setSettings,
-		settings: state.settings,
-	}))
+	} = useReaderStore(
+		useShallow((state) => ({
+			setSettings: state.setSettings,
+			settings: state.settings,
+		})),
+	)
 
 	const changeFont = useCallback(
 		(font?: string) => {
diff --git a/packages/browser/src/scenes/settings/app/reader/DefaultFontSize.tsx b/packages/browser/src/scenes/settings/app/reader/DefaultFontSize.tsx
index 4ebd15bd1e..804eec0550 100644
--- a/packages/browser/src/scenes/settings/app/reader/DefaultFontSize.tsx
+++ b/packages/browser/src/scenes/settings/app/reader/DefaultFontSize.tsx
@@ -1,6 +1,7 @@
 import { Input } from '@stump/components'
 import { useLocaleContext } from '@stump/i18n'
 import React from 'react'
+import { useShallow } from 'zustand/react/shallow'
 
 import { useReaderStore } from '@/stores'
 
@@ -9,10 +10,12 @@ export default function DefaultFontSize() {
 	const {
 		settings: { fontSize },
 		setSettings,
-	} = useReaderStore((state) => ({
-		setSettings: state.setSettings,
-		settings: state.settings,
-	}))
+	} = useReaderStore(
+		useShallow((state) => ({
+			setSettings: state.setSettings,
+			settings: state.settings,
+		})),
+	)
 
 	const onValueChange = (e: React.ChangeEvent<HTMLInputElement>) => {
 		const value = parseInt(e.target.value)
diff --git a/packages/browser/src/scenes/settings/app/reader/DefaultLineHeight.tsx b/packages/browser/src/scenes/settings/app/reader/DefaultLineHeight.tsx
index 51d6092589..834755c26b 100644
--- a/packages/browser/src/scenes/settings/app/reader/DefaultLineHeight.tsx
+++ b/packages/browser/src/scenes/settings/app/reader/DefaultLineHeight.tsx
@@ -1,6 +1,7 @@
 import { Input } from '@stump/components'
 import { useLocaleContext } from '@stump/i18n'
 import React from 'react'
+import { useShallow } from 'zustand/react/shallow'
 
 import { useReaderStore } from '@/stores'
 
@@ -9,10 +10,12 @@ export default function DefaultLineHeight() {
 	const {
 		settings: { lineHeight },
 		setSettings,
-	} = useReaderStore((state) => ({
-		setSettings: state.setSettings,
-		settings: state.settings,
-	}))
+	} = useReaderStore(
+		useShallow((state) => ({
+			setSettings: state.setSettings,
+			settings: state.settings,
+		})),
+	)
 
 	const onValueChange = (e: React.ChangeEvent<HTMLInputElement>) => {
 		const value = parseFloat(e.target.value)
diff --git a/packages/browser/src/scenes/settings/app/reader/DefaultReadingDirection.tsx b/packages/browser/src/scenes/settings/app/reader/DefaultReadingDirection.tsx
index 2acda3f2d3..978d9f6aa6 100644
--- a/packages/browser/src/scenes/settings/app/reader/DefaultReadingDirection.tsx
+++ b/packages/browser/src/scenes/settings/app/reader/DefaultReadingDirection.tsx
@@ -1,15 +1,18 @@
 import { Label, NativeSelect, Text } from '@stump/components'
 import { ReadingDirection } from '@stump/graphql'
 import { useLocaleContext } from '@stump/i18n'
+import { useShallow } from 'zustand/react/shallow'
 
 import { useReaderStore } from '@/stores'
 
 export default function DefaultReadingDirection() {
 	const { t } = useLocaleContext()
-	const { readingDirection, setSettings } = useReaderStore((store) => ({
-		readingDirection: store.settings.readingDirection,
-		setSettings: store.setSettings,
-	}))
+	const { readingDirection, setSettings } = useReaderStore(
+		useShallow((store) => ({
+			readingDirection: store.settings.readingDirection,
+			setSettings: store.setSettings,
+		})),
+	)
 
 	const handleChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
 		if (e.target.value === 'LTR' || e.target.value === 'RTL') {
diff --git a/packages/browser/src/scenes/settings/app/reader/PreloadPagesSection.tsx b/packages/browser/src/scenes/settings/app/reader/PreloadPagesSection.tsx
index 8041fc7f29..c43ffb2b26 100644
--- a/packages/browser/src/scenes/settings/app/reader/PreloadPagesSection.tsx
+++ b/packages/browser/src/scenes/settings/app/reader/PreloadPagesSection.tsx
@@ -1,5 +1,6 @@
 import { Input } from '@stump/components'
 import { useLocaleContext } from '@stump/i18n'
+import { useShallow } from 'zustand/react/shallow'
 
 import { useReaderStore } from '@/stores'
 
@@ -11,10 +12,12 @@ export default function PreloadPagesSection() {
 			preload: { ahead, behind },
 		},
 		setSettings,
-	} = useReaderStore((state) => ({
-		setSettings: state.setSettings,
-		settings: state.settings,
-	}))
+	} = useReaderStore(
+		useShallow((state) => ({
+			setSettings: state.setSettings,
+			settings: state.settings,
+		})),
+	)
 
 	const createChangeHandler =
 		(updater: (n: number) => void) => (e: React.ChangeEvent<HTMLInputElement>) => {
diff --git a/packages/browser/src/scenes/settings/app/reader/ReaderDefaultSettingsScene.tsx b/packages/browser/src/scenes/settings/app/reader/ReaderDefaultSettingsScene.tsx
index ed009d6aec..5763e29f4c 100644
--- a/packages/browser/src/scenes/settings/app/reader/ReaderDefaultSettingsScene.tsx
+++ b/packages/browser/src/scenes/settings/app/reader/ReaderDefaultSettingsScene.tsx
@@ -1,6 +1,7 @@
 import { Button, Heading, Text } from '@stump/components'
 import { useLocaleContext } from '@stump/i18n'
 import { Helmet } from 'react-helmet'
+import { useShallow } from 'zustand/react/shallow'
 
 import { Container, ContentContainer } from '@/components/container'
 import { useReaderStore } from '@/stores'
@@ -14,10 +15,12 @@ import PreloadPagesSection from './PreloadPagesSection'
 export default function ReaderDefaultSettingsScene() {
 	const { t } = useLocaleContext()
 
-	const { bookPreferences, clearStore } = useReaderStore((state) => ({
-		bookPreferences: state.bookPreferences,
-		clearStore: state.clearStore,
-	}))
+	const { bookPreferences, clearStore } = useReaderStore(
+		useShallow((state) => ({
+			bookPreferences: state.bookPreferences,
+			clearStore: state.clearStore,
+		})),
+	)
 
 	const canClearStore = Object.keys(bookPreferences).length > 0
 
diff --git a/packages/browser/src/stores/user.ts b/packages/browser/src/stores/user.ts
index b3d4c92a1c..0ca879243a 100644
--- a/packages/browser/src/stores/user.ts
+++ b/packages/browser/src/stores/user.ts
@@ -1,4 +1,6 @@
 import { createUserStore } from '@stump/client'
+import { useShallow } from 'zustand/react/shallow'
 
 export const useUserStore = createUserStore(localStorage)
-export const useUser = () => useUserStore((store) => ({ setUser: store.setUser, user: store.user }))
+export const useUser = () =>
+	useUserStore(useShallow((store) => ({ setUser: store.setUser, user: store.user })))
diff --git a/packages/browser/src/styles/index.css b/packages/browser/src/styles/index.css
index 8bce77d885..48f2f2c9d3 100644
--- a/packages/browser/src/styles/index.css
+++ b/packages/browser/src/styles/index.css
@@ -2,7 +2,7 @@
 @import '@stump/components/tailwind/preset.css';
 
 body {
-	@apply h-full bg-background font-inter antialiased;
+	@apply h-full bg-background antialiased;
 }
 
 #root,
diff --git a/packages/client/package.json b/packages/client/package.json
index 2675e2c551..c06e9489c2 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -19,7 +19,7 @@
 		"immer": "^10.0.4",
 		"react-use-websocket": "^4.8.1",
 		"ts-pattern": "^5.7.0",
-		"zustand": "^4.5.2"
+		"zustand": "^5.0.12"
 	},
 	"devDependencies": {
 		"@types/deep-equal": "^1.0.4",
diff --git a/yarn.lock b/yarn.lock
index 9a65920dbc..17edf3e099 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -25173,13 +25173,18 @@ zod@^3.22.3, zod@^3.22.4, zod@^3.23.8:
   resolved "https://registry.yarnpkg.com/zod/-/zod-4.1.13.tgz#93699a8afe937ba96badbb0ce8be6033c0a4b6b1"
   integrity sha512-AvvthqfqrAhNH9dnfmrfKzX5upOdjUVJYFqNSlkmGf64gRaTzlPwz99IHYnVs28qYAybvAlBV+H7pn0saFY4Ig==
 
-zustand@^4.4.7, zustand@^4.5.2:
+zustand@^4.4.7:
   version "4.5.7"
   resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.5.7.tgz#7d6bb2026a142415dd8be8891d7870e6dbe65f55"
   integrity sha512-CHOUy7mu3lbD6o6LJLfllpjkzhHXSBlX8B9+qPddUsIfeF5S/UZ5q0kmCsnRqT1UHFQZchNFDDzMbQsuesHWlw==
   dependencies:
     use-sync-external-store "^1.2.2"
 
+zustand@^5.0.12:
+  version "5.0.12"
+  resolved "https://registry.yarnpkg.com/zustand/-/zustand-5.0.12.tgz#ed36f647aa89965c4019b671dfc23ef6c6e3af8c"
+  integrity sha512-i77ae3aZq4dhMlRhJVCYgMLKuSiZAaUPAct2AksxQ+gOtimhGMdXljRT21P5BNpeT4kXlLIckvkPM029OljD7g==
+
 zwitch@^2.0.0, zwitch@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.4.tgz#c827d4b0acb76fc3e685a4c6ec2902d51070e9d7"

From 4b7bb229b7e4f83a6212164505618708151446a3 Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Tue, 31 Mar 2026 21:16:30 -0700
Subject: [PATCH 05/32] :globe_with_meridians: Update translations (#1010)

* New translations en-us.json (Polish)

* New translations en-us.json (Italian)

* New translations en-us.json (Dutch)

* New translations en-us.json (Spanish)

* New translations en-us.json (Romanian)

* New translations en-us.json (French)

* New translations en-us.json (Afrikaans)

* New translations en-us.json (Arabic)

* New translations en-us.json (Catalan)

* New translations en-us.json (Czech)

* New translations en-us.json (Danish)

* New translations en-us.json (German)

* New translations en-us.json (Greek)

* New translations en-us.json (Finnish)

* New translations en-us.json (Hebrew)

* New translations en-us.json (Hungarian)

* New translations en-us.json (Japanese)

* New translations en-us.json (Korean)

* New translations en-us.json (Norwegian)

* New translations en-us.json (Polish)

* New translations en-us.json (Portuguese)

* New translations en-us.json (Russian)

* New translations en-us.json (Serbian (Cyrillic))

* New translations en-us.json (Swedish)

* New translations en-us.json (Turkish)

* New translations en-us.json (Ukrainian)

* New translations en-us.json (Chinese Simplified)

* New translations en-us.json (Chinese Traditional)

* New translations en-us.json (English)

* New translations en-us.json (Vietnamese)

* New translations en-us.json (Portuguese, Brazilian)

* New translations en-us.json (English, United Kingdom)

* fix oopsie
---
 packages/i18n/src/locales/af-ZA.json |  16 +++-
 packages/i18n/src/locales/ar-SA.json |  16 +++-
 packages/i18n/src/locales/ca-ES.json |  16 +++-
 packages/i18n/src/locales/cs-CZ.json |  16 +++-
 packages/i18n/src/locales/da-DK.json |  16 +++-
 packages/i18n/src/locales/de-DE.json |  16 +++-
 packages/i18n/src/locales/el-GR.json |  16 +++-
 packages/i18n/src/locales/en-GB.json |  16 +++-
 packages/i18n/src/locales/en-US.json |   8 +-
 packages/i18n/src/locales/es-ES.json |  16 +++-
 packages/i18n/src/locales/fi-FI.json |  16 +++-
 packages/i18n/src/locales/fr-FR.json |  16 +++-
 packages/i18n/src/locales/he-IL.json |  16 +++-
 packages/i18n/src/locales/hu-HU.json |  16 +++-
 packages/i18n/src/locales/it-IT.json |  16 +++-
 packages/i18n/src/locales/ja-JP.json |  16 +++-
 packages/i18n/src/locales/ko-KR.json |  16 +++-
 packages/i18n/src/locales/nl-NL.json |  16 +++-
 packages/i18n/src/locales/no-NO.json |  16 +++-
 packages/i18n/src/locales/pl-PL.json | 112 +++++++++++++++------------
 packages/i18n/src/locales/pt-BR.json |  16 +++-
 packages/i18n/src/locales/pt-PT.json |  16 +++-
 packages/i18n/src/locales/ro-RO.json |  16 +++-
 packages/i18n/src/locales/ru-RU.json |  16 +++-
 packages/i18n/src/locales/sr-SP.json |  16 +++-
 packages/i18n/src/locales/sv-SE.json |  16 +++-
 packages/i18n/src/locales/tr-TR.json |  16 +++-
 packages/i18n/src/locales/uk-UA.json |  16 +++-
 packages/i18n/src/locales/vi-VN.json |  16 +++-
 packages/i18n/src/locales/zh-CN.json |  16 +++-
 packages/i18n/src/locales/zh-TW.json |  16 +++-
 31 files changed, 502 insertions(+), 82 deletions(-)

diff --git a/packages/i18n/src/locales/af-ZA.json b/packages/i18n/src/locales/af-ZA.json
index 3af6a427b4..ee3184ae35 100644
--- a/packages/i18n/src/locales/af-ZA.json
+++ b/packages/i18n/src/locales/af-ZA.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/ar-SA.json b/packages/i18n/src/locales/ar-SA.json
index 6a06f611de..0d79e61031 100644
--- a/packages/i18n/src/locales/ar-SA.json
+++ b/packages/i18n/src/locales/ar-SA.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/ca-ES.json b/packages/i18n/src/locales/ca-ES.json
index 6a06f611de..0d79e61031 100644
--- a/packages/i18n/src/locales/ca-ES.json
+++ b/packages/i18n/src/locales/ca-ES.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/cs-CZ.json b/packages/i18n/src/locales/cs-CZ.json
index 9f37eeae3a..10037f7719 100644
--- a/packages/i18n/src/locales/cs-CZ.json
+++ b/packages/i18n/src/locales/cs-CZ.json
@@ -700,7 +700,21 @@
 						"label": "Vyčistit knihovnu",
 						"text": "Opravdu chcete vyčistit tuto knihovnu?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Smazat knihovnu",
diff --git a/packages/i18n/src/locales/da-DK.json b/packages/i18n/src/locales/da-DK.json
index bcf539688a..188274fb1f 100644
--- a/packages/i18n/src/locales/da-DK.json
+++ b/packages/i18n/src/locales/da-DK.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/de-DE.json b/packages/i18n/src/locales/de-DE.json
index e74c2c8fce..3d408da0ec 100644
--- a/packages/i18n/src/locales/de-DE.json
+++ b/packages/i18n/src/locales/de-DE.json
@@ -700,7 +700,21 @@
 						"label": "Bibliothek bereinigen",
 						"text": "Bist du sicher, dass du diese Bibliothek bereinigen möchtest?"
 					},
-					"emptyText": "Es gab nichts zu reinigen"
+					"emptyText": "Es gab nichts zu reinigen",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Bibliothek löschen",
diff --git a/packages/i18n/src/locales/el-GR.json b/packages/i18n/src/locales/el-GR.json
index 6a06f611de..0d79e61031 100644
--- a/packages/i18n/src/locales/el-GR.json
+++ b/packages/i18n/src/locales/el-GR.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/en-GB.json b/packages/i18n/src/locales/en-GB.json
index c0ce5a27c9..77e784305e 100644
--- a/packages/i18n/src/locales/en-GB.json
+++ b/packages/i18n/src/locales/en-GB.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/en-US.json b/packages/i18n/src/locales/en-US.json
index 48d1eb03db..c1c94f3a73 100644
--- a/packages/i18n/src/locales/en-US.json
+++ b/packages/i18n/src/locales/en-US.json
@@ -707,7 +707,7 @@
 							"path": "Path",
 							"type": "Type"
 						},
-						"types":{
+						"types": {
 							"BOOK": "Book",
 							"SERIES": "Series",
 							"LIBRARY": "Library"
@@ -1279,7 +1279,7 @@
 						"label": "Avatar",
 						"heading": "Upload avatar",
 						"subtitle": "You can upload any image to use as your avatar for social features in Stump",
-						"dropzone":"Drop an image or click to select",
+						"dropzone": "Drop an image or click to select",
 						"changeImage": "Change Image",
 						"removeImage": "Remove Image",
 						"removeSelection": "Remove uploaded image",
@@ -1723,8 +1723,8 @@
 				},
 				"customEmojis": {
 					"title": "Custom emojis",
-					"description":"Upload and manage custom image emojis for your server",
-					"dropzone":"Drop an image or click to select",
+					"description": "Upload and manage custom image emojis for your server",
+					"dropzone": "Drop an image or click to select",
 					"input": {
 						"label": "Emoji name",
 						"placeholder": "e.g. party_parrot"
diff --git a/packages/i18n/src/locales/es-ES.json b/packages/i18n/src/locales/es-ES.json
index 30b6f80d03..f2dead5784 100644
--- a/packages/i18n/src/locales/es-ES.json
+++ b/packages/i18n/src/locales/es-ES.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/fi-FI.json b/packages/i18n/src/locales/fi-FI.json
index 6a06f611de..0d79e61031 100644
--- a/packages/i18n/src/locales/fi-FI.json
+++ b/packages/i18n/src/locales/fi-FI.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/fr-FR.json b/packages/i18n/src/locales/fr-FR.json
index 26205258a6..b00a95acc8 100644
--- a/packages/i18n/src/locales/fr-FR.json
+++ b/packages/i18n/src/locales/fr-FR.json
@@ -700,7 +700,21 @@
 						"label": "Nettoyer la bibliothèque",
 						"text": "Êtes-vous sûr de vouloir nettoyer cette bibliothèque ?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Supprimer la bibliothèque",
diff --git a/packages/i18n/src/locales/he-IL.json b/packages/i18n/src/locales/he-IL.json
index 6a06f611de..0d79e61031 100644
--- a/packages/i18n/src/locales/he-IL.json
+++ b/packages/i18n/src/locales/he-IL.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/hu-HU.json b/packages/i18n/src/locales/hu-HU.json
index 6be28a46cc..3c2ea867f9 100644
--- a/packages/i18n/src/locales/hu-HU.json
+++ b/packages/i18n/src/locales/hu-HU.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/it-IT.json b/packages/i18n/src/locales/it-IT.json
index 08c72e3839..6b55ae25cb 100644
--- a/packages/i18n/src/locales/it-IT.json
+++ b/packages/i18n/src/locales/it-IT.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/ja-JP.json b/packages/i18n/src/locales/ja-JP.json
index 0410daaca2..ad3385153f 100644
--- a/packages/i18n/src/locales/ja-JP.json
+++ b/packages/i18n/src/locales/ja-JP.json
@@ -700,7 +700,21 @@
 						"label": "ライブラリを消去",
 						"text": "このライブラリをクリーンアップしてもよろしいですか？"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "ライブラリを削除",
diff --git a/packages/i18n/src/locales/ko-KR.json b/packages/i18n/src/locales/ko-KR.json
index 333680f18b..41011df351 100644
--- a/packages/i18n/src/locales/ko-KR.json
+++ b/packages/i18n/src/locales/ko-KR.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/nl-NL.json b/packages/i18n/src/locales/nl-NL.json
index 79cd329ed2..e930d7f5de 100644
--- a/packages/i18n/src/locales/nl-NL.json
+++ b/packages/i18n/src/locales/nl-NL.json
@@ -700,7 +700,21 @@
 						"label": "Bibliotheek opschonen",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/no-NO.json b/packages/i18n/src/locales/no-NO.json
index 6a06f611de..0d79e61031 100644
--- a/packages/i18n/src/locales/no-NO.json
+++ b/packages/i18n/src/locales/no-NO.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/pl-PL.json b/packages/i18n/src/locales/pl-PL.json
index dc78c9e243..1059216f63 100644
--- a/packages/i18n/src/locales/pl-PL.json
+++ b/packages/i18n/src/locales/pl-PL.json
@@ -261,8 +261,8 @@
 					"description": "Ukryj zakładkę serii w nawigacji biblioteki"
 				},
 				"skipBookOverview": {
-					"label": "Skip book overview",
-					"description": "Open the reader directly when selecting books in this library"
+					"label": "Pomiń przegląd książki",
+					"description": "Przejdź od razu do czytnika, gdy wybierasz książkę z tej biblioteki"
 				},
 				"options": {
 					"series": {
@@ -700,7 +700,21 @@
 						"label": "Wyczyść bibliotekę",
 						"text": "Czy na pewno chcesz wyczyścić tę bibliotekę?"
 					},
-					"emptyText": "Nie było nic do wyczyszczenia"
+					"emptyText": "Nie było nic do wyczyszczenia",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Usuń bibliotekę",
@@ -929,10 +943,10 @@
 									"teams": "Zespoły",
 									"genres": "Gatunek",
 									"coverArtists": "Artysta okładki",
-									"ageRating": "Age rating",
-									"year": "Year",
-									"month": "Month",
-									"day": "Day"
+									"ageRating": "Klasyfikacja wiekowa",
+									"year": "Rok",
+									"month": "Miesiąc",
+									"day": "Dzień"
 								}
 							},
 							"series": {
@@ -955,7 +969,7 @@
 									"volume": "Tom",
 									"metaType": "Typ",
 									"ageRating": "Klasyfikacja wiekowa",
-									"year": "Start year"
+									"year": "Rok rozpoczęcia"
 								}
 							},
 							"library": {
@@ -1262,15 +1276,15 @@
 						"updateFailed": "Podczas aktualizacji profilu wystąpił błąd serwera. Spróbuj ponownie."
 					},
 					"avatarPicker": {
-						"label": "Avatar",
-						"heading": "Upload avatar",
-						"subtitle": "You can upload any image to use as your avatar for social features in Stump",
-						"dropzone": "Drop an image or click to select",
-						"changeImage": "Change Image",
-						"removeImage": "Remove Image",
-						"removeSelection": "Remove uploaded image",
-						"uploadFailed": "Failed to upload avatar",
-						"removeFailed": "Failed to remove avatar"
+						"label": "Awatar",
+						"heading": "Prześlij awatar",
+						"subtitle": "Możesz przesłać dowolny obraz do użycia jako awatar dla funkcji społecznościowych w Stump",
+						"dropzone": "Upuść obraz lub kliknij aby wybrać",
+						"changeImage": "Zmień obraz",
+						"removeImage": "Usuń obraz",
+						"removeSelection": "Usuń przesłany obraz",
+						"uploadFailed": "Nie udało się przesłać awatara",
+						"removeFailed": "Nie udało się usunąć awatara"
 					},
 					"buttons": {
 						"confirm": "Zapisz zmiany"
@@ -1696,11 +1710,11 @@
 					}
 				},
 				"helpfulLinks": {
-					"title": "Helpful links",
-					"description": "Links to resources that may be helpful for managing your Stump server instance",
+					"title": "Przydatne odnośniki",
+					"description": "Odnośniki do zasobów, które mogą okazać się pomocne w zarządzaniu Twoim serwerem Stump",
 					"links": {
-						"documentation": "Documentation",
-						"changelog": "Changelog"
+						"documentation": "Dokumentacja",
+						"changelog": "Historia zmian"
 					}
 				},
 				"serverPublicUrl": {
@@ -1708,25 +1722,25 @@
 					"description": "Adres, pod którym serwer dostępny jest spoza Twojej sieci. Zezwala to na odnośniki z zaproszeniami i inne funkcje"
 				},
 				"customEmojis": {
-					"title": "Custom emojis",
-					"description": "Upload and manage custom image emojis for your server",
-					"dropzone": "Drop an image or click to select",
+					"title": "Niestandardowe emotikony",
+					"description": "Przesyłaj i zarządzaj niestandardowymi obrazami emotikon dla Twojego serwera",
+					"dropzone": "Upuść obraz lub kliknij aby wybrać",
 					"input": {
-						"label": "Emoji name",
-						"placeholder": "e.g. party_parrot"
+						"label": "Nazwa emotikony",
+						"placeholder": "np. imprezowa_papuga"
 					},
 					"deleteModal": {
-						"title": "Delete emoji",
-						"description": "Are you sure you want to delete this emoji?"
+						"title": "Usuń emotikonę",
+						"description": "Czy na pewno chcesz usunąć tę emotikonę?"
 					},
-					"noCustomEmojis": "No custom emojis have been added yet",
-					"invalidName": "Please enter a valid name for your emoji",
-					"uploadError": "Failed to upload emoji",
-					"uploadSuccess": "Emoji uploaded",
-					"renameSuccess": "Emoji renamed",
-					"renameError": "Failed to rename emoji",
-					"deleteSuccess": "Emoji deleted",
-					"deleteError": "Failed to delete emoji"
+					"noCustomEmojis": "Nie dodano jeszcze żadnych niestandardowych emotikon",
+					"invalidName": "Wprowadź poprawną nazwę dla emotikony",
+					"uploadError": "Nie udało się przesłać emotikony",
+					"uploadSuccess": "Przesłano emotikonę",
+					"renameSuccess": "Zmieniono nazwę emotikony",
+					"renameError": "Nie udało się zmienić nazwy emotikony",
+					"deleteSuccess": "Usunięto emotikonę",
+					"deleteError": "Nie udało się usunąć emotikony"
 				}
 			}
 		},
@@ -2109,13 +2123,13 @@
 					"update": "Aktualizuj wysyłkę"
 				},
 				"testEmailer": {
-					"button": "Send test email",
-					"recipientLabel": "Test recipient",
-					"recipientDescription": "An email address to send the test email to",
-					"success": "Test email sent successfully",
+					"button": "Wyślij wiadomość testową",
+					"recipientLabel": "Testowy odbiorca",
+					"recipientDescription": "Adres pocztowy odbierający wiadomość testową",
+					"success": "Wiadomość testowa została wysłana poprawnie",
 					"error": {
-						"title": "Failed to send test email",
-						"description": "Check your SMTP settings and try again"
+						"title": "Nie udało się wysłać wiadomości testowej",
+						"description": "Sprawdź ustawienia SMTP i spróbuj ponownie"
 					}
 				}
 			},
@@ -2252,7 +2266,7 @@
 	"common": {
 		"add": "Dodaj",
 		"cancel": "Anuluj",
-		"clear": "Clear",
+		"clear": "Wyczyść",
 		"confirm": "Potwierdź",
 		"delete": "Usuń",
 		"enter": "Enter",
@@ -2265,7 +2279,7 @@
 		"update": "Aktualizuj",
 		"upload": "Prześlij",
 		"uploading": "Przesyłanie",
-		"uploadingEllipsis": "Uploading...",
+		"uploadingEllipsis": "Przesyłanie...",
 		"unimplemented": "Ta funkcjonalność nie jest jeszcze zaimplementowana! Sprawdź ponownie później",
 		"limitedFunctionality": "Funkcjonalność ta nie jest jeszcze w pełni zaimplementowana. Sprawdź później",
 		"logIn": "Zaloguj się",
@@ -2280,9 +2294,9 @@
 		"scan": "Skanuj",
 		"somethingWentWrong": "Coś poszło nie tak",
 		"fileUpload": {
-			"someRejected": "Some files were rejected. Please check the file types and try again",
-			"tooManyFiles": "You have selected too many files",
-			"noValidFiles": "No valid files were selected"
+			"someRejected": "Niektóre pliki zostały odrzucone. Sprawdź typy plików i spróbuj ponownie",
+			"tooManyFiles": "Wybrano zbyt dużą ilość plików",
+			"noValidFiles": "Nie wybrano żadnych poprawnych plików"
 		}
 	},
 	"userPermissions": {
@@ -2411,8 +2425,8 @@
 			"description": "Pozwala użytkownikowi na zapisywanie zmienionych metadanych z powrotem do plików źródłowych"
 		},
 		"EDIT_THUMBNAILS": {
-			"label": "Edit thumbnails",
-			"description": "Allows the user to edit thumbnails for books and series"
+			"label": "Edycja miniatur",
+			"description": "Pozwala użytkownikowi na edycję miniatur książek i serii"
 		}
 	}
 }
diff --git a/packages/i18n/src/locales/pt-BR.json b/packages/i18n/src/locales/pt-BR.json
index 451dbe9f66..200a05f110 100644
--- a/packages/i18n/src/locales/pt-BR.json
+++ b/packages/i18n/src/locales/pt-BR.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/pt-PT.json b/packages/i18n/src/locales/pt-PT.json
index a5faa11cf1..c1c94f3a73 100644
--- a/packages/i18n/src/locales/pt-PT.json
+++ b/packages/i18n/src/locales/pt-PT.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/ro-RO.json b/packages/i18n/src/locales/ro-RO.json
index 6a06f611de..0d79e61031 100644
--- a/packages/i18n/src/locales/ro-RO.json
+++ b/packages/i18n/src/locales/ro-RO.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/ru-RU.json b/packages/i18n/src/locales/ru-RU.json
index 47fb106a9b..025128010c 100644
--- a/packages/i18n/src/locales/ru-RU.json
+++ b/packages/i18n/src/locales/ru-RU.json
@@ -700,7 +700,21 @@
 						"label": "Почистить библиотеку",
 						"text": "Вы уверены, что хотите почистить эту библиотеку?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Удалить библиотеку",
diff --git a/packages/i18n/src/locales/sr-SP.json b/packages/i18n/src/locales/sr-SP.json
index 6a06f611de..0d79e61031 100644
--- a/packages/i18n/src/locales/sr-SP.json
+++ b/packages/i18n/src/locales/sr-SP.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/sv-SE.json b/packages/i18n/src/locales/sv-SE.json
index 933ccf1878..1edfe0f01b 100644
--- a/packages/i18n/src/locales/sv-SE.json
+++ b/packages/i18n/src/locales/sv-SE.json
@@ -700,7 +700,21 @@
 						"label": "Rensa bibliotek",
 						"text": "Är du säker på att du vill rensa detta bibliotek?"
 					},
-					"emptyText": "Det fanns inget att städa"
+					"emptyText": "Det fanns inget att städa",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Radera bibliotek",
diff --git a/packages/i18n/src/locales/tr-TR.json b/packages/i18n/src/locales/tr-TR.json
index 557af13d58..f6d7033f84 100644
--- a/packages/i18n/src/locales/tr-TR.json
+++ b/packages/i18n/src/locales/tr-TR.json
@@ -700,7 +700,21 @@
 						"label": "Kütüphaneyi temizle",
 						"text": "Kütüphaneyi temizlemek istediğinizdem emin misiniz?"
 					},
-					"emptyText": "Temizlenecek bir şey yoktu"
+					"emptyText": "Temizlenecek bir şey yoktu",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Kütüphaneyi sil",
diff --git a/packages/i18n/src/locales/uk-UA.json b/packages/i18n/src/locales/uk-UA.json
index 6a06f611de..0d79e61031 100644
--- a/packages/i18n/src/locales/uk-UA.json
+++ b/packages/i18n/src/locales/uk-UA.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/vi-VN.json b/packages/i18n/src/locales/vi-VN.json
index 6a06f611de..0d79e61031 100644
--- a/packages/i18n/src/locales/vi-VN.json
+++ b/packages/i18n/src/locales/vi-VN.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/zh-CN.json b/packages/i18n/src/locales/zh-CN.json
index a5faa11cf1..c1c94f3a73 100644
--- a/packages/i18n/src/locales/zh-CN.json
+++ b/packages/i18n/src/locales/zh-CN.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",
diff --git a/packages/i18n/src/locales/zh-TW.json b/packages/i18n/src/locales/zh-TW.json
index 8a3afb5780..43258807cc 100644
--- a/packages/i18n/src/locales/zh-TW.json
+++ b/packages/i18n/src/locales/zh-TW.json
@@ -700,7 +700,21 @@
 						"label": "Clean library",
 						"text": "Are you sure you want to clean this library?"
 					},
-					"emptyText": "There was nothing to clean"
+					"emptyText": "There was nothing to clean",
+					"missingEntitiesTable": {
+						"columns": {
+							"id": "ID",
+							"path": "Path",
+							"type": "Type"
+						},
+						"types": {
+							"BOOK": "Book",
+							"SERIES": "Series",
+							"LIBRARY": "Library"
+						},
+						"emptyHeading": "Nothing is missing for this library",
+						"emptySubtitle": "All files referenced in the database were located on disk"
+					}
 				},
 				"deleteLibrary": {
 					"heading": "Delete library",

From 6ea6769634fc9af53c69d67b5e1f1d93328a098e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Mar 2026 21:16:47 -0700
Subject: [PATCH 06/32] :arrow_up: Bump eslint-plugin-prettier from 5.5.4 to
 5.5.5 (#1024)

Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 5.5.4 to 5.5.5.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v5.5.4...v5.5.5)

---
updated-dependencies:
- dependency-name: eslint-plugin-prettier
  dependency-version: 5.5.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 74 +++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index 374a9d3f58..582ced00a0 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
 		"concurrently": "^8.2.2",
 		"eslint": "^9.39.1",
 		"eslint-config-prettier": "10.1.8",
-		"eslint-plugin-prettier": "^5.5.4",
+		"eslint-plugin-prettier": "^5.5.5",
 		"eslint-plugin-react": "^7.37.5",
 		"eslint-plugin-react-compiler": "^19.1.0-rc.2",
 		"eslint-plugin-react-hooks": "^7.0.1",
diff --git a/yarn.lock b/yarn.lock
index 940c304708..ebf9a26ca7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1196,7 +1196,20 @@
     "@babel/parser" "^7.27.2"
     "@babel/types" "^7.27.1"
 
-"@babel/traverse--for-generate-function-map@npm:@babel/traverse@^7.25.3", "@babel/traverse@^7.14.0", "@babel/traverse@^7.18.9", "@babel/traverse@^7.23.0", "@babel/traverse@^7.23.2", "@babel/traverse@^7.25.3", "@babel/traverse@^7.26.10", "@babel/traverse@^7.27.1", "@babel/traverse@^7.28.0", "@babel/traverse@^7.28.3", "@babel/traverse@^7.28.4", "@babel/traverse@^7.28.5":
+"@babel/traverse--for-generate-function-map@npm:@babel/traverse@^7.25.3":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.5.tgz#450cab9135d21a7a2ca9d2d35aa05c20e68c360b"
+  integrity sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==
+  dependencies:
+    "@babel/code-frame" "^7.27.1"
+    "@babel/generator" "^7.28.5"
+    "@babel/helper-globals" "^7.28.0"
+    "@babel/parser" "^7.28.5"
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.28.5"
+    debug "^4.3.1"
+
+"@babel/traverse@^7.14.0", "@babel/traverse@^7.18.9", "@babel/traverse@^7.23.0", "@babel/traverse@^7.23.2", "@babel/traverse@^7.25.3", "@babel/traverse@^7.26.10", "@babel/traverse@^7.27.1", "@babel/traverse@^7.28.0", "@babel/traverse@^7.28.3", "@babel/traverse@^7.28.4", "@babel/traverse@^7.28.5":
   version "7.28.5"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.5.tgz#450cab9135d21a7a2ca9d2d35aa05c20e68c360b"
   integrity sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==
@@ -12656,13 +12669,13 @@ eslint-plugin-jsx-a11y@^6.7.1:
     safe-regex-test "^1.0.3"
     string.prototype.includes "^2.0.1"
 
-eslint-plugin-prettier@^5.5.4:
-  version "5.5.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.4.tgz#9d61c4ea11de5af704d4edf108c82ccfa7f2e61c"
-  integrity sha512-swNtI95SToIz05YINMA6Ox5R057IMAmWZ26GqPxusAp1TZzj+IdY9tXNWWD3vkF/wEqydCONcwjTFpxybBqZsg==
+eslint-plugin-prettier@^5.5.5:
+  version "5.5.5"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.5.tgz#9eae11593faa108859c26f9a9c367d619a0769c0"
+  integrity sha512-hscXkbqUZ2sPithAuLm5MXL+Wph+U7wHngPBv9OMWwlP8iaflyxpjTYZkmdgB4/vPIhemRlBEoLrH7UC1n7aUw==
   dependencies:
-    prettier-linter-helpers "^1.0.0"
-    synckit "^0.11.7"
+    prettier-linter-helpers "^1.0.1"
+    synckit "^0.11.12"
 
 eslint-plugin-react-compiler@^19.1.0-rc.2:
   version "19.1.0-rc.2"
@@ -20368,10 +20381,10 @@ prettier-eslint@^16.4.2:
     tslib "^2.8.1"
     vue-eslint-parser "^9.4.3"
 
-prettier-linter-helpers@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
-  integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
+prettier-linter-helpers@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.1.tgz#6a31f88a4bad6c7adda253de12ba4edaea80ebcd"
+  integrity sha512-SxToR7P8Y2lWmv/kTzVLC1t/GDI2WGjMwNhLLE9qtH8Q13C+aEmuRlzDst4Up4s0Wc8sF2M+J57iB3cMLqftfg==
   dependencies:
     fast-diff "^1.1.2"
 
@@ -23027,7 +23040,16 @@ string-trim-spaces-only@^5.1.0:
   resolved "https://registry.yarnpkg.com/string-trim-spaces-only/-/string-trim-spaces-only-5.1.0.tgz#d68e328f4f11cbb96642334ae1582bf3c02582f5"
   integrity sha512-632znq4SGCNM7Vw7QITbx05oej+Xly2s7OtDxN9jvNbOoWcQuA5fq14CAS5TlpiiB04LDETzJj9fk851PnWLgg==
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -23158,7 +23180,7 @@ stringify-object@3.3.0, stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -23179,6 +23201,13 @@ strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1, strip-ansi@^7.1.0:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz#132875abde678c7ea8d691533f2e7e22bb744dba"
@@ -23384,10 +23413,10 @@ synchronous-promise@^2.0.15:
   resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.17.tgz#38901319632f946c982152586f2caf8ddc25c032"
   integrity sha512-AsS729u2RHUfEra9xJrE39peJcc2stq2+poBXX8bcM08Y6g9j/i/PUzwNQqkaJde7Ntg1TO7bSREbR5sdosQ+g==
 
-synckit@^0.11.7:
-  version "0.11.11"
-  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.11.11.tgz#c0b619cf258a97faa209155d9cd1699b5c998cb0"
-  integrity sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==
+synckit@^0.11.12:
+  version "0.11.12"
+  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.11.12.tgz#abe74124264fbc00a48011b0d98bdc1cffb64a7b"
+  integrity sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ==
   dependencies:
     "@pkgr/core" "^0.2.9"
 
@@ -25401,7 +25430,7 @@ workbox-window@7.4.0, workbox-window@^7.4.0:
     "@types/trusted-types" "^2.0.2"
     workbox-core "7.4.0"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -25419,6 +25448,15 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From c9e590284a414a95dd97a4d761bc22f8c0e17ac2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Apr 2026 12:53:05 -0700
Subject: [PATCH 07/32] :arrow_up: Bump @rn-primitives/tabs from 1.2.0 to 1.4.0
 (#1027)

Bumps @rn-primitives/tabs from 1.2.0 to 1.4.0.

---
updated-dependencies:
- dependency-name: "@rn-primitives/tabs"
  dependency-version: 1.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 apps/expo/package.json |  2 +-
 yarn.lock              | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/expo/package.json b/apps/expo/package.json
index a2218e6f1d..bf89a1b2e4 100644
--- a/apps/expo/package.json
+++ b/apps/expo/package.json
@@ -42,7 +42,7 @@
 		"@rn-primitives/radio-group": "^1.2.0",
 		"@rn-primitives/slot": "^1.2.0",
 		"@rn-primitives/switch": "^1.1.0",
-		"@rn-primitives/tabs": "^1.1.0",
+		"@rn-primitives/tabs": "^1.4.0",
 		"@rn-primitives/tooltip": "~1.1.0",
 		"@rn-primitives/types": "^1.1.0",
 		"@sentry/react-native": "~7.2.0",
diff --git a/yarn.lock b/yarn.lock
index ebf9a26ca7..32ee813ef2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5035,7 +5035,7 @@
     "@radix-ui/react-use-previous" "1.1.1"
     "@radix-ui/react-use-size" "1.1.1"
 
-"@radix-ui/react-tabs@^1.0.4", "@radix-ui/react-tabs@^1.1.12":
+"@radix-ui/react-tabs@^1.0.4", "@radix-ui/react-tabs@^1.1.12", "@radix-ui/react-tabs@^1.1.13":
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-tabs/-/react-tabs-1.1.13.tgz#3537ce379d7e7ff4eeb6b67a0973e139c2ac1f15"
   integrity sha512-7xdcatg7/U+7+Udyoj2zodtI9H/IIopqo+YOIcZOq1nJwXWBZ9p8xiu5llXlekDbZkca79a/fozEYQXIA4sW6A==
@@ -5728,14 +5728,14 @@
     "@rn-primitives/slot" "1.2.0"
     "@rn-primitives/types" "1.2.0"
 
-"@rn-primitives/tabs@^1.1.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@rn-primitives/tabs/-/tabs-1.2.0.tgz#d8906577eb6c6e9596337a5c79c1570591ac59d1"
-  integrity sha512-sKqVYQD1s46eS8kGBsCGxJrtZ4my+sjXD5m2auGSdTJmJ8dNYqZJEI1caiMm64ZvRuQDe2bFsekAFGexBD4qUQ==
+"@rn-primitives/tabs@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@rn-primitives/tabs/-/tabs-1.4.0.tgz#b1566d6b40c2ff36cc797302000b72d465849a03"
+  integrity sha512-K7GXSr+hlaCHk3qQ0KFCBV6/PCDu8gz+SqGG78hyI+LOJuB/06lxX6duZrG53Q2A9I9tOu/vk2aCQ9xSbd0SfA==
   dependencies:
-    "@radix-ui/react-tabs" "^1.1.12"
-    "@rn-primitives/slot" "1.2.0"
-    "@rn-primitives/types" "1.2.0"
+    "@radix-ui/react-tabs" "^1.1.13"
+    "@rn-primitives/slot" "1.4.0"
+    "@rn-primitives/types" "1.4.0"
 
 "@rn-primitives/tooltip@~1.1.0":
   version "1.1.0"

From 6c77226373f0f4d24c12635825bc16e022f2464f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Apr 2026 12:53:18 -0700
Subject: [PATCH 08/32] :arrow_up: Bump @react-native-community/slider from
 5.0.1 to 5.1.2 (#1026)

Bumps [@react-native-community/slider](https://github.com/callstack/react-native-slider) from 5.0.1 to 5.1.2.
- [Release notes](https://github.com/callstack/react-native-slider/releases)
- [Commits](https://github.com/callstack/react-native-slider/compare/v5.0.1...v5.1.2)

---
updated-dependencies:
- dependency-name: "@react-native-community/slider"
  dependency-version: 5.1.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 apps/expo/package.json | 2 +-
 yarn.lock              | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/expo/package.json b/apps/expo/package.json
index bf89a1b2e4..84133278d6 100644
--- a/apps/expo/package.json
+++ b/apps/expo/package.json
@@ -27,7 +27,7 @@
 		"@lodev09/react-native-true-sheet": "^3.9.1",
 		"@miblanchard/react-native-slider": "^2.6.0",
 		"@react-native-async-storage/async-storage": "2.2.0",
-		"@react-native-community/slider": "5.0.1",
+		"@react-native-community/slider": "5.1.2",
 		"@react-native-menu/menu": "^2.0.0",
 		"@react-navigation/native": "^7.1.6",
 		"@rn-primitives/accordion": "^1.2.0",
diff --git a/yarn.lock b/yarn.lock
index 32ee813ef2..5e5ed8023e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5349,10 +5349,10 @@
   dependencies:
     merge-options "^3.0.4"
 
-"@react-native-community/slider@5.0.1":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@react-native-community/slider/-/slider-5.0.1.tgz#478789e526af31e0660c6f49fa5c5429d8d4287b"
-  integrity sha512-K3JRWkIW4wQ79YJ6+BPZzp1SamoikxfPRw7Yw4B4PElEQmqZFrmH9M5LxvIo460/3QSrZF/wCgi3qizJt7g/iw==
+"@react-native-community/slider@5.1.2":
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/@react-native-community/slider/-/slider-5.1.2.tgz#b7255c27b52d74440bcf146a05dcf13c94e7d91c"
+  integrity sha512-UV/MjCyCtSjS5BQDrrGIMmCXm309xEG6XbR0Dj65kzTraJSVDxSjQS2uBUXgX+5SZUOCzCxzv3OufOZBdtQY4w==
 
 "@react-native-menu/menu@^2.0.0":
   version "2.0.0"

From b08557d2de03b091f449851df3d477692b0b843f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Apr 2026 12:55:22 -0700
Subject: [PATCH 09/32] :arrow_up: Bump jest and @types/jest (#1020)

Bumps [jest](https://github.com/jestjs/jest/tree/HEAD/packages/jest) and [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest). These dependencies needed to be updated together.

Updates `jest` from 29.7.0 to 30.3.0
- [Release notes](https://github.com/jestjs/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jestjs/jest/commits/v30.3.0/packages/jest)

Updates `@types/jest` from 29.5.14 to 30.0.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest)

---
updated-dependencies:
- dependency-name: jest
  dependency-version: 30.3.0
  dependency-type: direct:development
  update-type: version-update:semver-major
- dependency-name: "@types/jest"
  dependency-version: 30.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 packages/browser/package.json |    4 +-
 packages/sdk/package.json     |    2 +-
 yarn.lock                     | 1127 +++++++++++++++++++++------------
 3 files changed, 736 insertions(+), 397 deletions(-)

diff --git a/packages/browser/package.json b/packages/browser/package.json
index 52bb17615c..5cd056110e 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -92,7 +92,7 @@
 		"@testing-library/react": "^16.0.1",
 		"@testing-library/user-event": "^14.5.2",
 		"@types/is-valid-glob": "^1.0.3",
-		"@types/jest": "^29.5.12",
+		"@types/jest": "^30.0.0",
 		"@types/lodash.groupby": "^4.6.9",
 		"@types/lodash.isequal": "^4.5.8",
 		"@types/lodash.sortby": "^4.7.9",
@@ -108,7 +108,7 @@
 		"@types/react-window": "^1.8.8",
 		"@vitejs/plugin-react": "^5.0.2",
 		"cross-fetch": "^4.0.0",
-		"jest": "^29.7.0",
+		"jest": "^30.3.0",
 		"jest-environment-jsdom": "^29.7.0",
 		"ts-node": "^10.9.2",
 		"typescript": "^5.4.5",
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index ec4547476f..f590cfbf30 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -16,7 +16,7 @@
 		"@babel/preset-typescript": "^7.24.7",
 		"@types/qs": "^6.9.14",
 		"fast-xml-parser": "^5.3.4",
-		"jest": "^29.7.0",
+		"jest": "^30.3.0",
 		"ts-essentials": "^10.0.2",
 		"typescript": "^5.4.5"
 	},
diff --git a/yarn.lock b/yarn.lock
index 5e5ed8023e..8c06291f75 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -104,11 +104,25 @@
     js-tokens "^4.0.0"
     picocolors "^1.1.1"
 
+"@babel/code-frame@^7.28.6", "@babel/code-frame@^7.29.0":
+  version "7.29.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.29.0.tgz#7cd7a59f15b3cc0dcd803038f7792712a7d0b15c"
+  integrity sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.28.5"
+    js-tokens "^4.0.0"
+    picocolors "^1.1.1"
+
 "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.27.2", "@babel/compat-data@^7.27.7", "@babel/compat-data@^7.28.5":
   version "7.28.5"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.28.5.tgz#a8a4962e1567121ac0b3b487f52107443b455c7f"
   integrity sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==
 
+"@babel/compat-data@^7.28.6":
+  version "7.29.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.29.0.tgz#00d03e8c0ac24dd9be942c5370990cbe1f17d88d"
+  integrity sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==
+
 "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.14.0", "@babel/core@^7.18.9", "@babel/core@^7.20.0", "@babel/core@^7.23.0", "@babel/core@^7.23.2", "@babel/core@^7.23.9", "@babel/core@^7.24.4", "@babel/core@^7.25.2", "@babel/core@^7.26.0", "@babel/core@^7.26.10", "@babel/core@^7.28.0", "@babel/core@^7.28.5":
   version "7.28.5"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.5.tgz#4c81b35e51e1b734f510c99b07dfbc7bbbb48f7e"
@@ -130,7 +144,28 @@
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.14.0", "@babel/generator@^7.18.13", "@babel/generator@^7.20.5", "@babel/generator@^7.23.0", "@babel/generator@^7.25.0", "@babel/generator@^7.26.10", "@babel/generator@^7.28.5", "@babel/generator@^7.7.2":
+"@babel/core@^7.27.4":
+  version "7.29.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.29.0.tgz#5286ad785df7f79d656e88ce86e650d16ca5f322"
+  integrity sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==
+  dependencies:
+    "@babel/code-frame" "^7.29.0"
+    "@babel/generator" "^7.29.0"
+    "@babel/helper-compilation-targets" "^7.28.6"
+    "@babel/helper-module-transforms" "^7.28.6"
+    "@babel/helpers" "^7.28.6"
+    "@babel/parser" "^7.29.0"
+    "@babel/template" "^7.28.6"
+    "@babel/traverse" "^7.29.0"
+    "@babel/types" "^7.29.0"
+    "@jridgewell/remapping" "^2.3.5"
+    convert-source-map "^2.0.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.3"
+    semver "^6.3.1"
+
+"@babel/generator@^7.14.0", "@babel/generator@^7.18.13", "@babel/generator@^7.20.5", "@babel/generator@^7.23.0", "@babel/generator@^7.25.0", "@babel/generator@^7.26.10", "@babel/generator@^7.28.5":
   version "7.28.5"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.5.tgz#712722d5e50f44d07bc7ac9fe84438742dd61298"
   integrity sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==
@@ -141,6 +176,17 @@
     "@jridgewell/trace-mapping" "^0.3.28"
     jsesc "^3.0.2"
 
+"@babel/generator@^7.27.5", "@babel/generator@^7.29.0":
+  version "7.29.1"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.29.1.tgz#d09876290111abbb00ef962a7b83a5307fba0d50"
+  integrity sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==
+  dependencies:
+    "@babel/parser" "^7.29.0"
+    "@babel/types" "^7.29.0"
+    "@jridgewell/gen-mapping" "^0.3.12"
+    "@jridgewell/trace-mapping" "^0.3.28"
+    jsesc "^3.0.2"
+
 "@babel/helper-annotate-as-pure@^7.27.1", "@babel/helper-annotate-as-pure@^7.27.3":
   version "7.27.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz#f31fd86b915fc4daf1f3ac6976c59be7084ed9c5"
@@ -159,6 +205,17 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
+"@babel/helper-compilation-targets@^7.28.6":
+  version "7.28.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz#32c4a3f41f12ed1532179b108a4d746e105c2b25"
+  integrity sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==
+  dependencies:
+    "@babel/compat-data" "^7.28.6"
+    "@babel/helper-validator-option" "^7.27.1"
+    browserslist "^4.24.0"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
+
 "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.27.1", "@babel/helper-create-class-features-plugin@^7.28.3", "@babel/helper-create-class-features-plugin@^7.28.5":
   version "7.28.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.5.tgz#472d0c28028850968979ad89f173594a6995da46"
@@ -213,6 +270,14 @@
     "@babel/traverse" "^7.27.1"
     "@babel/types" "^7.27.1"
 
+"@babel/helper-module-imports@^7.28.6":
+  version "7.28.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz#60632cbd6ffb70b22823187201116762a03e2d5c"
+  integrity sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==
+  dependencies:
+    "@babel/traverse" "^7.28.6"
+    "@babel/types" "^7.28.6"
+
 "@babel/helper-module-transforms@^7.27.1", "@babel/helper-module-transforms@^7.28.3":
   version "7.28.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz#a2b37d3da3b2344fe085dab234426f2b9a2fa5f6"
@@ -222,6 +287,15 @@
     "@babel/helper-validator-identifier" "^7.27.1"
     "@babel/traverse" "^7.28.3"
 
+"@babel/helper-module-transforms@^7.28.6":
+  version "7.28.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz#9312d9d9e56edc35aeb6e95c25d4106b50b9eb1e"
+  integrity sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.28.6"
+    "@babel/helper-validator-identifier" "^7.28.5"
+    "@babel/traverse" "^7.28.6"
+
 "@babel/helper-optimise-call-expression@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz#c65221b61a643f3e62705e5dd2b5f115e35f9200"
@@ -292,6 +366,14 @@
     "@babel/template" "^7.27.2"
     "@babel/types" "^7.28.4"
 
+"@babel/helpers@^7.28.6":
+  version "7.29.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.29.2.tgz#9cfbccb02b8e229892c0b07038052cc1a8709c49"
+  integrity sha512-HoGuUs4sCZNezVEKdVcwqmZN8GoHirLUcLaYVNBK2J0DadGtdcqgr3BCbvH8+XUo4NGjNl3VOtSjEKNzqfFgKw==
+  dependencies:
+    "@babel/template" "^7.28.6"
+    "@babel/types" "^7.29.0"
+
 "@babel/highlight@^7.10.4":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.25.9.tgz#8141ce68fc73757946f983b343f1231f4691acc6"
@@ -309,6 +391,13 @@
   dependencies:
     "@babel/types" "^7.28.5"
 
+"@babel/parser@^7.28.6", "@babel/parser@^7.29.0":
+  version "7.29.2"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.29.2.tgz#58bd50b9a7951d134988a1ae177a35ef9a703ba1"
+  integrity sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==
+  dependencies:
+    "@babel/types" "^7.29.0"
+
 "@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.28.5":
   version "7.28.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.28.5.tgz#fbde57974707bbfa0376d34d425ff4fa6c732421"
@@ -480,7 +569,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.27.1", "@babel/plugin-syntax-jsx@^7.7.2":
+"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz#2f9beb5eff30fa507c5532d107daac7b888fa34c"
   integrity sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==
@@ -543,7 +632,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.27.1", "@babel/plugin-syntax-typescript@^7.7.2":
+"@babel/plugin-syntax-typescript@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz#5147d29066a793450f220c63fa3a9431b7e6dd18"
   integrity sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==
@@ -1196,6 +1285,15 @@
     "@babel/parser" "^7.27.2"
     "@babel/types" "^7.27.1"
 
+"@babel/template@^7.28.6":
+  version "7.28.6"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.28.6.tgz#0e7e56ecedb78aeef66ce7972b082fce76a23e57"
+  integrity sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==
+  dependencies:
+    "@babel/code-frame" "^7.28.6"
+    "@babel/parser" "^7.28.6"
+    "@babel/types" "^7.28.6"
+
 "@babel/traverse--for-generate-function-map@npm:@babel/traverse@^7.25.3":
   version "7.28.5"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.5.tgz#450cab9135d21a7a2ca9d2d35aa05c20e68c360b"
@@ -1222,6 +1320,19 @@
     "@babel/types" "^7.28.5"
     debug "^4.3.1"
 
+"@babel/traverse@^7.28.6", "@babel/traverse@^7.29.0":
+  version "7.29.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.29.0.tgz#f323d05001440253eead3c9c858adbe00b90310a"
+  integrity sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==
+  dependencies:
+    "@babel/code-frame" "^7.29.0"
+    "@babel/generator" "^7.29.0"
+    "@babel/helper-globals" "^7.28.0"
+    "@babel/parser" "^7.29.0"
+    "@babel/template" "^7.28.6"
+    "@babel/types" "^7.29.0"
+    debug "^4.3.1"
+
 "@babel/types@^7.0.0", "@babel/types@^7.18.13", "@babel/types@^7.18.9", "@babel/types@^7.20.7", "@babel/types@^7.23.0", "@babel/types@^7.25.2", "@babel/types@^7.26.0", "@babel/types@^7.26.10", "@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.28.2", "@babel/types@^7.28.4", "@babel/types@^7.28.5", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
   version "7.28.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.5.tgz#10fc405f60897c35f07e85493c932c7b5ca0592b"
@@ -1230,6 +1341,14 @@
     "@babel/helper-string-parser" "^7.27.1"
     "@babel/helper-validator-identifier" "^7.28.5"
 
+"@babel/types@^7.28.6", "@babel/types@^7.29.0":
+  version "7.29.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.29.0.tgz#9f5b1e838c446e72cf3cd4b918152b8c605e37c7"
+  integrity sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==
+  dependencies:
+    "@babel/helper-string-parser" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.28.5"
+
 "@base2/pretty-print-object@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.1.tgz#371ba8be66d556812dc7fb169ebc3c08378f69d4"
@@ -3257,51 +3376,50 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
-"@jest/console@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.7.0.tgz#cd4822dbdb84529265c5a2bdb529a3c9cc950ffc"
-  integrity sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==
+"@jest/console@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-30.3.0.tgz#42ccc3f995d400a8fe35b8850cfe10a8d4804cdf"
+  integrity sha512-PAwCvFJ4696XP2qZj+LAn1BWjZaJ6RjG6c7/lkMaUJnkyMS34ucuIsfqYvfskVNvUI27R/u4P1HMYFnlVXG/Ww==
   dependencies:
-    "@jest/types" "^29.6.3"
+    "@jest/types" "30.3.0"
     "@types/node" "*"
-    chalk "^4.0.0"
-    jest-message-util "^29.7.0"
-    jest-util "^29.7.0"
+    chalk "^4.1.2"
+    jest-message-util "30.3.0"
+    jest-util "30.3.0"
     slash "^3.0.0"
 
-"@jest/core@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.7.0.tgz#b6cccc239f30ff36609658c5a5e2291757ce448f"
-  integrity sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==
-  dependencies:
-    "@jest/console" "^29.7.0"
-    "@jest/reporters" "^29.7.0"
-    "@jest/test-result" "^29.7.0"
-    "@jest/transform" "^29.7.0"
-    "@jest/types" "^29.6.3"
+"@jest/core@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-30.3.0.tgz#d06bb8456f35350f6494fd2405bcec4abb97b994"
+  integrity sha512-U5mVPsBxLSO6xYbf+tgkymLx+iAhvZX43/xI1+ej2ZOPnPdkdO1CzDmFKh2mZBn2s4XZixszHeQnzp1gm/DIxw==
+  dependencies:
+    "@jest/console" "30.3.0"
+    "@jest/pattern" "30.0.1"
+    "@jest/reporters" "30.3.0"
+    "@jest/test-result" "30.3.0"
+    "@jest/transform" "30.3.0"
+    "@jest/types" "30.3.0"
     "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.9"
-    jest-changed-files "^29.7.0"
-    jest-config "^29.7.0"
-    jest-haste-map "^29.7.0"
-    jest-message-util "^29.7.0"
-    jest-regex-util "^29.6.3"
-    jest-resolve "^29.7.0"
-    jest-resolve-dependencies "^29.7.0"
-    jest-runner "^29.7.0"
-    jest-runtime "^29.7.0"
-    jest-snapshot "^29.7.0"
-    jest-util "^29.7.0"
-    jest-validate "^29.7.0"
-    jest-watcher "^29.7.0"
-    micromatch "^4.0.4"
-    pretty-format "^29.7.0"
+    ansi-escapes "^4.3.2"
+    chalk "^4.1.2"
+    ci-info "^4.2.0"
+    exit-x "^0.2.2"
+    graceful-fs "^4.2.11"
+    jest-changed-files "30.3.0"
+    jest-config "30.3.0"
+    jest-haste-map "30.3.0"
+    jest-message-util "30.3.0"
+    jest-regex-util "30.0.1"
+    jest-resolve "30.3.0"
+    jest-resolve-dependencies "30.3.0"
+    jest-runner "30.3.0"
+    jest-runtime "30.3.0"
+    jest-snapshot "30.3.0"
+    jest-util "30.3.0"
+    jest-validate "30.3.0"
+    jest-watcher "30.3.0"
+    pretty-format "30.3.0"
     slash "^3.0.0"
-    strip-ansi "^6.0.0"
 
 "@jest/create-cache-key-function@^29.7.0":
   version "29.7.0"
@@ -3315,6 +3433,21 @@
   resolved "https://registry.yarnpkg.com/@jest/diff-sequences/-/diff-sequences-30.0.1.tgz#0ededeae4d071f5c8ffe3678d15f3a1be09156be"
   integrity sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==
 
+"@jest/diff-sequences@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/diff-sequences/-/diff-sequences-30.3.0.tgz#25b0818d3d83f00b9c7b04e069b8810f9014b143"
+  integrity sha512-cG51MVnLq1ecVUaQ3fr6YuuAOitHK1S4WUJHnsPFE/quQr33ADUx1FfrTCpMCRxvy0Yr9BThKpDjSlcTi91tMA==
+
+"@jest/environment@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-30.3.0.tgz#b0657c2944b6ef3352f7b25903cc3a23e6ab70f6"
+  integrity sha512-SlLSF4Be735yQXyh2+mctBOzNDx5s5uLv88/j8Qn1wH679PDcwy67+YdADn8NJnGjzlXtN62asGH/T4vWOkfaw==
+  dependencies:
+    "@jest/fake-timers" "30.3.0"
+    "@jest/types" "30.3.0"
+    "@types/node" "*"
+    jest-mock "30.3.0"
+
 "@jest/environment@^29.7.0":
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.7.0.tgz#24d61f54ff1f786f3cd4073b4b94416383baf2a7"
@@ -3325,20 +3458,32 @@
     "@types/node" "*"
     jest-mock "^29.7.0"
 
-"@jest/expect-utils@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.7.0.tgz#023efe5d26a8a70f21677d0a1afc0f0a44e3a1c6"
-  integrity sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==
+"@jest/expect-utils@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-30.3.0.tgz#c45b2da9802ffed33bf43b3e019ddb95e5ad95e8"
+  integrity sha512-j0+W5iQQ8hBh7tHZkTQv3q2Fh/M7Je72cIsYqC4OaktgtO7v1So9UTjp6uPBHIaB6beoF/RRsCgMJKvti0wADA==
   dependencies:
-    jest-get-type "^29.6.3"
+    "@jest/get-type" "30.1.0"
 
-"@jest/expect@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.7.0.tgz#76a3edb0cb753b70dfbfe23283510d3d45432bf2"
-  integrity sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==
+"@jest/expect@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-30.3.0.tgz#08ee7f5b610167b0068743246c0b568f4c40c773"
+  integrity sha512-76Nlh4xJxk2D/9URCn3wFi98d2hb19uWE1idLsTt2ywhvdOldbw3S570hBgn25P4ICUZ/cBjybrBex2g17IDbg==
+  dependencies:
+    expect "30.3.0"
+    jest-snapshot "30.3.0"
+
+"@jest/fake-timers@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-30.3.0.tgz#2b2868130c1d28233a79566874c42cae1c5a70bc"
+  integrity sha512-WUQDs8SOP9URStX1DzhD425CqbN/HxUYCTwVrT8sTVBfMvFqYt/s61EK5T05qnHu0po6RitXIvP9otZxYDzTGQ==
   dependencies:
-    expect "^29.7.0"
-    jest-snapshot "^29.7.0"
+    "@jest/types" "30.3.0"
+    "@sinonjs/fake-timers" "^15.0.0"
+    "@types/node" "*"
+    jest-message-util "30.3.0"
+    jest-mock "30.3.0"
+    jest-util "30.3.0"
 
 "@jest/fake-timers@^29.7.0":
   version "29.7.0"
@@ -3357,44 +3502,51 @@
   resolved "https://registry.yarnpkg.com/@jest/get-type/-/get-type-30.1.0.tgz#4fcb4dc2ebcf0811be1c04fd1cb79c2dba431cbc"
   integrity sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==
 
-"@jest/globals@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.7.0.tgz#8d9290f9ec47ff772607fa864ca1d5a2efae1d4d"
-  integrity sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==
+"@jest/globals@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-30.3.0.tgz#40f4c90e5602629ecda1ca773a8fb21575bb64ea"
+  integrity sha512-+owLCBBdfpgL3HU+BD5etr1SvbXpSitJK0is1kiYjJxAAJggYMRQz5hSdd5pq1sSggfxPbw2ld71pt4x5wwViA==
   dependencies:
-    "@jest/environment" "^29.7.0"
-    "@jest/expect" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    jest-mock "^29.7.0"
+    "@jest/environment" "30.3.0"
+    "@jest/expect" "30.3.0"
+    "@jest/types" "30.3.0"
+    jest-mock "30.3.0"
 
-"@jest/reporters@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.7.0.tgz#04b262ecb3b8faa83b0b3d321623972393e8f4c7"
-  integrity sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==
+"@jest/pattern@30.0.1":
+  version "30.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/pattern/-/pattern-30.0.1.tgz#d5304147f49a052900b4b853dedb111d080e199f"
+  integrity sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==
+  dependencies:
+    "@types/node" "*"
+    jest-regex-util "30.0.1"
+
+"@jest/reporters@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-30.3.0.tgz#0c1065f6c892665e5a051df22b19df4466ed816b"
+  integrity sha512-a09z89S+PkQnL055bVj8+pe2Caed2PBOaczHcXCykW5ngxX9EWx/1uAwncxc/HiU0oZqfwseMjyhxgRjS49qPw==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^29.7.0"
-    "@jest/test-result" "^29.7.0"
-    "@jest/transform" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    "@jridgewell/trace-mapping" "^0.3.18"
+    "@jest/console" "30.3.0"
+    "@jest/test-result" "30.3.0"
+    "@jest/transform" "30.3.0"
+    "@jest/types" "30.3.0"
+    "@jridgewell/trace-mapping" "^0.3.25"
     "@types/node" "*"
-    chalk "^4.0.0"
-    collect-v8-coverage "^1.0.0"
-    exit "^0.1.2"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
+    chalk "^4.1.2"
+    collect-v8-coverage "^1.0.2"
+    exit-x "^0.2.2"
+    glob "^10.5.0"
+    graceful-fs "^4.2.11"
     istanbul-lib-coverage "^3.0.0"
     istanbul-lib-instrument "^6.0.0"
     istanbul-lib-report "^3.0.0"
-    istanbul-lib-source-maps "^4.0.0"
+    istanbul-lib-source-maps "^5.0.0"
     istanbul-reports "^3.1.3"
-    jest-message-util "^29.7.0"
-    jest-util "^29.7.0"
-    jest-worker "^29.7.0"
+    jest-message-util "30.3.0"
+    jest-util "30.3.0"
+    jest-worker "30.3.0"
     slash "^3.0.0"
-    string-length "^4.0.1"
-    strip-ansi "^6.0.0"
+    string-length "^4.0.2"
     v8-to-istanbul "^9.0.1"
 
 "@jest/schemas@30.0.5":
@@ -3411,35 +3563,65 @@
   dependencies:
     "@sinclair/typebox" "^0.27.8"
 
-"@jest/source-map@^29.6.3":
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.6.3.tgz#d90ba772095cf37a34a5eb9413f1b562a08554c4"
-  integrity sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==
+"@jest/snapshot-utils@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/snapshot-utils/-/snapshot-utils-30.3.0.tgz#ca003c91a3e1e4e4956dee716a2aaf04b6707f31"
+  integrity sha512-ORbRN9sf5PP82v3FXNSwmO1OTDR2vzR2YTaR+E3VkSBZ8zadQE6IqYdYEeFH1NIkeB2HIGdF02dapb6K0Mj05g==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.18"
-    callsites "^3.0.0"
-    graceful-fs "^4.2.9"
+    "@jest/types" "30.3.0"
+    chalk "^4.1.2"
+    graceful-fs "^4.2.11"
+    natural-compare "^1.4.0"
 
-"@jest/test-result@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.7.0.tgz#8db9a80aa1a097bb2262572686734baed9b1657c"
-  integrity sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==
+"@jest/source-map@30.0.1":
+  version "30.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-30.0.1.tgz#305ebec50468f13e658b3d5c26f85107a5620aaa"
+  integrity sha512-MIRWMUUR3sdbP36oyNyhbThLHyJ2eEDClPCiHVbrYAe5g3CHRArIVpBw7cdSB5fr+ofSfIb2Tnsw8iEHL0PYQg==
   dependencies:
-    "@jest/console" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    collect-v8-coverage "^1.0.0"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    callsites "^3.1.0"
+    graceful-fs "^4.2.11"
 
-"@jest/test-sequencer@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz#6cef977ce1d39834a3aea887a1726628a6f072ce"
-  integrity sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==
+"@jest/test-result@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-30.3.0.tgz#cd8882d683d467fcffb98c09501a65687a76aae9"
+  integrity sha512-e/52nJGuD74AKTSe0P4y5wFRlaXP0qmrS17rqOMHeSwm278VyNyXE3gFO/4DTGF9w+65ra3lo3VKj0LBrzmgdQ==
   dependencies:
-    "@jest/test-result" "^29.7.0"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^29.7.0"
+    "@jest/console" "30.3.0"
+    "@jest/types" "30.3.0"
+    "@types/istanbul-lib-coverage" "^2.0.6"
+    collect-v8-coverage "^1.0.2"
+
+"@jest/test-sequencer@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-30.3.0.tgz#27002b2093f4e0d9e0e1ebb0bc274a242fdadc14"
+  integrity sha512-dgbWy9b8QDlQeRZcv7LNF+/jFiiYHTKho1xirauZ7kVwY7avjFF6uTT0RqlgudB5OuIPagFdVtfFMosjVbk1eA==
+  dependencies:
+    "@jest/test-result" "30.3.0"
+    graceful-fs "^4.2.11"
+    jest-haste-map "30.3.0"
     slash "^3.0.0"
 
+"@jest/transform@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-30.3.0.tgz#9e6f78ffa205449bf956e269fd707c160f47ce2f"
+  integrity sha512-TLKY33fSLVd/lKB2YI1pH69ijyUblO/BQvCj566YvnwuzoTNr648iE0j22vRvVNk2HsPwByPxATg3MleS3gf5A==
+  dependencies:
+    "@babel/core" "^7.27.4"
+    "@jest/types" "30.3.0"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    babel-plugin-istanbul "^7.0.1"
+    chalk "^4.1.2"
+    convert-source-map "^2.0.0"
+    fast-json-stable-stringify "^2.1.0"
+    graceful-fs "^4.2.11"
+    jest-haste-map "30.3.0"
+    jest-regex-util "30.0.1"
+    jest-util "30.3.0"
+    pirates "^4.0.7"
+    slash "^3.0.0"
+    write-file-atomic "^5.0.1"
+
 "@jest/transform@^29.3.1", "@jest/transform@^29.7.0":
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.7.0.tgz#df2dd9c346c7d7768b8a06639994640c642e284c"
@@ -3461,6 +3643,19 @@
     slash "^3.0.0"
     write-file-atomic "^4.0.2"
 
+"@jest/types@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-30.3.0.tgz#cada800d323cb74945c24ac74615fdb312a6c85f"
+  integrity sha512-JHm87k7bA33hpBngtU8h6UBub/fqqA9uXfw+21j5Hmk7ooPHlboRNxHq0JcMtC+n8VJGP1mcfnD3Mk+XKe1oSw==
+  dependencies:
+    "@jest/pattern" "30.0.1"
+    "@jest/schemas" "30.0.5"
+    "@types/istanbul-lib-coverage" "^2.0.6"
+    "@types/istanbul-reports" "^3.0.4"
+    "@types/node" "*"
+    "@types/yargs" "^17.0.33"
+    chalk "^4.1.2"
+
 "@jest/types@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80"
@@ -3526,7 +3721,7 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.28":
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.23", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.28":
   version "0.3.31"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz#db15d6781c931f3a251a3dac39501c98a6082fd0"
   integrity sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==
@@ -6221,7 +6416,7 @@
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.34.41.tgz#aa51a6c1946df2c5a11494a2cdb9318e026db16c"
   integrity sha512-6gS8pZzSXdyRHTIqoqSVknxolr1kzfy4/CeDnrzsVz8TTIWUbOBr6gnzOmTYJ3eXQNh4IYHIGi5aIL7sOZ2G/g==
 
-"@sinonjs/commons@^3.0.0":
+"@sinonjs/commons@^3.0.0", "@sinonjs/commons@^3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.1.tgz#1029357e44ca901a615585f6d27738dbc89084cd"
   integrity sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==
@@ -6235,6 +6430,13 @@
   dependencies:
     "@sinonjs/commons" "^3.0.0"
 
+"@sinonjs/fake-timers@^15.0.0":
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-15.2.0.tgz#4ac2576998dfc23bca0db08724bc3badeb0f2d5f"
+  integrity sha512-+SM3gQi95RWZLlD+Npy/UC5mHftlXwnVJMRpMyiqjrF4yNnbvi/Ubh3x9sLw6gxWSuibOn00uiLu1CKozehWlQ==
+  dependencies:
+    "@sinonjs/commons" "^3.0.1"
+
 "@storybook/addon-actions@7.6.20", "@storybook/addon-actions@^7.6.17":
   version "7.6.20"
   resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-7.6.20.tgz#4264d1fba6e889f28f717ebb23c55b7d774a2f60"
@@ -7877,7 +8079,7 @@
   resolved "https://registry.yarnpkg.com/@types/is-valid-glob/-/is-valid-glob-1.0.3.tgz#66b5c290c56908e43b97eea9f58174b546568ccd"
   integrity sha512-8ovBwA8At13SfRefmy/AHMNfzQTTIjQV2+LPeeWuRtKyCbdvvlH7wC+dkx7LlMEgo2SRatgCxLyf/PJ14GTW2Q==
 
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1", "@types/istanbul-lib-coverage@^2.0.6":
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
   integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==
@@ -7889,20 +8091,20 @@
   dependencies:
     "@types/istanbul-lib-coverage" "*"
 
-"@types/istanbul-reports@^3.0.0":
+"@types/istanbul-reports@^3.0.0", "@types/istanbul-reports@^3.0.4":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54"
   integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@^29.5.12":
-  version "29.5.14"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.14.tgz#2b910912fa1d6856cadcd0c1f95af7df1d6049e5"
-  integrity sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==
+"@types/jest@^30.0.0":
+  version "30.0.0"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-30.0.0.tgz#5e85ae568006712e4ad66f25433e9bdac8801f1d"
+  integrity sha512-XTYugzhuwqWjws0CVz8QpM36+T+Dz5mTEBKhNs/esGLnCIlGdRy+Dq78NRjd7ls7r8BC8ZRMOrKlkO1hU0JOwA==
   dependencies:
-    expect "^29.0.0"
-    pretty-format "^29.0.0"
+    expect "^30.0.0"
+    pretty-format "^30.0.0"
 
 "@types/js-cookie@^2.2.6":
   version "2.2.7"
@@ -8189,7 +8391,7 @@
     "@types/node" "*"
     "@types/send" "<1"
 
-"@types/stack-utils@^2.0.0":
+"@types/stack-utils@^2.0.0", "@types/stack-utils@^2.0.3":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
   integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
@@ -8248,7 +8450,7 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@types/yargs@^17.0.8":
+"@types/yargs@^17.0.33", "@types/yargs@^17.0.8":
   version "17.0.35"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.35.tgz#07013e46aa4d7d7d50a49e15604c1c5340d4eb24"
   integrity sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==
@@ -9028,7 +9230,7 @@ ansi-colors@^4.1.1:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
   integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
 
-ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
+ansi-escapes@^4.2.1, ansi-escapes@^4.3.0, ansi-escapes@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
@@ -9115,7 +9317,7 @@ any-promise@^1.0.0:
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
   integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==
 
-anymatch@^3.0.3, anymatch@~3.1.2:
+anymatch@^3.0.3, anymatch@^3.1.3, anymatch@~3.1.2:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
   integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
@@ -9465,6 +9667,19 @@ babel-core@^7.0.0-bridge.0:
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
   integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==
 
+babel-jest@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-30.3.0.tgz#3ff5553fa3bcbb8738d2d7335a4dbdc3bd1a0eb5"
+  integrity sha512-gRpauEU2KRrCox5Z296aeVHR4jQ98BCnu0IO332D/xpHNOsIH/bgSRk9k6GbKIbBw8vFeN6ctuu6tV8WOyVfYQ==
+  dependencies:
+    "@jest/transform" "30.3.0"
+    "@types/babel__core" "^7.20.5"
+    babel-plugin-istanbul "^7.0.1"
+    babel-preset-jest "30.3.0"
+    chalk "^4.1.2"
+    graceful-fs "^4.2.11"
+    slash "^3.0.0"
+
 babel-jest@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5"
@@ -9509,6 +9724,24 @@ babel-plugin-istanbul@^6.1.1:
     istanbul-lib-instrument "^5.0.4"
     test-exclude "^6.0.0"
 
+babel-plugin-istanbul@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.1.tgz#d8b518c8ea199364cf84ccc82de89740236daf92"
+  integrity sha512-D8Z6Qm8jCvVXtIRkBnqNHX0zJ37rQcFJ9u8WOS6tkYOsRdHBzypCstaxWiu5ZIlqQtviRYbgnRLSoCEvjqcqbA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@istanbuljs/load-nyc-config" "^1.0.0"
+    "@istanbuljs/schema" "^0.1.3"
+    istanbul-lib-instrument "^6.0.2"
+    test-exclude "^6.0.0"
+
+babel-plugin-jest-hoist@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.3.0.tgz#235ad714a45c18b12566becf439e1c604e277015"
+  integrity sha512-+TRkByhsws6sfPjVaitzadk1I0F5sPvOVUH5tyTSzhePpsGIVrdeunHSw/C36QeocS95OOk8lunc4rlu5Anwsg==
+  dependencies:
+    "@types/babel__core" "^7.20.5"
+
 babel-plugin-jest-hoist@^29.6.3:
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz#aadbe943464182a8922c3c927c3067ff40d24626"
@@ -9574,7 +9807,7 @@ babel-plugin-transform-flow-enums@^0.0.2:
   dependencies:
     "@babel/plugin-syntax-flow" "^7.12.1"
 
-babel-preset-current-node-syntax@^1.0.0:
+babel-preset-current-node-syntax@^1.0.0, babel-preset-current-node-syntax@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz#20730d6cdc7dda5d89401cab10ac6a32067acde6"
   integrity sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==
@@ -9656,6 +9889,14 @@ babel-preset-fbjs@^3.4.0:
     "@babel/plugin-transform-template-literals" "^7.0.0"
     babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0"
 
+babel-preset-jest@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-30.3.0.tgz#21cf3d19a6f5e9924426c879ee0b7f092636d043"
+  integrity sha512-6ZcUbWHC+dMz2vfzdNwi87Z1gQsLNK2uLuK1Q89R11xdvejcivlYYwDlEv0FHX3VwEXpbBQ9uufB/MUNpZGfhQ==
+  dependencies:
+    babel-plugin-jest-hoist "30.3.0"
+    babel-preset-current-node-syntax "^1.2.0"
+
 babel-preset-jest@^29.6.3:
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz#fa05fa510e7d493896d7b0dd2033601c840f171c"
@@ -9994,7 +10235,7 @@ call-bound@^1.0.2, call-bound@^1.0.3, call-bound@^1.0.4:
     call-bind-apply-helpers "^1.0.2"
     get-intrinsic "^1.3.0"
 
-callsites@^3.0.0:
+callsites@^3.0.0, callsites@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
@@ -10026,7 +10267,7 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.2.0:
+camelcase@^6.2.0, camelcase@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
@@ -10276,6 +10517,11 @@ ci-info@^3.2.0, ci-info@^3.3.0, ci-info@^3.7.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
   integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
+ci-info@^4.2.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.4.0.tgz#7d54eff9f54b45b62401c26032696eb59c8bd18c"
+  integrity sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==
+
 citty@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/citty/-/citty-0.1.6.tgz#0f7904da1ed4625e1a9ea7e0fa780981aab7c5e4"
@@ -10283,11 +10529,16 @@ citty@^0.1.6:
   dependencies:
     consola "^3.2.3"
 
-cjs-module-lexer@^1.0.0, cjs-module-lexer@^1.2.3:
+cjs-module-lexer@^1.2.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz#0f79731eb8cfe1ec72acd4066efac9d61991b00d"
   integrity sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==
 
+cjs-module-lexer@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-2.2.0.tgz#b3ca5101843389259ade7d88c77bd06ce55849ca"
+  integrity sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ==
+
 class-variance-authority@^0.7.0:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/class-variance-authority/-/class-variance-authority-0.7.1.tgz#4008a798a0e4553a781a57ac5177c9fb5d043787"
@@ -10475,7 +10726,7 @@ collapse-white-space@^2.0.0:
   resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-2.1.0.tgz#640257174f9f42c740b40f3b55ee752924feefca"
   integrity sha512-loKTxY1zCOuG4j9f6EPnuyyYkf58RnhhWTvRoZEokgB+WbdXehfjFviyOVYkqzEWz1Q5kRiZdBYS5SwxbQYwzw==
 
-collect-v8-coverage@^1.0.0:
+collect-v8-coverage@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.3.tgz#cc1f01eb8d02298cbc9a437c74c70ab4e5210b80"
   integrity sha512-1L5aqIkwPfiodaMgQunkF1zRhNqifHBmtbbbxcr6yVxxBnliw4TDOW6NxpO8DJLgJ16OT+Y4ztZqP6p/FtXnAw==
@@ -10965,19 +11216,6 @@ cosmiconfig@^8.1.0, cosmiconfig@^8.1.3, cosmiconfig@^8.3.5:
     parse-json "^5.2.0"
     path-type "^4.0.0"
 
-create-jest@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/create-jest/-/create-jest-29.7.0.tgz#a355c5b3cb1e1af02ba177fe7afd7feee49a5320"
-  integrity sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==
-  dependencies:
-    "@jest/types" "^29.6.3"
-    chalk "^4.0.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.9"
-    jest-config "^29.7.0"
-    jest-util "^29.7.0"
-    prompts "^2.0.1"
-
 create-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
@@ -11593,10 +11831,10 @@ dedent@^0.7.0:
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
   integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
 
-dedent@^1.0.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.7.0.tgz#c1f9445335f0175a96587be245a282ff451446ca"
-  integrity sha512-HGFtf8yhuhGhqO07SV79tRp+br4MnbdjeVxotpn1QBl30pcLLCQjX5b2295ll0fv8RKDKsmWYrl05usHM9CewQ==
+dedent@^1.6.0:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.7.2.tgz#34e2264ab538301e27cf7b07bf2369c19baa8dd9"
+  integrity sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==
 
 deep-eql@^5.0.1:
   version "5.0.2"
@@ -11766,7 +12004,7 @@ detect-libc@^2.0.3:
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad"
   integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==
 
-detect-newline@^3.0.0:
+detect-newline@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
@@ -11803,11 +12041,6 @@ didyoumean@^1.2.2:
   resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037"
   integrity sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==
 
-diff-sequences@^29.6.3:
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
-  integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
-
 diff@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
@@ -13107,26 +13340,27 @@ execa@^8.0.1:
     signal-exit "^4.1.0"
     strip-final-newline "^3.0.0"
 
-exit@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
+exit-x@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/exit-x/-/exit-x-0.2.2.tgz#1f9052de3b8d99a696b10dad5bced9bdd5c3aa64"
+  integrity sha512-+I6B/IkJc1o/2tiURyz/ivu/O0nKNEArIUB5O7zBrlDVJr22SCLH3xTeEry428LvFhRzIA1g8izguxJ/gbNcVQ==
 
 expect-type@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-1.3.0.tgz#0d58ed361877a31bbc4dd6cf71bbfef7faf6bd68"
   integrity sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==
 
-expect@^29.0.0, expect@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-29.7.0.tgz#578874590dcb3214514084c08115d8aee61e11bc"
-  integrity sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==
+expect@30.3.0, expect@^30.0.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-30.3.0.tgz#1b82111517d1ab030f3db0cf1b4061c8aa644f61"
+  integrity sha512-1zQrciTiQfRdo7qJM1uG4navm8DayFa2TgCSRlzUyNkhcJ6XUZF3hjnpkyr3VhAqPH7i/9GkG7Tv5abz6fqz0Q==
   dependencies:
-    "@jest/expect-utils" "^29.7.0"
-    jest-get-type "^29.6.3"
-    jest-matcher-utils "^29.7.0"
-    jest-message-util "^29.7.0"
-    jest-util "^29.7.0"
+    "@jest/expect-utils" "30.3.0"
+    "@jest/get-type" "30.1.0"
+    jest-matcher-utils "30.3.0"
+    jest-message-util "30.3.0"
+    jest-mock "30.3.0"
+    jest-util "30.3.0"
 
 expo-application@~7.0.8:
   version "7.0.8"
@@ -13539,7 +13773,7 @@ fault@^2.0.0:
   dependencies:
     format "^0.2.0"
 
-fb-watchman@^2.0.0:
+fb-watchman@^2.0.0, fb-watchman@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
   integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
@@ -13999,7 +14233,7 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@^2.3.2, fsevents@~2.3.2, fsevents@~2.3.3:
+fsevents@^2.3.2, fsevents@^2.3.3, fsevents@~2.3.2, fsevents@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
@@ -14256,7 +14490,7 @@ glob@10.3.10:
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
     path-scurry "^1.10.1"
 
-glob@^10.0.0:
+glob@^10.0.0, glob@^10.5.0:
   version "10.5.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.5.0.tgz#8ec0355919cd3338c28428a23d4f24ecc5fe738c"
   integrity sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==
@@ -15100,7 +15334,7 @@ import-local@3.1.0:
     pkg-dir "^4.2.0"
     resolve-cwd "^3.0.0"
 
-import-local@^3.0.2:
+import-local@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.2.0.tgz#c3d5c745798c02a6f8b897726aba5100186ee260"
   integrity sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==
@@ -15434,7 +15668,7 @@ is-fullwidth-code-point@^5.0.0:
   dependencies:
     get-east-asian-width "^1.3.1"
 
-is-generator-fn@^2.0.0:
+is-generator-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
@@ -15777,7 +16011,7 @@ istanbul-lib-instrument@^5.0.4:
     istanbul-lib-coverage "^3.2.0"
     semver "^6.3.0"
 
-istanbul-lib-instrument@^6.0.0:
+istanbul-lib-instrument@^6.0.0, istanbul-lib-instrument@^6.0.2:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz#fa15401df6c15874bcb2105f773325d78c666765"
   integrity sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==
@@ -15797,14 +16031,14 @@ istanbul-lib-report@^3.0.0:
     make-dir "^4.0.0"
     supports-color "^7.1.0"
 
-istanbul-lib-source-maps@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
-  integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
+istanbul-lib-source-maps@^5.0.0:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz#acaef948df7747c8eb5fbf1265cb980f6353a441"
+  integrity sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.23"
     debug "^4.1.1"
     istanbul-lib-coverage "^3.0.0"
-    source-map "^0.6.1"
 
 istanbul-reports@^3.1.3:
   version "3.2.0"
@@ -15860,86 +16094,96 @@ jake@^10.8.5:
     filelist "^1.0.4"
     picocolors "^1.1.1"
 
-jest-changed-files@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.7.0.tgz#1c06d07e77c78e1585d020424dedc10d6e17ac3a"
-  integrity sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==
+jest-changed-files@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-30.3.0.tgz#055849df695f9a9fcde0ae44024f815bbc627f3a"
+  integrity sha512-B/7Cny6cV5At6M25EWDgf9S617lHivamL8vl6KEpJqkStauzcG4e+WPfDgMMF+H4FVH4A2PLRyvgDJan4441QA==
   dependencies:
-    execa "^5.0.0"
-    jest-util "^29.7.0"
+    execa "^5.1.1"
+    jest-util "30.3.0"
     p-limit "^3.1.0"
 
-jest-circus@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.7.0.tgz#b6817a45fcc835d8b16d5962d0c026473ee3668a"
-  integrity sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==
+jest-circus@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-30.3.0.tgz#153614c11ab35867f371bd93496ecb9690b92077"
+  integrity sha512-PyXq5szeSfR/4f1lYqCmmQjh0vqDkURUYi9N6whnHjlRz4IUQfMcXkGLeEoiJtxtyPqgUaUUfyQlApXWBSN1RA==
   dependencies:
-    "@jest/environment" "^29.7.0"
-    "@jest/expect" "^29.7.0"
-    "@jest/test-result" "^29.7.0"
-    "@jest/types" "^29.6.3"
+    "@jest/environment" "30.3.0"
+    "@jest/expect" "30.3.0"
+    "@jest/test-result" "30.3.0"
+    "@jest/types" "30.3.0"
     "@types/node" "*"
-    chalk "^4.0.0"
+    chalk "^4.1.2"
     co "^4.6.0"
-    dedent "^1.0.0"
-    is-generator-fn "^2.0.0"
-    jest-each "^29.7.0"
-    jest-matcher-utils "^29.7.0"
-    jest-message-util "^29.7.0"
-    jest-runtime "^29.7.0"
-    jest-snapshot "^29.7.0"
-    jest-util "^29.7.0"
+    dedent "^1.6.0"
+    is-generator-fn "^2.1.0"
+    jest-each "30.3.0"
+    jest-matcher-utils "30.3.0"
+    jest-message-util "30.3.0"
+    jest-runtime "30.3.0"
+    jest-snapshot "30.3.0"
+    jest-util "30.3.0"
     p-limit "^3.1.0"
-    pretty-format "^29.7.0"
-    pure-rand "^6.0.0"
+    pretty-format "30.3.0"
+    pure-rand "^7.0.0"
     slash "^3.0.0"
-    stack-utils "^2.0.3"
+    stack-utils "^2.0.6"
 
-jest-cli@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.7.0.tgz#5592c940798e0cae677eec169264f2d839a37995"
-  integrity sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==
+jest-cli@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-30.3.0.tgz#5ed75a337f486a1f1c5acbb2de8acddb106ead6c"
+  integrity sha512-l6Tqx+j1fDXJEW5bqYykDQQ7mQg+9mhWXtnj+tQZrTWYHyHoi6Be8HPumDSA+UiX2/2buEgjA58iJzdj146uCw==
   dependencies:
-    "@jest/core" "^29.7.0"
-    "@jest/test-result" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    chalk "^4.0.0"
-    create-jest "^29.7.0"
-    exit "^0.1.2"
-    import-local "^3.0.2"
-    jest-config "^29.7.0"
-    jest-util "^29.7.0"
-    jest-validate "^29.7.0"
-    yargs "^17.3.1"
+    "@jest/core" "30.3.0"
+    "@jest/test-result" "30.3.0"
+    "@jest/types" "30.3.0"
+    chalk "^4.1.2"
+    exit-x "^0.2.2"
+    import-local "^3.2.0"
+    jest-config "30.3.0"
+    jest-util "30.3.0"
+    jest-validate "30.3.0"
+    yargs "^17.7.2"
 
-jest-config@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.7.0.tgz#bcbda8806dbcc01b1e316a46bb74085a84b0245f"
-  integrity sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==
+jest-config@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-30.3.0.tgz#b969e0aaaf5964419e62953bb712c16d15972425"
+  integrity sha512-WPMAkMAtNDY9P/oKObtsRG/6KTrhtgPJoBTmk20uDn4Uy6/3EJnnaZJre/FMT1KVRx8cve1r7/FlMIOfRVWL4w==
   dependencies:
-    "@babel/core" "^7.11.6"
-    "@jest/test-sequencer" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    babel-jest "^29.7.0"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    deepmerge "^4.2.2"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
-    jest-circus "^29.7.0"
-    jest-environment-node "^29.7.0"
-    jest-get-type "^29.6.3"
-    jest-regex-util "^29.6.3"
-    jest-resolve "^29.7.0"
-    jest-runner "^29.7.0"
-    jest-util "^29.7.0"
-    jest-validate "^29.7.0"
-    micromatch "^4.0.4"
+    "@babel/core" "^7.27.4"
+    "@jest/get-type" "30.1.0"
+    "@jest/pattern" "30.0.1"
+    "@jest/test-sequencer" "30.3.0"
+    "@jest/types" "30.3.0"
+    babel-jest "30.3.0"
+    chalk "^4.1.2"
+    ci-info "^4.2.0"
+    deepmerge "^4.3.1"
+    glob "^10.5.0"
+    graceful-fs "^4.2.11"
+    jest-circus "30.3.0"
+    jest-docblock "30.2.0"
+    jest-environment-node "30.3.0"
+    jest-regex-util "30.0.1"
+    jest-resolve "30.3.0"
+    jest-runner "30.3.0"
+    jest-util "30.3.0"
+    jest-validate "30.3.0"
     parse-json "^5.2.0"
-    pretty-format "^29.7.0"
+    pretty-format "30.3.0"
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
+jest-diff@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-30.3.0.tgz#e0a4c84ef350ffd790ffd5b0016acabeecf5f759"
+  integrity sha512-n3q4PDQjS4LrKxfWB3Z5KNk1XjXtZTBwQp71OP0Jo03Z6V60x++K5L8k6ZrW8MY8pOFylZvHM0zsjS1RqlHJZQ==
+  dependencies:
+    "@jest/diff-sequences" "30.3.0"
+    "@jest/get-type" "30.1.0"
+    chalk "^4.1.2"
+    pretty-format "30.3.0"
+
 "jest-diff@>=30.0.0 < 31", jest-diff@^30.0.2:
   version "30.2.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-30.2.0.tgz#e3ec3a6ea5c5747f605c9e874f83d756cba36825"
@@ -15950,33 +16194,23 @@ jest-config@^29.7.0:
     chalk "^4.1.2"
     pretty-format "30.2.0"
 
-jest-diff@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a"
-  integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==
-  dependencies:
-    chalk "^4.0.0"
-    diff-sequences "^29.6.3"
-    jest-get-type "^29.6.3"
-    pretty-format "^29.7.0"
-
-jest-docblock@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.7.0.tgz#8fddb6adc3cdc955c93e2a87f61cfd350d5d119a"
-  integrity sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==
+jest-docblock@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-30.2.0.tgz#42cd98d69f887e531c7352309542b1ce4ee10256"
+  integrity sha512-tR/FFgZKS1CXluOQzZvNH3+0z9jXr3ldGSD8bhyuxvlVUwbeLOGynkunvlTMxchC5urrKndYiwCFC0DLVjpOCA==
   dependencies:
-    detect-newline "^3.0.0"
+    detect-newline "^3.1.0"
 
-jest-each@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.7.0.tgz#162a9b3f2328bdd991beaabffbb74745e56577d1"
-  integrity sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==
+jest-each@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-30.3.0.tgz#faa7229bf7a9fa6426dc604057a7d2a173493b1e"
+  integrity sha512-V8eMndg/aZ+3LnCJgSm13IxS5XSBM22QSZc9BtPK8Dek6pm+hfUNfwBdvsB3d342bo1q7wnSkC38zjX259qZNA==
   dependencies:
-    "@jest/types" "^29.6.3"
-    chalk "^4.0.0"
-    jest-get-type "^29.6.3"
-    jest-util "^29.7.0"
-    pretty-format "^29.7.0"
+    "@jest/get-type" "30.1.0"
+    "@jest/types" "30.3.0"
+    chalk "^4.1.2"
+    jest-util "30.3.0"
+    pretty-format "30.3.0"
 
 jest-environment-jsdom@^29.7.0:
   version "29.7.0"
@@ -15992,6 +16226,19 @@ jest-environment-jsdom@^29.7.0:
     jest-util "^29.7.0"
     jsdom "^20.0.0"
 
+jest-environment-node@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-30.3.0.tgz#aa8a57c5d0c4af0f8b1f7403ba737fec6b3aabbe"
+  integrity sha512-4i6HItw/JSiJVsC5q0hnKIe/hbYfZLVG9YJ/0pU9Hz2n/9qZe3Rhn5s5CUZA5ORZlcdT/vmAXRMyONXJwPrmYQ==
+  dependencies:
+    "@jest/environment" "30.3.0"
+    "@jest/fake-timers" "30.3.0"
+    "@jest/types" "30.3.0"
+    "@types/node" "*"
+    jest-mock "30.3.0"
+    jest-util "30.3.0"
+    jest-validate "30.3.0"
+
 jest-environment-node@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.7.0.tgz#0b93e111dda8ec120bc8300e6d1fb9576e164376"
@@ -16009,6 +16256,24 @@ jest-get-type@^29.6.3:
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1"
   integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
 
+jest-haste-map@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-30.3.0.tgz#1ea6843e6e45c077d91270666a4fcba958c24cd5"
+  integrity sha512-mMi2oqG4KRU0R9QEtscl87JzMXfUhbKaFqOxmjb2CKcbHcUGFrJCBWHmnTiUqi6JcnzoBlO4rWfpdl2k/RfLCA==
+  dependencies:
+    "@jest/types" "30.3.0"
+    "@types/node" "*"
+    anymatch "^3.1.3"
+    fb-watchman "^2.0.2"
+    graceful-fs "^4.2.11"
+    jest-regex-util "30.0.1"
+    jest-util "30.3.0"
+    jest-worker "30.3.0"
+    picomatch "^4.0.3"
+    walker "^1.0.8"
+  optionalDependencies:
+    fsevents "^2.3.3"
+
 jest-haste-map@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.7.0.tgz#3c2396524482f5a0506376e6c858c3bbcc17b104"
@@ -16028,23 +16293,38 @@ jest-haste-map@^29.7.0:
   optionalDependencies:
     fsevents "^2.3.2"
 
-jest-leak-detector@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz#5b7ec0dadfdfec0ca383dc9aa016d36b5ea4c728"
-  integrity sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==
+jest-leak-detector@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-30.3.0.tgz#a695a851e353f517a554a2f5c91c2742fc131c98"
+  integrity sha512-cuKmUUGIjfXZAiGJ7TbEMx0bcqNdPPI6P1V+7aF+m/FUJqFDxkFR4JqkTu8ZOiU5AaX/x0hZ20KaaIPXQzbMGQ==
   dependencies:
-    jest-get-type "^29.6.3"
-    pretty-format "^29.7.0"
+    "@jest/get-type" "30.1.0"
+    pretty-format "30.3.0"
 
-jest-matcher-utils@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz#ae8fec79ff249fd592ce80e3ee474e83a6c44f12"
-  integrity sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==
+jest-matcher-utils@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-30.3.0.tgz#d6c739fec1ecd33809f2d2b1348f6ab01d2f2493"
+  integrity sha512-HEtc9uFQgaUHkC7nLSlQL3Tph4Pjxt/yiPvkIrrDCt9jhoLIgxaubo1G+CFOnmHYMxHwwdaSN7mkIFs6ZK8OhA==
   dependencies:
-    chalk "^4.0.0"
-    jest-diff "^29.7.0"
-    jest-get-type "^29.6.3"
-    pretty-format "^29.7.0"
+    "@jest/get-type" "30.1.0"
+    chalk "^4.1.2"
+    jest-diff "30.3.0"
+    pretty-format "30.3.0"
+
+jest-message-util@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-30.3.0.tgz#4d723544d36890ba862ac3961db52db5b0d1ba39"
+  integrity sha512-Z/j4Bo+4ySJ+JPJN3b2Qbl9hDq3VrXmnjjGEWD/x0BCXeOXPTV1iZYYzl2X8c1MaCOL+ewMyNBcm88sboE6YWw==
+  dependencies:
+    "@babel/code-frame" "^7.27.1"
+    "@jest/types" "30.3.0"
+    "@types/stack-utils" "^2.0.3"
+    chalk "^4.1.2"
+    graceful-fs "^4.2.11"
+    picomatch "^4.0.3"
+    pretty-format "30.3.0"
+    slash "^3.0.0"
+    stack-utils "^2.0.6"
 
 jest-message-util@^29.7.0:
   version "29.7.0"
@@ -16061,6 +16341,15 @@ jest-message-util@^29.7.0:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
+jest-mock@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-30.3.0.tgz#e0fa4184a596a6c4fdec53d4f412158418923747"
+  integrity sha512-OTzICK8CpE+t4ndhKrwlIdbM6Pn8j00lvmSmq5ejiO+KxukbLjgOflKWMn3KE34EZdQm5RqTuKj+5RIEniYhog==
+  dependencies:
+    "@jest/types" "30.3.0"
+    "@types/node" "*"
+    jest-util "30.3.0"
+
 jest-mock@^27.0.6:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.1.tgz#19948336d49ef4d9c52021d34ac7b5f36ff967d6"
@@ -16078,119 +16367,137 @@ jest-mock@^29.7.0:
     "@types/node" "*"
     jest-util "^29.7.0"
 
-jest-pnp-resolver@^1.2.2:
+jest-pnp-resolver@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
   integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
 
+jest-regex-util@30.0.1:
+  version "30.0.1"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-30.0.1.tgz#f17c1de3958b67dfe485354f5a10093298f2a49b"
+  integrity sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==
+
 jest-regex-util@^29.6.3:
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.6.3.tgz#4a556d9c776af68e1c5f48194f4d0327d24e8a52"
   integrity sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==
 
-jest-resolve-dependencies@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz#1b04f2c095f37fc776ff40803dc92921b1e88428"
-  integrity sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==
+jest-resolve-dependencies@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-30.3.0.tgz#4d638c9f0d93a62a6ed25dec874bfd7e756c8ce5"
+  integrity sha512-9ev8s3YN6Hsyz9LV75XUwkCVFlwPbaFn6Wp75qnI0wzAINYWY8Fb3+6y59Rwd3QaS3kKXffHXsZMziMavfz/nw==
   dependencies:
-    jest-regex-util "^29.6.3"
-    jest-snapshot "^29.7.0"
+    jest-regex-util "30.0.1"
+    jest-snapshot "30.3.0"
 
-jest-resolve@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.7.0.tgz#64d6a8992dd26f635ab0c01e5eef4399c6bcbc30"
-  integrity sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==
+jest-resolve@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-30.3.0.tgz#b7bee9927279805b1b50715d2170a545553b87ff"
+  integrity sha512-NRtTAHQlpd15F9rUR36jqwelbrDV/dY4vzNte3S2kxCKUJRYNd5/6nTSbYiak1VX5g8IoFF23Uj5TURkUW8O5g==
   dependencies:
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^29.7.0"
-    jest-pnp-resolver "^1.2.2"
-    jest-util "^29.7.0"
-    jest-validate "^29.7.0"
-    resolve "^1.20.0"
-    resolve.exports "^2.0.0"
+    chalk "^4.1.2"
+    graceful-fs "^4.2.11"
+    jest-haste-map "30.3.0"
+    jest-pnp-resolver "^1.2.3"
+    jest-util "30.3.0"
+    jest-validate "30.3.0"
     slash "^3.0.0"
-
-jest-runner@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.7.0.tgz#809af072d408a53dcfd2e849a4c976d3132f718e"
-  integrity sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==
-  dependencies:
-    "@jest/console" "^29.7.0"
-    "@jest/environment" "^29.7.0"
-    "@jest/test-result" "^29.7.0"
-    "@jest/transform" "^29.7.0"
-    "@jest/types" "^29.6.3"
+    unrs-resolver "^1.7.11"
+
+jest-runner@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-30.3.0.tgz#fa970fc4e45d418ad7e7d581b24cac7af5944cb7"
+  integrity sha512-gDv6C9LGKWDPLia9TSzZwf4h3kMQCqyTpq+95PODnTRDO0g9os48XIYYkS6D236vjpBir2fF63YmJFtqkS5Duw==
+  dependencies:
+    "@jest/console" "30.3.0"
+    "@jest/environment" "30.3.0"
+    "@jest/test-result" "30.3.0"
+    "@jest/transform" "30.3.0"
+    "@jest/types" "30.3.0"
     "@types/node" "*"
-    chalk "^4.0.0"
+    chalk "^4.1.2"
     emittery "^0.13.1"
-    graceful-fs "^4.2.9"
-    jest-docblock "^29.7.0"
-    jest-environment-node "^29.7.0"
-    jest-haste-map "^29.7.0"
-    jest-leak-detector "^29.7.0"
-    jest-message-util "^29.7.0"
-    jest-resolve "^29.7.0"
-    jest-runtime "^29.7.0"
-    jest-util "^29.7.0"
-    jest-watcher "^29.7.0"
-    jest-worker "^29.7.0"
+    exit-x "^0.2.2"
+    graceful-fs "^4.2.11"
+    jest-docblock "30.2.0"
+    jest-environment-node "30.3.0"
+    jest-haste-map "30.3.0"
+    jest-leak-detector "30.3.0"
+    jest-message-util "30.3.0"
+    jest-resolve "30.3.0"
+    jest-runtime "30.3.0"
+    jest-util "30.3.0"
+    jest-watcher "30.3.0"
+    jest-worker "30.3.0"
     p-limit "^3.1.0"
     source-map-support "0.5.13"
 
-jest-runtime@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.7.0.tgz#efecb3141cf7d3767a3a0cc8f7c9990587d3d817"
-  integrity sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==
-  dependencies:
-    "@jest/environment" "^29.7.0"
-    "@jest/fake-timers" "^29.7.0"
-    "@jest/globals" "^29.7.0"
-    "@jest/source-map" "^29.6.3"
-    "@jest/test-result" "^29.7.0"
-    "@jest/transform" "^29.7.0"
-    "@jest/types" "^29.6.3"
+jest-runtime@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-30.3.0.tgz#1a9bec7a9b68db12dfe4136bbe41ab883ea2c996"
+  integrity sha512-CgC+hIBJbuh78HEffkhNKcbXAytQViplcl8xupqeIWyKQF50kCQA8J7GeJCkjisC6hpnC9Muf8jV5RdtdFbGng==
+  dependencies:
+    "@jest/environment" "30.3.0"
+    "@jest/fake-timers" "30.3.0"
+    "@jest/globals" "30.3.0"
+    "@jest/source-map" "30.0.1"
+    "@jest/test-result" "30.3.0"
+    "@jest/transform" "30.3.0"
+    "@jest/types" "30.3.0"
     "@types/node" "*"
-    chalk "^4.0.0"
-    cjs-module-lexer "^1.0.0"
-    collect-v8-coverage "^1.0.0"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^29.7.0"
-    jest-message-util "^29.7.0"
-    jest-mock "^29.7.0"
-    jest-regex-util "^29.6.3"
-    jest-resolve "^29.7.0"
-    jest-snapshot "^29.7.0"
-    jest-util "^29.7.0"
+    chalk "^4.1.2"
+    cjs-module-lexer "^2.1.0"
+    collect-v8-coverage "^1.0.2"
+    glob "^10.5.0"
+    graceful-fs "^4.2.11"
+    jest-haste-map "30.3.0"
+    jest-message-util "30.3.0"
+    jest-mock "30.3.0"
+    jest-regex-util "30.0.1"
+    jest-resolve "30.3.0"
+    jest-snapshot "30.3.0"
+    jest-util "30.3.0"
     slash "^3.0.0"
     strip-bom "^4.0.0"
 
-jest-snapshot@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.7.0.tgz#c2c574c3f51865da1bb329036778a69bf88a6be5"
-  integrity sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==
+jest-snapshot@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-30.3.0.tgz#6e7ea75069dda86e36311a0f73189e830d4f51ad"
+  integrity sha512-f14c7atpb4O2DeNhwcvS810Y63wEn8O1HqK/luJ4F6M4NjvxmAKQwBUWjbExUtMxWJQ0wVgmCKymeJK6NZMnfQ==
   dependencies:
-    "@babel/core" "^7.11.6"
-    "@babel/generator" "^7.7.2"
-    "@babel/plugin-syntax-jsx" "^7.7.2"
-    "@babel/plugin-syntax-typescript" "^7.7.2"
-    "@babel/types" "^7.3.3"
-    "@jest/expect-utils" "^29.7.0"
-    "@jest/transform" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    babel-preset-current-node-syntax "^1.0.0"
-    chalk "^4.0.0"
-    expect "^29.7.0"
-    graceful-fs "^4.2.9"
-    jest-diff "^29.7.0"
-    jest-get-type "^29.6.3"
-    jest-matcher-utils "^29.7.0"
-    jest-message-util "^29.7.0"
-    jest-util "^29.7.0"
-    natural-compare "^1.4.0"
-    pretty-format "^29.7.0"
-    semver "^7.5.3"
+    "@babel/core" "^7.27.4"
+    "@babel/generator" "^7.27.5"
+    "@babel/plugin-syntax-jsx" "^7.27.1"
+    "@babel/plugin-syntax-typescript" "^7.27.1"
+    "@babel/types" "^7.27.3"
+    "@jest/expect-utils" "30.3.0"
+    "@jest/get-type" "30.1.0"
+    "@jest/snapshot-utils" "30.3.0"
+    "@jest/transform" "30.3.0"
+    "@jest/types" "30.3.0"
+    babel-preset-current-node-syntax "^1.2.0"
+    chalk "^4.1.2"
+    expect "30.3.0"
+    graceful-fs "^4.2.11"
+    jest-diff "30.3.0"
+    jest-matcher-utils "30.3.0"
+    jest-message-util "30.3.0"
+    jest-util "30.3.0"
+    pretty-format "30.3.0"
+    semver "^7.7.2"
+    synckit "^0.11.8"
+
+jest-util@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-30.3.0.tgz#95a4fbacf2dac20e768e2f1744b70519f2ba7980"
+  integrity sha512-/jZDa00a3Sz7rdyu55NLrQCIrbyIkbBxareejQI315f/i8HjYN+ZWsDLLpoQSiUIEIyZF/R8fDg3BmB8AtHttg==
+  dependencies:
+    "@jest/types" "30.3.0"
+    "@types/node" "*"
+    chalk "^4.1.2"
+    ci-info "^4.2.0"
+    graceful-fs "^4.2.11"
+    picomatch "^4.0.3"
 
 jest-util@^29.7.0:
   version "29.7.0"
@@ -16204,6 +16511,18 @@ jest-util@^29.7.0:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
+jest-validate@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-30.3.0.tgz#215e11b8fcc5e2ca4b99ea5d730a5b4c969e4355"
+  integrity sha512-I/xzC8h5G+SHCb2P2gWkJYrNiTbeL47KvKeW5EzplkyxzBRBw1ssSHlI/jXec0ukH2q7x2zAWQm7015iusg62Q==
+  dependencies:
+    "@jest/get-type" "30.1.0"
+    "@jest/types" "30.3.0"
+    camelcase "^6.3.0"
+    chalk "^4.1.2"
+    leven "^3.1.0"
+    pretty-format "30.3.0"
+
 jest-validate@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.7.0.tgz#7bf705511c64da591d46b15fce41400d52147d9c"
@@ -16216,19 +16535,30 @@ jest-validate@^29.7.0:
     leven "^3.1.0"
     pretty-format "^29.7.0"
 
-jest-watcher@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.7.0.tgz#7810d30d619c3a62093223ce6bb359ca1b28a2f2"
-  integrity sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==
+jest-watcher@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-30.3.0.tgz#3afa1af355b9fe80f0261eb8a23981a315858596"
+  integrity sha512-PJ1d9ThtTR8aMiBWUdcownq9mDdLXsQzJayTk4kmaBRHKvwNQn+ANveuhEBUyNI2hR1TVhvQ8D5kHubbzBHR/w==
   dependencies:
-    "@jest/test-result" "^29.7.0"
-    "@jest/types" "^29.6.3"
+    "@jest/test-result" "30.3.0"
+    "@jest/types" "30.3.0"
     "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
+    ansi-escapes "^4.3.2"
+    chalk "^4.1.2"
     emittery "^0.13.1"
-    jest-util "^29.7.0"
-    string-length "^4.0.1"
+    jest-util "30.3.0"
+    string-length "^4.0.2"
+
+jest-worker@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-30.3.0.tgz#ae4dc1f1d93d0cba1415624fcedaec40ea764f14"
+  integrity sha512-DrCKkaQwHexjRUFTmPzs7sHQe0TSj9nvDALKGdwmK5mW9v7j90BudWirKAJHt3QQ9Dhrg1F7DogPzhChppkJpQ==
+  dependencies:
+    "@types/node" "*"
+    "@ungap/structured-clone" "^1.3.0"
+    jest-util "30.3.0"
+    merge-stream "^2.0.0"
+    supports-color "^8.1.1"
 
 jest-worker@^27.4.5:
   version "27.5.1"
@@ -16249,15 +16579,15 @@ jest-worker@^29.7.0:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-29.7.0.tgz#994676fc24177f088f1c5e3737f5697204ff2613"
-  integrity sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==
+jest@^30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-30.3.0.tgz#6460b889dd805e9677400505f16f1d9b14c285a3"
+  integrity sha512-AkXIIFcaazymvey2i/+F94XRnM6TsVLZDhBMLsd1Sf/W0wzsvvpjeyUrCZD6HGG4SDYPgDJDBKeiJTBb10WzMg==
   dependencies:
-    "@jest/core" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    import-local "^3.0.2"
-    jest-cli "^29.7.0"
+    "@jest/core" "30.3.0"
+    "@jest/types" "30.3.0"
+    import-local "^3.2.0"
+    jest-cli "30.3.0"
 
 jimp-compact@0.16.1:
   version "0.16.1"
@@ -20089,7 +20419,7 @@ pify@^4.0.1:
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
-pirates@^4.0.1, pirates@^4.0.4, pirates@^4.0.6:
+pirates@^4.0.1, pirates@^4.0.4, pirates@^4.0.6, pirates@^4.0.7:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.7.tgz#643b4a18c4257c8a65104b73f3049ce9a0a15e22"
   integrity sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==
@@ -20430,6 +20760,15 @@ pretty-format@30.2.0:
     ansi-styles "^5.2.0"
     react-is "^18.3.1"
 
+pretty-format@30.3.0, pretty-format@^30.0.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-30.3.0.tgz#e977eed4bcd1b6195faed418af8eac68b9ea1f29"
+  integrity sha512-oG4T3wCbfeuvljnyAzhBvpN45E8iOTXCU/TD3zXW80HA3dQ4ahdqMkWGiPWZvjpQwlbyHrPTWUAqUzGzv4l1JQ==
+  dependencies:
+    "@jest/schemas" "30.0.5"
+    ansi-styles "^5.2.0"
+    react-is "^18.3.1"
+
 pretty-format@^27.0.2:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
@@ -20439,7 +20778,7 @@ pretty-format@^27.0.2:
     ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
-pretty-format@^29.0.0, pretty-format@^29.7.0:
+pretty-format@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
   integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==
@@ -20527,7 +20866,7 @@ promise@^8.3.0:
   dependencies:
     asap "~2.0.6"
 
-prompts@^2.0.1, prompts@^2.3.2, prompts@^2.4.0:
+prompts@^2.3.2, prompts@^2.4.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
   integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
@@ -20637,10 +20976,10 @@ puppeteer-core@^2.1.1:
     rimraf "^2.6.1"
     ws "^6.1.0"
 
-pure-rand@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.1.0.tgz#d173cf23258231976ccbdb05247c9787957604f2"
-  integrity sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==
+pure-rand@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-7.0.1.tgz#6f53a5a9e3e4a47445822af96821ca509ed37566"
+  integrity sha512-oTUZM/NAZS8p7ANR3SHh30kXB+zK2r2BPcEn/awJIbOvq82WoMN4p62AWWp3Hhw50G0xMsw1mhIBLqHw64EcNQ==
 
 qrcode-terminal@0.11.0:
   version "0.11.0"
@@ -21894,12 +22233,12 @@ resolve-workspace-root@^2.0.0:
   resolved "https://registry.yarnpkg.com/resolve-workspace-root/-/resolve-workspace-root-2.0.0.tgz#a0098daa0067cd0efa6eb525c57c8fb4a61e78f8"
   integrity sha512-IsaBUZETJD5WsI11Wt8PKHwaIe45or6pwNc8yflvLJ4DWtImK9kuLoH5kUva/2Mmx/RdIyr4aONNSa2v9LTJsw==
 
-resolve.exports@2.0.3, resolve.exports@^2.0.0, resolve.exports@^2.0.3:
+resolve.exports@2.0.3, resolve.exports@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.3.tgz#41955e6f1b4013b7586f873749a635dea07ebe3f"
   integrity sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==
 
-resolve@^1.1.7, resolve@^1.10.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.22.10, resolve@^1.22.2, resolve@^1.22.4, resolve@^1.22.8:
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.22.1, resolve@^1.22.10, resolve@^1.22.2, resolve@^1.22.4, resolve@^1.22.8:
   version "1.22.11"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.11.tgz#aad857ce1ffb8bfa9b0b1ac29f1156383f68c262"
   integrity sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==
@@ -22859,7 +23198,7 @@ stack-trace@0.0.10:
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
   integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==
 
-stack-utils@^2.0.3:
+stack-utils@^2.0.3, stack-utils@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
   integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
@@ -23014,7 +23353,7 @@ string-left-right@^6.1.0:
     codsen-utils "^1.7.0"
     rfdc "^1.4.1"
 
-string-length@^4.0.1:
+string-length@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
   integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
@@ -23413,7 +23752,7 @@ synchronous-promise@^2.0.15:
   resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.17.tgz#38901319632f946c982152586f2caf8ddc25c032"
   integrity sha512-AsS729u2RHUfEra9xJrE39peJcc2stq2+poBXX8bcM08Y6g9j/i/PUzwNQqkaJde7Ntg1TO7bSREbR5sdosQ+g==
 
-synckit@^0.11.12:
+synckit@^0.11.12, synckit@^0.11.8:
   version "0.11.12"
   resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.11.12.tgz#abe74124264fbc00a48011b0d98bdc1cffb64a7b"
   integrity sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ==
@@ -24479,7 +24818,7 @@ unplugin@^1.3.1:
     acorn "^8.14.0"
     webpack-virtual-modules "^0.6.2"
 
-unrs-resolver@^1.6.2:
+unrs-resolver@^1.6.2, unrs-resolver@^1.7.11:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/unrs-resolver/-/unrs-resolver-1.11.1.tgz#be9cd8686c99ef53ecb96df2a473c64d304048a9"
   integrity sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==
@@ -25480,7 +25819,7 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write-file-atomic@5.0.1:
+write-file-atomic@5.0.1, write-file-atomic@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.1.tgz#68df4717c55c6fa4281a7860b4c2ba0a6d2b11e7"
   integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==
@@ -25643,7 +25982,7 @@ yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs@17.7.2, yargs@^17.0.0, yargs@^17.3.1, yargs@^17.6.2, yargs@^17.7.2:
+yargs@17.7.2, yargs@^17.0.0, yargs@^17.6.2, yargs@^17.7.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==

From 58f170e312f89ff20b911303edd6050f0b501014 Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Wed, 1 Apr 2026 12:56:33 -0700
Subject: [PATCH 10/32] :globe_with_meridians: Update translations (#1030)

* New translations en-us.json (Italian)

* New translations en-us.json (Italian)

* New translations en-us.json (German)

* New translations en-us.json (Polish)

* New translations en-us.json (German)

* New translations en-us.json (Chinese Simplified)

* New translations en-us.json (German)
---
 packages/i18n/src/locales/de-DE.json | 116 +++++------
 packages/i18n/src/locales/it-IT.json |  68 +++----
 packages/i18n/src/locales/pl-PL.json |  14 +-
 packages/i18n/src/locales/zh-CN.json | 292 +++++++++++++--------------
 4 files changed, 245 insertions(+), 245 deletions(-)

diff --git a/packages/i18n/src/locales/de-DE.json b/packages/i18n/src/locales/de-DE.json
index 3d408da0ec..a1a3417bfc 100644
--- a/packages/i18n/src/locales/de-DE.json
+++ b/packages/i18n/src/locales/de-DE.json
@@ -54,7 +54,7 @@
 		},
 		"emailBook": {
 			"heading": "E-Mail das Buch",
-			"description": "Sende dieses Buch zu einem Gerät oder einer E-mail-Adresse",
+			"description": "Sende dieses Buch zu einem Gerät oder einer E-Mail-Adresse",
 			"form": {
 				"email": {
 					"label": "E-Mail",
@@ -261,8 +261,8 @@
 					"description": "Verberge den Serienreiter in der Bibliotheksnavigation"
 				},
 				"skipBookOverview": {
-					"label": "Skip book overview",
-					"description": "Open the reader directly when selecting books in this library"
+					"label": "Buchübersicht überspringen",
+					"description": "Öffne den Reader direkt bei der Auswahl von Büchern in dieser Bibliotheken"
 				},
 				"options": {
 					"series": {
@@ -468,8 +468,8 @@
 					"description": "Die Details zu dieser Bibliothek, einschließlich Name, Pfad und Beschreibung"
 				},
 				{
-					"label": "Scannt",
-					"heading": "Scannt",
+					"label": "Scannen",
+					"heading": "Scannen",
 					"description": "Einstellungen in Bezug, wie Stump diese Bibliothek scannt"
 				},
 				{
@@ -547,7 +547,7 @@
 			"options": {
 				"general": "Allgemein",
 				"reading": "Lesen",
-				"scanning": "Wird gescannt",
+				"scanning": "Scannen",
 				"thumbnails": "Vorschaubilder",
 				"ignore-rules": "Dateien ignorieren",
 				"analysis": "Analyse",
@@ -704,16 +704,16 @@
 					"missingEntitiesTable": {
 						"columns": {
 							"id": "ID",
-							"path": "Path",
-							"type": "Type"
+							"path": "Pfad",
+							"type": "Typ"
 						},
 						"types": {
-							"BOOK": "Book",
-							"SERIES": "Series",
-							"LIBRARY": "Library"
+							"BOOK": "Buch",
+							"SERIES": "Serien",
+							"LIBRARY": "Bibliothek"
 						},
-						"emptyHeading": "Nothing is missing for this library",
-						"emptySubtitle": "All files referenced in the database were located on disk"
+						"emptyHeading": "Nichts fehlt für diese Bibliothek",
+						"emptySubtitle": "Alle in der Datenbank gespeicherten Dateien wurden auf der Festplatte gefunden"
 					}
 				},
 				"deleteLibrary": {
@@ -943,10 +943,10 @@
 									"teams": "Teams",
 									"genres": "Genre",
 									"coverArtists": "Cover-Künstler",
-									"ageRating": "Age rating",
-									"year": "Year",
-									"month": "Month",
-									"day": "Day"
+									"ageRating": "Altersfreigabe",
+									"year": "Jahr",
+									"month": "Monat",
+									"day": "Tag"
 								}
 							},
 							"series": {
@@ -969,7 +969,7 @@
 									"volume": "Band",
 									"metaType": "Typ",
 									"ageRating": "Altersfreigabe",
-									"year": "Start year"
+									"year": "Startjahr"
 								}
 							},
 							"library": {
@@ -1277,14 +1277,14 @@
 					},
 					"avatarPicker": {
 						"label": "Avatar",
-						"heading": "Upload avatar",
-						"subtitle": "You can upload any image to use as your avatar for social features in Stump",
-						"dropzone": "Drop an image or click to select",
-						"changeImage": "Change Image",
-						"removeImage": "Remove Image",
-						"removeSelection": "Remove uploaded image",
-						"uploadFailed": "Failed to upload avatar",
-						"removeFailed": "Failed to remove avatar"
+						"heading": "Avatar hochladen",
+						"subtitle": "Du kannst jedes Bild hochladen, um dieses als Avatar für soziale Funktionen in Stump zu verwenden",
+						"dropzone": "Bild hier ablegen oder zum Auswählen klicken",
+						"changeImage": "Bild ändern",
+						"removeImage": "Bild entfernen",
+						"removeSelection": "Hochgeladenes Bild entfernen",
+						"uploadFailed": "Avatar konnte nicht hochgeladen werden",
+						"removeFailed": "Avatar konnte nicht entfernt werden"
 					},
 					"buttons": {
 						"confirm": "Änderungen speichern"
@@ -1710,11 +1710,11 @@
 					}
 				},
 				"helpfulLinks": {
-					"title": "Helpful links",
-					"description": "Links to resources that may be helpful for managing your Stump server instance",
+					"title": "Hilfreiche Links",
+					"description": "Links zu Ressourcen, die bei der Verwaltung Ihrer Stump Serverinstanz hilfreich sein könnten",
 					"links": {
-						"documentation": "Documentation",
-						"changelog": "Changelog"
+						"documentation": "Dokumentation",
+						"changelog": "Änderungsprotokoll"
 					}
 				},
 				"serverPublicUrl": {
@@ -1722,25 +1722,25 @@
 					"description": "Die URL, über die von außen auf den Server zugegriffen werden kann, sofern verfügbar. Dies aktiviert Einladungslinks und andere Funktionen"
 				},
 				"customEmojis": {
-					"title": "Custom emojis",
-					"description": "Upload and manage custom image emojis for your server",
-					"dropzone": "Drop an image or click to select",
+					"title": "Benutzerdefinierte Emojis",
+					"description": "Verwalte und lade benutzerdefinierte Bild-Emojis für deinen Server hoch",
+					"dropzone": "Ein Bild hier ablegen oder zum Auswählen klicken",
 					"input": {
-						"label": "Emoji name",
-						"placeholder": "e.g. party_parrot"
+						"label": "Emoji-Name",
+						"placeholder": "z.B. party_papagei"
 					},
 					"deleteModal": {
-						"title": "Delete emoji",
-						"description": "Are you sure you want to delete this emoji?"
+						"title": "Emoji löschen",
+						"description": "Bist du sicher dieses Emoji löschen zu wollen?"
 					},
-					"noCustomEmojis": "No custom emojis have been added yet",
-					"invalidName": "Please enter a valid name for your emoji",
-					"uploadError": "Failed to upload emoji",
-					"uploadSuccess": "Emoji uploaded",
-					"renameSuccess": "Emoji renamed",
-					"renameError": "Failed to rename emoji",
-					"deleteSuccess": "Emoji deleted",
-					"deleteError": "Failed to delete emoji"
+					"noCustomEmojis": "Bisher wurden keine benutzerdefinierten Emojis hinzugefügt",
+					"invalidName": "Bitte gebe einen gültigen Namen für dein Emoji ein",
+					"uploadError": "Emoji konnte nicht hochgeladen werden",
+					"uploadSuccess": "Emoji hochgeladen",
+					"renameSuccess": "Emoji umbenannt",
+					"renameError": "Emoji konnte nicht umbenannt werden",
+					"deleteSuccess": "Emoji gelöscht",
+					"deleteError": "Emoji konnte nicht gelöscht werden"
 				}
 			}
 		},
@@ -2123,13 +2123,13 @@
 					"update": "E-Mail aktualisieren"
 				},
 				"testEmailer": {
-					"button": "Send test email",
-					"recipientLabel": "Test recipient",
-					"recipientDescription": "An email address to send the test email to",
-					"success": "Test email sent successfully",
+					"button": "Test-E-Mail verschicken",
+					"recipientLabel": "Testempfänger",
+					"recipientDescription": "Eine E-Mail-Adresse an die, die Test-E-Mail gesendet werden soll",
+					"success": "Test-E-Mail erfolgreich gesendet",
 					"error": {
-						"title": "Failed to send test email",
-						"description": "Check your SMTP settings and try again"
+						"title": "Das Versenden der Test-E-Mail ist fehlgeschlagen",
+						"description": "Überprüfe deine SMTP-Einstellungen und versuche es erneut"
 					}
 				}
 			},
@@ -2266,7 +2266,7 @@
 	"common": {
 		"add": "Hinzufügen",
 		"cancel": "Abbrechen",
-		"clear": "Clear",
+		"clear": "Löschen",
 		"confirm": "Bestätigen",
 		"delete": "Löschen",
 		"enter": "Enter",
@@ -2279,7 +2279,7 @@
 		"update": "Aktualisieren",
 		"upload": "Hochladen",
 		"uploading": "Wird hochgeladen",
-		"uploadingEllipsis": "Uploading...",
+		"uploadingEllipsis": "Wird hochgeladen...",
 		"unimplemented": "Diese Funktionalität ist noch nicht implementiert! Schaue später wieder vorbei",
 		"limitedFunctionality": "Das ist noch nicht vollständig implementiert und es fehlen noch ein paar Funktionen! Schaue später wieder vorbei",
 		"logIn": "Anmelden",
@@ -2294,9 +2294,9 @@
 		"scan": "Scannen",
 		"somethingWentWrong": "Etwas ist falsch gelaufen",
 		"fileUpload": {
-			"someRejected": "Some files were rejected. Please check the file types and try again",
-			"tooManyFiles": "You have selected too many files",
-			"noValidFiles": "No valid files were selected"
+			"someRejected": "Einige Dateien wurden abgelehnt. Bitte überprüfe die Dateitypen und versuche es erneut",
+			"tooManyFiles": "Du hast zu viele Dateien ausgewählt",
+			"noValidFiles": "Es wurden keine gültigen Dateien ausgewählt"
 		}
 	},
 	"userPermissions": {
@@ -2425,8 +2425,8 @@
 			"description": "Erlaubt dem Benutzer Metadatenänderungen zurück auf die Quelldateien zu schreiben"
 		},
 		"EDIT_THUMBNAILS": {
-			"label": "Edit thumbnails",
-			"description": "Allows the user to edit thumbnails for books and series"
+			"label": "Vorschaubilder bearbeiten",
+			"description": "Erlaubt dem Benutzer Vorschaubilder für Bücher und Serien zu bearbeiten"
 		}
 	}
 }
diff --git a/packages/i18n/src/locales/it-IT.json b/packages/i18n/src/locales/it-IT.json
index 6b55ae25cb..16f94b43d6 100644
--- a/packages/i18n/src/locales/it-IT.json
+++ b/packages/i18n/src/locales/it-IT.json
@@ -59,12 +59,12 @@
 				"email": {
 					"label": "E-mail",
 					"placeholder": "Indirizzo e-mail",
-					"description": "An email address to send the book to. Click add to finalize each input"
+					"description": "Un indirizzo email a cui inviare il libro. Fai clic su Aggiungi per confermare ogni input"
 				},
 				"devices": {
-					"label": "Devices",
-					"placeholder": "Select devices",
-					"noFilterMatch": "No devices match the filter"
+					"label": "Dispositivi",
+					"placeholder": "Seleziona i dispositivi",
+					"noFilterMatch": "Nessun dispositivo corrisponde al filtro"
 				}
 			}
 		},
@@ -73,65 +73,65 @@
 	"createOrUpdateBookClubForm": {
 		"fields": {
 			"name": {
-				"label": "Name",
-				"placeholder": "My book club",
-				"description": "The name of your book club"
+				"label": "Nome",
+				"placeholder": "Il mio club del libro",
+				"description": "Il nome del tuo club del libro"
 			},
 			"description": {
-				"label": "Description",
-				"placeholder": "An 'Our Flag Means Death' fan club. We read pirate fiction to our hearts' content",
-				"description": "An optional, short description of your book club"
+				"label": "Descrizione",
+				"placeholder": "Un fan club del 'La nostra bandiera significa morte'. Leggiamo le fiction dei pirati divorandole completamente",
+				"description": "Una breve descrizione facoltativa del club del libro"
 			},
 			"is_private": {
-				"label": "Private club",
-				"description": "If enabled, only users you invite will be able to join your book club"
+				"label": "Club Privato",
+				"description": "Se abilitato, solo gli utenti che inviti potranno unirsi al tuo club di libri"
 			},
 			"member_role_spec": {
-				"heading": "Custom role mapping",
+				"heading": "Mappatura del ruolo personalizzata",
 				"subtitle": [
-					"You can create custom names for the roles in your book club if you'd like. For more information, refer to the",
-					"documentation"
+					"Puoi creare nomi personalizzati per i ruoli nel tuo club di libri, se vuoi. Per ulteriori informazioni, fai riferimento al",
+					"documentazione"
 				],
 				"member": {
-					"label": "Member",
-					"placeholder": "Member",
-					"description": "The name of the default role for your book club"
+					"label": "Membro",
+					"placeholder": "Membro",
+					"description": "Il nome del ruolo predefinito per il tuo club del libro"
 				},
 				"moderator": {
-					"label": "Moderator",
-					"placeholder": "Moderator",
-					"description": "The name of the moderator role for your book club"
+					"label": "Moderatore",
+					"placeholder": "Moderatore",
+					"description": "Il nome del ruolo di moderatore per il tuo club del libro"
 				},
 				"admin": {
-					"label": "Admin",
-					"placeholder": "Admin",
-					"description": "The name of the admin role for your book club"
+					"label": "Amministratore",
+					"placeholder": "Amministratore",
+					"description": "Il nome del ruolo di amministratore per il tuo club del libro"
 				},
 				"creator": {
-					"label": "Creator",
-					"placeholder": "Creator",
-					"description": "The name of the creator role for your book club. This is you!"
+					"label": "Creatore",
+					"placeholder": "Creatore",
+					"description": "Il nome del ruolo di creatore per il tuo club del libro. Questo sei tu!"
 				}
 			},
 			"membershipOptions": {
 				"displayName": {
-					"label": "Display Name",
+					"label": "Nome visualizzato",
 					"placeholder": "oromei",
-					"description": "An optional display name for your membership in the book club. If set, this takes precedence over your username"
+					"description": "Un nome opzionale per la tua iscrizione nel club del libro. Se impostato, ha la precedenza sul tuo nome utente"
 				},
 				"hideProgress": {
-					"label": "Hide Progress",
-					"description": "If enabled, your reading progress will be hidden from other members of the book club"
+					"label": "Nascondi Progresso",
+					"description": "Se abilitato, i tuoi progressi di lettura saranno nascosti agli altri membri del club di libri"
 				}
 			}
 		},
 		"validation": {
-			"missingName": "Name is required",
-			"alreadyTaken": "is already taken"
+			"missingName": "Il nome è obbligatorio",
+			"alreadyTaken": "è già stato preso"
 		}
 	},
 	"createBookClubScene": {
-		"heading": "Create a new book club",
+		"heading": "Crea un nuovo club del libro",
 		"subtitle": "You can create a private book club for a select few, or make it public for anyone on the server to join",
 		"form": {
 			"stepLabel": "Step",
diff --git a/packages/i18n/src/locales/pl-PL.json b/packages/i18n/src/locales/pl-PL.json
index 1059216f63..754d1b0b9e 100644
--- a/packages/i18n/src/locales/pl-PL.json
+++ b/packages/i18n/src/locales/pl-PL.json
@@ -704,16 +704,16 @@
 					"missingEntitiesTable": {
 						"columns": {
 							"id": "ID",
-							"path": "Path",
-							"type": "Type"
+							"path": "Ścieżka",
+							"type": "Typ"
 						},
 						"types": {
-							"BOOK": "Book",
-							"SERIES": "Series",
-							"LIBRARY": "Library"
+							"BOOK": "Książka",
+							"SERIES": "Seria",
+							"LIBRARY": "Biblioteka"
 						},
-						"emptyHeading": "Nothing is missing for this library",
-						"emptySubtitle": "All files referenced in the database were located on disk"
+						"emptyHeading": "Nic nie brakuje w tej bibliotece",
+						"emptySubtitle": "Wszystkie pliki przywołane w bazie danych zostały zlokalizowane na dysku"
 					}
 				},
 				"deleteLibrary": {
diff --git a/packages/i18n/src/locales/zh-CN.json b/packages/i18n/src/locales/zh-CN.json
index c1c94f3a73..41bf23a238 100644
--- a/packages/i18n/src/locales/zh-CN.json
+++ b/packages/i18n/src/locales/zh-CN.json
@@ -1,155 +1,155 @@
 {
 	"underConstruction": {
-		"heading": "This is awkward",
-		"message": "You've stumbled upon a page that's still being developed. I'd love to show it to you, but it isn't quite ready yet.",
-		"homeLink": "Go Home",
-		"githubLink": "View the GitHub issue"
+		"heading": "这很尴尬",
+		"message": "你已经停留在一个仍在开发的页面上。我很乐意向你展示它，但它还没有做好准备。",
+		"homeLink": "返回首页",
+		"githubLink": "查看 GitHub 问题"
 	},
 	"authScene": {
-		"claimHeading": "Initialize your server",
-		"claimText": "This Stump server is not initialized. Use the form below to create your account. Once created, you will have full access to all server features.",
+		"claimHeading": "初始化您的服务器",
+		"claimText": "此 Stump 服务器尚未初始化。请使用下面的表单创建您的帐户。之后就能够完全访问服务器所有功能。",
 		"form": {
 			"validation": {
-				"missingUsername": "Username is required",
-				"missingPassword": "Password is required",
-				"usernameAlreadyExists": "Username already exists"
+				"missingUsername": "用户名为必填项",
+				"missingPassword": "密码为必填项",
+				"usernameAlreadyExists": "该用户已经存在"
 			},
 			"labels": {
-				"username": "Username",
-				"password": "Password"
+				"username": "用户名",
+				"password": "密码"
 			},
 			"buttons": {
-				"createAccount": "Create Account",
-				"login": "Log in",
-				"loginWithOidc": "Log in with OIDC",
-				"createAccountWithOidc": "Create Account with OIDC"
+				"createAccount": "创建账户",
+				"login": "登录",
+				"loginWithOidc": "使用 OIDC 登录",
+				"createAccountWithOidc": "使用 OIDC 创建帐户"
 			}
 		},
 		"toasts": {
-			"loggingIn": "Logging in...",
-			"loggedIn": "Welcome back!",
-			"loggedInFirstTime": "Welcome!",
-			"registering": "Registering...",
-			"registered": "Registered!",
-			"loginFailed": "Login failed. Please try again",
-			"registrationFailed": "Registration failed. Please try again"
+			"loggingIn": "登录中……",
+			"loggedIn": "欢迎回来！",
+			"loggedInFirstTime": "欢迎!",
+			"registering": "正在注册...",
+			"registered": "已注册！",
+			"loginFailed": "登录失败请重试",
+			"registrationFailed": "注册失败请重试"
 		}
 	},
 	"adminLibrarySidebar": {
 		"libraryConfiguration": {
-			"heading": "Library Configuration",
-			"subtitleCreating": "A preview of your new library will be shown below",
-			"subtitleEditing": "A preview of your library edits will be shown below"
+			"heading": "媒体库配置",
+			"subtitleCreating": "您的新书库预览将在下面显示",
+			"subtitleEditing": "您书库编辑的预览将在下方显示"
 		}
 	},
 	"bookOverviewScene": {
 		"fileInformation": {
-			"heading": "File Information",
+			"heading": "文件信息",
 			"labels": {
-				"fileSize": "File Size",
-				"fileType": "File Type",
-				"fileLocation": "File Location",
-				"fileChecksum": "Checksum"
+				"fileSize": "文件大小",
+				"fileType": "文件类型",
+				"fileLocation": "文件位置",
+				"fileChecksum": "校验和"
 			}
 		},
 		"emailBook": {
-			"heading": "Email book",
-			"description": "Send this book to a device or email address",
+			"heading": "电子邮件簿",
+			"description": "发送此书到设备或电子邮箱地址",
 			"form": {
 				"email": {
-					"label": "Email",
-					"placeholder": "Email address",
-					"description": "An email address to send the book to. Click add to finalize each input"
+					"label": "电子邮箱",
+					"placeholder": "电子邮箱地址",
+					"description": "要发送该书的电子邮箱地址。单击添加以完成每个输入"
 				},
 				"devices": {
-					"label": "Devices",
-					"placeholder": "Select devices",
-					"noFilterMatch": "No devices match the filter"
+					"label": "设备",
+					"placeholder": "选择设备",
+					"noFilterMatch": "没有符合筛选条件的设备"
 				}
 			}
 		},
-		"nextInSeries": "Next in Series"
+		"nextInSeries": "系列中的下一个"
 	},
 	"createOrUpdateBookClubForm": {
 		"fields": {
 			"name": {
-				"label": "Name",
-				"placeholder": "My book club",
-				"description": "The name of your book club"
+				"label": "名称",
+				"placeholder": "我的读书俱乐部",
+				"description": "您的读书俱乐部名称"
 			},
 			"description": {
-				"label": "Description",
-				"placeholder": "An 'Our Flag Means Death' fan club. We read pirate fiction to our hearts' content",
-				"description": "An optional, short description of your book club"
+				"label": "描述",
+				"placeholder": "《我们的旗帜意味着死亡》粉丝俱乐部。尽情阅读海盗题材漫画。",
+				"description": "您的读书俱乐部的简短描述（可选）"
 			},
 			"is_private": {
-				"label": "Private club",
-				"description": "If enabled, only users you invite will be able to join your book club"
+				"label": "私密俱乐部",
+				"description": "如果启用，只有您邀请的用户才能够加入您的读书俱乐部"
 			},
 			"member_role_spec": {
-				"heading": "Custom role mapping",
+				"heading": "自定义角色映射",
 				"subtitle": [
-					"You can create custom names for the roles in your book club if you'd like. For more information, refer to the",
-					"documentation"
+					"如果您喜欢，您可以在读书俱乐部创建自定义角色名称。想要了解更多信息，请参阅",
+					"文档"
 				],
 				"member": {
-					"label": "Member",
-					"placeholder": "Member",
-					"description": "The name of the default role for your book club"
+					"label": "成员",
+					"placeholder": "成员",
+					"description": "您的读书俱乐部默认角色的名称"
 				},
 				"moderator": {
-					"label": "Moderator",
-					"placeholder": "Moderator",
-					"description": "The name of the moderator role for your book club"
+					"label": "版主",
+					"placeholder": "版主",
+					"description": "您的读书俱乐部版主的名称"
 				},
 				"admin": {
-					"label": "Admin",
-					"placeholder": "Admin",
-					"description": "The name of the admin role for your book club"
+					"label": "管理",
+					"placeholder": "管理",
+					"description": "您的读书俱乐部管理员角色的名称"
 				},
 				"creator": {
-					"label": "Creator",
-					"placeholder": "Creator",
-					"description": "The name of the creator role for your book club. This is you!"
+					"label": "创建者",
+					"placeholder": "创建者",
+					"description": "你的读书俱乐部的创建者角色名称。这就是你！"
 				}
 			},
 			"membershipOptions": {
 				"displayName": {
-					"label": "Display Name",
+					"label": "显示名",
 					"placeholder": "oromei",
-					"description": "An optional display name for your membership in the book club. If set, this takes precedence over your username"
+					"description": "你在读书俱乐部中的可选显示名称。如果设置，它将优先于你的用户名"
 				},
 				"hideProgress": {
-					"label": "Hide Progress",
-					"description": "If enabled, your reading progress will be hidden from other members of the book club"
+					"label": "隐藏阅读进度",
+					"description": "如果启用，您的阅读进度将对读书俱乐部的其他成员隐藏"
 				}
 			}
 		},
 		"validation": {
-			"missingName": "Name is required",
-			"alreadyTaken": "is already taken"
+			"missingName": "姓名为必填项",
+			"alreadyTaken": "名称已经被使用"
 		}
 	},
 	"createBookClubScene": {
-		"heading": "Create a new book club",
-		"subtitle": "You can create a private book club for a select few, or make it public for anyone on the server to join",
+		"heading": "创建读书俱乐部",
+		"subtitle": "您可以创建一个私人读书俱乐部，或者创建一个公开的任何人都可以加入的读书俱乐部",
 		"form": {
-			"stepLabel": "Step",
+			"stepLabel": "步骤",
 			"steps": [
 				{
-					"label": "Basics",
-					"heading": "Basic Information",
-					"description": "The details of the club, including its name and description"
+					"label": "基本",
+					"heading": "基本信息",
+					"description": "俱乐部的详细信息，包括名称和描述"
 				},
 				{
-					"label": "Roles",
-					"heading": "Roles",
-					"description": "Customize the roles in your book club"
+					"label": "角色",
+					"heading": "角色",
+					"description": "自定义你的读书俱乐部中的角色"
 				},
 				{
-					"label": "Membership",
-					"heading": "Membership Preferences",
-					"description": "Additional options for your book club"
+					"label": "成员",
+					"heading": "成员设置",
+					"description": "书籍俱乐部的其他选项"
 				},
 				{
 					"label": "Review",
@@ -158,37 +158,37 @@
 				}
 			],
 			"review": {
-				"yes": "Yes",
-				"no": "No",
-				"none": "None",
+				"yes": "是",
+				"no": "否",
+				"none": "无",
 				"labels": {
-					"name": "Name",
-					"description": "Description"
+					"name": "名称",
+					"description": "描述"
 				}
 			},
-			"submit": "Create Book Club"
+			"submit": "创建读书俱乐部"
 		}
 	},
 	"bookClubSettingsScene": {
 		"sidebar": {
-			"basics": "Basics",
+			"basics": "基础",
 			"members": {
-				"members": "Members",
-				"roles": "Roles",
-				"label": "Membership"
+				"members": "成员",
+				"roles": "角色",
+				"label": "成员"
 			},
 			"scheduling": {
-				"scheduler": "Scheduler",
-				"options": "Options",
-				"label": "Scheduling"
+				"scheduler": "计划",
+				"options": "选项",
+				"label": "计划"
 			},
 			"danger-zone": {
-				"delete": "Deletion",
-				"label": "Danger Zone"
+				"delete": "删除",
+				"label": "危险操作区"
 			}
 		},
 		"basics": {
-			"title": "Basic Information",
+			"title": "基础信息",
 			"description": "The details of this book club, including its name and description",
 			"form": {
 				"submit": "Update club"
@@ -296,105 +296,105 @@
 			"thumbnailConfig": {
 				"section": {
 					"heading": {
-						"create": "Thumbnail configuration",
-						"update": "Generation"
+						"create": "缩略图配置",
+						"update": "生成"
 					},
-					"description": "Improve loading times while browsing your library by generating thumbnails for your books",
-					"disabled": "No additional configuration is required when thumbnail generation is disabled"
+					"description": "通过为你的书籍生成缩略图来改善浏览书库时的加载时间",
+					"disabled": "禁用缩略图生成时不需要额外配置"
 				},
 				"enableSwitch": {
-					"label": "Enabled",
-					"description": "Generate thumbnail images for this library"
+					"label": "已启用",
+					"description": "为该书库生成缩略图"
 				},
 				"resizeMethod": {
-					"label": "Resize Method",
+					"label": "调整尺寸方法",
 					"options": {
-						"scaleEvenlyByFactor": "Evenly Scale",
-						"exact": "Exact Size",
-						"scaleDimension": "Auto Scaled",
-						"none": "None"
+						"scaleEvenlyByFactor": "最终缩放",
+						"exact": "精确大小",
+						"scaleDimension": "自动比例",
+						"none": "无"
 					}
 				},
 				"scaleEvenlyByFactor": {
-					"description": "Scale the thumbnail by a factor of the original size. E.g., 0.65 will result in a thumbnail that is 65% of the original size",
+					"description": "缩放缩略图以原始大小的一个系数。例如，0.65 将产生一个缩略图，为原始大小的65%",
 					"factor": {
-						"label": "Scale Factor"
+						"label": "缩放比例"
 					}
 				},
 				"exact": {
-					"description": "Resize the thumbnail to an exact size in pixels",
+					"description": "将缩略图缩放到精确的像素大小",
 					"width": {
-						"label": "Width"
+						"label": "宽度"
 					},
 					"height": {
-						"label": "Height"
+						"label": "高度"
 					}
 				},
 				"scaleDimension": {
-					"label": "Auto Scaled",
-					"description": "Set either the width or height of the thumbnail and auto-scale the other to keep the original aspect ratio",
+					"label": "自动比例",
+					"description": "设置缩略图的宽度或高度并自动缩放对方，以保持原始宽度比",
 					"dimension": {
-						"label": "Dimension",
+						"label": "尺寸",
 						"options": {
-							"width": "Width",
-							"height": "Height"
+							"width": "宽度",
+							"height": "高度"
 						}
 					},
 					"size": {
-						"label": "Size"
+						"label": "大小"
 					}
 				},
 				"format": {
-					"label": "Image format",
-					"description": "The format of the generated thumbnail images"
+					"label": "图像格式",
+					"description": "生成的缩略图图像的格式"
 				},
 				"quality": {
-					"label": "Quality",
-					"description": "The quality of the generated thumbnail images, between 1 and 100"
+					"label": "质量",
+					"description": "生成的缩略图图像的质量，范围 1 到 100"
 				}
 			},
 			"ignoreRules": {
 				"section": {
-					"heading": "Ignore rules",
-					"description": "Define glob patterns to ignore certain files or directories during a scan"
+					"heading": "忽略规则",
+					"description": "定义 glob 模式以在扫描期间忽略特定文件或目录"
 				},
-				"noRules": "No ignore rules have been configured",
-				"save": "Save changes",
+				"noRules": "尚未配置忽略规则",
+				"save": "保存更改",
 				"addRule": {
-					"label": "New rule",
-					"description": "Glob pattern to ignore files or directories",
-					"addButton": "Add rule",
+					"label": "新规则",
+					"description": "用于忽略文件或目录的 glob 模式",
+					"addButton": "添加规则",
 					"ignoreParents": {
-						"title": "Ignore all parent directories",
-						"label": "Ignore parents"
+						"title": "忽略所有父目录",
+						"label": "忽略父目录"
 					},
 					"ignoreSubdirs": {
-						"title": "Ignore all subdirectories",
-						"label": "Ignore subdirectories"
+						"title": "忽略所有子目录",
+						"label": "忽略子目录"
 					}
 				},
-				"invalidGlob": "Invalid glob pattern",
-				"duplicateGlob": "Duplicate of an existing rule",
+				"invalidGlob": "无效的 glob 模式",
+				"duplicateGlob": "与现有规则重复",
 				"lockConfig": {
-					"lock": "Lock configuration",
-					"unlock": "Unlock configuration"
+					"lock": "锁定配置",
+					"unlock": "解锁配置"
 				},
-				"editRule": "Edit rule",
-				"deleteRule": "Delete rule",
-				"cancelEdit": "Cancel edit",
-				"confirmEdit": "Confirm edit"
+				"editRule": "编辑规则",
+				"deleteRule": "删除规则",
+				"cancelEdit": "取消编辑",
+				"confirmEdit": "确认编辑"
 			},
 			"convertOptions": {
 				"section": {
-					"heading": "File conversion",
-					"description": "Stump is capable of converting certain file formats to more compatible ones"
+					"heading": "文件转换",
+					"description": "Stump 能够将某些文件格式转换为更兼容的格式"
 				},
 				"rarToZip": {
-					"label": "Convert RAR to ZIP",
-					"description": "Convert RAR/CBR files to ZIP/CBZ files during a scan"
+					"label": "将 RAR 转换为 ZIP",
+					"description": "在扫描期间将 RAR/CBR 文件转换为 ZIP/CBZ 文件"
 				},
 				"deleteRarAfter": {
-					"label": "Delete RAR after conversion",
+					"label": "转换后删除 RAR",
 					"description": "Delete the original RAR/CBR file after conversion. This is irreversible"
 				}
 			},

From 42916153a204d8f1a469d23c70cc5645c683c8fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Apr 2026 17:01:29 -0700
Subject: [PATCH 11/32] :arrow_up: Bump
 @graphql-codegen/near-operation-file-preset (#1023)

Bumps [@graphql-codegen/near-operation-file-preset](https://github.com/dotansimha/graphql-code-generator-community/tree/HEAD/packages/presets/near-operation-file) from 3.1.0 to 5.0.0.
- [Release notes](https://github.com/dotansimha/graphql-code-generator-community/releases)
- [Changelog](https://github.com/dotansimha/graphql-code-generator-community/blob/main/packages/presets/near-operation-file/CHANGELOG.md)
- [Commits](https://github.com/dotansimha/graphql-code-generator-community/commits/@graphql-codegen/near-operation-file-preset@5.0.0/packages/presets/near-operation-file)

---
updated-dependencies:
- dependency-name: "@graphql-codegen/near-operation-file-preset"
  dependency-version: 5.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 packages/browser/package.json |   2 +-
 yarn.lock                     | 340 +++++++++++-----------------------
 2 files changed, 111 insertions(+), 231 deletions(-)

diff --git a/packages/browser/package.json b/packages/browser/package.json
index 5cd056110e..1994d49255 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -86,7 +86,7 @@
 		"@babel/preset-react": "^7.24.7",
 		"@babel/preset-typescript": "^7.24.7",
 		"@graphql-codegen/cli": "^5.0.5",
-		"@graphql-codegen/near-operation-file-preset": "^3.0.0",
+		"@graphql-codegen/near-operation-file-preset": "^5.0.0",
 		"@simbathesailor/use-what-changed": "^2.0.0",
 		"@testing-library/jest-dom": "^6.5.0",
 		"@testing-library/react": "^16.0.1",
diff --git a/yarn.lock b/yarn.lock
index 8c06291f75..0660931208 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -42,29 +42,6 @@
     jsonpointer "^5.0.0"
     leven "^3.1.0"
 
-"@ardatan/relay-compiler@12.0.0":
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/@ardatan/relay-compiler/-/relay-compiler-12.0.0.tgz#2e4cca43088e807adc63450e8cab037020e91106"
-  integrity sha512-9anThAaj1dQr6IGmzBMcfzOQKTa5artjuPmw8NYK/fiGEMjADbSguBY2FMDykt+QhilR3wc9VA/3yVju7JHg7Q==
-  dependencies:
-    "@babel/core" "^7.14.0"
-    "@babel/generator" "^7.14.0"
-    "@babel/parser" "^7.14.0"
-    "@babel/runtime" "^7.0.0"
-    "@babel/traverse" "^7.14.0"
-    "@babel/types" "^7.0.0"
-    babel-preset-fbjs "^3.4.0"
-    chalk "^4.0.0"
-    fb-watchman "^2.0.0"
-    fbjs "^3.0.0"
-    glob "^7.1.1"
-    immutable "~3.7.6"
-    invariant "^2.2.4"
-    nullthrows "^1.1.1"
-    relay-runtime "12.0.0"
-    signedsource "^1.0.0"
-    yargs "^15.3.1"
-
 "@ardatan/relay-compiler@^12.0.3":
   version "12.0.3"
   resolved "https://registry.yarnpkg.com/@ardatan/relay-compiler/-/relay-compiler-12.0.3.tgz#a60824672da7f7cef2a3879ed833b120d292fa08"
@@ -81,6 +58,15 @@
     relay-runtime "12.0.0"
     signedsource "^1.0.0"
 
+"@ardatan/relay-compiler@^13.0.0":
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/@ardatan/relay-compiler/-/relay-compiler-13.0.0.tgz#20038e20b0ce751947d8e142b6b45e322d90f2bd"
+  integrity sha512-ite4+xng5McO8MflWCi0un0YmnorTujsDnfPfhzYzAgoJ+jkI1pZj6jtmTl8Jptyi1H+Pa0zlatJIsxDD++ETA==
+  dependencies:
+    "@babel/runtime" "^7.26.10"
+    immutable "^5.1.5"
+    invariant "^2.2.4"
+
 "@aw-web-design/x-default-browser@1.4.126":
   version "1.4.126"
   resolved "https://registry.yarnpkg.com/@aw-web-design/x-default-browser/-/x-default-browser-1.4.126.tgz#43e4bd8f0314ed907a8718d7e862a203af79bc16"
@@ -113,7 +99,7 @@
     js-tokens "^4.0.0"
     picocolors "^1.1.1"
 
-"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.27.2", "@babel/compat-data@^7.27.7", "@babel/compat-data@^7.28.5":
+"@babel/compat-data@^7.27.2", "@babel/compat-data@^7.27.7", "@babel/compat-data@^7.28.5":
   version "7.28.5"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.28.5.tgz#a8a4962e1567121ac0b3b487f52107443b455c7f"
   integrity sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==
@@ -123,7 +109,7 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.29.0.tgz#00d03e8c0ac24dd9be942c5370990cbe1f17d88d"
   integrity sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==
 
-"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.14.0", "@babel/core@^7.18.9", "@babel/core@^7.20.0", "@babel/core@^7.23.0", "@babel/core@^7.23.2", "@babel/core@^7.23.9", "@babel/core@^7.24.4", "@babel/core@^7.25.2", "@babel/core@^7.26.0", "@babel/core@^7.26.10", "@babel/core@^7.28.0", "@babel/core@^7.28.5":
+"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.18.9", "@babel/core@^7.20.0", "@babel/core@^7.23.0", "@babel/core@^7.23.2", "@babel/core@^7.23.9", "@babel/core@^7.24.4", "@babel/core@^7.25.2", "@babel/core@^7.26.0", "@babel/core@^7.26.10", "@babel/core@^7.28.0", "@babel/core@^7.28.5":
   version "7.28.5"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.5.tgz#4c81b35e51e1b734f510c99b07dfbc7bbbb48f7e"
   integrity sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==
@@ -165,7 +151,7 @@
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.14.0", "@babel/generator@^7.18.13", "@babel/generator@^7.20.5", "@babel/generator@^7.23.0", "@babel/generator@^7.25.0", "@babel/generator@^7.26.10", "@babel/generator@^7.28.5":
+"@babel/generator@^7.18.13", "@babel/generator@^7.20.5", "@babel/generator@^7.23.0", "@babel/generator@^7.25.0", "@babel/generator@^7.26.10", "@babel/generator@^7.28.5":
   version "7.28.5"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.5.tgz#712722d5e50f44d07bc7ac9fe84438742dd61298"
   integrity sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==
@@ -194,7 +180,7 @@
   dependencies:
     "@babel/types" "^7.27.3"
 
-"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.27.1", "@babel/helper-compilation-targets@^7.27.2":
+"@babel/helper-compilation-targets@^7.27.1", "@babel/helper-compilation-targets@^7.27.2":
   version "7.27.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz#46a0f6efab808d51d29ce96858dd10ce8732733d"
   integrity sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==
@@ -384,7 +370,7 @@
     js-tokens "^4.0.0"
     picocolors "^1.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.0", "@babel/parser@^7.23.9", "@babel/parser@^7.24.4", "@babel/parser@^7.25.3", "@babel/parser@^7.26.10", "@babel/parser@^7.27.2", "@babel/parser@^7.28.5":
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.0", "@babel/parser@^7.23.9", "@babel/parser@^7.24.4", "@babel/parser@^7.25.3", "@babel/parser@^7.26.10", "@babel/parser@^7.27.2", "@babel/parser@^7.28.5":
   version "7.28.5"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.5.tgz#0b0225ee90362f030efd644e8034c99468893b08"
   integrity sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==
@@ -437,14 +423,6 @@
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/traverse" "^7.28.3"
 
-"@babel/plugin-proposal-class-properties@^7.0.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
-  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-proposal-decorators@^7.12.9":
   version "7.28.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.28.0.tgz#419c8acc31088e05a774344c021800f7ddc39bf0"
@@ -461,17 +439,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-proposal-object-rest-spread@^7.0.0":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
-  integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
-  dependencies:
-    "@babel/compat-data" "^7.20.5"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.20.7"
-
 "@babel/plugin-proposal-private-methods@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
@@ -499,7 +466,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-class-properties@^7.0.0", "@babel/plugin-syntax-class-properties@^7.12.13":
+"@babel/plugin-syntax-class-properties@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
   integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
@@ -534,7 +501,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.12.1", "@babel/plugin-syntax-flow@^7.27.1":
+"@babel/plugin-syntax-flow@^7.12.1", "@babel/plugin-syntax-flow@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.27.1.tgz#6c83cf0d7d635b716827284b7ecd5aead9237662"
   integrity sha512-p9OkPbZ5G7UT1MofwYFigGebnrzGJacoBSQM0/6bi/PUMVE+qlWDD/OalvQKbwgQzU6dl0xAv6r4X7Jme0RYxA==
@@ -569,7 +536,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.27.1":
+"@babel/plugin-syntax-jsx@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz#2f9beb5eff30fa507c5532d107daac7b888fa34c"
   integrity sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==
@@ -597,7 +564,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
@@ -647,7 +614,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-arrow-functions@^7.0.0", "@babel/plugin-transform-arrow-functions@^7.0.0-0", "@babel/plugin-transform-arrow-functions@^7.24.7", "@babel/plugin-transform-arrow-functions@^7.27.1":
+"@babel/plugin-transform-arrow-functions@^7.0.0-0", "@babel/plugin-transform-arrow-functions@^7.24.7", "@babel/plugin-transform-arrow-functions@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.27.1.tgz#6e2061067ba3ab0266d834a9f94811196f2aba9a"
   integrity sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==
@@ -672,14 +639,14 @@
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/helper-remap-async-to-generator" "^7.27.1"
 
-"@babel/plugin-transform-block-scoped-functions@^7.0.0", "@babel/plugin-transform-block-scoped-functions@^7.27.1":
+"@babel/plugin-transform-block-scoped-functions@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.27.1.tgz#558a9d6e24cf72802dd3b62a4b51e0d62c0f57f9"
   integrity sha512-cnqkuOtZLapWYZUYM5rVIdv1nXYuFVIltZ6ZJ7nIj585QsjKM5dhL2Fu/lICXZ1OyIAFc7Qy+bvDAtTXqGrlhg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.25.0", "@babel/plugin-transform-block-scoping@^7.28.5":
+"@babel/plugin-transform-block-scoping@^7.25.0", "@babel/plugin-transform-block-scoping@^7.28.5":
   version "7.28.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.5.tgz#e0d3af63bd8c80de2e567e690a54e84d85eb16f6"
   integrity sha512-45DmULpySVvmq9Pj3X9B+62Xe+DJGov27QravQJU1LLcapR6/10i+gYVAucGGJpHBp5mYxIMK4nDAT/QDLr47g==
@@ -702,7 +669,7 @@
     "@babel/helper-create-class-features-plugin" "^7.28.3"
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-classes@^7.0.0", "@babel/plugin-transform-classes@^7.0.0-0", "@babel/plugin-transform-classes@^7.25.4", "@babel/plugin-transform-classes@^7.28.4":
+"@babel/plugin-transform-classes@^7.0.0-0", "@babel/plugin-transform-classes@^7.25.4", "@babel/plugin-transform-classes@^7.28.4":
   version "7.28.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.4.tgz#75d66175486788c56728a73424d67cbc7473495c"
   integrity sha512-cFOlhIYPBv/iBoc+KS3M6et2XPtbT2HiCRfBXWtfpc9OAyostldxIf9YAYB6ypURBBbx+Qv6nyrLzASfJe+hBA==
@@ -714,7 +681,7 @@
     "@babel/helper-replace-supers" "^7.27.1"
     "@babel/traverse" "^7.28.4"
 
-"@babel/plugin-transform-computed-properties@^7.0.0", "@babel/plugin-transform-computed-properties@^7.24.7", "@babel/plugin-transform-computed-properties@^7.27.1":
+"@babel/plugin-transform-computed-properties@^7.24.7", "@babel/plugin-transform-computed-properties@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.27.1.tgz#81662e78bf5e734a97982c2b7f0a793288ef3caa"
   integrity sha512-lj9PGWvMTVksbWiDT2tW68zGS/cyo4AkZ/QTp0sQT0mjPopCmrSkzxeXkznjqBxzDI6TclZhOJbBmbBLjuOZUw==
@@ -722,7 +689,7 @@
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/template" "^7.27.1"
 
-"@babel/plugin-transform-destructuring@^7.0.0", "@babel/plugin-transform-destructuring@^7.24.8", "@babel/plugin-transform-destructuring@^7.28.0", "@babel/plugin-transform-destructuring@^7.28.5":
+"@babel/plugin-transform-destructuring@^7.24.8", "@babel/plugin-transform-destructuring@^7.28.0", "@babel/plugin-transform-destructuring@^7.28.5":
   version "7.28.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.5.tgz#b8402764df96179a2070bb7b501a1586cf8ad7a7"
   integrity sha512-Kl9Bc6D0zTUcFUvkNuQh4eGXPKKNDOJQXVyyM4ZAQPMveniJdxi8XMJwLo+xSoW3MIq81bD33lcUe9kZpl0MCw==
@@ -782,7 +749,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-flow-strip-types@^7.0.0", "@babel/plugin-transform-flow-strip-types@^7.25.2", "@babel/plugin-transform-flow-strip-types@^7.27.1":
+"@babel/plugin-transform-flow-strip-types@^7.25.2", "@babel/plugin-transform-flow-strip-types@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.27.1.tgz#5def3e1e7730f008d683144fb79b724f92c5cdf9"
   integrity sha512-G5eDKsu50udECw7DL2AcsysXiQyB7Nfg521t2OAJ4tbfTJ27doHLeF/vlI1NZGlLdbb/v+ibvtL1YBQqYOwJGg==
@@ -790,7 +757,7 @@
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/plugin-syntax-flow" "^7.27.1"
 
-"@babel/plugin-transform-for-of@^7.0.0", "@babel/plugin-transform-for-of@^7.24.7", "@babel/plugin-transform-for-of@^7.27.1":
+"@babel/plugin-transform-for-of@^7.24.7", "@babel/plugin-transform-for-of@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.27.1.tgz#bc24f7080e9ff721b63a70ac7b2564ca15b6c40a"
   integrity sha512-BfbWFFEJFQzLCQ5N8VocnCtA8J1CLkNTe2Ms2wocj75dd6VpiqS5Z5quTYcUoo4Yq+DN0rtikODccuv7RU81sw==
@@ -798,7 +765,7 @@
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
 
-"@babel/plugin-transform-function-name@^7.0.0", "@babel/plugin-transform-function-name@^7.25.1", "@babel/plugin-transform-function-name@^7.27.1":
+"@babel/plugin-transform-function-name@^7.25.1", "@babel/plugin-transform-function-name@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.27.1.tgz#4d0bf307720e4dce6d7c30fcb1fd6ca77bdeb3a7"
   integrity sha512-1bQeydJF9Nr1eBCMMbC+hdwmRlsv5XYOMu03YSWFwNs0HsAmtSxxF1fyuYPqemVldVyFmlCU7w8UE14LupUSZQ==
@@ -814,7 +781,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-literals@^7.0.0", "@babel/plugin-transform-literals@^7.25.2", "@babel/plugin-transform-literals@^7.27.1":
+"@babel/plugin-transform-literals@^7.25.2", "@babel/plugin-transform-literals@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.27.1.tgz#baaefa4d10a1d4206f9dcdda50d7d5827bb70b24"
   integrity sha512-0HCFSepIpLTkLcsi86GG3mTUzxV5jpmbv97hTETW3yzrAij8aqlD36toB1D0daVFJM8NK6GvKO0gslVQmm+zZA==
@@ -828,7 +795,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-member-expression-literals@^7.0.0", "@babel/plugin-transform-member-expression-literals@^7.27.1":
+"@babel/plugin-transform-member-expression-literals@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.27.1.tgz#37b88ba594d852418e99536f5612f795f23aeaf9"
   integrity sha512-hqoBX4dcZ1I33jCSWcXrP+1Ku7kdqXf1oeah7ooKOIiAdKQ+uqftgCFNOSzA5AMS2XIHEYeGFg4cKRCdpxzVOQ==
@@ -843,7 +810,7 @@
     "@babel/helper-module-transforms" "^7.27.1"
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.23.0", "@babel/plugin-transform-modules-commonjs@^7.24.8", "@babel/plugin-transform-modules-commonjs@^7.27.1":
+"@babel/plugin-transform-modules-commonjs@^7.23.0", "@babel/plugin-transform-modules-commonjs@^7.24.8", "@babel/plugin-transform-modules-commonjs@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.27.1.tgz#8e44ed37c2787ecc23bdc367f49977476614e832"
   integrity sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==
@@ -909,7 +876,7 @@
     "@babel/plugin-transform-parameters" "^7.27.7"
     "@babel/traverse" "^7.28.4"
 
-"@babel/plugin-transform-object-super@^7.0.0", "@babel/plugin-transform-object-super@^7.27.1":
+"@babel/plugin-transform-object-super@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.27.1.tgz#1c932cd27bf3874c43a5cac4f43ebf970c9871b5"
   integrity sha512-SFy8S9plRPbIcxlJ8A6mT/CxFdJx/c04JEctz4jf8YZaVS2px34j7NXRrlGlHkN/M2gnpL37ZpGRGVFLd3l8Ng==
@@ -932,7 +899,7 @@
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
 
-"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.24.7", "@babel/plugin-transform-parameters@^7.27.7":
+"@babel/plugin-transform-parameters@^7.24.7", "@babel/plugin-transform-parameters@^7.27.7":
   version "7.27.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.27.7.tgz#1fd2febb7c74e7d21cf3b05f7aebc907940af53a"
   integrity sha512-qBkYTYCb76RRxUM6CcZA5KRu8K4SM8ajzVeUgVdMVO9NN9uI/GaVmBg/WKJJGnNokV9SY8FxNOVWGXzqzUidBg==
@@ -956,14 +923,14 @@
     "@babel/helper-create-class-features-plugin" "^7.27.1"
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-property-literals@^7.0.0", "@babel/plugin-transform-property-literals@^7.27.1":
+"@babel/plugin-transform-property-literals@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.27.1.tgz#07eafd618800591e88073a0af1b940d9a42c6424"
   integrity sha512-oThy3BCuCha8kDZ8ZkgOg2exvPYUlprMukKQXI1r1pJ47NCvxfkEy8vK+r/hT9nF0Aa4H1WUPZZjHTFtAhGfmQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-react-display-name@^7.0.0", "@babel/plugin-transform-react-display-name@^7.24.7", "@babel/plugin-transform-react-display-name@^7.28.0":
+"@babel/plugin-transform-react-display-name@^7.24.7", "@babel/plugin-transform-react-display-name@^7.28.0":
   version "7.28.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.28.0.tgz#6f20a7295fea7df42eb42fed8f896813f5b934de"
   integrity sha512-D6Eujc2zMxKjfa4Zxl4GHMsmhKKZ9VpcqIchJLvwTxad9zWIYulwYItBovpDOoNLISpcZSXoDJ5gaGbQUDqViA==
@@ -991,7 +958,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.25.2", "@babel/plugin-transform-react-jsx@^7.27.1":
+"@babel/plugin-transform-react-jsx@^7.25.2", "@babel/plugin-transform-react-jsx@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.27.1.tgz#1023bc94b78b0a2d68c82b5e96aed573bcfb9db0"
   integrity sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==
@@ -1044,14 +1011,14 @@
     babel-plugin-polyfill-regenerator "^0.6.5"
     semver "^6.3.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.0.0", "@babel/plugin-transform-shorthand-properties@^7.0.0-0", "@babel/plugin-transform-shorthand-properties@^7.24.7", "@babel/plugin-transform-shorthand-properties@^7.27.1":
+"@babel/plugin-transform-shorthand-properties@^7.0.0-0", "@babel/plugin-transform-shorthand-properties@^7.24.7", "@babel/plugin-transform-shorthand-properties@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.27.1.tgz#532abdacdec87bfee1e0ef8e2fcdee543fe32b90"
   integrity sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-spread@^7.0.0", "@babel/plugin-transform-spread@^7.24.7", "@babel/plugin-transform-spread@^7.27.1":
+"@babel/plugin-transform-spread@^7.24.7", "@babel/plugin-transform-spread@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.27.1.tgz#1a264d5fc12750918f50e3fe3e24e437178abb08"
   integrity sha512-kpb3HUqaILBJcRFVhFUs6Trdd4mkrzcGXss+6/mxUd273PfbWqSDHRzMT2234gIg2QYfAjvXLSquP1xECSg09Q==
@@ -1066,7 +1033,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-template-literals@^7.0.0", "@babel/plugin-transform-template-literals@^7.0.0-0", "@babel/plugin-transform-template-literals@^7.27.1":
+"@babel/plugin-transform-template-literals@^7.0.0-0", "@babel/plugin-transform-template-literals@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.27.1.tgz#1a0eb35d8bb3e6efc06c9fd40eb0bcef548328b8"
   integrity sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg==
@@ -1307,7 +1274,7 @@
     "@babel/types" "^7.28.5"
     debug "^4.3.1"
 
-"@babel/traverse@^7.14.0", "@babel/traverse@^7.18.9", "@babel/traverse@^7.23.0", "@babel/traverse@^7.23.2", "@babel/traverse@^7.25.3", "@babel/traverse@^7.26.10", "@babel/traverse@^7.27.1", "@babel/traverse@^7.28.0", "@babel/traverse@^7.28.3", "@babel/traverse@^7.28.4", "@babel/traverse@^7.28.5":
+"@babel/traverse@^7.18.9", "@babel/traverse@^7.23.0", "@babel/traverse@^7.23.2", "@babel/traverse@^7.25.3", "@babel/traverse@^7.26.10", "@babel/traverse@^7.27.1", "@babel/traverse@^7.28.0", "@babel/traverse@^7.28.3", "@babel/traverse@^7.28.4", "@babel/traverse@^7.28.5":
   version "7.28.5"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.5.tgz#450cab9135d21a7a2ca9d2d35aa05c20e68c360b"
   integrity sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==
@@ -2554,14 +2521,6 @@
   dependencies:
     "@0no-co/graphql.web" "^1.0.5"
 
-"@graphql-codegen/add@^3.2.1":
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/add/-/add-3.2.3.tgz#f1ecee085987e7c21841edc4b1fd48877c663e1a"
-  integrity sha512-sQOnWpMko4JLeykwyjFTxnhqjd/3NOG2OyMuvK76Wnnwh8DRrNf2VEs2kmSvLl7MndMlOj7Kh5U154dVcvhmKQ==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^3.1.1"
-    tslib "~2.4.0"
-
 "@graphql-codegen/add@^5.0.3":
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/@graphql-codegen/add/-/add-5.0.3.tgz#1ede6bac9a93661ed7fa5808b203d079e1b1d215"
@@ -2570,6 +2529,14 @@
     "@graphql-codegen/plugin-helpers" "^5.0.3"
     tslib "~2.6.0"
 
+"@graphql-codegen/add@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/add/-/add-6.0.0.tgz#d195051d7c4bd6d3955a92361cc9eec7784bb541"
+  integrity sha512-biFdaURX0KTwEJPQ1wkT6BRgNasqgQ5KbCI1a3zwtLtO7XTo7/vKITPylmiU27K5DSOWYnY/1jfSqUAEBuhZrQ==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^6.0.0"
+    tslib "~2.6.0"
+
 "@graphql-codegen/cli@^5.0.5":
   version "5.0.7"
   resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-5.0.7.tgz#5c8f843fb12e2d69692bee55b2846afa05e7999b"
@@ -2651,36 +2618,36 @@
     auto-bind "~4.0.0"
     tslib "~2.6.0"
 
-"@graphql-codegen/near-operation-file-preset@^3.0.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/near-operation-file-preset/-/near-operation-file-preset-3.1.0.tgz#5c60a9ec137bb78d83eeab39a97595a09ad6bd9a"
-  integrity sha512-sXIIi0BPP3IcARdzSztpE51oJTcGB67hi7ddBYfLinks/R/5aFG1Ry/J61707Kt+6Q5WhTnf5XAQUAqi6200yA==
+"@graphql-codegen/near-operation-file-preset@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/near-operation-file-preset/-/near-operation-file-preset-5.0.0.tgz#00cf43ce61eba094f82751f3b1709b7a9b9857b9"
+  integrity sha512-Ck5jMu2izbKFwODYCM/sGWNQKN4BN4fpxr8g99fs6ESH29yfWMjA1dbUlTbtQtR7iXy39jT8451BLTG4/vOIxQ==
   dependencies:
-    "@graphql-codegen/add" "^3.2.1"
-    "@graphql-codegen/plugin-helpers" "^3.0.0"
-    "@graphql-codegen/visitor-plugin-common" "2.13.8"
-    "@graphql-tools/utils" "^10.0.0"
+    "@graphql-codegen/add" "^6.0.0"
+    "@graphql-codegen/plugin-helpers" "^6.1.1"
+    "@graphql-codegen/visitor-plugin-common" "^6.2.4"
+    "@graphql-tools/utils" "^11.0.0"
     parse-filepath "^1.0.2"
     tslib "^2.8.1"
 
-"@graphql-codegen/plugin-helpers@^3.0.0", "@graphql-codegen/plugin-helpers@^3.1.1", "@graphql-codegen/plugin-helpers@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-3.1.2.tgz#69a2e91178f478ea6849846ade0a59a844d34389"
-  integrity sha512-emOQiHyIliVOIjKVKdsI5MXj312zmRDwmHpyUTZMjfpvxq/UVAHUJIVdVf+lnjjrI+LXBTgMlTWTgHQfmICxjg==
+"@graphql-codegen/plugin-helpers@^5.0.3", "@graphql-codegen/plugin-helpers@^5.1.0", "@graphql-codegen/plugin-helpers@^5.1.1":
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-5.1.1.tgz#b7c744c8826367c3002c346112de3cd1b0f99b16"
+  integrity sha512-28GHODK2HY1NhdyRcPP3sCz0Kqxyfiz7boIZ8qIxFYmpLYnlDgiYok5fhFLVSZihyOpCs4Fa37gVHf/Q4I2FEg==
   dependencies:
-    "@graphql-tools/utils" "^9.0.0"
+    "@graphql-tools/utils" "^10.0.0"
     change-case-all "1.0.15"
     common-tags "1.8.2"
     import-from "4.0.0"
     lodash "~4.17.0"
-    tslib "~2.4.0"
+    tslib "~2.6.0"
 
-"@graphql-codegen/plugin-helpers@^5.0.3", "@graphql-codegen/plugin-helpers@^5.1.0", "@graphql-codegen/plugin-helpers@^5.1.1":
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-5.1.1.tgz#b7c744c8826367c3002c346112de3cd1b0f99b16"
-  integrity sha512-28GHODK2HY1NhdyRcPP3sCz0Kqxyfiz7boIZ8qIxFYmpLYnlDgiYok5fhFLVSZihyOpCs4Fa37gVHf/Q4I2FEg==
+"@graphql-codegen/plugin-helpers@^6.0.0", "@graphql-codegen/plugin-helpers@^6.1.1":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-6.2.0.tgz#d10a56939c9341522e30c23aa2a83b10eafcd0c0"
+  integrity sha512-TKm0Q0+wRlg354Qt3PyXc+sy6dCKxmNofBsgmHoFZNVHtzMQSSgNT+rUWdwBwObQ9bFHiUVsDIv8QqxKMiKmpw==
   dependencies:
-    "@graphql-tools/utils" "^10.0.0"
+    "@graphql-tools/utils" "^11.0.0"
     change-case-all "1.0.15"
     common-tags "1.8.2"
     import-from "4.0.0"
@@ -2729,22 +2696,6 @@
     auto-bind "~4.0.0"
     tslib "~2.6.0"
 
-"@graphql-codegen/visitor-plugin-common@2.13.8":
-  version "2.13.8"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-2.13.8.tgz#09bc6317b227e5a278f394f4cef0d6c2d1910597"
-  integrity sha512-IQWu99YV4wt8hGxIbBQPtqRuaWZhkQRG2IZKbMoSvh0vGeWb3dB0n0hSgKaOOxDY+tljtOf9MTcUYvJslQucMQ==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^3.1.2"
-    "@graphql-tools/optimize" "^1.3.0"
-    "@graphql-tools/relay-operation-optimizer" "^6.5.0"
-    "@graphql-tools/utils" "^9.0.0"
-    auto-bind "~4.0.0"
-    change-case-all "1.0.15"
-    dependency-graph "^0.11.0"
-    graphql-tag "^2.11.0"
-    parse-filepath "^1.0.2"
-    tslib "~2.4.0"
-
 "@graphql-codegen/visitor-plugin-common@5.8.0", "@graphql-codegen/visitor-plugin-common@^5.8.0":
   version "5.8.0"
   resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-5.8.0.tgz#1b796453eb96d8e6ad5d4d3acff304e4672781a0"
@@ -2761,6 +2712,22 @@
     parse-filepath "^1.0.2"
     tslib "~2.6.0"
 
+"@graphql-codegen/visitor-plugin-common@^6.2.4":
+  version "6.2.4"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-6.2.4.tgz#73906f34e8baaaadf5bfe5fefece4d86f835aebc"
+  integrity sha512-iwiVCc7Mv8/XAa3K35AdFQ9chJSDv/gYEnBeQFF/Sq/W8EyJoHypOGOTTLk7OSrWO4xea65ggv0e7fGt7rPJjQ==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^6.1.1"
+    "@graphql-tools/optimize" "^2.0.0"
+    "@graphql-tools/relay-operation-optimizer" "^7.1.1"
+    "@graphql-tools/utils" "^11.0.0"
+    auto-bind "~4.0.0"
+    change-case-all "1.0.15"
+    dependency-graph "^1.0.0"
+    graphql-tag "^2.11.0"
+    parse-filepath "^1.0.2"
+    tslib "~2.6.0"
+
 "@graphql-hive/signal@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@graphql-hive/signal/-/signal-1.0.0.tgz#6e2193660a47c925abadbe72293dfc9430e24f8f"
@@ -2974,13 +2941,6 @@
     "@graphql-tools/utils" "^10.11.0"
     tslib "^2.4.0"
 
-"@graphql-tools/optimize@^1.3.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/optimize/-/optimize-1.4.0.tgz#20d6a9efa185ef8fc4af4fd409963e0907c6e112"
-  integrity sha512-dJs/2XvZp+wgHH8T5J2TqptT9/6uVzIYvA6uFACha+ufvdMBedkfR4b4GbT8jAKLRARiqRTxy3dctnwkTM2tdw==
-  dependencies:
-    tslib "^2.4.0"
-
 "@graphql-tools/optimize@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@graphql-tools/optimize/-/optimize-2.0.0.tgz#7a9779d180824511248a50c5a241eff6e7a2d906"
@@ -3010,15 +2970,6 @@
     tslib "^2.4.0"
     yaml-ast-parser "^0.0.43"
 
-"@graphql-tools/relay-operation-optimizer@^6.5.0":
-  version "6.5.18"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-6.5.18.tgz#a1b74a8e0a5d0c795b8a4d19629b654cf66aa5ab"
-  integrity sha512-mc5VPyTeV+LwiM+DNvoDQfPqwQYhPV/cl5jOBjTgSniyaq8/86aODfMkrE2OduhQ5E00hqrkuL2Fdrgk0w1QJg==
-  dependencies:
-    "@ardatan/relay-compiler" "12.0.0"
-    "@graphql-tools/utils" "^9.2.1"
-    tslib "^2.4.0"
-
 "@graphql-tools/relay-operation-optimizer@^7.0.0":
   version "7.0.26"
   resolved "https://registry.yarnpkg.com/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-7.0.26.tgz#309ffed9e63038db97db15e7adae667571442af9"
@@ -3028,6 +2979,15 @@
     "@graphql-tools/utils" "^10.11.0"
     tslib "^2.4.0"
 
+"@graphql-tools/relay-operation-optimizer@^7.1.1":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-7.1.1.tgz#5294ffc075dcdf0c2ffcd1f02339374cefba51b8"
+  integrity sha512-va+ZieMlz6Fj18xUbwyQkZ34PsnzIdPT6Ccy1BNOQw1iclQwk52HejLMZeE/4fH+4cu80Q2HXi5+FjCKpmnJCg==
+  dependencies:
+    "@ardatan/relay-compiler" "^13.0.0"
+    "@graphql-tools/utils" "^11.0.0"
+    tslib "^2.4.0"
+
 "@graphql-tools/schema@^10.0.0", "@graphql-tools/schema@^10.0.25", "@graphql-tools/schema@^10.0.30":
   version "10.0.30"
   resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-10.0.30.tgz#cdc9583e70a297d53ff0b344935bd81e3bf7d7ac"
@@ -3065,12 +3025,14 @@
     cross-inspect "1.0.1"
     tslib "^2.4.0"
 
-"@graphql-tools/utils@^9.0.0", "@graphql-tools/utils@^9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-9.2.1.tgz#1b3df0ef166cfa3eae706e3518b17d5922721c57"
-  integrity sha512-WUw506Ql6xzmOORlriNrD6Ugx+HjVgYxt9KCXD9mHAak+eaXSwuGGPyE60hy9xaDEoXKBsG7SkG69ybitaVl6A==
+"@graphql-tools/utils@^11.0.0":
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-11.0.0.tgz#f54a09372e96c32416fcbd0eb8e9e0f1338900bd"
+  integrity sha512-bM1HeZdXA2C3LSIeLOnH/bcqSgbQgKEDrjxODjqi3y58xai2TkNrtYcQSoWzGbt9VMN1dORGjR7Vem8SPnUFQA==
   dependencies:
     "@graphql-typed-document-node/core" "^3.1.1"
+    "@whatwg-node/promise-helpers" "^1.0.0"
+    cross-inspect "1.0.1"
     tslib "^2.4.0"
 
 "@graphql-tools/wrap@^10.0.16":
@@ -9795,11 +9757,6 @@ babel-plugin-syntax-hermes-parser@0.29.1, babel-plugin-syntax-hermes-parser@^0.2
   dependencies:
     hermes-parser "0.29.1"
 
-babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0:
-  version "7.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf"
-  integrity sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==
-
 babel-plugin-transform-flow-enums@^0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-enums/-/babel-plugin-transform-flow-enums-0.0.2.tgz#d1d0cc9bdc799c850ca110d0ddc9f21b9ec3ef25"
@@ -9856,39 +9813,6 @@ babel-preset-expo@~54.0.9:
     debug "^4.3.4"
     resolve-from "^5.0.0"
 
-babel-preset-fbjs@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz#38a14e5a7a3b285a3f3a86552d650dca5cf6111c"
-  integrity sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow==
-  dependencies:
-    "@babel/plugin-proposal-class-properties" "^7.0.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.0.0"
-    "@babel/plugin-syntax-class-properties" "^7.0.0"
-    "@babel/plugin-syntax-flow" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-    "@babel/plugin-transform-arrow-functions" "^7.0.0"
-    "@babel/plugin-transform-block-scoped-functions" "^7.0.0"
-    "@babel/plugin-transform-block-scoping" "^7.0.0"
-    "@babel/plugin-transform-classes" "^7.0.0"
-    "@babel/plugin-transform-computed-properties" "^7.0.0"
-    "@babel/plugin-transform-destructuring" "^7.0.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.0.0"
-    "@babel/plugin-transform-for-of" "^7.0.0"
-    "@babel/plugin-transform-function-name" "^7.0.0"
-    "@babel/plugin-transform-literals" "^7.0.0"
-    "@babel/plugin-transform-member-expression-literals" "^7.0.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.0.0"
-    "@babel/plugin-transform-object-super" "^7.0.0"
-    "@babel/plugin-transform-parameters" "^7.0.0"
-    "@babel/plugin-transform-property-literals" "^7.0.0"
-    "@babel/plugin-transform-react-display-name" "^7.0.0"
-    "@babel/plugin-transform-react-jsx" "^7.0.0"
-    "@babel/plugin-transform-shorthand-properties" "^7.0.0"
-    "@babel/plugin-transform-spread" "^7.0.0"
-    "@babel/plugin-transform-template-literals" "^7.0.0"
-    babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0"
-
 babel-preset-jest@30.3.0:
   version "30.3.0"
   resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-30.3.0.tgz#21cf3d19a6f5e9924426c879ee0b7f092636d043"
@@ -10262,7 +10186,7 @@ camelcase-keys@^6.2.2:
     map-obj "^4.0.0"
     quick-lru "^4.0.1"
 
-camelcase@^5.0.0, camelcase@^5.3.1:
+camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
@@ -10638,15 +10562,6 @@ clipboardy@^4.0.0:
     is-wsl "^3.1.0"
     is64bit "^2.0.0"
 
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
-  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
-
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -11799,7 +11714,7 @@ decamelize-keys@^1.1.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.1.0, decamelize@^1.2.0:
+decamelize@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
@@ -11969,6 +11884,11 @@ dependency-graph@^0.11.0:
   resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27"
   integrity sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==
 
+dependency-graph@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-1.0.0.tgz#bb5e85aec1310bc13b22dbd76e3196c4ee4c10d2"
+  integrity sha512-cW3gggJ28HZ/LExwxP2B++aiKxhJXMSIt9K48FOXQkm+vuG5gyatXnLsONRJdzO/7VfjDIiaOOa/bs4l464Lwg==
+
 deprecation@^2.0.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
@@ -14285,7 +14205,7 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1, get-caller-file@^2.0.5:
+get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -15308,6 +15228,11 @@ immer@^10.0.4:
   resolved "https://registry.yarnpkg.com/immer/-/immer-10.2.0.tgz#88a4ce06a1af64172d254b70f7cb04df51c871b1"
   integrity sha512-d/+XTN3zfODyjr89gM3mPq1WNX2B8pYsu7eORitdwyA2sBubnTl3laYlBk4sXY5FUa5qTZGBDPJICVbvqzjlbw==
 
+immutable@^5.1.5:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.1.5.tgz#93ee4db5c2a9ab42a4a783069f3c5d8847d40165"
+  integrity sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==
+
 immutable@~3.7.6:
   version "3.7.6"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.7.6.tgz#13b4d3cb12befa15482a26fe1b2ebae640071e4b"
@@ -22158,11 +22083,6 @@ require-from-string@^2.0.2:
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
 require-relative@^0.8.7:
   version "0.8.7"
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
@@ -24337,11 +24257,6 @@ tslib@^1.13.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@~2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
-  integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
-
 tslib@~2.6.0:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
@@ -25537,11 +25452,6 @@ which-collection@^1.0.1, which-collection@^1.0.2:
     is-weakmap "^2.0.2"
     is-weakset "^2.0.3"
 
-which-module@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
-  integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
-
 which-typed-array@^1.1.13, which-typed-array@^1.1.16, which-typed-array@^1.1.19, which-typed-array@^1.1.2:
   version "1.1.19"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.19.tgz#df03842e870b6b88e117524a4b364b6fc689f956"
@@ -25924,11 +25834,6 @@ xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-y18n@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
-  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
-
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
@@ -25969,14 +25874,6 @@ yargs-parser@21.1.1, yargs-parser@^21.1.1:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs-parser@^18.1.2:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
 yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   version "20.2.9"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
@@ -25995,23 +25892,6 @@ yargs@17.7.2, yargs@^17.0.0, yargs@^17.6.2, yargs@^17.7.2:
     y18n "^5.0.5"
     yargs-parser "^21.1.1"
 
-yargs@^15.3.1:
-  version "15.4.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
-  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
-  dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.2"
-
 yargs@^16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"

From 957bba88d71d3e762879b1df3a2b248d41e963ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Apr 2026 17:04:19 -0700
Subject: [PATCH 12/32] :arrow_up: Bump @typescript-eslint/parser from 8.48.1
 to 8.58.0 (#1022)

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 8.48.1 to 8.58.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.58.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-version: 8.58.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 582ced00a0..b450d73498 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
 		"@babel/traverse": "^7.28.5",
 		"@eslint/js": "^9.39.1",
 		"@typescript-eslint/eslint-plugin": "^8.48.1",
-		"@typescript-eslint/parser": "^8.48.1",
+		"@typescript-eslint/parser": "^8.58.0",
 		"babel-plugin-react-compiler": "^1.0.0",
 		"concurrently": "^8.2.2",
 		"eslint": "^9.39.1",
diff --git a/yarn.lock b/yarn.lock
index 0660931208..01e053ba83 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8434,7 +8434,7 @@
     natural-compare "^1.4.0"
     ts-api-utils "^2.1.0"
 
-"@typescript-eslint/parser@8.48.1", "@typescript-eslint/parser@^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0", "@typescript-eslint/parser@^8.48.1":
+"@typescript-eslint/parser@8.48.1":
   version "8.48.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.48.1.tgz#4e3c66d9ec20683ec142417fafeadab61c479c3f"
   integrity sha512-PC0PDZfJg8sP7cmKe6L3QIL8GZwU5aRvUFedqSIpw3B+QjRSUZeeITC2M5XKeMXEzL6wccN196iy3JLwKNvDVA==
@@ -8445,6 +8445,17 @@
     "@typescript-eslint/visitor-keys" "8.48.1"
     debug "^4.3.4"
 
+"@typescript-eslint/parser@^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0", "@typescript-eslint/parser@^8.58.0":
+  version "8.58.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.58.0.tgz#da04ece1967b6c2fe8f10c3473dabf3825795ef7"
+  integrity sha512-rLoGZIf9afaRBYsPUMtvkDWykwXwUPL60HebR4JgTI8mxfFe2cQTu3AGitANp4b9B2QlVru6WzjgB2IzJKiCSA==
+  dependencies:
+    "@typescript-eslint/scope-manager" "8.58.0"
+    "@typescript-eslint/types" "8.58.0"
+    "@typescript-eslint/typescript-estree" "8.58.0"
+    "@typescript-eslint/visitor-keys" "8.58.0"
+    debug "^4.4.3"
+
 "@typescript-eslint/parser@^6.21.0":
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.21.0.tgz#af8fcf66feee2edc86bc5d1cf45e33b0630bf35b"
@@ -8465,6 +8476,15 @@
     "@typescript-eslint/types" "^8.48.1"
     debug "^4.3.4"
 
+"@typescript-eslint/project-service@8.58.0":
+  version "8.58.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.58.0.tgz#66ceda0aabf7427aec3e2713fa43eb278dead2aa"
+  integrity sha512-8Q/wBPWLQP1j16NxoPNIKpDZFMaxl7yWIoqXWYeWO+Bbd2mjgvoF0dxP2jKZg5+x49rgKdf7Ck473M8PC3V9lg==
+  dependencies:
+    "@typescript-eslint/tsconfig-utils" "^8.58.0"
+    "@typescript-eslint/types" "^8.58.0"
+    debug "^4.4.3"
+
 "@typescript-eslint/scope-manager@6.21.0":
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1"
@@ -8481,11 +8501,24 @@
     "@typescript-eslint/types" "8.48.1"
     "@typescript-eslint/visitor-keys" "8.48.1"
 
+"@typescript-eslint/scope-manager@8.58.0":
+  version "8.58.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.58.0.tgz#e304142775e49a1b7ac3c8bf2536714447c72cab"
+  integrity sha512-W1Lur1oF50FxSnNdGp3Vs6P+yBRSmZiw4IIjEeYxd8UQJwhUF0gDgDD/W/Tgmh73mxgEU3qX0Bzdl/NGuSPEpQ==
+  dependencies:
+    "@typescript-eslint/types" "8.58.0"
+    "@typescript-eslint/visitor-keys" "8.58.0"
+
 "@typescript-eslint/tsconfig-utils@8.48.1", "@typescript-eslint/tsconfig-utils@^8.48.1":
   version "8.48.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.48.1.tgz#68139ce2d258f984e2b33a95389158f1212af646"
   integrity sha512-k0Jhs4CpEffIBm6wPaCXBAD7jxBtrHjrSgtfCjUvPp9AZ78lXKdTR8fxyZO5y4vWNlOvYXRtngSZNSn+H53Jkw==
 
+"@typescript-eslint/tsconfig-utils@8.58.0", "@typescript-eslint/tsconfig-utils@^8.58.0":
+  version "8.58.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.58.0.tgz#c5a8edb21f31e0fdee565724e1b984171c559482"
+  integrity sha512-doNSZEVJsWEu4htiVC+PR6NpM+pa+a4ClH9INRWOWCUzMst/VA9c4gXq92F8GUD1rwhNvRLkgjfYtFXegXQF7A==
+
 "@typescript-eslint/type-utils@8.48.1":
   version "8.48.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.48.1.tgz#955bd3ddd648450f0a627925ff12ade63fb7516d"
@@ -8502,11 +8535,16 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
   integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
 
-"@typescript-eslint/types@8.48.1", "@typescript-eslint/types@^8.48.1":
+"@typescript-eslint/types@8.48.1":
   version "8.48.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.48.1.tgz#a9ff808f5f798f28767d5c0b015a88fa7ce46bd7"
   integrity sha512-+fZ3LZNeiELGmimrujsDCT4CRIbq5oXdHe7chLiW8qzqyPMnn1puNstCrMNVAqwcl2FdIxkuJ4tOs/RFDBVc/Q==
 
+"@typescript-eslint/types@8.58.0", "@typescript-eslint/types@^8.48.1", "@typescript-eslint/types@^8.58.0":
+  version "8.58.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.58.0.tgz#e94ae7abdc1c6530e71183c1007b61fa93112a5a"
+  integrity sha512-O9CjxypDT89fbHxRfETNoAnHj/i6IpRK0CvbVN3qibxlLdo5p5hcLmUuCCrHMpxiWSwKyI8mCP7qRNYuOJ0Uww==
+
 "@typescript-eslint/typescript-estree@6.21.0":
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46"
@@ -8536,6 +8574,21 @@
     tinyglobby "^0.2.15"
     ts-api-utils "^2.1.0"
 
+"@typescript-eslint/typescript-estree@8.58.0":
+  version "8.58.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.58.0.tgz#ed233faa8e2f2a2e1357c3e7d553d6465a0ee59a"
+  integrity sha512-7vv5UWbHqew/dvs+D3e1RvLv1v2eeZ9txRHPnEEBUgSNLx5ghdzjHa0sgLWYVKssH+lYmV0JaWdoubo0ncGYLA==
+  dependencies:
+    "@typescript-eslint/project-service" "8.58.0"
+    "@typescript-eslint/tsconfig-utils" "8.58.0"
+    "@typescript-eslint/types" "8.58.0"
+    "@typescript-eslint/visitor-keys" "8.58.0"
+    debug "^4.4.3"
+    minimatch "^10.2.2"
+    semver "^7.7.3"
+    tinyglobby "^0.2.15"
+    ts-api-utils "^2.5.0"
+
 "@typescript-eslint/utils@8.48.1":
   version "8.48.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.48.1.tgz#6cf7b99e0943b33a983ef687b9a86b65578b5c32"
@@ -8562,6 +8615,14 @@
     "@typescript-eslint/types" "8.48.1"
     eslint-visitor-keys "^4.2.1"
 
+"@typescript-eslint/visitor-keys@8.58.0":
+  version "8.58.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.58.0.tgz#2abd55a4be70fd55967aceaba4330b9ba9f45189"
+  integrity sha512-XJ9UD9+bbDo4a4epraTwG3TsNPeiB9aShrUneAVXy8q4LuwowN+qu89/6ByLMINqvIMeI9H9hOHQtg/ijrYXzQ==
+  dependencies:
+    "@typescript-eslint/types" "8.58.0"
+    eslint-visitor-keys "^5.0.0"
+
 "@typescript/vfs@^1.6.0":
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/@typescript/vfs/-/vfs-1.6.2.tgz#e66883c5a8dcc5d2794dfa05c8f9749d767219f8"
@@ -11692,7 +11753,7 @@ debug@2.6.9, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@4.4.3, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@^4.3.6, debug@^4.3.7, debug@^4.4.0, debug@^4.4.1:
+debug@4, debug@4.4.3, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@^4.3.6, debug@^4.3.7, debug@^4.4.0, debug@^4.4.1, debug@^4.4.3:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
   integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
@@ -12936,6 +12997,11 @@ eslint-visitor-keys@^4.2.1:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz#4cfea60fe7dd0ad8e816e1ed026c1d5251b512c1"
   integrity sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==
 
+eslint-visitor-keys@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz#9e3c9489697824d2d4ce3a8ad12628f91e9f59be"
+  integrity sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==
+
 eslint@^8.57.1:
   version "8.57.1"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.1.tgz#7df109654aba7e3bbe5c8eae533c5e461d3c6ca9"
@@ -22532,6 +22598,11 @@ semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.3.4, semver@^7.3.5, semve
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946"
   integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==
 
+semver@^7.7.3:
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.4.tgz#28464e36060e991fa7a11d0279d2d3f3b57a7e8a"
+  integrity sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==
+
 semver@~7.6.3:
   version "7.6.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
@@ -24169,6 +24240,11 @@ ts-api-utils@^2.1.0:
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.1.0.tgz#595f7094e46eed364c13fd23e75f9513d29baf91"
   integrity sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==
 
+ts-api-utils@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.5.0.tgz#4acd4a155e22734990a5ed1fe9e97f113bcb37c1"
+  integrity sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==
+
 ts-dedent@^2.0.0, ts-dedent@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-2.2.0.tgz#39e4bd297cd036292ae2394eb3412be63f563bb5"

From 421e71ffb3c68b899d3c436873652daf46b292ba Mon Sep 17 00:00:00 2001
From: Marc Plano-Lesay <marc.planolesay@gmail.com>
Date: Fri, 3 Apr 2026 02:06:51 +1100
Subject: [PATCH 13/32] =?UTF-8?q?=F0=9F=94=A8=20Use=20the=20same=20Rust=20?=
 =?UTF-8?q?version=20from=20the=20Nix=20flake=20(#1034)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Nix flake was previously using its own Rust version, floating
depending on whatever nixpkgs currently had. This re-uses the version
from rust-toolchain.toml instead, making sure there's no
inconsistencies.
---
 flake.lock |  6 +++---
 flake.nix  | 30 ++++++++++--------------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index aa98a61299..21519e39b8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -136,11 +136,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1773371126,
-        "narHash": "sha256-SGnZQO8hnynR90Lo/1MVrTScsOPx9i26XjqSqoFOZ4E=",
+        "lastModified": 1775099554,
+        "narHash": "sha256-3xBsGnGDLOFtnPZ1D3j2LU19wpAlYefRKTlkv648rU0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "475826b105eb52f39bd3281f60c052299e64d085",
+        "rev": "8d6387ed6d8e6e6672fd3ed4b61b59d44b124d99",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 3823d490f7..2a6d3a5753 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,19 +29,20 @@
           openssl
         ];
 
+        rustVersion = (builtins.fromTOML (builtins.readFile ./rust-toolchain.toml)).toolchain.channel;
+        rustToolchain = pkgs.rust-bin.stable.${rustVersion}.default.override {
+          extensions = [ "rust-src" "rust-analyzer" ];
+        };
+
         packages = with pkgs; [
           git
 
           # node
           (nodePackages.yarn.override { withNode = false; })
-          nodejs_20
+          nodejs_22
 
           # rust
-          rustfmt
-          rust-analyzer
-          clippy
-          rustc
-          cargo
+          rustToolchain
           cargo-deny
           cargo-edit
           cargo-watch
@@ -59,20 +60,9 @@
         ];
 
         genericShellConfig = {
-          buildInputs = packages ++ [
-            (
-              # Needed for rust-analyzer
-              pkgs.rust-bin.stable.latest.default.override {
-                extensions = [ "rust-src" ];
-              })
-          ];
-
-          # Needed for rust-analyzer
-          RUST_SRC_PATH = "${
-              pkgs.rust-bin.stable.latest.default.override {
-                extensions = [ "rust-src" ];
-              }
-            }/lib/rustlib/src/rust/library";
+          buildInputs = packages;
+
+          RUST_SRC_PATH = "${rustToolchain}/lib/rustlib/src/rust/library";
 
           shellHook = ''
             export LD_LIBRARY_PATH=${

From e28f5687ed7d8dd52fde796f74a22726399165de Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Thu, 2 Apr 2026 17:59:07 -0700
Subject: [PATCH 14/32] :sparkles: Darkreader support and new `Midnight` theme
 (#1038)

* wip: draft change without testing

* fix getThemeColor?

* add midnight theme derived from expo, update docs, misc cleanup
---
 .../pages/guides/configuration/theming.mdx    | 161 ++++++++++++------
 apps/docs/tailwind.config.js                  |  14 --
 packages/browser/src/hooks/useApplyTheme.ts   |  13 ++
 packages/browser/src/hooks/useTheme.ts        |   8 +-
 .../settings/app/preferences/ThemeSelect.tsx  |   1 +
 packages/browser/tailwind.config.ts           |   7 -
 packages/components/tailwind/themes.css       |  67 ++++++++
 packages/i18n/src/locales/en-US.json          |   1 +
 8 files changed, 195 insertions(+), 77 deletions(-)
 delete mode 100644 apps/docs/tailwind.config.js
 delete mode 100644 packages/browser/tailwind.config.ts

diff --git a/apps/docs/pages/guides/configuration/theming.mdx b/apps/docs/pages/guides/configuration/theming.mdx
index 4943cbf329..2c90c4b10d 100644
--- a/apps/docs/pages/guides/configuration/theming.mdx
+++ b/apps/docs/pages/guides/configuration/theming.mdx
@@ -1,48 +1,93 @@
+import { Callout } from 'nextra/components'
+
 # Theming
 
+Information about theming in Stump, including how to add new themes and fonts.
+
 ## Color palettes
 
-Stump supports code-based theming. This means that you can create your own themes by writing a few lines of code. This is done by creating a new, exported object that defines each required piece of the palette.
+Stump supports CSS-based theming using Tailwind v4's CSS custom properties. This means that you can create your own themes by defining CSS variables in the themes file. All themes are defined in a single CSS file using CSS custom properties.
 
-For example, the default dark theme for Stump can be found [here](https://github.com/stumpapp/stump/tree/nightly/packages/components/themes/dark.ts). For brevity, the entire theme won't be shown here, but let's say we wanted to make a new theme called "midnight" that is based on the dark theme, but with a darker background:
+### Adding a new theme
 
-```ts filename="themes/midnight.ts" copy
-export const midnight: StumpTheme = {
-	background: {
-		DEFAULT: '#000000',
-		// ... other background colors
-	},
-	// ... other theme definitions
-}
-```
+To add a new theme, you'll need to follow these steps:
+
+#### 1. Define the theme in CSS
+
+Add your theme to the [`packages/components/tailwind/themes.css`](https://github.com/stumpapp/stump/tree/nightly/packages/components/tailwind/themes.css) file. Each theme is defined as a CSS class with all the required color variables.
 
-Then we just need to include it in the exported `themes` object:
+For example, let's create a "midnight" theme that is based on the dark theme, but with a pure black background:
 
-```ts filename="themes/index.ts" copy
-export const themes = {
-	dark,
-	light,
-	// ... other themes
-	midnight, // <- our new theme
+```css filename="packages/components/tailwind/themes.css" copy
+.midnight {
+	/* MARK: backgrounds */
+	--color-background: #000000;
+	--color-background-inverse: #ffffff;
+	
+	/* ... other theme colors ... */
 }
 ```
 
-Then we should add it to the main [`ThemeSelect` component](https://github.com/stumpapp/stump/tree/nightly/packages/browser/src/scenes/settings/app/preferences/ThemeSelect.tsx) so that it can be selected:
+You can copy an existing theme (like `.dark` or `.light`) as a starting point.
 
-```tsx filename="scenes/settings/app/preferences/ThemeSelect.tsx" copy
+#### 2. Add the theme to the theme selector
+
+Update the [`ThemeSelect` component](https://github.com/stumpapp/stump/tree/nightly/packages/browser/src/scenes/settings/app/preferences/ThemeSelect.tsx) to include your new theme in the dropdown:
+
+```tsx filename="packages/browser/src/scenes/settings/app/preferences/ThemeSelect.tsx" copy
 <NativeSelect
 	value={theme}
 	options={[
+		{ label: t(`${localeKey}.options.system`), value: 'system' },
 		{ label: t(`${localeKey}.options.light`), value: 'light' },
-		{ label: t(`${localeKey}.options.dark`), value: 'dark' },
-		{ label: t(`${localeKey}.options.bronze`), value: 'bronze' },
+		// ... existing themes ...
 		{ label: t(`${localeKey}.options.midnight`), value: 'midnight' }, // <- our new theme
 	]}
 	onChange={(e) => changeTheme(e.target.value)}
 />
 ```
 
-Note that the `label` is a translation key, so we should add it to the [`locales/en.json` file](https://github.com/stumpapp/stump/tree/nightly/packages/browser/src/i18n/locales/en.json), as well.
+#### 3. Add translation keys
+
+Add the theme name to the translation files. The main English locale file is at [`packages/i18n/src/locales/en-US.json`](https://github.com/stumpapp/stump/tree/nightly/packages/i18n/src/locales/en-US.json):
+
+```json filename="packages/i18n/src/locales/en-US.json" copy
+{
+	"settingsScene": {
+		"app/preferences": {
+			"sections": {
+				"themeSelect": {
+					"options": {
+						"system": "System",
+						"light": "Light",
+						"dark": "Dark",
+						// ... other themes ...
+						"midnight": "Midnight"
+					}
+				}
+			}
+		}
+	}
+}
+```
+
+#### 4. Update the dark themes list (if applicable)
+
+If your theme is a dark variant, add it to the `DARK_THEMES` array in [`packages/browser/src/hooks/useTheme.ts`](https://github.com/stumpapp/stump/tree/nightly/packages/browser/src/hooks/useTheme.ts):
+
+```ts filename="packages/browser/src/hooks/useTheme.ts" copy
+export const DARK_THEMES = ['dark', 'ocean', 'cosmic', 'pumpkin', 'autumn', 'midnight']
+```
+
+This ensures that the theme is recognized as a dark variant for proper UI adjustments.
+
+#### 5. Add gradient support (optional)
+
+If your theme supports gradient backgrounds, add it to the `THEMES_WITH_GRADIENTS` array in the same file:
+
+```ts filename="packages/browser/src/hooks/useTheme.ts" copy
+export const THEMES_WITH_GRADIENTS = ['cosmic', 'midnight']
+```
 
 ## Fonts
 
@@ -51,50 +96,62 @@ Stump has a limited number of fonts built-in:
 - [Inter](https://rsms.me/inter/)
 - [OpenDyslexic](https://opendyslexic.org/)
 - [Atkinson Hyperlegible](https://brailleinstitute.org/freefont)
+- [Bitter](https://fonts.google.com/specimen/Bitter)
+- [Charis](https://software.sil.org/charis/)
+- [Literata](https://fonts.google.com/specimen/Literata)
+- [Libre Baskerville](https://fonts.google.com/specimen/Libre+Baskerville)
+- [Nunito](https://fonts.google.com/specimen/Nunito)
+- [Hina Mincho](https://fonts.google.com/specimen/Hina+Mincho)
+
+### Adding a new font
 
-If you would like a new font, it will have to be added to the project manually. This can be done by appropriately defining the font in CSS, such as:
+If you would like to add a new font, follow these steps:
 
-```css filename="font/my-font.css" copy
+#### 1. Add the font files
+
+Place your font files in the [`packages/browser/public/assets/fonts`](https://github.com/stumpapp/stump/tree/main/packages/browser/public/assets/fonts) directory. Create a new folder for your font with a CSS file that defines the `@font-face` rules:
+
+```css filename="packages/browser/public/assets/fonts/my-font/my-font.css" copy
 @font-face {
 	font-family: 'My Font';
+	/* define accordingly, this is an example */
 	src: url('path/to/font.woff2') format('woff2');
 }
 ```
 
-You can see how this is done in the [fonts](https://github.com/stumpapp/stump/tree/main/packages/browser/public/assets/fonts) directory of the `browser` package.
+#### 2. Register the font in Tailwind CSS
 
-Once the font is defined, it can be added to the `fontFamily` object in the custom tailwind preset file:
+Add your font to the Tailwind preset at [`packages/components/tailwind/preset.css`](https://github.com/stumpapp/stump/tree/nightly/packages/components/tailwind/preset.css). In the `@theme` block, add your font family definition:
 
-```ts filename="tailwind/preset.ts" copy
-module.exports = {
-	// ... stuff here ...
-	theme: {
-		fontFamily: {
-			// ... other fonts
-			'myfont': ['My Font', 'sans'],
-		},
-	},
-	// ... other configurations
+```css filename="packages/components/tailwind/preset.css" copy
+@theme {
+	/* MARK: fonts */
+	--font-inter: 'Inter', ui-sans-serif, system-ui, sans-serif;
+	--font-opendyslexic: 'OpenDyslexic', ui-sans-serif, system-ui, sans-serif;
+	/* ... other fonts ... */
+	--font-myfont: 'My Font', ui-sans-serif, system-ui, sans-serif;
 }
 ```
 
-Then, the font can be used in the `FontSelect` component by adding it to `SUPPORTED_FONT_OPTIONS`:
+Also add your font to the safelist so Tailwind doesn't purge it:
 
-```tsx filename="scenes/settings/app/preferences/FontSelect.tsx" copy
-<ComboBox
-	value={app_font || 'inter'}
-	options={SUPPORTED_FONT_OPTIONS}
-	onChange={changeFont}
-	size="full"
-/>
+```css filename="packages/components/tailwind/preset.css" copy
+/* MARK: safelist fonts */
+@source inline(
+	'font-inter font-opendyslexic font-atkinsonhyperlegiblenext font-charis font-literata font-bitter font-librebaskerville font-nunito font-hinamincho font-myfont'
+);
+```
+
+#### 3. Add the font to the FontSelect component
 
-// ... skipping to the bottom ...
+Add your font to the `SUPPORTED_FONT_OPTIONS` in the [`FontSelect` component](https://github.com/stumpapp/stump/tree/nightly/packages/browser/src/scenes/settings/app/preferences/FontSelect.tsx):
 
+```tsx filename="packages/browser/src/scenes/settings/app/preferences/FontSelect.tsx" copy
 export const SUPPORTED_FONT_OPTIONS = [
 	{
 		label: 'Atkinson Hyperlegible',
-		value: 'atkinsonhyperlegible',
-		fontClassName: 'font-atkinsonhyperlegible',
+		value: 'atkinsonhyperlegiblenext',
+		fontClassName: 'font-atkinsonhyperlegiblenext',
 	},
 	{
 		label: 'Bitter',
@@ -110,7 +167,7 @@ export const SUPPORTED_FONT_OPTIONS = [
 ]
 ```
 
-This will allow users to select the new font from the settings page. In the future, it is planned to allow for the mapping of local fonts so that users can use their own fonts without needing to modify the source code. See the [Future plans](#future-plans) section for more information.
+This will allow users to select the new font from the settings page.
 
 ### Restrictions
 
@@ -124,6 +181,6 @@ There are some restrictions for which fonts can be added:
 
 ## Future plans
 
-In the future, it is planned to support arbitrary, local CSS files for overriding Stump's default theme(s). This will allow for the same level of customization but without the need for a full release cycle or the need to share your coveted theme with the world.
-
-You can track the progress of this feature [here](https://github.com/stumpapp/stump/issues/383).
+<Callout type="info">
+Support for arbitrary, local CSS files to override Stump's default themes is planned. You can track the progress of this feature in [issue #383](https://github.com/stumpapp/stump/issues/383).
+</Callout>
diff --git a/apps/docs/tailwind.config.js b/apps/docs/tailwind.config.js
deleted file mode 100644
index d16c847bf4..0000000000
--- a/apps/docs/tailwind.config.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-module.exports = {
-	content: [
-		'./src/**/*.{js,ts,jsx,tsx,html,mdx}',
-		'./components/**/*.{js,ts,jsx,tsx,html,mdx}',
-		'./pages/**/*.{js,ts,jsx,tsx,html,mdx}',
-		'./theme.config.tsx',
-	],
-	darkMode: 'class',
-	plugins: [],
-	theme: {
-		extend: {},
-	},
-}
diff --git a/packages/browser/src/hooks/useApplyTheme.ts b/packages/browser/src/hooks/useApplyTheme.ts
index b5f5d1a5f3..e847dca1b6 100644
--- a/packages/browser/src/hooks/useApplyTheme.ts
+++ b/packages/browser/src/hooks/useApplyTheme.ts
@@ -45,6 +45,19 @@ export function useApplyTheme({ appTheme, appFont = SupportedFont.Inter }: Param
 			html?.classList.remove(...htmlClasses)
 			html?.classList.add(resolvedTheme)
 		}
+
+		// https://github.com/darkreader/darkreader/discussions/15128
+		if (resolvedTheme === 'dark') {
+			let meta = document.querySelector('meta[name="color-scheme"]')
+			if (!meta) {
+				meta = document.createElement('meta')
+				// @ts-expect-error: this is a valid attribute
+				meta.name = 'color-scheme'
+				// @ts-expect-error: this is a valid attribute
+				meta.content = 'dark'
+				document.head.appendChild(meta)
+			}
+		}
 	}, [appTheme, prefersDark])
 
 	/**
diff --git a/packages/browser/src/hooks/useTheme.ts b/packages/browser/src/hooks/useTheme.ts
index 631d4f5329..bf7c136281 100644
--- a/packages/browser/src/hooks/useTheme.ts
+++ b/packages/browser/src/hooks/useTheme.ts
@@ -5,12 +5,12 @@ import { usePreferences } from './usePreferences'
 
 /**
  * Get a theme color from CSS custom properties
- * @param path - The dot-separated path to the color (e.g., 'thumbnail.placeholder', 'thumbnail.stack.series')
+ * @param path - The hyphen-separated path to the color (e.g., 'thumbnail-placeholder', 'thumbnail-stack-series')
  */
 export function getThemeColor(path: string): string | undefined {
-	const variableName = `--twc-${path.replace(/\./g, '-')}`
+	const variableName = `--color-${path.replace(/\./g, '-')}`
 	const value = getComputedStyle(document.documentElement).getPropertyValue(variableName).trim()
-	return value ? `hsl(${value})` : undefined
+	return value ? value : undefined
 }
 
 /**
@@ -71,5 +71,5 @@ export function useTheme() {
 	}
 }
 
-export const DARK_THEMES = ['dark', 'ocean', 'cosmic', 'pumpkin', 'autumn']
+export const DARK_THEMES = ['dark', 'ocean', 'cosmic', 'pumpkin', 'autumn', 'midnight']
 export const THEMES_WITH_GRADIENTS = ['cosmic']
diff --git a/packages/browser/src/scenes/settings/app/preferences/ThemeSelect.tsx b/packages/browser/src/scenes/settings/app/preferences/ThemeSelect.tsx
index 481b6f7b72..cdf86188c6 100644
--- a/packages/browser/src/scenes/settings/app/preferences/ThemeSelect.tsx
+++ b/packages/browser/src/scenes/settings/app/preferences/ThemeSelect.tsx
@@ -26,6 +26,7 @@ export default function ThemeSelect() {
 					{ label: t(`${localeKey}.options.autumn`), value: 'autumn' },
 					{ label: t(`${localeKey}.options.cosmic`), value: 'cosmic' },
 					{ label: t(`${localeKey}.options.pumpkin`), value: 'pumpkin' },
+					{ label: t(`${localeKey}.options.midnight`), value: 'midnight' },
 				]}
 				onChange={(e) => changeTheme(e.target.value)}
 			/>
diff --git a/packages/browser/tailwind.config.ts b/packages/browser/tailwind.config.ts
deleted file mode 100644
index af7ce6c21e..0000000000
--- a/packages/browser/tailwind.config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import stumpPreset, { getContent } from '@stump/components/tailwind'
-import type { Config } from 'tailwindcss'
-
-export default {
-	content: getContent({ relativePath: 'packages/browser' }),
-	presets: [stumpPreset],
-} satisfies Config
diff --git a/packages/components/tailwind/themes.css b/packages/components/tailwind/themes.css
index db69d27fbc..f85d2b285a 100644
--- a/packages/components/tailwind/themes.css
+++ b/packages/components/tailwind/themes.css
@@ -533,3 +533,70 @@
 		--color-thumbnail-stack-library-end: #631c03;
 	}
 }
+
+/* note i mostly just adapted from how i theme expo */
+/* MARK: midnight theme */
+.midnight {
+	--color-background: #000000;
+	--color-background-inverse: #ffffff;
+	--color-background-overlay: #111113;
+	--color-background-overlay-hover: #17171a;
+	--color-background-surface: #0a0a0a;
+	--color-background-surface-hover: #242628;
+	--color-background-surface-secondary: #1f2123;
+
+	--color-edge: #1f2123;
+	--color-edge-brand: #cf9977;
+	--color-edge-danger: #b02a29;
+	--color-edge-info: #3f89ca;
+	--color-edge-strong: #ffffff;
+	--color-edge-subtle: #292c30;
+	--color-edge-success: #2e7d32;
+	--color-edge-warning: #d8a219;
+
+	--color-fill-brand: #c48259;
+	--color-fill-brand-hover: #cf9977;
+	--color-fill-brand-secondary: #c4825926;
+	--color-fill-danger: #e53935;
+	--color-fill-danger-hover: #ea5c59;
+	--color-fill-danger-secondary: #e5393526;
+	--color-fill-disabled: #71757d;
+	--color-fill-info: #3f89ca;
+	--color-fill-info-hover: #5f9dd3;
+	--color-fill-info-secondary: #3f89ca26;
+	--color-fill-success: #43a047;
+	--color-fill-success-hover: #54b859;
+	--color-fill-success-secondary: #43a04726;
+	--color-fill-warning: #f59e0b;
+	--color-fill-warning-hover: #f7ae32;
+	--color-fill-warning-secondary: #f59e0b26;
+	--color-fill-on-black: #242628;
+	--color-fill-on-black-muted: #242628;
+
+	--color-foreground: #f5f3ef;
+	--color-foreground-brand: #c48259;
+	--color-foreground-disabled: #898d94;
+	--color-foreground-muted: #898d94;
+	--color-foreground-subtle: #e9eaeb;
+	--color-foreground-on-inverse: #161719;
+	--color-foreground-on-black: #e9eaeb;
+	--color-foreground-on-black-muted: #b0b3b7;
+
+	--color-sidebar: #000000;
+	--color-sidebar-inverse: #ffffff;
+	--color-sidebar-overlay: #0a0a0a;
+	--color-sidebar-overlay-hover: #111113;
+	--color-sidebar-surface: #0a0a0a;
+	--color-sidebar-surface-hover: #17171a;
+	--color-sidebar-surface-secondary: #1f2123;
+
+	--color-scrollbar: #000000;
+	--color-scrollbar-thumb: hsla(0, 0%, 100%, 0.4);
+	--color-scrollbar-thumb-hover: hsla(0, 0%, 100%, 0.3);
+
+	--color-thumbnail-border: rgba(233, 234, 235, 0.1);
+	--color-thumbnail-placeholder: #1c1c1c;
+	--color-thumbnail-stack-series: #543c2f;
+	--color-thumbnail-stack-library-start: #331e11;
+	--color-thumbnail-stack-library-end: #543c2f;
+}
diff --git a/packages/i18n/src/locales/en-US.json b/packages/i18n/src/locales/en-US.json
index c1c94f3a73..f726da588f 100644
--- a/packages/i18n/src/locales/en-US.json
+++ b/packages/i18n/src/locales/en-US.json
@@ -1327,6 +1327,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},

From cdd0e65e417fbdc35ec2ea0fd59201c322a9563b Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Thu, 2 Apr 2026 18:07:15 -0700
Subject: [PATCH 15/32] :globe_with_meridians: (expo): Start localization
 support (#1037)

* setup localization, wip: translate settings

* settings -> preferences

* wip: reading settings

* stump settings

* data usage

* debug

* support/contact sections

* wip: reader settings

* image reader settings done

* most of the root-level stack
---
 apps/expo/app/(tabs)/_layout.tsx              |  15 +-
 apps/expo/app/(tabs)/index/_layout.tsx        |   4 +-
 apps/expo/app/(tabs)/index/index.tsx          |  45 ++-
 apps/expo/app/(tabs)/library/_layout.tsx      |   4 +-
 apps/expo/app/(tabs)/library/index.tsx        |   2 +-
 apps/expo/app/(tabs)/settings/_layout.tsx     |   7 +-
 apps/expo/app/(tabs)/settings/index.tsx       |  20 +-
 apps/expo/app/(tabs)/settings/usage/[id].tsx  |  65 ++--
 apps/expo/app/(tabs)/settings/usage/index.tsx |  25 +-
 apps/expo/app/_layout.tsx                     | 182 ++++-----
 .../appSettings/ContactInformation.tsx        |  10 +-
 .../appSettings/SupportInformation.tsx        |  19 +-
 .../management/AppDataUsageLink.tsx           |   6 +-
 .../appSettings/preferences/AppLanguage.tsx   |   4 +-
 .../preferences/AppPrimaryColor.tsx           |   4 +-
 .../appSettings/preferences/AppTheme.tsx      |  11 +-
 .../preferences/AutoSyncLocalData.tsx         |   8 +-
 .../appSettings/preferences/DefaultServer.tsx |   6 +-
 .../preferences/DeleteDatabase.tsx            |  11 +-
 .../preferences/DisableDismissGesture.tsx     |   6 +-
 .../preferences/EnableDebugAnalytics.tsx      |   9 +-
 .../preferences/ImageCacheActions.tsx         |  20 +-
 .../appSettings/preferences/MaskURLs.tsx      |  10 +-
 .../preferences/PerformanceMonitor.tsx        |   6 +-
 .../preferences/PreferMinimalReader.tsx       |   4 +-
 .../preferences/PreferNativePdf.tsx           |   6 +-
 .../preferences/ReaderSettingsLink.tsx        |   6 +-
 .../preferences/ReduceAnimations.tsx          |   6 +-
 .../preferences/ThumbnailPlaceholder.tsx      |  15 +-
 .../preferences/ThumbnailRatio.tsx            |   4 +-
 .../preferences/ThumbnailResizeMode.tsx       |  17 +-
 .../appSettings/stump/BookClubsEnabled.tsx    |   4 +-
 .../appSettings/stump/StumpEnabled.tsx        |  10 +-
 .../book/overview/DescriptionSection.tsx      |   9 +-
 .../book/reader/settings/DoublePageSelect.tsx |  20 +-
 .../reader/settings/FootControlsSelect.tsx    |  16 +-
 .../reader/settings/ImageScalingSelect.tsx    |  23 +-
 .../book/reader/settings/ReaderSettings.tsx   |  32 +-
 .../settings/ReadingDirectionSelect.tsx       |  13 +-
 .../reader/settings/ReadingModeSelect.tsx     |  25 +-
 .../downloadQueue/DownloadProblemsSheet.tsx   |  24 +-
 .../downloadQueue/DownloadQueueItem.tsx       |  14 +-
 .../downloadQueue/DownloadQueueSheet.tsx      |  29 +-
 .../localLibrary/DownloadRowItem.tsx          |  80 ++--
 .../DownloadedBookDetailsSheet.tsx            |  57 +--
 .../localLibrary/DownloadsHeaderMenu.tsx      |  34 +-
 .../localLibrary/DownloadsHeaderSortMenu.tsx  |  47 +--
 .../localLibrary/NoDownloadsOnDevice.tsx      |  27 +-
 .../savedServer/AddOrEditServerForm.tsx       | 141 ++++---
 .../savedServer/SavedServerListItem.tsx       |  17 +-
 apps/expo/lib/hooks/index.ts                  |   1 +
 apps/expo/lib/hooks/useTranslate.ts           |   8 +
 apps/expo/tsconfig.json                       |  10 +-
 packages/browser/src/AppRouter.tsx            |   2 +-
 packages/i18n/src/context.ts                  |   4 +-
 packages/i18n/src/locales/en-US.json          | 352 ++++++++++++++++++
 56 files changed, 1066 insertions(+), 490 deletions(-)
 create mode 100644 apps/expo/lib/hooks/useTranslate.ts

diff --git a/apps/expo/app/(tabs)/_layout.tsx b/apps/expo/app/(tabs)/_layout.tsx
index 878142760d..532b893cf3 100644
--- a/apps/expo/app/(tabs)/_layout.tsx
+++ b/apps/expo/app/(tabs)/_layout.tsx
@@ -6,10 +6,13 @@ import { Platform } from 'react-native'
 import { AddServerDialog } from '~/components/savedServer'
 import { Icon as JSIcon } from '~/components/ui'
 import { useColors } from '~/lib/constants'
+import { useTranslate } from '~/lib/hooks'
 import { cn } from '~/lib/utils'
 import { usePreferencesStore } from '~/stores'
 
 export default function TabLayout() {
+	const { t } = useTranslate()
+
 	const colors = useColors()
 	const accentColor = usePreferencesStore((state) => state.accentColor)
 
@@ -20,15 +23,15 @@ export default function TabLayout() {
 				tintColor={accentColor || colors.fill.brand.DEFAULT}
 			>
 				<NativeTabs.Trigger name="index">
-					<Label>Servers</Label>
+					<Label>{t('tabs.servers')}</Label>
 					<Icon sf="server.rack" drawable="custom_android_drawable" />
 				</NativeTabs.Trigger>
 				<NativeTabs.Trigger name="library">
-					<Label>Library</Label>
+					<Label>{t('tabs.localLibrary')}</Label>
 					<Icon sf="books.vertical" drawable="custom_android_drawable" />
 				</NativeTabs.Trigger>
 				<NativeTabs.Trigger name="settings">
-					<Label>Settings</Label>
+					<Label>{t('tabs.settings')}</Label>
 					<Icon sf="gear" drawable="custom_android_drawable" />
 				</NativeTabs.Trigger>
 			</NativeTabs>
@@ -44,7 +47,7 @@ export default function TabLayout() {
 					name="index"
 					options={{
 						headerShown: true,
-						title: 'Servers',
+						title: t('tabs.servers'),
 						tabBarIcon: ({ focused }) => (
 							<JSIcon
 								as={Server}
@@ -57,7 +60,7 @@ export default function TabLayout() {
 				<Tabs.Screen
 					name="library"
 					options={{
-						title: 'Library',
+						title: t('tabs.localLibrary'),
 						tabBarIcon: ({ focused }) => (
 							<JSIcon
 								as={HardDriveDownload}
@@ -69,7 +72,7 @@ export default function TabLayout() {
 				<Tabs.Screen
 					name="settings"
 					options={{
-						title: 'Settings',
+						title: t('tabs.settings'),
 						tabBarIcon: ({ focused }) => (
 							<JSIcon
 								as={Settings}
diff --git a/apps/expo/app/(tabs)/index/_layout.tsx b/apps/expo/app/(tabs)/index/_layout.tsx
index ddda79ff67..e7f3bdf924 100644
--- a/apps/expo/app/(tabs)/index/_layout.tsx
+++ b/apps/expo/app/(tabs)/index/_layout.tsx
@@ -3,15 +3,17 @@ import { Platform } from 'react-native'
 
 import { AddServerDialog } from '~/components/savedServer'
 import { IS_IOS_24_PLUS } from '~/lib/constants'
+import { useTranslate } from '~/lib/hooks'
 import { usePreferencesStore } from '~/stores'
 
 export default function Screen() {
+	const { t } = useTranslate()
 	const animationEnabled = usePreferencesStore((state) => !state.reduceAnimations)
 
 	return (
 		<Stack
 			screenOptions={{
-				title: 'Servers',
+				title: t('tabs.servers'),
 				headerShown: Platform.OS === 'ios',
 				headerTransparent: Platform.OS === 'ios',
 				headerLargeTitle: true,
diff --git a/apps/expo/app/(tabs)/index/index.tsx b/apps/expo/app/(tabs)/index/index.tsx
index d74f06a4e9..5a3dd94cf7 100644
--- a/apps/expo/app/(tabs)/index/index.tsx
+++ b/apps/expo/app/(tabs)/index/index.tsx
@@ -10,10 +10,12 @@ import { useOwlHeaderOffset } from '~/components/Owl'
 import EditServerDialog from '~/components/savedServer/EditServerDialog'
 import SavedServerListItem from '~/components/savedServer/SavedServerListItem'
 import { Button, Icon, ListEmptyMessage, ListLabel, Text } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 import { useSavedServers } from '~/stores'
 import { CreateServer, SavedServer, SavedServerWithConfig } from '~/stores/savedServer'
 
 export default function Screen() {
+	const { t } = useTranslate()
 	const { savedServers, stumpEnabled, updateServer, deleteServer, getServerConfig } =
 		useSavedServers()
 	const router = useRouter()
@@ -67,16 +69,23 @@ export default function Screen() {
 
 	const handleDeleteServer = useCallback(
 		(server: SavedServer) => {
-			const message = server.stumpOPDS
-				? `This server is registered for both Stump and OPDS. Deleting it will remove both entries.\n\nAre you sure you want to delete '${server.name}'?`
-				: `Are you sure you want to delete '${server.name}'?`
-
-			Alert.alert('Delete Server', message, [
-				{ text: 'Cancel', style: 'cancel' },
-				{ text: 'Delete', style: 'destructive', onPress: () => deleteServer(server.id) },
-			])
+			Alert.alert(
+				t('savedServerActions.deleteServer.title'),
+				t('savedServerActions.deleteServer.confirmation').replace(
+					'{{serverName}}',
+					`'${server.name}'`,
+				),
+				[
+					{ text: t('common.cancel'), style: 'cancel' },
+					{
+						text: t('common.delete'),
+						style: 'destructive',
+						onPress: () => deleteServer(server.id),
+					},
+				],
+			)
 		},
-		[deleteServer],
+		[deleteServer, t],
 	)
 
 	const onSelectForEdit = useCallback(
@@ -110,8 +119,8 @@ export default function Screen() {
 
 			{isCleanSlate && (
 				<EmptyState
-					title="Nothing to show yet"
-					message="Get started by adding a server to access book collections"
+					title={t('emptyState.noServers')}
+					message={t('emptyState.cta')}
 					actions={
 						<>
 							<Button
@@ -121,12 +130,12 @@ export default function Screen() {
 								className="relative"
 								onPress={() => Linking.openURL('https://www.stumpapp.dev/guides/mobile/app')}
 							>
-								<Text>See Documentation</Text>
+								<Text>{t('emptyState.seeDocumentation')}</Text>
 
 								<Icon
 									as={ExternalLink}
 									size={16}
-									className="absolute right-4 transform text-foreground"
+									className="right-4 absolute transform text-foreground"
 								/>
 							</Button>
 						</>
@@ -141,13 +150,13 @@ export default function Screen() {
 					className="flex-1 bg-background"
 					contentInsetAdjustmentBehavior="automatic"
 				>
-					<View className="flex-1 items-start justify-start gap-5 bg-background p-4 tablet:p-6">
+					<View className="gap-5 p-4 tablet:p-6 flex-1 items-start justify-start bg-background">
 						{stumpEnabled && (
-							<View className="flex w-full items-start gap-2">
+							<View className="gap-2 flex w-full items-start">
 								<ListLabel className="px-2">Stump</ListLabel>
 
 								{!stumpServers.length && (
-									<ListEmptyMessage icon={Server} message="No Stump servers added" />
+									<ListEmptyMessage icon={Server} message={t('emptyState.noStumpServers')} />
 								)}
 
 								{stumpServers.map((server) => (
@@ -161,11 +170,11 @@ export default function Screen() {
 							</View>
 						)}
 
-						<View className="flex w-full items-start gap-2">
+						<View className="gap-2 flex w-full items-start">
 							<ListLabel className="px-2">OPDS</ListLabel>
 
 							{!allOPDSServers.length && (
-								<ListEmptyMessage icon={Rss} message="No OPDS feeds added" />
+								<ListEmptyMessage icon={Rss} message={t('emptyState.noOPDSServers')} />
 							)}
 
 							{allOPDSServers.map((server) => (
diff --git a/apps/expo/app/(tabs)/library/_layout.tsx b/apps/expo/app/(tabs)/library/_layout.tsx
index a198d55804..c79d10001f 100644
--- a/apps/expo/app/(tabs)/library/_layout.tsx
+++ b/apps/expo/app/(tabs)/library/_layout.tsx
@@ -7,6 +7,7 @@ import { useStore } from 'zustand'
 import { DownloadsHeaderMenu, DownloadsHeaderSortMenu } from '~/components/localLibrary'
 import { SelectionLeftScreenHeader, SelectionRightScreenHeader } from '~/components/selection'
 import { IS_IOS_24_PLUS } from '~/lib/constants'
+import { useTranslate } from '~/lib/hooks'
 import { usePreferencesStore } from '~/stores'
 import { createSelectionStore, SelectionContext, SelectionStore } from '~/stores/selection'
 
@@ -31,6 +32,7 @@ function AndroidHeaderWrapper({
 }
 
 export default function Screen() {
+	const { t } = useTranslate()
 	const animationEnabled = usePreferencesStore((state) => !state.reduceAnimations)
 
 	// eslint-disable-next-line react-hooks/refs
@@ -81,7 +83,7 @@ export default function Screen() {
 			<QueryClientProvider client={offlineQueryClient}>
 				<Stack
 					screenOptions={{
-						title: 'Local Library',
+						title: t('localLibrary.title'),
 						headerShown: Platform.OS === 'ios',
 						headerTransparent: Platform.OS === 'ios',
 						headerLargeTitle: true,
diff --git a/apps/expo/app/(tabs)/library/index.tsx b/apps/expo/app/(tabs)/library/index.tsx
index 083692cb38..091eb3e89b 100644
--- a/apps/expo/app/(tabs)/library/index.tsx
+++ b/apps/expo/app/(tabs)/library/index.tsx
@@ -124,7 +124,7 @@ export default function Screen() {
 	const customSelectionActions = useMemo(
 		() => ({
 			deleteSelection: async (ids: string[]) => {
-				await db.delete(downloadedFiles).where(inArray(downloadedFiles.id, ids)).run()
+				db.delete(downloadedFiles).where(inArray(downloadedFiles.id, ids)).run()
 				// Trigger re-fetch
 				increment()
 			},
diff --git a/apps/expo/app/(tabs)/settings/_layout.tsx b/apps/expo/app/(tabs)/settings/_layout.tsx
index 4f39fb0562..86a2a0b0a4 100644
--- a/apps/expo/app/(tabs)/settings/_layout.tsx
+++ b/apps/expo/app/(tabs)/settings/_layout.tsx
@@ -5,9 +5,12 @@ import { Platform } from 'react-native'
 import { settingsQueryClient } from '~/components/appSettings/queryClient'
 import { HeaderButton } from '~/components/ui/header-button/header-button'
 import { IS_IOS_24_PLUS } from '~/lib/constants'
+import { useTranslate } from '~/lib/hooks'
 import { usePreferencesStore } from '~/stores'
 
 export default function Layout() {
+	const { t } = useTranslate()
+
 	const router = useRouter()
 	const animationEnabled = usePreferencesStore((state) => !state.reduceAnimations)
 
@@ -22,7 +25,7 @@ export default function Layout() {
 				<Stack.Screen
 					name="index"
 					options={{
-						title: 'Settings',
+						title: t('common.settings'),
 						headerShown: true,
 						headerTransparent: Platform.OS === 'ios',
 						headerBlurEffect: IS_IOS_24_PLUS ? undefined : 'regular',
@@ -33,7 +36,7 @@ export default function Layout() {
 				<Stack.Screen
 					name="reader"
 					options={{
-						title: 'Reader Settings',
+						title: t('readerSettings.title'),
 						headerShown: true,
 						headerTransparent: Platform.OS === 'ios',
 						headerBlurEffect: IS_IOS_24_PLUS ? undefined : 'regular',
diff --git a/apps/expo/app/(tabs)/settings/index.tsx b/apps/expo/app/(tabs)/settings/index.tsx
index 5808af18a7..4c40cf8de2 100644
--- a/apps/expo/app/(tabs)/settings/index.tsx
+++ b/apps/expo/app/(tabs)/settings/index.tsx
@@ -25,12 +25,15 @@ import {
 } from '~/components/appSettings/preferences'
 import { BookClubsEnabled, StumpEnabled } from '~/components/appSettings/stump'
 import { Card } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 
 export default function Screen() {
+	const { t } = useTranslate()
+
 	return (
 		<ScrollView className="flex-1 bg-background" contentInsetAdjustmentBehavior="automatic">
-			<View className="flex-1 gap-8 bg-background p-4 tablet:p-6">
-				<Card label="Preferences">
+			<View className="gap-8 p-4 tablet:p-6 flex-1 bg-background">
+				<Card label={t(getSectionLabelKey('preferences'))}>
 					<AppTheme />
 					<AppPrimaryColor />
 					<AppLanguage />
@@ -40,7 +43,7 @@ export default function Screen() {
 					<ThumbnailResizeMode />
 				</Card>
 
-				<Card label="Reading">
+				<Card label={t(getSectionLabelKey('reading'))}>
 					<PreferNativePdf />
 					<PreferMinimalReader />
 					{Platform.OS === 'ios' && <DisableDismissGesture />}
@@ -48,19 +51,19 @@ export default function Screen() {
 				</Card>
 
 				<Card
-					label="Stump"
-					description="Stump features are optional, you can completely turn them off if you just want OPDS support"
+					label={t(getSectionLabelKey('stump'))}
+					description={t(getSectionKey('stump', 'description'))}
 				>
 					<StumpEnabled />
 					<AutoSyncLocalData />
 					<BookClubsEnabled />
 				</Card>
 
-				<Card label="Management">
+				<Card label={t(getSectionLabelKey('management'))}>
 					<AppDataUsageLink />
 				</Card>
 
-				<Card label="Debug">
+				<Card label={t(getSectionLabelKey('debug'))}>
 					<ImageCacheActions />
 					{__DEV__ && <DeleteDatabase />}
 					<PerformanceMonitor />
@@ -76,3 +79,6 @@ export default function Screen() {
 		</ScrollView>
 	)
 }
+
+const getSectionKey = (section: string, key: string) => `settings.${section}.${key}`
+const getSectionLabelKey = (section: string) => `${getSectionKey(section, 'label')}`
diff --git a/apps/expo/app/(tabs)/settings/usage/[id].tsx b/apps/expo/app/(tabs)/settings/usage/[id].tsx
index fb90f0cd8c..25bf82d7a9 100644
--- a/apps/expo/app/(tabs)/settings/usage/[id].tsx
+++ b/apps/expo/app/(tabs)/settings/usage/[id].tsx
@@ -13,14 +13,14 @@ import { Button, Card, Text } from '~/components/ui'
 import { db, downloadedFiles } from '~/db'
 import { getServerStoredPreferencesUsage } from '~/lib/filesystem'
 import { formatBytes } from '~/lib/format'
-import { useDownload } from '~/lib/hooks'
+import { useDownload, useTranslate } from '~/lib/hooks'
 import { useDynamicHeader } from '~/lib/hooks/useDynamicHeader'
 import { useReaderStore } from '~/stores'
 import { useSavedServerStore } from '~/stores/savedServer'
 
 export default function Screen() {
 	const { id: serverID } = useLocalSearchParams<{ id: string }>()
-
+	const { t } = useTranslate()
 	const {
 		data: preferencesBytes,
 		refetch,
@@ -54,32 +54,38 @@ export default function Screen() {
 	}, [serverID, clearLibrarySettings, refetch])
 
 	const { deleteServerDownloads } = useDownload()
-	const onDeleteDownloads = useCallback(async () => {
+	const onDeleteDownloads = async () => {
 		try {
 			await deleteServerDownloads(serverID)
 			refetch()
 		} catch {
 			Alert.alert(
-				'Deletion Failed',
-				`There was an error deleting all all downloads from "${server?.name || 'this server'}".`,
+				t(getKey('deleteDownloads.deleteFailed.title')),
+				t(getKey('deleteDownloads.deleteFailed.description')).replace(
+					'{{serverName}}',
+					server?.name ? `'${server.name}'` : t('common.thisServer'),
+				),
 			)
 		}
-	}, [deleteServerDownloads, serverID, refetch, server?.name])
+	}
 
 	useDynamicHeader({
 		title: server?.name || '',
 	})
 
-	const handleDelete = useCallback(() => {
+	const handleDelete = () => {
 		Alert.alert(
-			'Delete Downloads',
-			`Are you sure you want to delete all downloads from ${server?.name ? `'${server?.name}'` : 'this server'}?`,
+			t(getKey('deleteDownloads.label')),
+			t(getKey('deleteDownloads.confirmation')).replace(
+				'{{serverName}}',
+				server?.name ? `'${server.name}'` : t('common.thisServer'),
+			),
 			[
-				{ text: 'Cancel', style: 'cancel' },
-				{ text: 'Delete', style: 'destructive', onPress: onDeleteDownloads },
+				{ text: t('common.cancel'), style: 'cancel' },
+				{ text: t('common.delete'), style: 'destructive', onPress: onDeleteDownloads },
 			],
 		)
-	}, [onDeleteDownloads, server?.name])
+	}
 
 	if (!server) {
 		return <Redirect href="/settings/usage" />
@@ -94,46 +100,50 @@ export default function Screen() {
 				refreshControl={<RefreshControl refreshing={isRefetching} onRefresh={refetch} />}
 				contentInsetAdjustmentBehavior="automatic"
 			>
-				<View className="flex-1 gap-8 bg-background px-4 pt-8">
-					<View className="flex-1 gap-4">
+				<View className="gap-8 px-4 pt-8 flex-1 bg-background">
+					<View className="gap-4 flex-1">
 						<Card
-							label="Downloads"
+							label={t('common.downloads')}
 							listEmptyStyle={{
 								icon: HardDriveDownload,
-								message: 'No downloaded files for this server',
+								message: t(getKey('noDownloads')),
 							}}
 						>
 							<Card.StatGroup>
-								<Card.Stat label="Total files" value={downloadedFilesCount} />
-								{humanizedUsage && <Card.Stat label="Total size" value={humanizedUsage} />}
+								<Card.Stat label={t(getKey('totalFiles'))} value={downloadedFilesCount} />
+								{humanizedUsage && (
+									<Card.Stat label={t(getKey('totalSize'))} value={humanizedUsage} />
+								)}
 							</Card.StatGroup>
+
 							{(files.length > 0 || downloadedFilesSum > 0) && (
-								<Card.Row label="Delete Downloads">
+								<Card.Row label={t(getKey('deleteDownloads.label'))}>
 									<Button size="sm" roundness="full" variant="destructive" onPress={handleDelete}>
-										<Text>Delete</Text>
+										<Text>{t('common.delete')}</Text>
 									</Button>
 								</Card.Row>
 							)}
 						</Card>
 					</View>
 
-					<View className="flex-1 gap-4">
+					<View className="gap-4 flex-1">
 						<Card
-							label="Stored Preferences"
-							description="Miscellaneous data like book preferences, offline reading progress, etc."
+							label={t(getKey('storedPreferences.label'))}
+							description={t(getKey('storedPreferences.description'))}
 						>
 							<Card.StatGroup>
-								<Card.Stat label="Total size" value={preferencesSize} />
+								<Card.Stat label={t(getKey('totalSize'))} value={preferencesSize} />
 							</Card.StatGroup>
+
 							{!!preferencesBytes && (
-								<Card.Row label="Clear Preferences">
+								<Card.Row label={t(getKey('clearPreferences'))}>
 									<Button
 										size="sm"
 										roundness="full"
 										variant="destructive"
 										onPress={onClearPreferences}
 									>
-										<Text>Clear</Text>
+										<Text>{t('common.clear')}</Text>
 									</Button>
 								</Card.Row>
 							)}
@@ -144,3 +154,6 @@ export default function Screen() {
 		</SafeAreaView>
 	)
 }
+
+const LOCALE_BASE = 'settings.management.dataUsage'
+const getKey = (key: string) => `${LOCALE_BASE}.${key}`
diff --git a/apps/expo/app/(tabs)/settings/usage/index.tsx b/apps/expo/app/(tabs)/settings/usage/index.tsx
index 005def4a3b..876d14dd75 100644
--- a/apps/expo/app/(tabs)/settings/usage/index.tsx
+++ b/apps/expo/app/(tabs)/settings/usage/index.tsx
@@ -10,10 +10,12 @@ import RefreshControl from '~/components/RefreshControl'
 import { Card, Icon, Text } from '~/components/ui'
 import { getAppUsage } from '~/lib/filesystem'
 import { formatBytes } from '~/lib/format'
+import { useTranslate } from '~/lib/hooks'
 import { useDynamicHeader } from '~/lib/hooks/useDynamicHeader'
 import { useSavedServers } from '~/stores'
 
 export default function Screen() {
+	const { t } = useTranslate()
 	const { data, isLoading, isRefetching, refetch } = useQuery({
 		queryKey: ['app-usage'],
 		queryFn: getAppUsage,
@@ -22,7 +24,7 @@ export default function Screen() {
 	})
 
 	useDynamicHeader({
-		title: 'Data Usage',
+		title: t(getKey('label')),
 	})
 
 	const { savedServers } = useSavedServers()
@@ -50,17 +52,23 @@ export default function Screen() {
 				refreshControl={<RefreshControl refreshing={isRefetching} onRefresh={refetch} />}
 				contentInsetAdjustmentBehavior="automatic"
 			>
-				<View className="flex-1 gap-8 bg-background px-4 pt-8">
+				<View className="gap-8 px-4 pt-8 flex-1 bg-background">
 					<Card>
 						<Card.StatGroup>
-							<Card.Stat label="Non-Stump data" value={formatBytes(data?.appTotal)} />
-							<Card.Stat label="Servers total" value={formatBytes(data?.serversTotal)} />
+							<Card.Stat label={t(getKey('nonStumpData'))} value={formatBytes(data?.appTotal)} />
+							<Card.Stat
+								label={t(getKey('serversTotal'))}
+								value={formatBytes(data?.serversTotal)}
+							/>
 						</Card.StatGroup>
 					</Card>
 
-					<View className="flex-1 gap-4">
+					<View className="gap-4 flex-1">
 						{savedServers.length > 0 && (
-							<Card label="Servers" listEmptyStyle={{ icon: Server, message: 'No servers added' }}>
+							<Card
+								label={t('common.servers')}
+								listEmptyStyle={{ icon: Server, message: 'No servers added' }}
+							>
 								{savedServers.map((server) => (
 									<Pressable
 										key={server.id}
@@ -72,7 +80,7 @@ export default function Screen() {
 										}
 									>
 										<Card.Row label={server.name}>
-											<View className="flex flex-row items-center gap-2">
+											<View className="gap-2 flex flex-row items-center">
 												<Text className="text-foreground-muted">
 													{formatBytes(serverToUsage[server.id])}
 												</Text>
@@ -89,3 +97,6 @@ export default function Screen() {
 		</SafeAreaView>
 	)
 }
+
+const LOCALE_BASE = 'settings.management.dataUsage'
+const getKey = (key: string) => `${LOCALE_BASE}.${key}`
diff --git a/apps/expo/app/_layout.tsx b/apps/expo/app/_layout.tsx
index 9439d63aed..4464c224c3 100644
--- a/apps/expo/app/_layout.tsx
+++ b/apps/expo/app/_layout.tsx
@@ -3,7 +3,7 @@ import '~/global.css'
 import { DarkTheme, DefaultTheme, Theme, ThemeProvider } from '@react-navigation/native'
 import { PortalHost } from '@rn-primitives/portal'
 import * as Sentry from '@sentry/react-native'
-import { initDateFnsLocale } from '@stump/i18n'
+import { initDateFnsLocale, LocaleProvider } from '@stump/i18n'
 import { getColor, to } from 'colorjs.io/fn'
 import { useMigrations } from 'drizzle-orm/expo-sqlite/migrator'
 import * as Localization from 'expo-localization'
@@ -77,13 +77,15 @@ export default function RootLayout() {
 
 	useFileImportListener()
 
-	const { performanceMonitor, animationEnabled, disableDismissGesture } = usePreferencesStore(
-		useShallow((state) => ({
-			animationEnabled: !state.reduceAnimations,
-			performanceMonitor: state.performanceMonitor,
-			disableDismissGesture: state.disableDismissGesture,
-		})),
-	)
+	const { performanceMonitor, animationEnabled, disableDismissGesture, locale } =
+		usePreferencesStore(
+			useShallow((state) => ({
+				animationEnabled: !state.reduceAnimations,
+				performanceMonitor: state.performanceMonitor,
+				disableDismissGesture: state.disableDismissGesture,
+				locale: state.locale,
+			})),
+		)
 	const isReading = useReaderStore((state) => state.isReading)
 	const isReadingEbook = useEpubLocationStore((state) => !!state.book)
 	const { colors: epubThemeColors } = useEpubTheme()
@@ -183,93 +185,95 @@ export default function RootLayout() {
 	}
 
 	return (
-		<GestureHandlerRootView style={{ flex: 1 }}>
-			<ThemeProvider value={isDarkColorScheme ? DARK_THEME : LIGHT_THEME}>
-				{performanceMonitor && <PerformanceMonitor style={{ top: insets.top || 12 }} />}
-				<KeyboardProvider>
-					<SystemBars
-						style={isDarkBackground ? 'light' : 'dark'}
-						hidden={{ statusBar: hideStatusBar, navigationBar: hideNavigationBar }}
-					/>
-					<Stack
-						// https://github.com/expo/expo/issues/15244 ?
-						// screenOptions={{
-						// 	statusBarHidden: shouldHideStatusBar,
-						// }}
-						screenOptions={{
-							animation: animationEnabled ? 'default' : 'none',
-							contentStyle: {
-								backgroundColor: colors.background.DEFAULT,
-							},
-						}}
-					>
-						<Stack.Screen
-							name="(tabs)"
-							options={{
-								headerShown: false,
-								title: '',
-								animation: animationEnabled ? 'default' : 'none',
-							}}
+		<LocaleProvider locale={locale}>
+			<GestureHandlerRootView style={{ flex: 1 }}>
+				<ThemeProvider value={isDarkColorScheme ? DARK_THEME : LIGHT_THEME}>
+					{performanceMonitor && <PerformanceMonitor style={{ top: insets.top || 12 }} />}
+					<KeyboardProvider>
+						<SystemBars
+							style={isDarkBackground ? 'light' : 'dark'}
+							hidden={{ statusBar: hideStatusBar, navigationBar: hideNavigationBar }}
 						/>
-						<Stack.Screen
-							name="server/[id]"
-							options={{
-								headerShown: false,
-								title: '',
+						<Stack
+							// https://github.com/expo/expo/issues/15244 ?
+							// screenOptions={{
+							// 	statusBarHidden: shouldHideStatusBar,
+							// }}
+							screenOptions={{
 								animation: animationEnabled ? 'default' : 'none',
-								autoHideHomeIndicator: hideNavigationBar,
 								contentStyle: {
 									backgroundColor: colors.background.DEFAULT,
 								},
 							}}
-						/>
-						<Stack.Screen
-							name="opds/[id]"
-							options={{
-								headerShown: false,
-								animation: animationEnabled ? 'default' : 'none',
-							}}
-						/>
-						<Stack.Screen
-							name="opds-legacy/[id]"
-							options={{
-								headerShown: false,
-								animation: animationEnabled ? 'default' : 'none',
-							}}
-						/>
-
-						<Stack.Screen
-							name="offline"
-							options={{
-								headerShown: false,
-								title: '',
-								animation: animationEnabled ? 'default' : 'none',
-								autoHideHomeIndicator: hideNavigationBar,
-								presentation:
-									disableDismissGesture && Platform.OS === 'ios' ? 'fullScreenModal' : undefined,
-								contentStyle: {
-									backgroundColor: colors.background.DEFAULT,
-								},
-							}}
-						/>
-					</Stack>
-					<FloatingQueueButton />
-					<PortalHost />
-				</KeyboardProvider>
-
-				<Toaster
-					position="bottom-center"
-					styles={{
-						title: {
-							fontSize: 18,
-						},
-						description: {
-							fontSize: 16,
-						},
-					}}
-				/>
-			</ThemeProvider>
-		</GestureHandlerRootView>
+						>
+							<Stack.Screen
+								name="(tabs)"
+								options={{
+									headerShown: false,
+									title: '',
+									animation: animationEnabled ? 'default' : 'none',
+								}}
+							/>
+							<Stack.Screen
+								name="server/[id]"
+								options={{
+									headerShown: false,
+									title: '',
+									animation: animationEnabled ? 'default' : 'none',
+									autoHideHomeIndicator: hideNavigationBar,
+									contentStyle: {
+										backgroundColor: colors.background.DEFAULT,
+									},
+								}}
+							/>
+							<Stack.Screen
+								name="opds/[id]"
+								options={{
+									headerShown: false,
+									animation: animationEnabled ? 'default' : 'none',
+								}}
+							/>
+							<Stack.Screen
+								name="opds-legacy/[id]"
+								options={{
+									headerShown: false,
+									animation: animationEnabled ? 'default' : 'none',
+								}}
+							/>
+
+							<Stack.Screen
+								name="offline"
+								options={{
+									headerShown: false,
+									title: '',
+									animation: animationEnabled ? 'default' : 'none',
+									autoHideHomeIndicator: hideNavigationBar,
+									presentation:
+										disableDismissGesture && Platform.OS === 'ios' ? 'fullScreenModal' : undefined,
+									contentStyle: {
+										backgroundColor: colors.background.DEFAULT,
+									},
+								}}
+							/>
+						</Stack>
+						<FloatingQueueButton />
+						<PortalHost />
+					</KeyboardProvider>
+
+					<Toaster
+						position="bottom-center"
+						styles={{
+							title: {
+								fontSize: 18,
+							},
+							description: {
+								fontSize: 16,
+							},
+						}}
+					/>
+				</ThemeProvider>
+			</GestureHandlerRootView>
+		</LocaleProvider>
 	)
 }
 
diff --git a/apps/expo/components/appSettings/ContactInformation.tsx b/apps/expo/components/appSettings/ContactInformation.tsx
index 02ee44e3e3..7d3bf3ed9a 100644
--- a/apps/expo/components/appSettings/ContactInformation.tsx
+++ b/apps/expo/components/appSettings/ContactInformation.tsx
@@ -1,17 +1,21 @@
 import { ArrowUpRight, Github, Mail } from 'lucide-react-native'
 import { Linking } from 'react-native'
 
+import { useTranslate } from '~/lib/hooks'
+
 import { Card, Icon, icons } from '../ui'
 import AppSettingsRow from './AppSettingsRow'
 
 const { Discord } = icons
 
 export default function ContactInformation() {
+	const { t } = useTranslate()
+
 	return (
 		<Card label="Contact">
 			<AppSettingsRow
 				icon={Mail}
-				title="Email"
+				title={t('settings.contactInfo.email')}
 				onPress={() => Linking.openURL('mailto:aaronleopold1221@gmail.com')}
 				isLink
 			>
@@ -21,7 +25,7 @@ export default function ContactInformation() {
 			<AppSettingsRow
 				// @ts-expect-error: It's fine
 				icon={Discord}
-				title="Discord"
+				title={t('settings.contactInfo.discord')}
 				isLink
 				onPress={() => Linking.openURL('https://discord.gg/63Ybb7J3as')}
 			>
@@ -30,7 +34,7 @@ export default function ContactInformation() {
 
 			<AppSettingsRow
 				icon={Github}
-				title="GitHub"
+				title={t('settings.contactInfo.github')}
 				isLink
 				onPress={() => Linking.openURL('https://github.com/stumpapp/stump/issues/new/choose')}
 			>
diff --git a/apps/expo/components/appSettings/SupportInformation.tsx b/apps/expo/components/appSettings/SupportInformation.tsx
index 2e319c1f44..6c7c48de3b 100644
--- a/apps/expo/components/appSettings/SupportInformation.tsx
+++ b/apps/expo/components/appSettings/SupportInformation.tsx
@@ -2,9 +2,13 @@ import * as Application from 'expo-application'
 import { useEffect, useState } from 'react'
 import { Platform, View } from 'react-native'
 
+import { useTranslate } from '~/lib/hooks'
+
 import { Text } from '../ui'
 
 export default function SupportInformation() {
+	const { t } = useTranslate()
+
 	const [supportID, setSupportID] = useState<string | null>(null)
 
 	useEffect(() => {
@@ -23,9 +27,18 @@ export default function SupportInformation() {
 
 	return (
 		<View>
-			<Text className="mb-3 text-foreground-muted">Build Information</Text>
-			<Text className="text-foreground-muted">Version: {Application.nativeApplicationVersion}</Text>
-			<Text className="text-foreground-muted">Support Identifier: {supportID}</Text>
+			<Text className="mb-3 text-foreground-muted">
+				{t('settings.supportInfo.buildInformation')}
+			</Text>
+			<Text className="text-foreground-muted">
+				{t('settings.supportInfo.version').replace(
+					'{{version}}',
+					Application.nativeApplicationVersion || '??',
+				)}
+			</Text>
+			<Text className="text-foreground-muted">
+				{t('settings.supportInfo.suuportIdentifier').replace('{{supportID}}', supportID || '??')}
+			</Text>
 		</View>
 	)
 }
diff --git a/apps/expo/components/appSettings/management/AppDataUsageLink.tsx b/apps/expo/components/appSettings/management/AppDataUsageLink.tsx
index 39bec92567..90ce8c8073 100644
--- a/apps/expo/components/appSettings/management/AppDataUsageLink.tsx
+++ b/apps/expo/components/appSettings/management/AppDataUsageLink.tsx
@@ -6,11 +6,13 @@ import { View } from 'react-native'
 import { Icon, Text } from '~/components/ui'
 import { getAppUsage } from '~/lib/filesystem'
 import { formatBytes } from '~/lib/format'
+import { useTranslate } from '~/lib/hooks'
 import { cn } from '~/lib/utils'
 
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function AppDataUsageLink() {
+	const { t } = useTranslate()
 	const { data } = useQuery({
 		queryKey: ['app-usage'],
 		queryFn: getAppUsage,
@@ -25,7 +27,7 @@ export default function AppDataUsageLink() {
 	return (
 		<AppSettingsRow
 			icon={HardDrive}
-			title="Data usage"
+			title={t('settings.management.dataUsage.label')}
 			isLink
 			onPress={() =>
 				router.push({
@@ -33,7 +35,7 @@ export default function AppDataUsageLink() {
 				})
 			}
 		>
-			<View className={cn('flex flex-row items-center gap-2')}>
+			<View className={cn('gap-2 flex flex-row items-center')}>
 				<Text className="text-foreground-muted">{formattedSize}</Text>
 				<Icon as={ChevronRight} size={20} className="text-foreground-muted" />
 			</View>
diff --git a/apps/expo/components/appSettings/preferences/AppLanguage.tsx b/apps/expo/components/appSettings/preferences/AppLanguage.tsx
index 46166536ac..b2b9b8b171 100644
--- a/apps/expo/components/appSettings/preferences/AppLanguage.tsx
+++ b/apps/expo/components/appSettings/preferences/AppLanguage.tsx
@@ -9,6 +9,7 @@ import { PickerOption } from '~/components/ui/picker/types'
 import { usePreferencesStore } from '~/stores'
 
 import AppSettingsRow from '../AppSettingsRow'
+import { useTranslate } from '~/lib/hooks'
 
 const localeOptions: PickerOption<AllowedLocale>[] = Object.entries(localeNames).map(
 	([value, label]) => ({
@@ -18,6 +19,7 @@ const localeOptions: PickerOption<AllowedLocale>[] = Object.entries(localeNames)
 )
 
 export default function AppLanguage() {
+	const { t } = useTranslate()
 	const { locale, patch } = usePreferencesStore(
 		useShallow((state) => ({
 			locale: state.locale,
@@ -40,7 +42,7 @@ export default function AppLanguage() {
 	}
 
 	return (
-		<AppSettingsRow icon={Languages} title="Language">
+		<AppSettingsRow icon={Languages} title={t('settings.preferences.appLanguage')}>
 			<Picker<AllowedLocale>
 				value={currentLocale}
 				options={localeOptions}
diff --git a/apps/expo/components/appSettings/preferences/AppPrimaryColor.tsx b/apps/expo/components/appSettings/preferences/AppPrimaryColor.tsx
index 2f44e5bde2..5bbdc0fd4a 100644
--- a/apps/expo/components/appSettings/preferences/AppPrimaryColor.tsx
+++ b/apps/expo/components/appSettings/preferences/AppPrimaryColor.tsx
@@ -4,12 +4,14 @@ import { Platform } from 'react-native'
 import { useShallow } from 'zustand/react/shallow'
 
 import { useColors } from '~/lib/constants'
+import { useTranslate } from '~/lib/hooks'
 import { usePreferencesStore } from '~/stores'
 
 import AppSettingsRow from '../AppSettingsRow'
 
 // TODO: A picker is probably a bit too much, maybe a set of presets?
 export default function AppPrimaryColor() {
+	const { t } = useTranslate()
 	const store = usePreferencesStore(
 		useShallow((state) => ({
 			accentColor: state.accentColor,
@@ -27,7 +29,7 @@ export default function AppPrimaryColor() {
 
 	return Platform.select({
 		ios: (
-			<AppSettingsRow icon={Pipette} title="Accent">
+			<AppSettingsRow icon={Pipette} title={t('settings.preferences.appPrimaryColor')}>
 				<Host matchContents>
 					<ColorPicker
 						label=""
diff --git a/apps/expo/components/appSettings/preferences/AppTheme.tsx b/apps/expo/components/appSettings/preferences/AppTheme.tsx
index 881fe188b0..5a041b04c1 100644
--- a/apps/expo/components/appSettings/preferences/AppTheme.tsx
+++ b/apps/expo/components/appSettings/preferences/AppTheme.tsx
@@ -1,24 +1,26 @@
 import { Paintbrush } from 'lucide-react-native'
 
 import { Picker } from '~/components/ui/picker/picker'
+import { useTranslate } from '~/lib/hooks'
 import { useColorScheme } from '~/lib/useColorScheme'
 
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function AppTheme() {
+	const { t } = useTranslate()
 	const { colorScheme, setColorScheme } = useColorScheme()
 
 	return (
-		<AppSettingsRow icon={Paintbrush} title="Theme">
+		<AppSettingsRow icon={Paintbrush} title={t(getKey('label'))}>
 			<Picker<'light' | 'dark'>
 				value={colorScheme}
 				options={[
 					{
-						label: 'Light',
+						label: t(getKey('options.light')),
 						value: 'light',
 					},
 					{
-						label: 'Dark',
+						label: t(getKey('options.dark')),
 						value: 'dark',
 					},
 				]}
@@ -27,3 +29,6 @@ export default function AppTheme() {
 		</AppSettingsRow>
 	)
 }
+
+const LOCALE_BASE = 'settings.preferences.appTheme'
+const getKey = (key: string) => `${LOCALE_BASE}.${key}`
diff --git a/apps/expo/components/appSettings/preferences/AutoSyncLocalData.tsx b/apps/expo/components/appSettings/preferences/AutoSyncLocalData.tsx
index ca9ea2a071..996a7ccd86 100644
--- a/apps/expo/components/appSettings/preferences/AutoSyncLocalData.tsx
+++ b/apps/expo/components/appSettings/preferences/AutoSyncLocalData.tsx
@@ -3,11 +3,13 @@ import { View } from 'react-native'
 import { useShallow } from 'zustand/react/shallow'
 
 import { Switch } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 import { usePreferencesStore } from '~/stores'
 
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function AutoSyncLocalData() {
+	const { t } = useTranslate()
 	const { autoSyncLocalData, patch } = usePreferencesStore(
 		useShallow((state) => ({
 			autoSyncLocalData: state.autoSyncLocalData,
@@ -15,13 +17,15 @@ export default function AutoSyncLocalData() {
 		})),
 	)
 
+	// note: i didn't nest in stump in locale file since eventually opds v2 will
+	// have better syncing features
 	return (
 		<AppSettingsRow
 			icon={RefreshCw}
-			title="Auto-Sync Local Data"
+			title={t('settings.autoSyncLocalData')}
 			onPress={() => patch({ autoSyncLocalData: !autoSyncLocalData })}
 		>
-			<View className="flex flex-row items-center gap-2">
+			<View className="gap-2 flex flex-row items-center">
 				<Switch
 					checked={autoSyncLocalData}
 					onCheckedChange={(checked) => patch({ autoSyncLocalData: checked })}
diff --git a/apps/expo/components/appSettings/preferences/DefaultServer.tsx b/apps/expo/components/appSettings/preferences/DefaultServer.tsx
index c64c92698c..6dce91375f 100644
--- a/apps/expo/components/appSettings/preferences/DefaultServer.tsx
+++ b/apps/expo/components/appSettings/preferences/DefaultServer.tsx
@@ -1,22 +1,24 @@
 import { Server } from 'lucide-react-native'
 
 import { Picker } from '~/components/ui/picker/picker'
+import { useTranslate } from '~/lib/hooks'
 import { useSavedServers } from '~/stores'
 
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function DefaultServer() {
+	const { t } = useTranslate()
 	const { savedServers, setDefaultServer } = useSavedServers()
 
 	const defaultServer = savedServers.find((server) => server.defaultServer)
 
 	return (
-		<AppSettingsRow icon={Server} title="Default server">
+		<AppSettingsRow icon={Server} title={t('settings.preferences.defaultServer')}>
 			<Picker
 				value={defaultServer?.id || 'none'}
 				options={[
 					{
-						label: 'None',
+						label: t('common.none'),
 						value: 'none',
 					},
 					...savedServers.map((server) => ({
diff --git a/apps/expo/components/appSettings/preferences/DeleteDatabase.tsx b/apps/expo/components/appSettings/preferences/DeleteDatabase.tsx
index de4f9c53e2..44bd646187 100644
--- a/apps/expo/components/appSettings/preferences/DeleteDatabase.tsx
+++ b/apps/expo/components/appSettings/preferences/DeleteDatabase.tsx
@@ -3,15 +3,15 @@ import { Alert } from 'react-native'
 
 import { Button, Text } from '~/components/ui'
 import { deleteDatabase } from '~/db'
+import { useTranslate } from '~/lib/hooks'
 
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function DeleteDatabase() {
+	const { t } = useTranslate()
 	const onDeletedDatabase = (success: boolean) => {
-		Alert.alert(
-			success ? 'Database deleted' : 'Error',
-			success ? 'Please restart the app' : 'Failed to delete database',
-		)
+		const baseKey = success ? 'success' : 'error'
+		Alert.alert(t(getKey(`${baseKey}.title`)), t(getKey(`${baseKey}.description`)))
 	}
 
 	return (
@@ -35,3 +35,6 @@ export default function DeleteDatabase() {
 		</AppSettingsRow>
 	)
 }
+
+const LOCALE_BASE = 'settings.debug.deleteDatabase'
+const getKey = (key: string) => `${LOCALE_BASE}.${key}`
diff --git a/apps/expo/components/appSettings/preferences/DisableDismissGesture.tsx b/apps/expo/components/appSettings/preferences/DisableDismissGesture.tsx
index e09a347256..6f388f9202 100644
--- a/apps/expo/components/appSettings/preferences/DisableDismissGesture.tsx
+++ b/apps/expo/components/appSettings/preferences/DisableDismissGesture.tsx
@@ -3,11 +3,13 @@ import { View } from 'react-native'
 import { useShallow } from 'zustand/react/shallow'
 
 import { Switch } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 import { usePreferencesStore } from '~/stores'
 
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function DisableDismissGesture() {
+	const { t } = useTranslate()
 	const { disableDismissGesture, patch } = usePreferencesStore(
 		useShallow((state) => ({
 			disableDismissGesture: state.disableDismissGesture,
@@ -18,10 +20,10 @@ export default function DisableDismissGesture() {
 	return (
 		<AppSettingsRow
 			icon={ArrowRightFromLine}
-			title="Disable Dismiss Gesture"
+			title={t('settings.reading.disableDismissGesture')}
 			onPress={() => patch({ disableDismissGesture: !disableDismissGesture })}
 		>
-			<View className="flex flex-row items-center gap-2">
+			<View className="gap-2 flex flex-row items-center">
 				<Switch
 					checked={disableDismissGesture}
 					onCheckedChange={(checked) => patch({ disableDismissGesture: checked })}
diff --git a/apps/expo/components/appSettings/preferences/EnableDebugAnalytics.tsx b/apps/expo/components/appSettings/preferences/EnableDebugAnalytics.tsx
index c07e46606c..4a3a61261d 100644
--- a/apps/expo/components/appSettings/preferences/EnableDebugAnalytics.tsx
+++ b/apps/expo/components/appSettings/preferences/EnableDebugAnalytics.tsx
@@ -6,8 +6,10 @@ import { Switch } from '~/components/ui'
 import { usePreferencesStore } from '~/stores'
 
 import AppSettingsRow from '../AppSettingsRow'
+import { useTranslate } from '~/lib/hooks'
 
 export default function EnableDebugAnalytics() {
+	const { t } = useTranslate()
 	const { enableDebugAnalytics, patch } = usePreferencesStore(
 		useShallow((state) => ({
 			enableDebugAnalytics: state.enableDebugAnalytics,
@@ -18,8 +20,8 @@ export default function EnableDebugAnalytics() {
 	return (
 		<AppSettingsRow
 			icon={Bug}
-			title="Debug Analytics"
-			description="Send additional debug-related events to help troubleshoot issues"
+			title={t(getKey('label'))}
+			description={t(getKey('description'))}
 			onPress={() => patch({ enableDebugAnalytics: !enableDebugAnalytics })}
 		>
 			<View className="gap-2 flex flex-row items-center">
@@ -31,3 +33,6 @@ export default function EnableDebugAnalytics() {
 		</AppSettingsRow>
 	)
 }
+
+const LOCALE_BASE = 'settings.debug.debugAnalytics'
+const getKey = (key: string) => `${LOCALE_BASE}.${key}`
diff --git a/apps/expo/components/appSettings/preferences/ImageCacheActions.tsx b/apps/expo/components/appSettings/preferences/ImageCacheActions.tsx
index e4df4457c8..493262e409 100644
--- a/apps/expo/components/appSettings/preferences/ImageCacheActions.tsx
+++ b/apps/expo/components/appSettings/preferences/ImageCacheActions.tsx
@@ -3,41 +3,47 @@ import { Alert, View } from 'react-native'
 import TurboImage from 'react-native-turbo-image'
 
 import { Button, Text } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function CachePolicySelect() {
+	const { t } = useTranslate()
+
 	const onClearCache = async (message: string) => {
 		Alert.alert(message)
 	}
 
 	return (
 		<AppSettingsRow icon={Image} title="Clear Cache">
-			<View className="flex-row gap-2">
+			<View className="gap-2 flex-row">
 				<Button
 					size="sm"
 					roundness="full"
-					variant="outline"
+					variant="destructive"
 					onPress={async () => {
 						await TurboImage.clearMemoryCache()
-						onClearCache('Memory cache cleared')
+						onClearCache(t(getKey('memory.success')))
 					}}
 				>
-					<Text>Memory</Text>
+					<Text>{t(getKey('memory.button'))}</Text>
 				</Button>
 
 				<Button
 					size="sm"
 					roundness="full"
-					variant="outline"
+					variant="destructive"
 					onPress={async () => {
 						await TurboImage.clearDiskCache()
-						onClearCache('Disk cache cleared')
+						onClearCache(t(getKey('disk.success')))
 					}}
 				>
-					<Text>Disk</Text>
+					<Text>{t(getKey('disk.button'))}</Text>
 				</Button>
 			</View>
 		</AppSettingsRow>
 	)
 }
+
+const LOCALE_BASE = 'settings.debug.clearCache'
+const getKey = (key: string) => `${LOCALE_BASE}.${key}`
diff --git a/apps/expo/components/appSettings/preferences/MaskURLs.tsx b/apps/expo/components/appSettings/preferences/MaskURLs.tsx
index 63b4b0d9c1..66fcbce61a 100644
--- a/apps/expo/components/appSettings/preferences/MaskURLs.tsx
+++ b/apps/expo/components/appSettings/preferences/MaskURLs.tsx
@@ -3,11 +3,13 @@ import { View } from 'react-native'
 import { useShallow } from 'zustand/react/shallow'
 
 import { Switch } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 import { usePreferencesStore } from '~/stores'
 
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function MaskURLs() {
+	const { t } = useTranslate()
 	const { maskURLs, setMaskURLs } = usePreferencesStore(
 		useShallow((state) => ({
 			maskURLs: state.maskURLs,
@@ -16,8 +18,12 @@ export default function MaskURLs() {
 	)
 
 	return (
-		<AppSettingsRow icon={Link} title="Mask URLs" onPress={() => setMaskURLs(!maskURLs)}>
-			<View className="flex flex-row items-center gap-2">
+		<AppSettingsRow
+			icon={Link}
+			title={t('settings.debug.maskUrls')}
+			onPress={() => setMaskURLs(!maskURLs)}
+		>
+			<View className="gap-2 flex flex-row items-center">
 				<Switch checked={maskURLs} onCheckedChange={setMaskURLs} />
 			</View>
 		</AppSettingsRow>
diff --git a/apps/expo/components/appSettings/preferences/PerformanceMonitor.tsx b/apps/expo/components/appSettings/preferences/PerformanceMonitor.tsx
index 6128a55114..b8641f0b1c 100644
--- a/apps/expo/components/appSettings/preferences/PerformanceMonitor.tsx
+++ b/apps/expo/components/appSettings/preferences/PerformanceMonitor.tsx
@@ -3,11 +3,13 @@ import { View } from 'react-native'
 import { useShallow } from 'zustand/react/shallow'
 
 import { Switch } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 import { usePreferencesStore } from '~/stores'
 
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function PerformanceMonitor() {
+	const { t } = useTranslate()
 	const { performanceMonitor, patch } = usePreferencesStore(
 		useShallow((state) => ({
 			performanceMonitor: state.performanceMonitor,
@@ -18,10 +20,10 @@ export default function PerformanceMonitor() {
 	return (
 		<AppSettingsRow
 			icon={Gauge}
-			title="Performance Monitor"
+			title={t('settings.debug.performanceMonitor')}
 			onPress={() => patch({ performanceMonitor: !performanceMonitor })}
 		>
-			<View className="flex flex-row items-center gap-2">
+			<View className="gap-2 flex flex-row items-center">
 				<Switch
 					checked={performanceMonitor}
 					onCheckedChange={(checked) => patch({ performanceMonitor: checked })}
diff --git a/apps/expo/components/appSettings/preferences/PreferMinimalReader.tsx b/apps/expo/components/appSettings/preferences/PreferMinimalReader.tsx
index 78371872fb..154a7d7c4b 100644
--- a/apps/expo/components/appSettings/preferences/PreferMinimalReader.tsx
+++ b/apps/expo/components/appSettings/preferences/PreferMinimalReader.tsx
@@ -3,11 +3,13 @@ import { View } from 'react-native'
 import { useShallow } from 'zustand/react/shallow'
 
 import { Switch } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 import { usePreferencesStore } from '~/stores'
 
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function PreferMinimalReader() {
+	const { t } = useTranslate()
 	const { preferMinimalReader, patch } = usePreferencesStore(
 		useShallow((state) => ({
 			preferMinimalReader: state.preferMinimalReader,
@@ -18,7 +20,7 @@ export default function PreferMinimalReader() {
 	return (
 		<AppSettingsRow
 			icon={Spotlight}
-			title="Prefer Minimal Reader"
+			title={t('settings.reading.preferMinimalReader')}
 			onPress={() => patch({ preferMinimalReader: !preferMinimalReader })}
 		>
 			<View className="gap-2 flex flex-row items-center">
diff --git a/apps/expo/components/appSettings/preferences/PreferNativePdf.tsx b/apps/expo/components/appSettings/preferences/PreferNativePdf.tsx
index 89dc048eeb..1c0e781fbd 100644
--- a/apps/expo/components/appSettings/preferences/PreferNativePdf.tsx
+++ b/apps/expo/components/appSettings/preferences/PreferNativePdf.tsx
@@ -3,11 +3,13 @@ import { View } from 'react-native'
 import { useShallow } from 'zustand/react/shallow'
 
 import { Switch } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 import { usePreferencesStore } from '~/stores'
 
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function PreferNativePdf() {
+	const { t } = useTranslate()
 	const { preferNativePdf, patch } = usePreferencesStore(
 		useShallow((state) => ({
 			preferNativePdf: state.preferNativePdf,
@@ -18,10 +20,10 @@ export default function PreferNativePdf() {
 	return (
 		<AppSettingsRow
 			icon={FileDown}
-			title="Prefer Native PDF"
+			title={t('settings.reading.preferNativePdf')}
 			onPress={() => patch({ preferNativePdf: !preferNativePdf })}
 		>
-			<View className="flex flex-row items-center gap-2">
+			<View className="gap-2 flex flex-row items-center">
 				<Switch
 					checked={Boolean(preferNativePdf)}
 					onCheckedChange={(checked) => patch({ preferNativePdf: checked })}
diff --git a/apps/expo/components/appSettings/preferences/ReaderSettingsLink.tsx b/apps/expo/components/appSettings/preferences/ReaderSettingsLink.tsx
index 17e23b817a..96e57a181d 100644
--- a/apps/expo/components/appSettings/preferences/ReaderSettingsLink.tsx
+++ b/apps/expo/components/appSettings/preferences/ReaderSettingsLink.tsx
@@ -3,19 +3,21 @@ import { ChevronRight, Settings2 } from 'lucide-react-native'
 import { View } from 'react-native'
 
 import { Icon } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function ReaderSettingsLink() {
+	const { t } = useTranslate()
 	const router = useRouter()
 	return (
 		<AppSettingsRow
 			icon={Settings2}
-			title="Settings"
+			title={t('common.settings')}
 			onPress={() => router.push('/settings/reader')}
 			isLink
 		>
-			<View className="flex flex-row items-center gap-2">
+			<View className="gap-2 flex flex-row items-center">
 				<Icon as={ChevronRight} size={20} className="text-foreground-muted" />
 			</View>
 		</AppSettingsRow>
diff --git a/apps/expo/components/appSettings/preferences/ReduceAnimations.tsx b/apps/expo/components/appSettings/preferences/ReduceAnimations.tsx
index 21ed3a66d6..6a4e84c48b 100644
--- a/apps/expo/components/appSettings/preferences/ReduceAnimations.tsx
+++ b/apps/expo/components/appSettings/preferences/ReduceAnimations.tsx
@@ -3,11 +3,13 @@ import { View } from 'react-native'
 import { useShallow } from 'zustand/react/shallow'
 
 import { Switch } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 import { usePreferencesStore } from '~/stores'
 
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function ReduceAnimations() {
+	const { t } = useTranslate()
 	const { reduceAnimations, patch } = usePreferencesStore(
 		useShallow((state) => ({
 			reduceAnimations: state.reduceAnimations,
@@ -18,10 +20,10 @@ export default function ReduceAnimations() {
 	return (
 		<AppSettingsRow
 			icon={Rabbit}
-			title="Reduce Animations"
+			title={t('settings.debug.reduceAnimations')}
 			onPress={() => patch({ reduceAnimations: !reduceAnimations })}
 		>
-			<View className="flex flex-row items-center gap-2">
+			<View className="gap-2 flex flex-row items-center">
 				<Switch
 					checked={reduceAnimations}
 					onCheckedChange={(checked) => patch({ reduceAnimations: checked })}
diff --git a/apps/expo/components/appSettings/preferences/ThumbnailPlaceholder.tsx b/apps/expo/components/appSettings/preferences/ThumbnailPlaceholder.tsx
index 1c3d01f7f0..eb030ded55 100644
--- a/apps/expo/components/appSettings/preferences/ThumbnailPlaceholder.tsx
+++ b/apps/expo/components/appSettings/preferences/ThumbnailPlaceholder.tsx
@@ -3,6 +3,7 @@ import { useShallow } from 'zustand/react/shallow'
 
 import { ThumbnailPlaceholderType } from '~/components/image/ThumbnailPlaceholder'
 import { Picker } from '~/components/ui/picker/picker'
+import { useTranslate } from '~/lib/hooks'
 import { usePreferencesStore } from '~/stores'
 
 import AppSettingsRow from '../AppSettingsRow'
@@ -10,6 +11,7 @@ import AppSettingsRow from '../AppSettingsRow'
 // TODO(android): Use non-native dropdown
 
 export default function ThumbnailPlaceholder() {
+	const { t } = useTranslate()
 	const { thumbnailPlaceholder, patch } = usePreferencesStore(
 		useShallow((state) => ({
 			thumbnailPlaceholder: state.thumbnailPlaceholder,
@@ -18,24 +20,24 @@ export default function ThumbnailPlaceholder() {
 	)
 
 	return (
-		<AppSettingsRow icon={Palette} title="Thumbnail Placeholder">
+		<AppSettingsRow icon={Palette} title={t(getKey('label'))}>
 			<Picker<ThumbnailPlaceholderType>
 				value={thumbnailPlaceholder}
 				options={[
 					{
-						label: 'Grayscale',
+						label: t(getKey('options.grayscale')),
 						value: 'grayscale',
 					},
 					{
-						label: 'Average Color',
+						label: t(getKey('options.averageColor')),
 						value: 'averageColor',
 					},
 					{
-						label: 'Colorful',
+						label: t(getKey('options.colorful')),
 						value: 'colorful',
 					},
 					{
-						label: 'Thumbhash',
+						label: t(getKey('options.thumbhash')),
 						value: 'thumbhash',
 					},
 				]}
@@ -44,3 +46,6 @@ export default function ThumbnailPlaceholder() {
 		</AppSettingsRow>
 	)
 }
+
+const LOCALE_BASE = 'settings.preferences.thumbnailPlaceholder'
+const getKey = (key: string) => `${LOCALE_BASE}.${key}`
diff --git a/apps/expo/components/appSettings/preferences/ThumbnailRatio.tsx b/apps/expo/components/appSettings/preferences/ThumbnailRatio.tsx
index 0d3c5c7f0a..a9e5096170 100644
--- a/apps/expo/components/appSettings/preferences/ThumbnailRatio.tsx
+++ b/apps/expo/components/appSettings/preferences/ThumbnailRatio.tsx
@@ -5,8 +5,10 @@ import { Picker } from '~/components/ui/picker/picker'
 import { usePreferencesStore } from '~/stores'
 
 import AppSettingsRow from '../AppSettingsRow'
+import { useTranslate } from '~/lib/hooks'
 
 export default function ThumbnailRatio() {
+	const { t } = useTranslate()
 	const { thumbnailRatio, patch } = usePreferencesStore(
 		useShallow((state) => ({
 			thumbnailRatio: state.thumbnailRatio,
@@ -27,7 +29,7 @@ export default function ThumbnailRatio() {
 	const thumbnailRatioName = ratioToStringMap[thumbnailRatio]
 
 	return (
-		<AppSettingsRow icon={Ruler} title="Thumbnail Ratio">
+		<AppSettingsRow icon={Ruler} title={t('settings.preferences.thumbnailRatio')}>
 			<Picker
 				value={thumbnailRatioName || '1 : 1.5'}
 				options={[
diff --git a/apps/expo/components/appSettings/preferences/ThumbnailResizeMode.tsx b/apps/expo/components/appSettings/preferences/ThumbnailResizeMode.tsx
index 80bb6d7d31..9790081d38 100644
--- a/apps/expo/components/appSettings/preferences/ThumbnailResizeMode.tsx
+++ b/apps/expo/components/appSettings/preferences/ThumbnailResizeMode.tsx
@@ -2,11 +2,13 @@ import { Maximize } from 'lucide-react-native'
 import { useShallow } from 'zustand/react/shallow'
 
 import { Picker } from '~/components/ui/picker/picker'
+import { useTranslate } from '~/lib/hooks'
 import { usePreferencesStore } from '~/stores'
 
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function ThumbnailResizeMode() {
+	const { t } = useTranslate()
 	const { thumbnailResizeMode, patch } = usePreferencesStore(
 		useShallow((state) => ({
 			thumbnailResizeMode: state.thumbnailResizeMode,
@@ -15,11 +17,11 @@ export default function ThumbnailResizeMode() {
 	)
 
 	return (
-		<AppSettingsRow icon={Maximize} title="Thumbnail Resize">
+		<AppSettingsRow icon={Maximize} title={t(getKey('label'))}>
 			<Picker
 				value={thumbnailResizeMode || 'cover'}
 				options={(['cover', 'stretch', 'fit'] as const).map((value) => ({
-					label: getLabel(value),
+					label: t(getKey(`options.${value}`)),
 					value,
 				}))}
 				onValueChange={(value) => patch({ thumbnailResizeMode: value })}
@@ -28,12 +30,5 @@ export default function ThumbnailResizeMode() {
 	)
 }
 
-const LABELS = {
-	cover: 'Cover',
-	stretch: 'Stretch',
-	fit: 'Fit',
-}
-
-const getLabel = (key: keyof typeof LABELS) => {
-	return LABELS[key] || 'Cover'
-}
+const LOCALE_BASE = 'settings.preferences.thumbnailResizeMode'
+const getKey = (key: string) => `${LOCALE_BASE}.${key}`
diff --git a/apps/expo/components/appSettings/stump/BookClubsEnabled.tsx b/apps/expo/components/appSettings/stump/BookClubsEnabled.tsx
index ed3077bbe7..dc08021264 100644
--- a/apps/expo/components/appSettings/stump/BookClubsEnabled.tsx
+++ b/apps/expo/components/appSettings/stump/BookClubsEnabled.tsx
@@ -3,11 +3,13 @@ import { View } from 'react-native'
 import { useShallow } from 'zustand/react/shallow'
 
 import { Switch } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 import { usePreferencesStore } from '~/stores'
 
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function BookClubsEnabled() {
+	const { t } = useTranslate()
 	const { bookClubsEnabled, patch } = usePreferencesStore(
 		useShallow((state) => ({
 			bookClubsEnabled: state.bookClubsEnabled,
@@ -18,7 +20,7 @@ export default function BookClubsEnabled() {
 	return (
 		<AppSettingsRow
 			icon={Users}
-			title="Book Club Features"
+			title={t('settings.stump.bookClubsEnabled')}
 			onPress={() => patch({ bookClubsEnabled: !bookClubsEnabled })}
 		>
 			<View className="gap-2 flex flex-row items-center">
diff --git a/apps/expo/components/appSettings/stump/StumpEnabled.tsx b/apps/expo/components/appSettings/stump/StumpEnabled.tsx
index d659a88647..d570aed903 100644
--- a/apps/expo/components/appSettings/stump/StumpEnabled.tsx
+++ b/apps/expo/components/appSettings/stump/StumpEnabled.tsx
@@ -2,16 +2,22 @@ import { Box } from 'lucide-react-native'
 import { View } from 'react-native'
 
 import { Switch } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 import { useSavedServers } from '~/stores/savedServer'
 
 import AppSettingsRow from '../AppSettingsRow'
 
 export default function StumpEnabled() {
+	const { t } = useTranslate()
 	const { stumpEnabled, setStumpEnabled } = useSavedServers()
 
 	return (
-		<AppSettingsRow icon={Box} title="Enabled" onPress={() => setStumpEnabled(!stumpEnabled)}>
-			<View className="flex flex-row items-center gap-2">
+		<AppSettingsRow
+			icon={Box}
+			title={t('common.enabled')}
+			onPress={() => setStumpEnabled(!stumpEnabled)}
+		>
+			<View className="gap-2 flex flex-row items-center">
 				<Switch checked={stumpEnabled} onCheckedChange={setStumpEnabled} />
 			</View>
 		</AppSettingsRow>
diff --git a/apps/expo/components/book/overview/DescriptionSection.tsx b/apps/expo/components/book/overview/DescriptionSection.tsx
index b89ae61d12..286b011000 100644
--- a/apps/expo/components/book/overview/DescriptionSection.tsx
+++ b/apps/expo/components/book/overview/DescriptionSection.tsx
@@ -6,6 +6,7 @@ import { stripHtml } from 'string-strip-html'
 
 import { Markdown, Text } from '~/components/ui'
 import { IS_IOS_24_PLUS, useColors } from '~/lib/constants'
+import { useTranslate } from '~/lib/hooks'
 
 import { DottedLine } from './DottedLine'
 
@@ -14,6 +15,8 @@ type Props = {
 }
 
 export default function DescriptionSection({ description }: Props) {
+	const { t } = useTranslate()
+
 	const sheetRef = useRef<TrueSheet | null>(null)
 
 	const colors = useColors()
@@ -27,7 +30,7 @@ export default function DescriptionSection({ description }: Props) {
 					{strippedDescription}
 				</Text>
 
-				<View className="flex-row items-center gap-1">
+				<View className="gap-1 flex-row items-center">
 					<DottedLine />
 					<Pressable onPress={() => sheetRef.current?.present()}>
 						<GlassView
@@ -41,7 +44,7 @@ export default function DescriptionSection({ description }: Props) {
 									className="text-base font-semibold"
 									style={{ color: colors.fill.brand.DEFAULT }}
 								>
-									Read more
+									{t('common.readMore')}
 								</Text>
 							</View>
 						</GlassView>
@@ -58,7 +61,7 @@ export default function DescriptionSection({ description }: Props) {
 				backgroundColor={IS_IOS_24_PLUS ? undefined : colors.background.DEFAULT}
 				grabberOptions={{ color: colors.sheet.grabber }}
 			>
-				<ScrollView className="flex-1 p-6">
+				<ScrollView className="p-6 flex-1">
 					<Markdown>{strippedDescription}</Markdown>
 				</ScrollView>
 			</TrueSheet>
diff --git a/apps/expo/components/book/reader/settings/DoublePageSelect.tsx b/apps/expo/components/book/reader/settings/DoublePageSelect.tsx
index ffb2c400d6..e6ca84a6e4 100644
--- a/apps/expo/components/book/reader/settings/DoublePageSelect.tsx
+++ b/apps/expo/components/book/reader/settings/DoublePageSelect.tsx
@@ -4,6 +4,7 @@ import { View } from 'react-native'
 import * as DropdownMenu from 'zeego/dropdown-menu'
 
 import { Icon, Text } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 import { cn } from '~/lib/utils'
 import { DoublePageBehavior } from '~/stores/reader'
 
@@ -13,13 +14,15 @@ type Props = {
 }
 
 export default function DoublePageSelect({ behavior, onChange }: Props) {
+	const { t } = useTranslate()
+
 	const [isOpen, setIsOpen] = useState(false)
 
 	return (
 		<DropdownMenu.Root onOpenChange={setIsOpen}>
 			<DropdownMenu.Trigger>
-				<View className={cn('flex-row items-center gap-1.5', { 'opacity-80': isOpen })}>
-					<Text>{BEHAVIOR_TEXT[behavior]}</Text>
+				<View className={cn('gap-1.5 flex-row items-center', { 'opacity-80': isOpen })}>
+					<Text>{t(getKey(behavior))}</Text>
 					<Icon as={ChevronsUpDown} className="h-5 text-foreground-muted" />
 				</View>
 			</DropdownMenu.Trigger>
@@ -30,7 +33,7 @@ export default function DoublePageSelect({ behavior, onChange }: Props) {
 					value={behavior === 'auto'}
 					onValueChange={() => onChange('auto')}
 				>
-					<DropdownMenu.ItemTitle>Auto</DropdownMenu.ItemTitle>
+					<DropdownMenu.ItemTitle>{t(getKey('auto'))}</DropdownMenu.ItemTitle>
 				</DropdownMenu.CheckboxItem>
 
 				<DropdownMenu.CheckboxItem
@@ -38,7 +41,7 @@ export default function DoublePageSelect({ behavior, onChange }: Props) {
 					value={behavior === 'always'}
 					onValueChange={() => onChange('always')}
 				>
-					<DropdownMenu.ItemTitle>Always</DropdownMenu.ItemTitle>
+					<DropdownMenu.ItemTitle>{t(getKey('always'))}</DropdownMenu.ItemTitle>
 				</DropdownMenu.CheckboxItem>
 
 				<DropdownMenu.CheckboxItem
@@ -46,15 +49,12 @@ export default function DoublePageSelect({ behavior, onChange }: Props) {
 					value={behavior === 'off'}
 					onValueChange={() => onChange('off')}
 				>
-					<DropdownMenu.ItemTitle>Off</DropdownMenu.ItemTitle>
+					<DropdownMenu.ItemTitle>{t(getKey('off'))}</DropdownMenu.ItemTitle>
 				</DropdownMenu.CheckboxItem>
 			</DropdownMenu.Content>
 		</DropdownMenu.Root>
 	)
 }
 
-const BEHAVIOR_TEXT: Record<DoublePageBehavior, string> = {
-	always: 'Always',
-	auto: 'Auto',
-	off: 'Off',
-}
+const LOCALE_BASE = 'readerSettings.doublePageBehavior'
+const getKey = (key: DoublePageBehavior) => `${LOCALE_BASE}.options.${key}`
diff --git a/apps/expo/components/book/reader/settings/FootControlsSelect.tsx b/apps/expo/components/book/reader/settings/FootControlsSelect.tsx
index 1c4374a01f..57e26fdc73 100644
--- a/apps/expo/components/book/reader/settings/FootControlsSelect.tsx
+++ b/apps/expo/components/book/reader/settings/FootControlsSelect.tsx
@@ -4,6 +4,7 @@ import { View } from 'react-native'
 import * as DropdownMenu from 'zeego/dropdown-menu'
 
 import { Icon, Text } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 import { cn } from '~/lib/utils'
 import { FooterControls } from '~/stores/reader'
 
@@ -13,13 +14,14 @@ type Props = {
 }
 
 export default function FooterControlsSelect({ variant, onChange }: Props) {
+	const { t } = useTranslate()
 	const [isOpen, setIsOpen] = useState(false)
 
 	return (
 		<DropdownMenu.Root onOpenChange={setIsOpen}>
 			<DropdownMenu.Trigger>
-				<View className={cn('flex-row items-center gap-1.5', { 'opacity-80': isOpen })}>
-					<Text>{VARIANT_TEXT[variant]}</Text>
+				<View className={cn('gap-1.5 flex-row items-center', { 'opacity-80': isOpen })}>
+					<Text>{t(getKey(variant))}</Text>
 					<Icon as={ChevronsUpDown} className="h-5 text-foreground-muted" />
 				</View>
 			</DropdownMenu.Trigger>
@@ -30,7 +32,7 @@ export default function FooterControlsSelect({ variant, onChange }: Props) {
 					value={variant === 'images'}
 					onValueChange={() => onChange('images')}
 				>
-					<DropdownMenu.ItemTitle>{VARIANT_TEXT.images}</DropdownMenu.ItemTitle>
+					<DropdownMenu.ItemTitle>{t(getKey('images'))}</DropdownMenu.ItemTitle>
 				</DropdownMenu.CheckboxItem>
 
 				<DropdownMenu.CheckboxItem
@@ -38,14 +40,12 @@ export default function FooterControlsSelect({ variant, onChange }: Props) {
 					value={variant === 'slider'}
 					onValueChange={() => onChange('slider')}
 				>
-					<DropdownMenu.ItemTitle>{VARIANT_TEXT.slider}</DropdownMenu.ItemTitle>
+					<DropdownMenu.ItemTitle>{t(getKey('slider'))}</DropdownMenu.ItemTitle>
 				</DropdownMenu.CheckboxItem>
 			</DropdownMenu.Content>
 		</DropdownMenu.Root>
 	)
 }
 
-const VARIANT_TEXT: Record<FooterControls, string> = {
-	images: 'Image Gallery',
-	slider: 'Slider',
-}
+const LOCALE_BASE = 'readerSettings.footerControls'
+const getKey = (variant: FooterControls) => `${LOCALE_BASE}.options.${variant}`
diff --git a/apps/expo/components/book/reader/settings/ImageScalingSelect.tsx b/apps/expo/components/book/reader/settings/ImageScalingSelect.tsx
index 552c7cb647..b95b68e3ca 100644
--- a/apps/expo/components/book/reader/settings/ImageScalingSelect.tsx
+++ b/apps/expo/components/book/reader/settings/ImageScalingSelect.tsx
@@ -5,6 +5,7 @@ import { View } from 'react-native'
 import * as DropdownMenu from 'zeego/dropdown-menu'
 
 import { Icon, Text } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 import { cn } from '~/lib/utils'
 
 type Props = {
@@ -13,13 +14,15 @@ type Props = {
 }
 
 export default function ImageScalingSelect({ behavior, onChange }: Props) {
+	const { t } = useTranslate()
+
 	const [isOpen, setIsOpen] = useState(false)
 
 	return (
 		<DropdownMenu.Root onOpenChange={setIsOpen}>
 			<DropdownMenu.Trigger>
-				<View className={cn('flex-row items-center gap-1.5', { 'opacity-80': isOpen })}>
-					<Text>{BEHAVIOR_TEXT[behavior]}</Text>
+				<View className={cn('gap-1.5 flex-row items-center', { 'opacity-80': isOpen })}>
+					<Text>{t(getKey(behavior))}</Text>
 					<Icon as={ChevronsUpDown} className="h-5 text-foreground-muted" />
 				</View>
 			</DropdownMenu.Trigger>
@@ -30,7 +33,7 @@ export default function ImageScalingSelect({ behavior, onChange }: Props) {
 					value={behavior === ReadingImageScaleFit.Auto}
 					onValueChange={() => onChange(ReadingImageScaleFit.Auto)}
 				>
-					<DropdownMenu.ItemTitle>Auto</DropdownMenu.ItemTitle>
+					<DropdownMenu.ItemTitle>{t(getKey(ReadingImageScaleFit.Auto))}</DropdownMenu.ItemTitle>
 				</DropdownMenu.CheckboxItem>
 
 				<DropdownMenu.CheckboxItem
@@ -39,7 +42,7 @@ export default function ImageScalingSelect({ behavior, onChange }: Props) {
 					onValueChange={() => onChange(ReadingImageScaleFit.Height)}
 					disabled
 				>
-					<DropdownMenu.ItemTitle>Fit Height</DropdownMenu.ItemTitle>
+					<DropdownMenu.ItemTitle>{t(getKey(ReadingImageScaleFit.Height))}</DropdownMenu.ItemTitle>
 				</DropdownMenu.CheckboxItem>
 
 				<DropdownMenu.CheckboxItem
@@ -48,7 +51,7 @@ export default function ImageScalingSelect({ behavior, onChange }: Props) {
 					onValueChange={() => onChange(ReadingImageScaleFit.Width)}
 					disabled
 				>
-					<DropdownMenu.ItemTitle>Fit Width</DropdownMenu.ItemTitle>
+					<DropdownMenu.ItemTitle>{t(getKey(ReadingImageScaleFit.Width))}</DropdownMenu.ItemTitle>
 				</DropdownMenu.CheckboxItem>
 
 				<DropdownMenu.CheckboxItem
@@ -57,16 +60,12 @@ export default function ImageScalingSelect({ behavior, onChange }: Props) {
 					onValueChange={() => onChange(ReadingImageScaleFit.None)}
 					disabled
 				>
-					<DropdownMenu.ItemTitle>None</DropdownMenu.ItemTitle>
+					<DropdownMenu.ItemTitle>{t(getKey(ReadingImageScaleFit.None))}</DropdownMenu.ItemTitle>
 				</DropdownMenu.CheckboxItem>
 			</DropdownMenu.Content>
 		</DropdownMenu.Root>
 	)
 }
 
-const BEHAVIOR_TEXT: Record<ReadingImageScaleFit, string> = {
-	[ReadingImageScaleFit.Height]: 'Fit Height',
-	[ReadingImageScaleFit.Width]: 'Fit Width',
-	[ReadingImageScaleFit.None]: 'None',
-	[ReadingImageScaleFit.Auto]: 'Auto',
-}
+const LOCALE_BASE = 'readerSettings.imageScaling'
+const getKey = (key: ReadingImageScaleFit) => `${LOCALE_BASE}.options.${key}`
diff --git a/apps/expo/components/book/reader/settings/ReaderSettings.tsx b/apps/expo/components/book/reader/settings/ReaderSettings.tsx
index 81e92e25fe..fb327a8241 100644
--- a/apps/expo/components/book/reader/settings/ReaderSettings.tsx
+++ b/apps/expo/components/book/reader/settings/ReaderSettings.tsx
@@ -3,6 +3,7 @@ import { useCallback, useMemo } from 'react'
 import { View } from 'react-native'
 
 import { Card, Switch } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 import { BookPreferences, GlobalSettings, useReaderStore } from '~/stores/reader'
 
 import DoublePageSelect from './DoublePageSelect'
@@ -19,6 +20,8 @@ type Props = {
 // TODO(android): Use non-native dropdown for all of these
 
 export default function ReaderSettings({ forBook, forServer }: Props) {
+	const { t } = useTranslate()
+
 	const bookSettingsMap = useReaderStore((state) => state.bookSettings)
 	const globalSettings = useReaderStore((state) => state.globalSettings)
 	const addBookSettings = useReaderStore((state) => state.addBookSettings)
@@ -66,9 +69,9 @@ export default function ReaderSettings({ forBook, forServer }: Props) {
 	const allowDownscaling = activeSettings.allowDownscaling ?? true
 
 	return (
-		<View className="flex-1 gap-8">
-			<Card label="Mode">
-				<Card.Row label="Flow">
+		<View className="gap-8 flex-1">
+			<Card label={t('readerSettings.sections.mode')}>
+				<Card.Row label={t('readerSettings.readingMode.label')}>
 					<ReadingModeSelect
 						mode={activeSettings.readingMode}
 						onChange={(mode) => onPreferenceChange({ readingMode: mode })}
@@ -76,7 +79,7 @@ export default function ReaderSettings({ forBook, forServer }: Props) {
 				</Card.Row>
 
 				<Card.Row
-					label="Direction"
+					label={t('readerSettings.readingDirection.label')}
 					disabled={activeSettings.readingMode === ReadingMode.ContinuousVertical}
 				>
 					<ReadingDirectionSelect
@@ -86,8 +89,8 @@ export default function ReaderSettings({ forBook, forServer }: Props) {
 				</Card.Row>
 			</Card>
 
-			<Card label="Image Options">
-				<Card.Row label="Double Paged">
+			<Card label={t('readerSettings.sections.imageOptions')}>
+				<Card.Row label={t('readerSettings.doublePageBehavior.label')}>
 					<DoublePageSelect
 						behavior={activeSettings.doublePageBehavior || 'auto'}
 						onChange={(behavior) => onPreferenceChange({ doublePageBehavior: behavior })}
@@ -95,7 +98,7 @@ export default function ReaderSettings({ forBook, forServer }: Props) {
 				</Card.Row>
 
 				<Card.Row
-					label="Separate Second Page"
+					label={t('readerSettings.separateSecondPage')}
 					disabled={activeSettings.doublePageBehavior === 'off'}
 				>
 					<Switch
@@ -106,28 +109,23 @@ export default function ReaderSettings({ forBook, forServer }: Props) {
 					/>
 				</Card.Row>
 
-				<Card.Row label="Scaling">
+				<Card.Row label={t('readerSettings.imageScaling.label')}>
 					<ImageScalingSelect
 						behavior={activeSettings.imageScaling.scaleToFit}
 						onChange={(fit) => onPreferenceChange({ imageScaling: { scaleToFit: fit } })}
 					/>
 				</Card.Row>
 
-				<Card.Row label="Downscaling">
+				<Card.Row label={t('readerSettings.allowDownscaling')}>
 					<Switch
 						checked={allowDownscaling}
 						onCheckedChange={(value) => onPreferenceChange({ allowDownscaling: value })}
 					/>
 				</Card.Row>
-
-				{/* TODO: https://docs.expo.dev/versions/latest/sdk/media-library/ */}
-				<Card.Row label="Panel Downloads" disabled>
-					<Switch checked={false} onCheckedChange={() => {}} />
-				</Card.Row>
 			</Card>
 
-			<Card label="Navigation">
-				<Card.Row label="Tap Sides to Navigate">
+			<Card label={t('readerSettings.sections.controls')}>
+				<Card.Row label={t('readerSettings.tapSidesToNavigate')}>
 					<Switch
 						variant="brand"
 						checked={activeSettings.tapSidesToNavigate ?? true}
@@ -135,7 +133,7 @@ export default function ReaderSettings({ forBook, forServer }: Props) {
 					/>
 				</Card.Row>
 
-				<Card.Row label="Bottom Controls">
+				<Card.Row label={t('readerSettings.footerControls.label')}>
 					<FooterControlsSelect
 						variant={activeSettings.footerControls || 'images'}
 						onChange={(variant) => onPreferenceChange({ footerControls: variant })}
diff --git a/apps/expo/components/book/reader/settings/ReadingDirectionSelect.tsx b/apps/expo/components/book/reader/settings/ReadingDirectionSelect.tsx
index 070d2da3c8..7483e1aa98 100644
--- a/apps/expo/components/book/reader/settings/ReadingDirectionSelect.tsx
+++ b/apps/expo/components/book/reader/settings/ReadingDirectionSelect.tsx
@@ -1,10 +1,12 @@
 import { ReadingDirection } from '@stump/graphql'
+import { get } from 'colorjs.io/fn'
 import { ChevronsUpDown } from 'lucide-react-native'
 import { useState } from 'react'
 import { View } from 'react-native'
 import * as DropdownMenu from 'zeego/dropdown-menu'
 
 import { Icon, Text } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 import { cn } from '~/lib/utils'
 
 type Props = {
@@ -13,12 +15,14 @@ type Props = {
 }
 
 export default function ReadingDirectionSelect({ direction, onChange }: Props) {
+	const { t } = useTranslate()
+
 	const [isOpen, setIsOpen] = useState(false)
 
 	return (
 		<DropdownMenu.Root onOpenChange={setIsOpen}>
 			<DropdownMenu.Trigger>
-				<View className={cn('flex-row items-center gap-1.5', { 'opacity-80': isOpen })}>
+				<View className={cn('gap-1.5 flex-row items-center', { 'opacity-80': isOpen })}>
 					<Text>{direction.toUpperCase()}</Text>
 					<Icon as={ChevronsUpDown} className="h-5 text-foreground-muted" />
 				</View>
@@ -30,7 +34,7 @@ export default function ReadingDirectionSelect({ direction, onChange }: Props) {
 					value={direction === ReadingDirection.Ltr}
 					onValueChange={() => onChange(ReadingDirection.Ltr)}
 				>
-					<DropdownMenu.ItemTitle>Left to Right</DropdownMenu.ItemTitle>
+					<DropdownMenu.ItemTitle>{t(getKey(ReadingDirection.Ltr))}</DropdownMenu.ItemTitle>
 				</DropdownMenu.CheckboxItem>
 
 				<DropdownMenu.CheckboxItem
@@ -38,9 +42,12 @@ export default function ReadingDirectionSelect({ direction, onChange }: Props) {
 					value={direction === ReadingDirection.Rtl}
 					onValueChange={() => onChange(ReadingDirection.Rtl)}
 				>
-					<DropdownMenu.ItemTitle>Right to Left</DropdownMenu.ItemTitle>
+					<DropdownMenu.ItemTitle>{t(getKey(ReadingDirection.Rtl))}</DropdownMenu.ItemTitle>
 				</DropdownMenu.CheckboxItem>
 			</DropdownMenu.Content>
 		</DropdownMenu.Root>
 	)
 }
+
+const LOCALE_BASE = 'readerSettings.readingMode'
+const getKey = (key: ReadingDirection) => `${LOCALE_BASE}.options.${key}`
diff --git a/apps/expo/components/book/reader/settings/ReadingModeSelect.tsx b/apps/expo/components/book/reader/settings/ReadingModeSelect.tsx
index b75a3efb01..2845025198 100644
--- a/apps/expo/components/book/reader/settings/ReadingModeSelect.tsx
+++ b/apps/expo/components/book/reader/settings/ReadingModeSelect.tsx
@@ -5,6 +5,7 @@ import { View } from 'react-native'
 import * as DropdownMenu from 'zeego/dropdown-menu'
 
 import { Icon, Text } from '~/components/ui'
+import { useTranslate } from '~/lib/hooks'
 import { cn } from '~/lib/utils'
 
 type Props = {
@@ -13,13 +14,15 @@ type Props = {
 }
 
 export default function ReadingModeSelect({ mode, onChange }: Props) {
+	const { t } = useTranslate()
+
 	const [isOpen, setIsOpen] = useState(false)
 
 	return (
 		<DropdownMenu.Root onOpenChange={setIsOpen}>
 			<DropdownMenu.Trigger>
-				<View className={cn('flex-row items-center gap-1.5', { 'opacity-80': isOpen })}>
-					<Text>{READ_FLOW[mode]}</Text>
+				<View className={cn('gap-1.5 flex-row items-center', { 'opacity-80': isOpen })}>
+					<Text>{t(getOption(mode))}</Text>
 					<Icon as={ChevronsUpDown} className="h-5 text-foreground-muted" />
 				</View>
 			</DropdownMenu.Trigger>
@@ -30,7 +33,7 @@ export default function ReadingModeSelect({ mode, onChange }: Props) {
 					value={mode === ReadingMode.Paged}
 					onValueChange={() => onChange(ReadingMode.Paged)}
 				>
-					<DropdownMenu.ItemTitle>Paged</DropdownMenu.ItemTitle>
+					<DropdownMenu.ItemTitle>{t(getOption(ReadingMode.Paged))}</DropdownMenu.ItemTitle>
 				</DropdownMenu.CheckboxItem>
 
 				<DropdownMenu.CheckboxItem
@@ -38,7 +41,9 @@ export default function ReadingModeSelect({ mode, onChange }: Props) {
 					value={mode === ReadingMode.ContinuousHorizontal}
 					onValueChange={() => onChange(ReadingMode.ContinuousHorizontal)}
 				>
-					<DropdownMenu.ItemTitle>Scroll (Horizontal)</DropdownMenu.ItemTitle>
+					<DropdownMenu.ItemTitle>
+						{t(getOption(ReadingMode.ContinuousHorizontal))}
+					</DropdownMenu.ItemTitle>
 				</DropdownMenu.CheckboxItem>
 
 				<DropdownMenu.CheckboxItem
@@ -46,15 +51,15 @@ export default function ReadingModeSelect({ mode, onChange }: Props) {
 					value={mode === ReadingMode.ContinuousVertical}
 					onValueChange={() => onChange(ReadingMode.ContinuousVertical)}
 				>
-					<DropdownMenu.ItemTitle>Scroll (Vertical)</DropdownMenu.ItemTitle>
+					<DropdownMenu.ItemTitle>
+						{t(getOption(ReadingMode.ContinuousVertical))}
+					</DropdownMenu.ItemTitle>
 				</DropdownMenu.CheckboxItem>
 			</DropdownMenu.Content>
 		</DropdownMenu.Root>
 	)
 }
 
-const READ_FLOW: Record<ReadingMode, string> = {
-	[ReadingMode.Paged]: 'Paged',
-	[ReadingMode.ContinuousHorizontal]: 'Scroll (Horizontal)',
-	[ReadingMode.ContinuousVertical]: 'Scroll (Vertical)',
-}
+const LOCALE_BASE = 'readerSettings.readingMode'
+const getKey = (key: string) => `${LOCALE_BASE}.${key}`
+const getOption = (mode: ReadingMode) => getKey(`options.${mode}`)
diff --git a/apps/expo/components/downloadQueue/DownloadProblemsSheet.tsx b/apps/expo/components/downloadQueue/DownloadProblemsSheet.tsx
index 8f4de6f36c..882908428e 100644
--- a/apps/expo/components/downloadQueue/DownloadProblemsSheet.tsx
+++ b/apps/expo/components/downloadQueue/DownloadProblemsSheet.tsx
@@ -5,7 +5,7 @@ import { View } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 
 import { useColors } from '~/lib/constants'
-import { useDownloadQueue } from '~/lib/hooks'
+import { useDownloadQueue, useTranslate } from '~/lib/hooks'
 
 import { Card, Heading } from '../ui'
 import { Button } from '../ui/button'
@@ -24,6 +24,7 @@ export const DownloadProblemsSheet = forwardRef<TrueSheet, Props>(function Downl
 	const colors = useColors()
 	const insets = useSafeAreaInsets()
 
+	const { t } = useTranslate()
 	const { failedItems, retry, dismiss, retryAllFailed, dismissAllFailed } = useDownloadQueue()
 
 	return (
@@ -44,39 +45,39 @@ export const DownloadProblemsSheet = forwardRef<TrueSheet, Props>(function Downl
 			onDidDismiss={onDismiss}
 			header={
 				<View className="gap-4 px-6 pt-8">
-					<Heading size="2xl">Failed Downloads</Heading>
+					<Heading size="2xl">{t(getKey('title'))}</Heading>
 				</View>
 			}
 		>
-			<View className="flex-1 gap-4 px-4 pb-4">
+			<View className="gap-4 px-4 pb-4 flex-1">
 				{/* TODO: Thumbs up owl or something */}
 				{failedItems.length === 0 && (
-					<View className="items-center justify-center py-8">
-						<Text className="text-foreground-muted">No failed downloads</Text>
+					<View className="py-8 items-center justify-center">
+						<Text className="text-foreground-muted">{t(getKey('noFailedDownloads'))}</Text>
 					</View>
 				)}
 
 				{failedItems.length > 0 && (
 					<>
-						<View className="flex-row gap-2">
+						<View className="gap-2 flex-row">
 							<Button
 								variant="outline"
 								roundness="full"
-								className="flex-1 flex-row gap-2"
+								className="gap-2 flex-1 flex-row"
 								onPress={retryAllFailed}
 							>
 								<Icon as={RefreshCw} size={14} />
-								<Text>Retry All</Text>
+								<Text>{t(getKey('retryAll'))}</Text>
 							</Button>
 
 							<Button
 								variant="destructive"
 								roundness="full"
-								className="flex-1 flex-row gap-2"
+								className="gap-2 flex-1 flex-row"
 								onPress={dismissAllFailed}
 							>
 								<Icon as={Trash2} size={14} className="text-white" />
-								<Text>Dismiss All</Text>
+								<Text>{t(getKey('dismissAll'))}</Text>
 							</Button>
 						</View>
 
@@ -91,3 +92,6 @@ export const DownloadProblemsSheet = forwardRef<TrueSheet, Props>(function Downl
 		</TrueSheet>
 	)
 })
+
+const LOCALE_BASE = 'localLibrary.downloadProblemsSheet'
+const getKey = (key: string) => `${LOCALE_BASE}.${key}`
diff --git a/apps/expo/components/downloadQueue/DownloadQueueItem.tsx b/apps/expo/components/downloadQueue/DownloadQueueItem.tsx
index bf0db1ad52..1aa5d6617f 100644
--- a/apps/expo/components/downloadQueue/DownloadQueueItem.tsx
+++ b/apps/expo/components/downloadQueue/DownloadQueueItem.tsx
@@ -3,7 +3,7 @@ import { X } from 'lucide-react-native'
 import { Pressable, View } from 'react-native'
 
 import { downloadQueueMetadata } from '~/db'
-import { useDownloadQueue } from '~/lib/hooks'
+import { useDownloadQueue, useTranslate } from '~/lib/hooks'
 
 import { Card, Icon, Progress, Text } from '../ui'
 
@@ -13,6 +13,8 @@ type Props = {
 }
 
 export default function DownloadQueueItem({ item, onCancel }: Props) {
+	const { t } = useTranslate()
+
 	const renderProgress = () => {
 		if (item.status === 'downloading' && item.progress) {
 			return (
@@ -22,7 +24,9 @@ export default function DownloadQueueItem({ item, onCancel }: Props) {
 				</>
 			)
 		} else if (item.status === 'downloading') {
-			return <Text className="text-xs text-foreground-muted">Starting...</Text>
+			return (
+				<Text className="text-xs text-foreground-muted">{t('downloadQueue.downloadStarting')}</Text>
+			)
 		} else {
 			return (
 				<Text className="text-xs text-foreground-muted">
@@ -34,16 +38,16 @@ export default function DownloadQueueItem({ item, onCancel }: Props) {
 
 	return (
 		<Card.Row>
-			<View className="flex-1 gap-1">
+			<View className="gap-1 flex-1">
 				<Text className="font-medium" numberOfLines={1}>
 					{downloadQueueMetadata.safeParse(item.metadata).data?.bookName || item.filename}
 				</Text>
-				<View className="flex-row items-center gap-2">{renderProgress()}</View>
+				<View className="gap-2 flex-row items-center">{renderProgress()}</View>
 			</View>
 
 			<Pressable
 				onPress={() => onCancel(item.id)}
-				className="rounded-full bg-white/75 p-2 active:opacity-70 dark:bg-black/40"
+				className="bg-white/75 p-2 dark:bg-black/40 rounded-full active:opacity-70"
 			>
 				<Icon as={X} size={16} className="text-foreground-muted" />
 			</Pressable>
diff --git a/apps/expo/components/downloadQueue/DownloadQueueSheet.tsx b/apps/expo/components/downloadQueue/DownloadQueueSheet.tsx
index 107f44351b..1551558b1c 100644
--- a/apps/expo/components/downloadQueue/DownloadQueueSheet.tsx
+++ b/apps/expo/components/downloadQueue/DownloadQueueSheet.tsx
@@ -5,7 +5,7 @@ import { Platform, ScrollView, View } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 
 import { useColors } from '~/lib/constants'
-import { useDownloadQueue } from '~/lib/hooks'
+import { useDownloadQueue, useTranslate } from '~/lib/hooks'
 
 import Owl from '../Owl'
 import { Card, Tabs } from '../ui'
@@ -26,6 +26,7 @@ export const DownloadQueueSheet = forwardRef<TrueSheet, Props>(function Download
 
 	const [tab, setTab] = useState<'HEALTHY' | 'FAILED'>('HEALTHY')
 
+	const { t } = useTranslate()
 	const { pendingItems, activeItems, failedItems, cancel, retry, dismiss } = useDownloadQueue()
 
 	const activeAndPendingItems = [...activeItems, ...pendingItems]
@@ -79,7 +80,7 @@ export const DownloadQueueSheet = forwardRef<TrueSheet, Props>(function Download
 			insetAdjustment="automatic"
 			header={
 				<View className="gap-4 px-6 pt-8">
-					<View className="w-full pb-2">
+					<View className="pb-2 w-full">
 						{Platform.select({
 							ios: (
 								<View className="w-full">
@@ -99,11 +100,11 @@ export const DownloadQueueSheet = forwardRef<TrueSheet, Props>(function Download
 								<Tabs value={tab} onValueChange={(value) => setTab(value as 'HEALTHY' | 'FAILED')}>
 									<Tabs.List className="flex-row">
 										<Tabs.Trigger value="HEALTHY">
-											<Text>Downloading</Text>
+											<Text>{t('downloadQueue.downloading')}</Text>
 										</Tabs.Trigger>
 
 										<Tabs.Trigger value="FAILED">
-											<Text>Failed</Text>
+											<Text>{t('downloadQueue.failed')}</Text>
 										</Tabs.Trigger>
 									</Tabs.List>
 								</Tabs>
@@ -113,12 +114,14 @@ export const DownloadQueueSheet = forwardRef<TrueSheet, Props>(function Download
 				</View>
 			}
 		>
-			<ScrollView className="flex-1 p-6" nestedScrollEnabled>
+			<ScrollView className="p-6 flex-1" nestedScrollEnabled>
 				<View className="gap-y-6">
 					{isTotalEmptyState && (
-						<View className="items-center justify-center gap-4 py-8">
+						<View className="gap-4 py-8 items-center justify-center">
 							<Owl owl="empty" />
-							<Text className="text-lg text-foreground-muted">Nothing is being downloaded</Text>
+							<Text className="text-lg text-foreground-muted">
+								{t('downloadQueue.nothingDownloading')}
+							</Text>
 						</View>
 					)}
 
@@ -131,9 +134,11 @@ export const DownloadQueueSheet = forwardRef<TrueSheet, Props>(function Download
 					)}
 
 					{activeAndPendingItems.length === 0 && tab === 'HEALTHY' && !isTotalEmptyState && (
-						<View className="items-center justify-center gap-4 py-8">
+						<View className="gap-4 py-8 items-center justify-center">
 							<Owl owl="empty" />
-							<Text className="text-lg text-foreground-muted">No active downloads</Text>
+							<Text className="text-lg text-foreground-muted">
+								{t('downloadQueue.noActiveDownloads')}
+							</Text>
 						</View>
 					)}
 
@@ -146,9 +151,11 @@ export const DownloadQueueSheet = forwardRef<TrueSheet, Props>(function Download
 					)}
 
 					{failedItems.length === 0 && tab === 'FAILED' && !isTotalEmptyState && (
-						<View className="items-center justify-center gap-4 py-8">
+						<View className="gap-4 py-8 items-center justify-center">
 							<Owl owl="empty" />
-							<Text className="text-lg text-foreground-muted">No failed downloads</Text>
+							<Text className="text-lg text-foreground-muted">
+								{t('downloadQueue.noFailedDownloads')}
+							</Text>
 						</View>
 					)}
 				</View>
diff --git a/apps/expo/components/localLibrary/DownloadRowItem.tsx b/apps/expo/components/localLibrary/DownloadRowItem.tsx
index f284df1b29..9305bbf886 100644
--- a/apps/expo/components/localLibrary/DownloadRowItem.tsx
+++ b/apps/expo/components/localLibrary/DownloadRowItem.tsx
@@ -10,7 +10,7 @@ import { useShallow } from 'zustand/react/shallow'
 import { epubProgress, imageMeta, syncStatus } from '~/db'
 import { useColors } from '~/lib/constants'
 import { formatBytes } from '~/lib/format'
-import { useDownload } from '~/lib/hooks'
+import { useDownload, useTranslate } from '~/lib/hooks'
 import { useSelectionStore } from '~/stores/selection'
 
 import { ThumbnailImage } from '../image'
@@ -31,6 +31,8 @@ export default function DownloadRowItem({ downloadedFile }: Props) {
 	const router = useRouter()
 	const sheetRef = useRef<TrueSheet>(null)
 
+	const { t } = useTranslate()
+
 	const { deleteBook, markAsComplete, clearProgress } = useDownload({
 		serverId: downloadedFile.serverId,
 	})
@@ -62,7 +64,10 @@ export default function DownloadRowItem({ downloadedFile }: Props) {
 		})),
 	)
 
-	const onSelectItem = (id: string) => selectionStore.toggleSelection(id)
+	const onSelectItem = useCallback(
+		(id: string) => selectionStore.toggleSelection(id),
+		[selectionStore],
+	)
 
 	const iconOpacity = useSharedValue(1)
 	const overlayOpacity = useSharedValue(0)
@@ -115,47 +120,56 @@ export default function DownloadRowItem({ downloadedFile }: Props) {
 
 	const handleMarkAsComplete = useCallback(() => {
 		Alert.alert(
-			'Mark as Read',
-			`Are you sure you want to mark ${downloadedFile.bookName ? `'${downloadedFile.bookName}'` : 'this book'} as read?`,
+			t('bookActions.markAsRead.label'),
+			t('bookActions.markAsRead.confirmation').replace(
+				'{{bookTitle}}',
+				downloadedFile.bookName ? `'${downloadedFile.bookName}'` : t('common.thisBook'),
+			),
 			[
-				{ text: 'Cancel', style: 'cancel' },
+				{ text: t('common.cancel'), style: 'cancel' },
 				{
-					text: 'Mark as Read',
+					text: t('bookActions.markAsRead.label'),
 					onPress: () => markAsComplete(downloadedFile.id, downloadedFile.pages),
 				},
 			],
 		)
-	}, [markAsComplete, downloadedFile.id, downloadedFile.pages, downloadedFile.bookName])
+	}, [markAsComplete, downloadedFile.id, downloadedFile.pages, downloadedFile.bookName, t])
 
 	const handleClearProgress = useCallback(() => {
 		Alert.alert(
-			'Clear Progress',
-			`Are you sure you want to clear your current reading of ${downloadedFile.bookName ? `'${downloadedFile.bookName}'` : 'this book'}?`,
+			t('bookActions.clearProgress.label'),
+			t('bookActions.clearProgress.confirmation').replace(
+				'{{bookTitle}}',
+				downloadedFile.bookName ? `'${downloadedFile.bookName}'` : t('common.thisBook'),
+			),
 			[
-				{ text: 'Cancel', style: 'cancel' },
+				{ text: t('common.cancel'), style: 'cancel' },
 				{
-					text: 'Clear',
+					text: t('common.clear'),
 					style: 'destructive',
 					onPress: () => clearProgress(downloadedFile.id),
 				},
 			],
 		)
-	}, [clearProgress, downloadedFile.id, downloadedFile.bookName])
+	}, [clearProgress, downloadedFile.id, downloadedFile.bookName, t])
 
 	const handleDelete = useCallback(() => {
 		Alert.alert(
-			'Delete Book',
-			`Are you sure you want to delete '${downloadedFile.bookName ? `'${downloadedFile.bookName}'` : 'this book'}'?`,
+			t('bookActions.deleteBook.label'),
+			t('bookActions.deleteBook.confirmation').replace(
+				'{{bookTitle}}',
+				downloadedFile.bookName ? `'${downloadedFile.bookName}'` : t('common.thisBook'),
+			),
 			[
-				{ text: 'Cancel', style: 'cancel' },
+				{ text: t('common.cancel'), style: 'cancel' },
 				{
-					text: 'Delete',
+					text: t('common.delete'),
 					style: 'destructive',
 					onPress: () => deleteBook(downloadedFile.id),
 				},
 			],
 		)
-	}, [deleteBook, downloadedFile.id, downloadedFile.bookName])
+	}, [deleteBook, downloadedFile.id, downloadedFile.bookName, t])
 
 	const getProgress = () => {
 		if (!readProgress) {
@@ -188,7 +202,7 @@ export default function DownloadRowItem({ downloadedFile }: Props) {
 					{
 						items: [
 							{
-								label: 'See Details',
+								label: t('bookActions.seeDetails'),
 								icon: {
 									ios: 'info.circle',
 									android: Info,
@@ -196,7 +210,7 @@ export default function DownloadRowItem({ downloadedFile }: Props) {
 								onPress: () => sheetRef.current?.present(),
 							},
 							{
-								label: 'Select',
+								label: t('common.select'),
 								icon: {
 									ios: 'checkmark.circle',
 									android: CheckCircle2,
@@ -210,7 +224,7 @@ export default function DownloadRowItem({ downloadedFile }: Props) {
 							...(!progression.isCompleted
 								? [
 										{
-											label: 'Mark as Read',
+											label: t('bookActions.markAsRead.label'),
 											icon: {
 												ios: 'book.closed',
 												android: BookOpenCheck,
@@ -222,7 +236,7 @@ export default function DownloadRowItem({ downloadedFile }: Props) {
 							...(progression.hasProgress
 								? [
 										{
-											label: 'Clear Progress',
+											label: t('bookActions.clearProgress.label'),
 											icon: {
 												ios: 'minus.circle',
 												android: CircleMinus,
@@ -236,7 +250,7 @@ export default function DownloadRowItem({ downloadedFile }: Props) {
 					{
 						items: [
 							{
-								label: 'Delete Book',
+								label: t('bookActions.deleteBook.label'),
 								icon: {
 									ios: 'trash',
 									android: Trash,
@@ -248,7 +262,7 @@ export default function DownloadRowItem({ downloadedFile }: Props) {
 					},
 				]}
 			>
-				<View className="relative mx-4 flex-row gap-4" style={{ height }}>
+				<View className="mx-4 gap-4 relative flex-row" style={{ height }}>
 					{/* TODO: Use file icons when no thumbnail is available? */}
 					<ThumbnailImage
 						source={{
@@ -260,10 +274,10 @@ export default function DownloadRowItem({ downloadedFile }: Props) {
 						placeholderData={thumbnailData}
 					/>
 
-					<View className="flex-1 justify-center gap-2 py-1.5">
-						<View className="flex-row justify-between gap-2">
+					<View className="gap-2 py-1.5 flex-1 justify-center">
+						<View className="gap-2 flex-row justify-between">
 							<Heading numberOfLines={2} className="shrink">
-								{downloadedFile.bookName || 'Untitled'}
+								{downloadedFile.bookName || t('common.unknownTitle')}
 							</Heading>
 
 							{status && (
@@ -273,10 +287,10 @@ export default function DownloadRowItem({ downloadedFile }: Props) {
 							)}
 						</View>
 
-						<View className="flex-row items-center gap-2">
+						<View className="gap-2 flex-row items-center">
 							{currentPage && (
-								<View className="squircle flex-row items-end rounded-full bg-background-surface-secondary px-2.5 py-0.5">
-									<Text size="sm">{`Page ${currentPage}`}</Text>
+								<View className="squircle px-2.5 py-0.5 flex-row items-end rounded-full bg-background-surface-secondary">
+									<Text size="sm">{`${t('common.page')} ${currentPage}`}</Text>
 									<Text
 										size="xs"
 										className="pb-0.5 text-foreground-muted"
@@ -285,7 +299,7 @@ export default function DownloadRowItem({ downloadedFile }: Props) {
 							)}
 
 							{size && (
-								<View className="squircle rounded-full bg-background-surface-secondary px-2.5 py-0.5">
+								<View className="squircle px-2.5 py-0.5 rounded-full bg-background-surface-secondary">
 									<Text size="sm" className="text-foreground-muted">
 										{size}
 									</Text>
@@ -294,7 +308,7 @@ export default function DownloadRowItem({ downloadedFile }: Props) {
 						</View>
 
 						{readProgress && (
-							<View className="flex-row items-center gap-3">
+							<View className="gap-3 flex-row items-center">
 								<Progress
 									className="h-1 shrink bg-background-surface-secondary"
 									value={getProgress()}
@@ -309,7 +323,7 @@ export default function DownloadRowItem({ downloadedFile }: Props) {
 					</View>
 
 					<Animated.View
-						className="squircle absolute inset-0 z-10 -m-1 rounded-lg border-2"
+						className="squircle inset-0 -m-1 rounded-lg absolute z-10 border-2"
 						style={overlayStyle}
 					>
 						<View className="flex flex-1 items-center justify-center">{CheckIcon}</View>
@@ -328,5 +342,5 @@ const CheckIcon = Platform.select({
 			<Image systemName="checkmark.circle.fill" size={32} />
 		</Host>
 	),
-	android: <Icon as={CheckCircle2} size={32} className="text-fill-brand shadow" />,
+	android: <Icon as={CheckCircle2} size={32} className="shadow text-fill-brand" />,
 })
diff --git a/apps/expo/components/localLibrary/DownloadedBookDetailsSheet.tsx b/apps/expo/components/localLibrary/DownloadedBookDetailsSheet.tsx
index f55bb21191..8caf68f148 100644
--- a/apps/expo/components/localLibrary/DownloadedBookDetailsSheet.tsx
+++ b/apps/expo/components/localLibrary/DownloadedBookDetailsSheet.tsx
@@ -12,6 +12,7 @@ import { epubProgress, imageMeta } from '~/db'
 import { formatSeriesPosition } from '~/lib/bookUtils'
 import { useColors } from '~/lib/constants'
 import { formatBytes } from '~/lib/format'
+import { useTranslate } from '~/lib/hooks'
 import { usePreferencesStore } from '~/stores'
 
 import { DescriptionSection, useOverviewAnimations } from '../book/overview'
@@ -29,6 +30,8 @@ type Props = {
 // overview components, instead, instead of being :sparkles: l a z y :sparkles:
 export const DownloadedBookDetailsSheet = forwardRef<TrueSheet, Props>(
 	function DownloadedBookDetailsSheet({ downloadedFile }, ref) {
+		const { t } = useTranslate()
+
 		const colors = useColors()
 		const insets = useSafeAreaInsets()
 		const thumbnailRatio = usePreferencesStore((state) => state.thumbnailRatio)
@@ -117,10 +120,10 @@ export const DownloadedBookDetailsSheet = forwardRef<TrueSheet, Props>(
 				}}
 			>
 				<Animated.ScrollView ref={animatedScrollRef}>
-					<View className="overflow-hidden pb-16">
+					<View className="pb-16 overflow-hidden">
 						{thumbnailUri && (
 							<Animated.View
-								className="absolute -inset-12 opacity-70 dark:opacity-30"
+								className="-inset-12 absolute opacity-70 dark:opacity-30"
 								style={parallaxStyle}
 							>
 								<TImage
@@ -135,7 +138,7 @@ export const DownloadedBookDetailsSheet = forwardRef<TrueSheet, Props>(
 							</Animated.View>
 						)}
 
-						<View className="items-center gap-4 px-4 pb-8 pt-8">
+						<View className="gap-4 px-4 pb-8 pt-8 items-center">
 							<ThumbnailImage
 								source={{
 									// @ts-expect-error: URI doesn't like undefined but it shows a placeholder when undefined
@@ -148,24 +151,24 @@ export const DownloadedBookDetailsSheet = forwardRef<TrueSheet, Props>(
 							/>
 
 							<View className="gap-1">
-								<Heading size="lg" className="text-center leading-6" numberOfLines={3}>
-									{downloadedFile.bookName || 'Untitled'}
+								<Heading size="lg" className="leading-6 text-center" numberOfLines={3}>
+									{downloadedFile.bookName || t('common.unknownTitle')}
 								</Heading>
 
 								{seriesPosition != null ? (
-									<Text className="text-center text-base text-foreground-muted" numberOfLines={1}>
+									<Text className="text-base text-center text-foreground-muted" numberOfLines={1}>
 										{seriesPosition}
 									</Text>
 								) : (
 									downloadedFile.series && (
-										<Text className="text-center text-base text-foreground-muted" numberOfLines={1}>
+										<Text className="text-base text-center text-foreground-muted" numberOfLines={1}>
 											{downloadedFile.series.name}
 										</Text>
 									)
 								)}
 
 								{downloadedFile.library && (
-									<Text className="text-center text-sm text-foreground-muted" numberOfLines={1}>
+									<Text className="text-sm text-center text-foreground-muted" numberOfLines={1}>
 										{downloadedFile.library.name}
 									</Text>
 								)}
@@ -173,22 +176,22 @@ export const DownloadedBookDetailsSheet = forwardRef<TrueSheet, Props>(
 						</View>
 					</View>
 
-					<View className="ios:rounded-[3rem] ios:-mt-[4.5rem] -mt-[2.5rem] gap-4 rounded-[2.5rem] bg-background px-4 py-6">
+					<View className="ios:rounded-[3rem] ios:-mt-[4.5rem] gap-4 px-4 py-6 -mt-[2.5rem] rounded-[2.5rem] bg-background">
 						<Card>
 							<Card.StatGroup>
 								{pages && <Card.Stat label="Pages" value={pages} />}
 								{epubProgressData?.chapterTitle &&
 									!epubProgressData.chapterTitle.match(/\.(html|xml|xhtml)$/i) && (
-										<Card.Stat label="Chapter" value={epubProgressData.chapterTitle} />
+										<Card.Stat label={t('common.chapter')} value={epubProgressData.chapterTitle} />
 									)}
 								{progressPercentage != null && (
 									<Card.Stat
-										label="Progress"
+										label={t('common.progress')}
 										value={`${progressPercentage.toFixed(1)}`}
 										suffix={'%'}
 									/>
 								)}
-								{readTime && <Card.Stat label="Read time" value={readTime} />}
+								{readTime && <Card.Stat label={t('common.readTime')} value={readTime} />}
 							</Card.StatGroup>
 						</Card>
 
@@ -196,29 +199,37 @@ export const DownloadedBookDetailsSheet = forwardRef<TrueSheet, Props>(
 
 						<Card>
 							<Card.StatGroup>
-								{!!publisher && <Card.Stat label="Publisher" value={publisher} />}
-								{!!seriesVolume && <Card.Stat label="Volume" value={seriesVolume} />}
-								{year != null && year > 0 && <Card.Stat label="Year" value={year} />}
-								{pages && <Card.Stat label="Pages" value={pages} />}
+								{!!publisher && <Card.Stat label={t('bookMetadata.publisher')} value={publisher} />}
+								{!!seriesVolume && (
+									<Card.Stat label={t('bookMetadata.volume')} value={seriesVolume} />
+								)}
+								{year != null && year > 0 && (
+									<Card.Stat label={t('bookMetadata.year')} value={year} />
+								)}
+								{pages && <Card.Stat label={t('common.pages')} value={pages} />}
 							</Card.StatGroup>
 						</Card>
 
 						<MetadataBadgeSection
-							label="Genres"
+							label={t('bookMetadata.genres')}
 							items={genres.map((genre) => ({ label: genre }))}
 						/>
 
 						{showDetails && (
-							<Card label="Details">
-								{extension && <Card.Row label="Format" value={extension} />}
-								{!!formattedSize && <Card.Row label="Size" value={formattedSize} />}
-								{metadata?.language && <Card.Row label="Language" value={metadata.language} />}
+							<Card label={t('common.details')}>
+								{extension && <Card.Row label={t('bookMetadata.format')} value={extension} />}
+								{!!formattedSize && (
+									<Card.Row label={t('bookMetadata.size')} value={formattedSize} />
+								)}
+								{metadata?.language && (
+									<Card.Row label={t('bookMetadata.language')} value={metadata.language} />
+								)}
 								{metadata?.ageRating != null && metadata.ageRating > 0 && (
-									<Card.Row label="Age Rating" value={`${metadata.ageRating}+`} />
+									<Card.Row label={t('bookMetadata.ageRating')} value={`${metadata.ageRating}+`} />
 								)}
 								{downloadedFile.downloadedAt && (
 									<Card.Row
-										label="Downloaded"
+										label={t('bookMetadata.downloadedAt')}
 										value={intlFormat(new Date(downloadedFile.downloadedAt), {
 											month: 'long',
 											day: 'numeric',
diff --git a/apps/expo/components/localLibrary/DownloadsHeaderMenu.tsx b/apps/expo/components/localLibrary/DownloadsHeaderMenu.tsx
index 17caff20e9..76aad91177 100644
--- a/apps/expo/components/localLibrary/DownloadsHeaderMenu.tsx
+++ b/apps/expo/components/localLibrary/DownloadsHeaderMenu.tsx
@@ -3,7 +3,13 @@ import { AlertCircle, CheckCircle, Menu, RefreshCw, Sparkles, Trash } from 'luci
 import { useRef } from 'react'
 import { Alert } from 'react-native'
 
-import { useDownload, useDownloadsCount, useFailedDownloadsCount, useFullSync } from '~/lib/hooks'
+import {
+	useDownload,
+	useDownloadsCount,
+	useFailedDownloadsCount,
+	useFullSync,
+	useTranslate,
+} from '~/lib/hooks'
 import { usePreferencesStore } from '~/stores'
 import { useSelectionStore } from '~/stores/selection'
 
@@ -23,6 +29,8 @@ export default function DownloadsHeaderMenu() {
 	const refetchDownloads = useDownloadsState((state) => state.increment)
 	const setIsSelecting = useSelectionStore((state) => state.setIsSelecting)
 
+	const { t } = useTranslate()
+
 	const onDeleteAllDownloads = async () => {
 		await deleteAllDownloads()
 		refetchDownloads()
@@ -30,11 +38,11 @@ export default function DownloadsHeaderMenu() {
 
 	const confirmDeleteAllDownloads = () => {
 		Alert.alert(
-			'Are you sure you want to delete your local library?',
-			'This action cannot be undone.',
+			t(getKey('deleteAllDownloads.confirmation')),
+			t(getKey('deleteAllDownloads.disclaimer')),
 			[
-				{ text: 'Cancel', style: 'cancel' },
-				{ text: 'Delete', style: 'destructive', onPress: onDeleteAllDownloads },
+				{ text: t('common.cancel'), style: 'cancel' },
+				{ text: t('common.delete'), style: 'destructive', onPress: onDeleteAllDownloads },
 			],
 		)
 	}
@@ -62,7 +70,7 @@ export default function DownloadsHeaderMenu() {
 								onPress: () => {
 									setIsSelecting(true)
 								},
-								label: 'Select',
+								label: t('common.select'),
 								disabled: downloadsCount === 0,
 							},
 							{
@@ -70,7 +78,7 @@ export default function DownloadsHeaderMenu() {
 									ios: 'arrow.trianglehead.2.clockwise.rotate.90',
 									android: RefreshCw,
 								},
-								label: 'Attempt Sync',
+								label: t(getKey('attemptSync')),
 								// Note: I removed the guard that checked if there was unsynced local progress since
 								// now a sync is always bi-directional (so we might be able to pull)
 								onPress: async () => {
@@ -83,7 +91,7 @@ export default function DownloadsHeaderMenu() {
 									ios: 'sparkles.rectangle.stack',
 									android: Sparkles,
 								},
-								label: isCuratedDownloadsEnabled ? 'Hide Curated' : 'Show Curated',
+								label: t(getKey(isCuratedDownloadsEnabled ? 'hideCurated' : 'showCurated')),
 								onPress: () => setIsCuratedDownloadsEnabled(!isCuratedDownloadsEnabled),
 							},
 							...(failedDownloadsCount > 0
@@ -93,7 +101,10 @@ export default function DownloadsHeaderMenu() {
 												ios: 'exclamationmark.triangle',
 												android: AlertCircle,
 											},
-											label: `See Problems (${failedDownloadsCount})`,
+											label: t(getKey('seeProblems')).replace(
+												'{{problemsCount}}',
+												failedDownloadsCount.toString(),
+											),
 											onPress: () => {
 												problemsSheetRef.current?.present()
 											},
@@ -109,7 +120,7 @@ export default function DownloadsHeaderMenu() {
 									ios: 'trash',
 									android: Trash,
 								},
-								label: 'Delete Books',
+								label: t(getKey('deleteAllDownloads.label')),
 								onPress: confirmDeleteAllDownloads,
 								role: 'destructive',
 								disabled: downloadsCount === 0,
@@ -123,3 +134,6 @@ export default function DownloadsHeaderMenu() {
 		</>
 	)
 }
+
+const LOCALE_BASE = 'localLibrary.downloadsHeaderMenu'
+const getKey = (key: string) => `${LOCALE_BASE}.${key}`
diff --git a/apps/expo/components/localLibrary/DownloadsHeaderSortMenu.tsx b/apps/expo/components/localLibrary/DownloadsHeaderSortMenu.tsx
index 47c5e98a64..f91d26cadf 100644
--- a/apps/expo/components/localLibrary/DownloadsHeaderSortMenu.tsx
+++ b/apps/expo/components/localLibrary/DownloadsHeaderSortMenu.tsx
@@ -25,11 +25,14 @@ import {
 	Text,
 } from '~/components/ui'
 import { useColors } from '~/lib/constants'
+import { useTranslate } from '~/lib/hooks'
 
 import { Icon } from '../ui/icon'
 import { DownloadSortOption, DownloadSourceFilter, useDownloadsState } from './store'
 
 export default function DownloadsHeaderSortMenu() {
+	const { t } = useTranslate()
+
 	const [isOpen, setIsOpen] = useState(false)
 
 	const sortConfig = useDownloadsState((state) => state.sort)
@@ -52,10 +55,8 @@ export default function DownloadsHeaderSortMenu() {
 		(option: DownloadSortOption) => {
 			if (sortConfig.option !== option) return null
 
-			let content = sortConfig.direction === 'ASC' ? 'A → Z' : 'Z → A'
-			if (option === 'ADDED_AT') {
-				content = sortConfig.direction === 'ASC' ? 'Oldest First' : 'Newest First'
-			}
+			const sortLocaleKey = option === 'ADDED_AT' ? 'sortDirectionDate' : 'sortDirectionText'
+			const content = t(getKey(`${sortLocaleKey}.${sortConfig.direction}`))
 
 			// TODO: Refactor based on how I refactor for Android
 			return Platform.select({
@@ -63,7 +64,7 @@ export default function DownloadsHeaderSortMenu() {
 				android: <Text className="ml-2 text-sm text-foreground-muted">{content}</Text>,
 			})
 		},
-		[sortConfig],
+		[sortConfig, t],
 	)
 
 	const handleSelection = useCallback(
@@ -95,14 +96,7 @@ export default function DownloadsHeaderSortMenu() {
 	)
 
 	const getFilterLabel = (filter: DownloadSourceFilter) => {
-		switch (filter) {
-			case 'all':
-				return 'All Books'
-			case 'server':
-				return 'Downloaded'
-			case 'imported':
-				return 'Imported'
-		}
+		return t(getKey(`sourceFilter.${filter}`))
 	}
 
 	const getFilterIcon = (filter: DownloadSourceFilter) => {
@@ -153,7 +147,9 @@ export default function DownloadsHeaderSortMenu() {
 							key="sortByName"
 							onSelect={() => handleSelection('NAME')}
 						>
-							<NativeDropdownMenu.ItemTitle>Name</NativeDropdownMenu.ItemTitle>
+							<NativeDropdownMenu.ItemTitle>
+								{t(getKey('sortBy.NAME'))}
+							</NativeDropdownMenu.ItemTitle>
 							<NativeDropdownMenu.ItemIcon ios={{ name: 'character' }} />
 							{renderSubtitle('NAME')}
 						</NativeDropdownMenu.CheckboxItem>
@@ -163,7 +159,9 @@ export default function DownloadsHeaderSortMenu() {
 							key="sortByRecent"
 							onSelect={() => handleSelection('ADDED_AT')}
 						>
-							<NativeDropdownMenu.ItemTitle>Date Added</NativeDropdownMenu.ItemTitle>
+							<NativeDropdownMenu.ItemTitle>
+								{t(getKey('sortBy.ADDED_AT'))}
+							</NativeDropdownMenu.ItemTitle>
 							<NativeDropdownMenu.ItemIcon ios={{ name: 'clock' }} />
 							{renderSubtitle('ADDED_AT')}
 						</NativeDropdownMenu.CheckboxItem>
@@ -173,7 +171,9 @@ export default function DownloadsHeaderSortMenu() {
 							key="sortBySeries"
 							onSelect={() => handleSelection('SERIES')}
 						>
-							<NativeDropdownMenu.ItemTitle>Series</NativeDropdownMenu.ItemTitle>
+							<NativeDropdownMenu.ItemTitle>
+								{t(getKey('sortBy.SERIES'))}
+							</NativeDropdownMenu.ItemTitle>
 							<NativeDropdownMenu.ItemIcon ios={{ name: 'books.vertical.fill' }} />
 							{renderSubtitle('SERIES')}
 						</NativeDropdownMenu.CheckboxItem>
@@ -223,7 +223,7 @@ export default function DownloadsHeaderSortMenu() {
 				<DropdownMenuContent
 					insets={contentInsets}
 					sideOffset={2}
-					className="w-2/3 tablet:w-64"
+					className="tablet:w-64 w-2/3"
 					align="end"
 				>
 					<DropdownMenuCheckboxItem
@@ -232,7 +232,7 @@ export default function DownloadsHeaderSortMenu() {
 						className="text-foreground"
 						closeOnPress={false}
 					>
-						<Text className="text-lg">Name</Text>
+						<Text className="text-lg">{t(getKey('sortBy.NAME'))}</Text>
 						<Icon as={ALargeSmall} size={20} className="ml-auto text-foreground-muted" />
 					</DropdownMenuCheckboxItem>
 
@@ -242,7 +242,7 @@ export default function DownloadsHeaderSortMenu() {
 						className="text-foreground"
 						closeOnPress={false}
 					>
-						<Text className="text-lg">Date Added</Text>
+						<Text className="text-lg">{t(getKey('sortBy.ADDED_AT'))}</Text>
 						<Icon as={Clock} size={20} className="ml-auto text-foreground-muted" />
 					</DropdownMenuCheckboxItem>
 
@@ -252,7 +252,7 @@ export default function DownloadsHeaderSortMenu() {
 						className="text-foreground"
 						closeOnPress={false}
 					>
-						<Text className="text-lg">Series</Text>
+						<Text className="text-lg">{t(getKey('sortBy.SERIES'))}</Text>
 						<Icon as={LibraryBig} size={20} className="ml-auto text-foreground-muted" />
 					</DropdownMenuCheckboxItem>
 
@@ -269,7 +269,7 @@ export default function DownloadsHeaderSortMenu() {
 						className="text-foreground"
 						closeOnPress={false}
 					>
-						<Text className="text-lg">Ascending</Text>
+						<Text className="text-lg">{t(getKey('sortDirectionDate.ASC'))}</Text>
 						<Icon as={ArrowUpRight} size={20} className="ml-auto text-foreground-muted" />
 					</DropdownMenuCheckboxItem>
 
@@ -282,7 +282,7 @@ export default function DownloadsHeaderSortMenu() {
 						className="text-foreground"
 						closeOnPress={false}
 					>
-						<Text className="text-lg">Descending</Text>
+						<Text className="text-lg">{t(getKey('sortDirectionDate.DESC'))}</Text>
 						<Icon as={ArrowDownLeft} size={20} className="ml-auto text-foreground-muted" />
 					</DropdownMenuCheckboxItem>
 
@@ -312,3 +312,6 @@ export default function DownloadsHeaderSortMenu() {
 	// TODO: Use ActionMenu once expo/ui better supports checkbox items with icons
 	return Component
 }
+
+const LOCALE_BASE = 'localLibrary.downloadsHeaderSortMenu'
+const getKey = (key: string) => `${LOCALE_BASE}.${key}`
diff --git a/apps/expo/components/localLibrary/NoDownloadsOnDevice.tsx b/apps/expo/components/localLibrary/NoDownloadsOnDevice.tsx
index de45cd53fa..dc4ddea090 100644
--- a/apps/expo/components/localLibrary/NoDownloadsOnDevice.tsx
+++ b/apps/expo/components/localLibrary/NoDownloadsOnDevice.tsx
@@ -1,5 +1,7 @@
 import { View } from 'react-native'
 
+import { useTranslate } from '~/lib/hooks'
+
 import Owl, { useOwlHeaderOffset } from '../Owl'
 import { Heading, Text } from '../ui'
 import { DownloadSourceFilter } from './store'
@@ -10,31 +12,26 @@ type Props = {
 
 export default function NoDownloadsOnDevice({ source }: Props) {
 	const emptyContainerStyle = useOwlHeaderOffset()
+
+	const { t } = useTranslate()
+
 	return (
 		<View
-			className="h-full flex-1 items-center justify-center gap-6 p-4"
+			className="gap-6 p-4 h-full flex-1 items-center justify-center"
 			style={emptyContainerStyle}
 		>
 			<Owl owl="empty" />
 
 			<View className="gap-2 px-4 tablet:max-w-lg">
-				<Heading size="lg" className="text-center font-semibold leading-tight">
-					{TITLES[source]}
+				<Heading size="lg" className="font-semibold leading-tight text-center">
+					{t(getSourceKey(source, 'title'))}
 				</Heading>
-				<Text className="text-center text-lg">{DESCRIPTIONS[source]}</Text>
+				<Text className="text-lg text-center">{t(getSourceKey(source, 'description'))}</Text>
 			</View>
 		</View>
 	)
 }
 
-const TITLES: Record<DownloadSourceFilter, string> = {
-	all: 'Nothing to read yet',
-	imported: 'No imported books',
-	server: 'No downloaded books',
-}
-
-const DESCRIPTIONS: Record<DownloadSourceFilter, string> = {
-	all: 'Once you have books for offline reading, they will appear here',
-	imported: 'Import books to read them offline',
-	server: 'Download books from your server to read them offline',
-}
+const LOCALE_BASE = 'localLibrary.emptyState'
+const getSourceKey = (source: DownloadSourceFilter, key: 'title' | 'description') =>
+	`${LOCALE_BASE}.${source}.${key}`
diff --git a/apps/expo/components/savedServer/AddOrEditServerForm.tsx b/apps/expo/components/savedServer/AddOrEditServerForm.tsx
index 37826bf84c..ac547ff3bc 100644
--- a/apps/expo/components/savedServer/AddOrEditServerForm.tsx
+++ b/apps/expo/components/savedServer/AddOrEditServerForm.tsx
@@ -11,6 +11,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { match, P } from 'ts-pattern'
 import { z } from 'zod'
 
+import { useTranslate } from '~/lib/hooks'
 import { cn } from '~/lib/utils'
 import { usePreferencesStore, useSavedServers } from '~/stores'
 import { SavedServerWithConfig } from '~/stores/savedServer'
@@ -30,6 +31,7 @@ export default function AddOrEditServerForm({
 	onClose,
 	onInputFocused,
 }: Props) {
+	const { t } = useTranslate()
 	const { savedServers, stumpEnabled } = useSavedServers()
 
 	const { control, handleSubmit, ...form } = useForm<AddOrEditServerSchema>({
@@ -37,11 +39,14 @@ export default function AddOrEditServerForm({
 		resolver: zodResolver(
 			createSchema(
 				savedServers.map(({ name }) => name).filter((name) => name !== editingServer?.name),
+				t,
 			),
 		),
 	})
 	const { errors } = useFormState({ control })
 
+	const headerSchema = createHeaderSchema(t)
+
 	const maskURLs = usePreferencesStore((state) => state.maskURLs)
 
 	const [didConnect, setDidConnect] = useState(false)
@@ -63,13 +68,13 @@ export default function AddOrEditServerForm({
 		if (!isValid) {
 			form.setError('url', {
 				type: 'manual',
-				message: 'Failed to connect to server',
+				message: t(getKey('failedToConnect')),
 			})
 		} else {
 			form.clearErrors('url')
 			setDidConnect(true)
 		}
-	}, [kind, url, form, setDidConnect])
+	}, [kind, url, form, setDidConnect, t])
 
 	const [isAddingHeader, setIsAddingHeader] = useState(false)
 
@@ -88,9 +93,12 @@ export default function AddOrEditServerForm({
 			setIsAddingHeader(false)
 		} else {
 			console.error(result.error.errors)
-			Alert.alert('Error', result.error.errors[0]?.message || 'Invalid header')
+			Alert.alert(
+				t('common.error'),
+				result.error.errors[0]?.message || t(getKey('customHeaders.invalidHeader')),
+			)
 		}
-	}, [newHeaderKey, newHeaderValue, form])
+	}, [newHeaderKey, newHeaderValue, form, t, headerSchema])
 
 	const onCancelAddHeader = () => {
 		setNewHeaderKey('')
@@ -123,10 +131,8 @@ export default function AddOrEditServerForm({
 	const renderAuthMode = () => {
 		if (authMode === 'default') {
 			return (
-				<View className="squircle rounded-lg border border-dashed border-edge p-3">
-					<Text className="text-foreground-muted">
-						You will be prompted to login when accessing content as needed
-					</Text>
+				<View className="squircle rounded-lg p-3 border border-dashed border-edge">
+					<Text className="text-foreground-muted">{t(getKey('auth.default.description'))}</Text>
 				</View>
 			)
 		} else if (authMode === 'basic') {
@@ -136,7 +142,7 @@ export default function AddOrEditServerForm({
 						control={control}
 						render={({ field: { onChange, onBlur, value } }) => (
 							<Input
-								label="Username"
+								label={t('common.username')}
 								autoCorrect={false}
 								autoCapitalize="none"
 								placeholder="oromei"
@@ -154,7 +160,7 @@ export default function AddOrEditServerForm({
 						control={control}
 						render={({ field: { onChange, onBlur, value } }) => (
 							<Input
-								label="Password"
+								label={t('common.password')}
 								autoCorrect={false}
 								autoCapitalize="none"
 								placeholder="*************"
@@ -179,7 +185,7 @@ export default function AddOrEditServerForm({
 							label="Token"
 							autoCorrect={false}
 							autoCapitalize="none"
-							placeholder="Bearer token"
+							placeholder={t(getKey('auth.token.placeholder'))}
 							onBlur={onBlur}
 							onChangeText={onChange}
 							value={value}
@@ -224,12 +230,12 @@ export default function AddOrEditServerForm({
 
 	return (
 		<View
-			className="w-full gap-4"
+			className="gap-4 w-full"
 			style={{ paddingBottom: Platform.OS === 'android' ? 32 : insets.bottom }}
 		>
-			<View className="flex-row items-center justify-between pb-2">
+			<View className="pb-2 flex-row items-center justify-between">
 				<Pressable onPress={onClose}>
-					<Text className="text-foreground-muted">Cancel</Text>
+					<Text className="text-foreground-muted">{t('common.cancel')}</Text>
 				</Pressable>
 
 				<Button
@@ -238,23 +244,21 @@ export default function AddOrEditServerForm({
 					onPress={handleSubmit(onSubmit)}
 					disabled={editingServer ? !isUpdateReady : false}
 				>
-					<Text>Save</Text>
+					<Text>{t('common.save')}</Text>
 				</Button>
 			</View>
 
 			<View>
 				<Heading size="lg" className="font-bold leading-6">
-					{editingServer ? 'Edit Server' : 'Add Server'}
+					{editingServer ? t(getKey('editServer.title')) : t(getKey('addServer.title'))}
 				</Heading>
 				<Text className="text-foreground-muted">
-					{editingServer
-						? 'Make changes to the server configuration'
-						: 'Configure a new server to access your content'}
+					{t(getKey(editingServer ? 'editServer.subtitle' : 'addServer.subtitle'))}
 				</Text>
 			</View>
 
 			<View className="w-full flex-row items-center justify-between">
-				<Text className="text-base font-medium text-foreground-muted">Kind</Text>
+				<Text className="text-base font-medium text-foreground-muted">{t(getKey('kind'))}</Text>
 
 				<Tabs
 					value={broadKind}
@@ -274,7 +278,9 @@ export default function AddOrEditServerForm({
 
 			{broadKind === 'opds' && (
 				<View className="w-full flex-row items-center justify-between">
-					<Text className="text-base font-medium text-foreground-muted">OPDS Version</Text>
+					<Text className="text-base font-medium text-foreground-muted">
+						OPDS {t('common.version')}
+					</Text>
 
 					<Tabs
 						value={opdsVersion}
@@ -303,10 +309,10 @@ export default function AddOrEditServerForm({
 				}}
 				render={({ field: { onChange, onBlur, value } }) => (
 					<Input
-						label="Name"
+						label={t('common.name')}
 						autoCorrect={false}
 						autoCapitalize="none"
-						placeholder="My Server"
+						placeholder={t(getKey('serverNamePlaceholder'))}
 						onBlur={onBlur}
 						onChangeText={onChange}
 						value={value}
@@ -323,7 +329,7 @@ export default function AddOrEditServerForm({
 				}}
 				render={({ field: { onChange, onBlur, value } }) => (
 					<Input
-						label={kind === 'stump' ? 'URL' : 'Catalog URL'}
+						label={t(kind === 'stump' ? 'common.url' : getKey('catalogUrl'))}
 						autoCorrect={false}
 						autoCapitalize="none"
 						placeholder={`https://stump.my-domain.cloud${kind !== 'stump' ? `/opds/${opdsVersion === 'v1' ? 'v1.2' : 'v2.0'}/catalog` : ''}`}
@@ -349,15 +355,17 @@ export default function AddOrEditServerForm({
 					disabled={!url}
 					onPress={checkConnection}
 				>
-					<Text>{didConnect ? 'Connected' : 'Check connection'}</Text>
+					<Text>{t(getKey(didConnect ? 'didConnect' : 'checkConnection'))}</Text>
 				</Button>
 			</View>
 
-			<View className="w-full gap-2">
-				<Text className="text-base font-medium text-foreground-muted">Custom Headers</Text>
+			<View className="gap-2 w-full">
+				<Text className="text-base font-medium text-foreground-muted">
+					{t(getKey('customHeaders.label'))}
+				</Text>
 
 				{formValues.customHeaders?.length && (
-					<View className="squircle w-full overflow-hidden rounded-lg border border-edge">
+					<View className="squircle rounded-lg w-full overflow-hidden border border-edge">
 						{formValues.customHeaders.map((header, index) => (
 							<Swipeable
 								key={index}
@@ -369,7 +377,7 @@ export default function AddOrEditServerForm({
 							>
 								<View
 									className={cn(
-										'w-full flex-row items-center justify-between gap-2 p-3 tablet:p-4',
+										'gap-2 p-3 tablet:p-4 w-full flex-row items-center justify-between',
 										{
 											'border-b border-edge': index !== (formValues.customHeaders?.length || 0) - 1,
 										},
@@ -384,39 +392,41 @@ export default function AddOrEditServerForm({
 				)}
 
 				{isAddingHeader ? (
-					<View className="squircle gap-2 rounded-2xl border border-edge p-3">
+					<View className="squircle gap-2 rounded-2xl p-3 border border-edge">
 						<Input
-							label="Key"
+							label={t('common.name')}
 							autoCorrect={false}
 							autoCapitalize="none"
-							placeholder="Key"
+							placeholder="X-Biz-Baz"
 							onChangeText={setNewHeaderKey}
 						/>
 						<Input
-							label="Value"
+							label={t('common.value')}
 							autoCorrect={false}
 							autoCapitalize="none"
-							placeholder="Value"
+							placeholder={t('common.value').toLowerCase()}
 							onChangeText={setNewHeaderValue}
 						/>
-						<View className="flex-row justify-end gap-4">
+						<View className="gap-4 flex-row justify-end">
 							<Button variant="outline" size="sm" onPress={onCancelAddHeader}>
-								<Text>Cancel</Text>
+								<Text>{t('common.cancel')}</Text>
 							</Button>
 							<Button variant="brand" size="sm" onPress={addNewHeader}>
-								<Text>Save</Text>
+								<Text>{t('common.save')}</Text>
 							</Button>
 						</View>
 					</View>
 				) : (
 					<Button roundness="xl" variant="outline" onPress={() => setIsAddingHeader(true)}>
-						<Text>Add header</Text>
+						<Text>{t(getKey('customHeaders.addHeader'))}</Text>
 					</Button>
 				)}
 			</View>
 
 			<View className="w-full flex-row items-center justify-between">
-				<Text className="text-base font-medium text-foreground-muted">Auth</Text>
+				<Text className="text-base font-medium text-foreground-muted">
+					{t(getKey('auth.label'))}
+				</Text>
 
 				<Controller
 					control={control}
@@ -424,15 +434,15 @@ export default function AddOrEditServerForm({
 						<Tabs value={value} onValueChange={onChange}>
 							<Tabs.List className="flex-row">
 								<Tabs.Trigger value="default">
-									<Text>Login</Text>
+									<Text>{t(getKey('auth.default.label'))}</Text>
 								</Tabs.Trigger>
 
 								<Tabs.Trigger value="basic">
-									<Text>Basic</Text>
+									<Text>{t(getKey('auth.basic'))}</Text>
 								</Tabs.Trigger>
 
 								<Tabs.Trigger value="token">
-									<Text>Token</Text>
+									<Text>{t(getKey('auth.token.label'))}</Text>
 								</Tabs.Trigger>
 							</Tabs.List>
 						</Tabs>
@@ -443,9 +453,9 @@ export default function AddOrEditServerForm({
 
 			{renderAuthMode()}
 
-			<View className="w-full gap-6">
-				<Text className="text-base font-medium text-foreground-muted">Options</Text>
-				<View className="w-full flex-row items-center justify-between gap-6">
+			<View className="gap-6 w-full">
+				<Text className="text-base font-medium text-foreground-muted">{t('common.options')}</Text>
+				<View className="gap-6 w-full flex-row items-center justify-between">
 					<Label
 						nativeID="defaultServer"
 						onPress={() => {
@@ -453,7 +463,7 @@ export default function AddOrEditServerForm({
 						}}
 						disabled={kind !== 'stump'}
 					>
-						Set as default server
+						{t(getKey('setAsDefaultServer'))}
 					</Label>
 
 					<Switch
@@ -465,7 +475,7 @@ export default function AddOrEditServerForm({
 				</View>
 
 				{kind === 'stump' && (
-					<View className="w-full flex-row items-center justify-between gap-6">
+					<View className="gap-6 w-full flex-row items-center justify-between">
 						<Label
 							nativeID="stumpOPDS"
 							onPress={() => {
@@ -473,7 +483,7 @@ export default function AddOrEditServerForm({
 							}}
 							disabled={kind !== 'stump'}
 						>
-							Enable OPDS
+							{t(getKey('enableOPDS'))}
 						</Label>
 
 						<Switch
@@ -494,6 +504,7 @@ function RenderHeaderAction(
 	drag: SharedValue<number>,
 	onDelete: () => void,
 ) {
+	const { t } = useTranslate()
 	const styleAnimation = useAnimatedStyle(() => {
 		return {
 			transform: [{ translateX: drag.value + 50 }],
@@ -503,10 +514,12 @@ function RenderHeaderAction(
 	return (
 		<Reanimated.View style={styleAnimation}>
 			<Pressable
-				className="h-full w-14 items-center justify-center bg-fill-danger"
+				className="w-14 h-full items-center justify-center bg-fill-danger"
 				onPress={onDelete}
 			>
-				{({ pressed }) => <Text className={cn({ 'opacity-80': pressed })}>Delete</Text>}
+				{({ pressed }) => (
+					<Text className={cn({ 'opacity-80': pressed })}>{t('common.delete')}</Text>
+				)}
 			</Pressable>
 		</Reanimated.View>
 	)
@@ -573,23 +586,24 @@ const getDefaultValues = (stumpEnabled: boolean, editingServer?: SavedServerWith
 	} as AddOrEditServerSchema
 }
 
-const headerSchema = z
-	.object({
-		key: z.string().nonempty(),
-		value: z.string().nonempty(),
-	})
-	.refine((value) => value.key.toLowerCase() !== 'authorization', {
-		message: 'Cannot set Authorization header',
-	})
-
-const createSchema = (names: string[]) =>
+const createHeaderSchema = (t: (key: string) => string) =>
+	z
+		.object({
+			key: z.string().nonempty(),
+			value: z.string().nonempty(),
+		})
+		.refine((value) => value.key.toLowerCase() !== 'authorization', {
+			message: t(getKey('validations.cannotSetAuthorizationHeader')),
+		})
+
+const createSchema = (names: string[], t: (key: string) => string) =>
 	z.object({
 		name: z
 			.string()
 			.nonempty()
 			.min(1)
 			.refine((value) => !names.includes(value), {
-				message: 'Name already exists',
+				message: t(getKey('validations.nameAlreadyExists')),
 			}),
 		url: z.string().url(),
 		kind: z
@@ -603,7 +617,7 @@ const createSchema = (names: string[]) =>
 		token: z.string().optional(),
 		basicUser: z.string().optional(),
 		basicPassword: z.string().optional(),
-		customHeaders: z.array(headerSchema).optional(),
+		customHeaders: z.array(createHeaderSchema(t)).optional(),
 	})
 export type AddOrEditServerSchema = z.infer<ReturnType<typeof createSchema>>
 
@@ -644,3 +658,6 @@ export const transformFormData = (data: AddOrEditServerSchema) => {
 		config,
 	}
 }
+
+const LOCALE_BASE = 'addOrEditServer'
+const getKey = (key: string) => `${LOCALE_BASE}.${key}`
diff --git a/apps/expo/components/savedServer/SavedServerListItem.tsx b/apps/expo/components/savedServer/SavedServerListItem.tsx
index e68a1349b1..a1378118ec 100644
--- a/apps/expo/components/savedServer/SavedServerListItem.tsx
+++ b/apps/expo/components/savedServer/SavedServerListItem.tsx
@@ -5,6 +5,7 @@ import { KeyRound, Sliders, SquareX, Trash } from 'lucide-react-native'
 import { View } from 'react-native'
 import { match } from 'ts-pattern'
 
+import { useTranslate } from '~/lib/hooks'
 import { usePreferencesStore } from '~/stores'
 import { useCacheStore } from '~/stores/cache'
 import { SavedServer, useSavedServers } from '~/stores/savedServer'
@@ -20,6 +21,8 @@ type Props = {
 }
 
 export default function SavedServerListItem({ server, onEdit, onDelete, forceOPDS }: Props) {
+	const { t } = useTranslate()
+
 	const maskURLs = usePreferencesStore((state) => state.maskURLs)
 
 	const formatURL = (url: string) => {
@@ -75,7 +78,7 @@ export default function SavedServerListItem({ server, onEdit, onDelete, forceOPD
 					{
 						items: [
 							{
-								label: 'Edit',
+								label: t('common.edit'),
 								icon: {
 									ios: 'slider.horizontal.2.square.on.square',
 									android: Sliders,
@@ -83,7 +86,7 @@ export default function SavedServerListItem({ server, onEdit, onDelete, forceOPD
 								onPress: onEdit,
 							},
 							{
-								label: 'Clear Cache',
+								label: t('savedServerActions.clearCache'),
 								icon: {
 									ios: 'clear',
 									android: SquareX,
@@ -94,8 +97,8 @@ export default function SavedServerListItem({ server, onEdit, onDelete, forceOPD
 							...(server.kind === 'stump' && !forceOPDS
 								? [
 										{
-											label: 'Discard Tokens',
-											subtext: 'Affects login tokens only',
+											label: t('savedServerActions.discardTokens.label'),
+											subtext: t('savedServerActions.discardTokens.description'),
 											icon: {
 												ios: 'key.fill',
 												android: KeyRound,
@@ -112,7 +115,7 @@ export default function SavedServerListItem({ server, onEdit, onDelete, forceOPD
 									]
 								: []),
 							{
-								label: 'Remove',
+								label: t('common.delete'),
 								icon: {
 									ios: 'trash',
 									android: Trash,
@@ -124,8 +127,8 @@ export default function SavedServerListItem({ server, onEdit, onDelete, forceOPD
 					},
 				]}
 			>
-				<View className="bg-background-muted squircle w-full items-start rounded-3xl border border-edge bg-background-surface px-4 py-3">
-					<View className="flex-1 items-start justify-center gap-1">
+				<View className="bg-background-muted squircle rounded-3xl px-4 py-3 w-full items-start border border-edge bg-background-surface">
+					<View className="gap-1 flex-1 items-start justify-center">
 						<Text className="text-lg">{server.name}</Text>
 						<Text className="flex-1 text-foreground-muted">{formatURL(server.url)}</Text>
 					</View>
diff --git a/apps/expo/lib/hooks/index.ts b/apps/expo/lib/hooks/index.ts
index f43023a869..1c40ddcb6a 100644
--- a/apps/expo/lib/hooks/index.ts
+++ b/apps/expo/lib/hooks/index.ts
@@ -18,3 +18,4 @@ export { useLegacyOPDSFeed } from './useLegacyOPDSFeed'
 export { useListItemSize } from './useListItemSize'
 export { usePrevious } from './usePrevious'
 export { useSingleOrDoubleTap } from './useSingleOrDoubleTap'
+export { useTranslate } from './useTranslate'
diff --git a/apps/expo/lib/hooks/useTranslate.ts b/apps/expo/lib/hooks/useTranslate.ts
new file mode 100644
index 0000000000..56c76e7f00
--- /dev/null
+++ b/apps/expo/lib/hooks/useTranslate.ts
@@ -0,0 +1,8 @@
+import { useLocaleContext } from '@stump/i18n'
+
+export function useTranslate() {
+	const { t } = useLocaleContext()
+	return {
+		t: (key: string) => t(`mobileApp.${key}`),
+	}
+}
diff --git a/apps/expo/tsconfig.json b/apps/expo/tsconfig.json
index d3b0bec842..083206892d 100644
--- a/apps/expo/tsconfig.json
+++ b/apps/expo/tsconfig.json
@@ -12,14 +12,14 @@
 			"@stump/client": ["../../packages/client/src/index.ts"],
 			"@stump/client/*": ["../../packages/client/src/*"],
 			"@stump/graphql": ["../../packages/graphql/src/index.ts"],
-			"@stump/graphql/*": ["../../packages/graphql/src/*"]
+			"@stump/graphql/*": ["../../packages/graphql/src/*"],
 		},
 		"plugins": [
 			{
 				"name": "@0no-co/graphqlsp",
-				"schema": "../../crates/graphql/schema.graphql"
-			}
-		]
+				"schema": "../../crates/graphql/schema.graphql",
+			},
+		],
 	},
-	"include": ["**/*.ts", "**/*.tsx", ".expo/types/**/*.ts", "expo-env.d.ts", "nativewind-env.d.ts"]
+	"include": ["**/*.ts", "**/*.tsx", ".expo/types/**/*.ts", "expo-env.d.ts", "nativewind-env.d.ts"],
 }
diff --git a/packages/browser/src/AppRouter.tsx b/packages/browser/src/AppRouter.tsx
index 4afe6e500a..883379fe4a 100644
--- a/packages/browser/src/AppRouter.tsx
+++ b/packages/browser/src/AppRouter.tsx
@@ -33,7 +33,7 @@ export function AppRouter({ basePath }: AppRouterProps = {}) {
 	}
 
 	return (
-		<LocaleProvider locale={(locale as AllowedLocale) || 'en'}>
+		<LocaleProvider locale={(locale as AllowedLocale) || 'en-US'}>
 			<RouterProvider basePath={basePath}>
 				<Routes>
 					<Route path="/" element={<AppLayout />}>
diff --git a/packages/i18n/src/context.ts b/packages/i18n/src/context.ts
index 8697dfa8e1..06256de61a 100644
--- a/packages/i18n/src/context.ts
+++ b/packages/i18n/src/context.ts
@@ -7,8 +7,8 @@ export type LocaleContextProps = {
 	t: (key: string) => string
 }
 
-export const getDefaultLocale = () => {
-	return 'navigator' in globalThis ? (navigator?.language as AllowedLocale) : 'en-US'
+export const getDefaultLocale = (defaultValue: AllowedLocale = 'en-US') => {
+	return 'navigator' in globalThis ? (navigator?.language as AllowedLocale) : defaultValue
 }
 
 export const LocaleContext = createContext<LocaleContextProps>({
diff --git a/packages/i18n/src/locales/en-US.json b/packages/i18n/src/locales/en-US.json
index f726da588f..a8c7f29e90 100644
--- a/packages/i18n/src/locales/en-US.json
+++ b/packages/i18n/src/locales/en-US.json
@@ -2429,5 +2429,357 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turn them off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all all downloads from {{serverName}}"
+
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }

From 361b1c530781c70c11f28a24b53b0ea6af8d31a6 Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Thu, 2 Apr 2026 18:34:36 -0700
Subject: [PATCH 16/32] =?UTF-8?q?=F0=9F=94=A7=20rerun=20build=20script=20w?=
 =?UTF-8?q?hen=20GIT=5FREV=20or=20BUILD=5FCHANNEL=20changes=20(#1039)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

this _should_ fix some of the stale issues i have been plagued with
---
 apps/server/build.rs | 3 +++
 core/build.rs        | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/apps/server/build.rs b/apps/server/build.rs
index 3c40ebafd4..2d340b7dc6 100644
--- a/apps/server/build.rs
+++ b/apps/server/build.rs
@@ -2,6 +2,9 @@ use chrono::prelude::{DateTime, Utc};
 use std::{process::Command, time::SystemTime};
 
 fn main() {
+	println!("cargo:rerun-if-env-changed=GIT_REV");
+	println!("cargo:rerun-if-env-changed=BUILD_CHANNEL");
+
 	let system_time = SystemTime::now();
 	let date_time: DateTime<Utc> = system_time.into();
 	let compiled_at = format!("{}", date_time.format("%+"));
diff --git a/core/build.rs b/core/build.rs
index fa1f073416..9c5cbdebeb 100644
--- a/core/build.rs
+++ b/core/build.rs
@@ -2,6 +2,8 @@ use chrono::prelude::{DateTime, Utc};
 use std::{process::Command, time::SystemTime};
 
 fn main() {
+	println!("cargo:rerun-if-env-changed=GIT_REV");
+
 	let system_time = SystemTime::now();
 	let date_time: DateTime<Utc> = system_time.into();
 	let compiled_at = format!("{}", date_time.format("%+"));

From b6cda00b38c53675d9eba438907e288aad85013d Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Fri, 3 Apr 2026 06:54:23 -0700
Subject: [PATCH 17/32] :globe_with_meridians: Update translations (#1033)

---
 packages/i18n/src/locales/pl-PL.json |   36 +-
 packages/i18n/src/locales/zh-CN.json | 2260 +++++++++++++-------------
 2 files changed, 1148 insertions(+), 1148 deletions(-)

diff --git a/packages/i18n/src/locales/pl-PL.json b/packages/i18n/src/locales/pl-PL.json
index 754d1b0b9e..a2971a4fa8 100644
--- a/packages/i18n/src/locales/pl-PL.json
+++ b/packages/i18n/src/locales/pl-PL.json
@@ -309,9 +309,9 @@
 				"resizeMethod": {
 					"label": "Metoda skalowania",
 					"options": {
-						"scaleEvenlyByFactor": "Skalowane równomiernie",
+						"scaleEvenlyByFactor": "Skalowanie równomierne",
 						"exact": "Dokładny wymiar",
-						"scaleDimension": "Skalowane automatycznie",
+						"scaleDimension": "Skalowanie automatyczne",
 						"none": "Żadne"
 					}
 				},
@@ -331,7 +331,7 @@
 					}
 				},
 				"scaleDimension": {
-					"label": "Skalowane automatycznie",
+					"label": "Skalowanie automatyczne",
 					"description": "Ustaw szerokość lub wysokość miniatury, a druga wartość zostanie wyskalowana automatycznie tak, aby zachować oryginalny współczynnik kształtu",
 					"dimension": {
 						"label": "Wymiar",
@@ -366,11 +366,11 @@
 					"addButton": "Dodaj regułę",
 					"ignoreParents": {
 						"title": "Pomijaj wszystkie katalogi nadrzędne",
-						"label": "Wzorce pomijania"
+						"label": "Ignoruj nadrzędne"
 					},
 					"ignoreSubdirs": {
-						"title": "Pomijaj wszystkie podkatalogi",
-						"label": "Pomijaj podkatalogi"
+						"title": "Ignoruj wszystkie podkatalogi",
+						"label": "Ignoruj podrzędne"
 					}
 				},
 				"invalidGlob": "Nieprawidłowy wzorzec",
@@ -505,7 +505,7 @@
 					"processMetadata": "Przetwarzaj metadane",
 					"generateFileHashes": "Generuj skróty plików",
 					"generateKoreaderHashes": "Generuj skróty KoReader",
-					"scaleEvenlyByFactor": "Skalowane równomiernie",
+					"scaleEvenlyByFactor": "Skalowanie równomierne",
 					"exact": "Dokładny wymiar",
 					"scaleDimension": "O stałych wymiarach"
 				}
@@ -1296,9 +1296,9 @@
 					},
 					"heading": "Język i ustawienia regionalne",
 					"subtitle": [
-						"Stump obsługuje wiele języków i ustawień regionalnych, ustaw swoje preferencje poniżej. Proszę rozważ pomoc w poprawie jakości",
+						"Stump obsługuje wiele języków i ustawień regionalnych, ustaw swoje preferencje poniżej. Jeśli jesteś w stanie, proszę rozważ pomoc w poprawie jakości",
 						"tłumaczeń Stump",
-						"jeśli jesteś w stanie!"
+						"!"
 					]
 				}
 			}
@@ -1837,7 +1837,7 @@
 		"server/users": {
 			"helmet": "Zarządzanie użytkownikami",
 			"title": "Użytkownicy",
-			"description": "Zarządzanie użytkownikami na tym serwerze",
+			"description": "Zarządzaj użytkownikami na tym serwerze",
 			"createUser": {
 				"helmet": "Dodaj użytkownika",
 				"title": "Dodaj użytkownika",
@@ -1852,7 +1852,7 @@
 				"accessControl": {
 					"heading": "Kontrola i ograniczenia dostępu",
 					"subtitle": [
-						"Skonfiguruj wszelkie ograniczenia, które chcesz zastosować do tego użytkownika. Aby uzyskać więcej informacji o kontroli dostępu, zobacz",
+						"Skonfiguruj wszelkie ograniczenia, które chcesz zastosować dla tego użytkownika. Aby uzyskać więcej informacji o kontroli dostępu, zobacz",
 						"dokumentację"
 					],
 					"ageRestriction": {
@@ -1861,7 +1861,7 @@
 						"placeholder": "13",
 						"enforceUnset": {
 							"label": "Wymuś na nieokreślonych",
-							"description": "Jeśli opcja jest włączona, użytkownicy będą ograniczeni do dostępu do treści bez dostępnych ocen wiekowych"
+							"description": "Jeśli opcja ta jest włączona, użytkownik nie będzie miał dostępu do treści bez ocen wiekowych"
 						}
 					},
 					"tagRestriction": {
@@ -1931,7 +1931,7 @@
 					"email": {
 						"label": "Wysyłka poczty elektronicznej",
 						"send": {
-							"label": "Wysyłaj wiadomości poczty elektronicznej",
+							"label": "Wysyłanie wiadomości poczty elektronicznej",
 							"description": "Pozwala użytkownikowi wysyłać wiadomości e-mail z serwera na którykolwiek ze skonfigurowanych aliasów"
 						},
 						"arbitrary_send": {
@@ -2361,15 +2361,15 @@
 			"description": "Pozwala użytkownikowi na wysyłanie niestandardowych wiadomości e-mail na dowolny adres"
 		},
 		"EMAIL_SEND": {
-			"label": "Wysyłaj wiadomości poczty elektronicznej",
+			"label": "Wysyłanie wiadomości poczty elektronicznej",
 			"description": "Pozwala użytkownikowi na wysyłanie wiadomości e-mail przez system"
 		},
 		"FILE_EXPLORER": {
-			"label": "Przeglądarka plików",
+			"label": "Przeglądanie plików",
 			"description": "Pozwala użytkownikowi na przeglądanie i eksploracje systemu plików serwera"
 		},
 		"MANAGE_LIBRARY": {
-			"label": "Zarządzaj bibliotekami",
+			"label": "Zarządzanie bibliotekami",
 			"description": "Pozwala użytkownikowi na zarządzanie ustawieniami biblioteki i konfiguracją"
 		},
 		"MANAGE_NOTIFIER": {
@@ -2413,11 +2413,11 @@
 			"description": "Pozwala użytkownikowi na przesyłanie plików na serwer"
 		},
 		"MANAGE_JOBS": {
-			"label": "Zarządzaj zadaniami",
+			"label": "Zarządzanie zadaniami",
 			"description": "Pozwala użytkownikowi na zarządzanie dowolnym zadaniem w kolejce"
 		},
 		"EDIT_METADATA": {
-			"label": "Edycja metadanych",
+			"label": "Edytowanie metadanych",
 			"description": "Pozwala użytkownikowi na edycję metadanych książek i serii"
 		},
 		"WRITE_BACK_METADATA": {
diff --git a/packages/i18n/src/locales/zh-CN.json b/packages/i18n/src/locales/zh-CN.json
index 41bf23a238..cb1b24240f 100644
--- a/packages/i18n/src/locales/zh-CN.json
+++ b/packages/i18n/src/locales/zh-CN.json
@@ -28,8 +28,8 @@
 		"toasts": {
 			"loggingIn": "登录中……",
 			"loggedIn": "欢迎回来！",
-			"loggedInFirstTime": "欢迎!",
-			"registering": "正在注册...",
+			"loggedInFirstTime": "欢迎！",
+			"registering": "正在注册……",
 			"registered": "已注册！",
 			"loginFailed": "登录失败请重试",
 			"registrationFailed": "注册失败请重试"
@@ -79,8 +79,8 @@
 			},
 			"description": {
 				"label": "描述",
-				"placeholder": "《我们的旗帜意味着死亡》粉丝俱乐部。尽情阅读海盗题材漫画。",
-				"description": "您的读书俱乐部的简短描述（可选）"
+				"placeholder": "《我们的旗帜意味着死亡》粉丝俱乐部。尽情阅读海盗题材漫画",
+				"description": "您的读书俱乐部的简短描述，可选"
 			},
 			"is_private": {
 				"label": "私密俱乐部",
@@ -103,8 +103,8 @@
 					"description": "您的读书俱乐部版主的名称"
 				},
 				"admin": {
-					"label": "管理",
-					"placeholder": "管理",
+					"label": "管理员",
+					"placeholder": "管理员",
 					"description": "您的读书俱乐部管理员角色的名称"
 				},
 				"creator": {
@@ -152,9 +152,9 @@
 					"description": "书籍俱乐部的其他选项"
 				},
 				{
-					"label": "Review",
-					"heading": "Review",
-					"description": "Review your club settings before creating it"
+					"label": "审查",
+					"heading": "审查",
+					"description": "在创建之前审查您的俱乐部设置"
 				}
 			],
 			"review": {
@@ -189,45 +189,45 @@
 		},
 		"basics": {
 			"title": "基础信息",
-			"description": "The details of this book club, including its name and description",
+			"description": "此读书俱乐部的详细信息，包括名称和描述",
 			"form": {
-				"submit": "Update club"
+				"submit": "更新俱乐部"
 			}
 		},
 		"members": {
-			"title": "Members",
-			"description": "Manage the members of this book club",
+			"title": "成员",
+			"description": "管理此读书俱乐部的成员",
 			"sections": {}
 		},
 		"roles": {
-			"title": "Roles",
-			"description": "Customize the roles in this book club",
+			"title": "角色",
+			"description": "自定义此读书俱乐部中的角色",
 			"sections": {
 				"roleMappings": {
-					"heading": "Existing role mappings",
-					"description": "The current role mappings for this book club"
+					"heading": "现有角色映射",
+					"description": "此读书俱乐部的当前角色映射"
 				}
 			}
 		},
 		"scheduling/scheduler": {
-			"title": "Scheduler",
-			"description": "Create and manage the scheduled readings for this book club"
+			"title": "计划",
+			"description": "为此读书俱乐部创建和管理阅读计划"
 		},
 		"scheduling/options": {
-			"title": "Options",
-			"description": "Additional options for this book club's scheduling"
+			"title": "选项",
+			"description": "此读书俱乐部的计划额外选项"
 		},
 		"danger-zone/delete": {
-			"title": "Deletion Actions",
-			"description": "Permanently delete this book club and all of its contents or certain resources",
+			"title": "删除操作",
+			"description": "永久删除此读书俱乐部及其全部内容或特定资源",
 			"sections": {
 				"deleteClub": {
-					"heading": "Delete club",
+					"heading": "删除俱乐部",
 					"description": [
-						"Permanently delete this book club and all its contents.",
-						"This action cannot be undone"
+						"永久删除此读书俱乐部及其全部内容。",
+						"此操作不可撤销"
 					],
-					"trigger": "Delete club"
+					"trigger": "删除俱乐部"
 				}
 			}
 		}
@@ -235,62 +235,62 @@
 	"createOrUpdateLibraryForm": {
 		"fields": {
 			"name": {
-				"label": "Name",
-				"description": "A friendly name for your library",
-				"placeholder": "My Library"
+				"label": "名称",
+				"description": "容易记住的书库名称",
+				"placeholder": "我的书库"
 			},
 			"path": {
-				"label": "Path",
-				"description": "The path to the library as it exists on your server",
+				"label": "路径",
+				"description": "您服务器上的书库路径",
 				"placeholder": "/path/to/library"
 			},
 			"description": {
-				"label": "Description",
-				"description": "A short description of your library",
-				"placeholder": "A library of all my favorite books"
+				"label": "描述",
+				"description": "您的书库的简短描述",
+				"placeholder": "我最喜欢的书库"
 			},
 			"tags": {
-				"label": "Tags",
-				"description": "Used to categorize your library or enforce access rules"
+				"label": "标签",
+				"description": "用于分类你的书库或强制执行访问规则"
 			},
 			"defaultLibraryView": {
-				"label": "Default library view",
-				"description": "Configure which tab is shown by default when opening this library",
+				"label": "默认库视图",
+				"description": "配置打开此库时默认显示的标签",
 				"hideSeriesView": {
-					"label": "Hide series tab",
-					"description": "Hide the series tab from the library navigation"
+					"label": "隐藏系列标签",
+					"description": "从库导航中隐藏系列选项卡"
 				},
 				"skipBookOverview": {
-					"label": "Skip book overview",
-					"description": "Open the reader directly when selecting books in this library"
+					"label": "跳过书籍概览",
+					"description": "选择书库时直接打开阅读器"
 				},
 				"options": {
 					"series": {
-						"label": "Series",
-						"description": "Show the series tab by default"
+						"label": "系列",
+						"description": "默认显示系列选项卡"
 					},
 					"books": {
-						"label": "Books",
-						"description": "Show the books tab by default"
+						"label": "书籍",
+						"description": "默认显示书籍选项卡"
 					}
 				}
 			},
 			"readingSettings": {
 				"section": {
-					"heading": "Reading settings",
-					"description": "Default reader settings to use for books"
+					"heading": "阅读设置",
+					"description": "用于书籍的默认阅读器设置"
 				},
 				"imageScaling": {
-					"label": "Image scaling",
-					"description": "How the image-based reader scales images to the page"
+					"label": "图像缩放",
+					"description": "图像阅读器如何将图像缩放到页面"
 				},
 				"readingMode": {
-					"label": "Default reader",
-					"description": "The default reader to use for image-based books"
+					"label": "默认阅读器",
+					"description": "用于图像类书籍的默认阅读器"
 				},
 				"readingDirection": {
-					"label": "Reading direction",
-					"description": "Which direction the reader progresses through pages"
+					"label": "阅读方向",
+					"description": "阅读器翻页的方向"
 				}
 			},
 			"thumbnailConfig": {
@@ -309,9 +309,9 @@
 				"resizeMethod": {
 					"label": "调整尺寸方法",
 					"options": {
-						"scaleEvenlyByFactor": "最终缩放",
+						"scaleEvenlyByFactor": "按比例缩放",
 						"exact": "精确大小",
-						"scaleDimension": "自动比例",
+						"scaleDimension": "按维度缩放",
 						"none": "无"
 					}
 				},
@@ -395,760 +395,760 @@
 				},
 				"deleteRarAfter": {
 					"label": "转换后删除 RAR",
-					"description": "Delete the original RAR/CBR file after conversion. This is irreversible"
+					"description": "转换后删除原始 RAR/CBR 文件。此操作不可撤销"
 				}
 			},
 			"scannerFeatures": {
 				"section": {
-					"heading": "Optional processing",
-					"description": "Opt-in processing features for the scanner",
-					"disclaimer": "These features involve additional file reads which may slow down the scan process"
+					"heading": "可选处理",
+					"description": "扫描器的可选处理功能",
+					"disclaimer": "这些功能涉及额外的文件读取，可能会减慢扫描过程"
 				},
 				"processMetadata": {
-					"label": "Process metadata",
-					"description": "Extract any metadata from library files and store the results in the database"
+					"label": "处理元数据",
+					"description": "从书库文件中提取任何元数据并将结果存储到数据库中"
 				},
 				"watch": {
-					"label": "Watch",
-					"description": "Watch the library directory for changes and update the database accordingly"
+					"label": "监视",
+					"description": "监视书库目录的变化并相应更新数据库"
 				},
 				"generateFileHashes": {
-					"label": "Generate file hashes",
-					"description": "Generate a hash for each file in the library to detect duplicates"
+					"label": "生成文件校验码",
+					"description": "为书库中的每个文件生成哈希值以检测重复"
 				},
 				"koreaderHashes": {
-					"label": "KoReader-compatible hashes",
-					"description": "If using KoReader, generate additional hashes in the format it expects"
+					"label": "KoReader兼容的哈希",
+					"description": "如果使用 KoReader，生成它所期望格式的额外哈希值"
 				}
 			},
 			"libraryPattern": {
 				"section": {
-					"heading": "Organization",
-					"description": "Identify which pattern most closely matches the organization of your library",
+					"heading": "组织",
+					"description": "确定哪种模式最符合你的书库的组织方式",
 					"docs": [
-						"Not sure which to choose? Click",
-						"here",
-						"for more information.",
-						"You cannot change this setting later"
+						"不确定选择哪一个？点击",
+						"这里",
+						"了解更多信息。",
+						"你稍后无法更改此设置"
 					],
-					"disabled": "You cannot change this setting"
+					"disabled": "你无法更改此设置"
 				},
 				"options": {
-					"label": "Library pattern",
-					"description": "The setting which determines how Stump will organize your library",
+					"label": "书库模式",
+					"description": "决定 Stump 如何组织你的书库的设置",
 					"collectionPriority": {
-						"label": "Collection priority",
-						"description": "Each folder at the top-most level of the library root is a single series"
+						"label": "集合优先",
+						"description": "书库根目录最顶层的每个文件夹视为一个系列"
 					},
 					"seriesPriority": {
-						"label": "Series priority",
-						"description": "Each folder at any level recursively is a single series"
+						"label": "系列优先",
+						"description": "递归任意层级的每个文件夹视为一个系列"
 					}
 				}
 			}
 		},
 		"scan": {
 			"label": {
-				"create": "Scan after creation",
-				"update": "Scan after updates"
+				"create": "创建后扫描",
+				"update": "更新后扫描"
 			},
-			"description": "Index the library files to populate your database"
+			"description": "索引书库文件以填充你的数据库"
 		}
 	},
 	"createLibraryScene": {
-		"heading": "Create library",
-		"subtitle": "Libraries are used to group your books together. If you want a refresh on how they work, check out the",
-		"subtitleLink": "relevant documentation",
+		"heading": "新建书库",
+		"subtitle": "库被用来将您的书籍分组。如果您想要刷新它们如何工作，请查看",
+		"subtitleLink": "相关文档",
 		"form": {
-			"stepLabel": "Step",
+			"stepLabel": "步骤",
 			"steps": [
 				{
-					"label": "Basics",
-					"heading": "Basic Information",
-					"description": "The details of this library, including its name, path, and description"
+					"label": "基础",
+					"heading": "基础信息",
+					"description": "该书库的详细信息，包括名称、路径和描述"
 				},
 				{
-					"label": "Scanning",
-					"heading": "Scanning",
-					"description": "Settings related to how Stump scans this library"
+					"label": "扫描",
+					"heading": "扫描",
+					"description": "Stump 如何扫描此资料库的相关设置"
 				},
 				{
-					"label": "Thumbnails",
-					"heading": "Thumbnails",
-					"description": "The options for if and how Stump generates thumbnails for this library"
+					"label": "缩略图",
+					"heading": "缩略图",
+					"description": "Stump 是否以及如何为该书库生成缩略图的选项"
 				},
 				{
-					"label": "Review",
-					"heading": "Review",
-					"description": "Review your library settings before creating it"
+					"label": "确认",
+					"heading": "确认",
+					"description": "在创建前检查你的书库设置"
 				}
 			],
 			"review": {
-				"yes": "Yes",
-				"no": "No",
-				"none": "None",
+				"yes": "是",
+				"no": "否",
+				"none": "无",
 				"labels": {
-					"generateThumbnails": "Generate thumbnails",
-					"processThumbnailColors": "Process thumbnail colors",
-					"mode": "Mode",
-					"format": "Format",
-					"quality": "Quality",
-					"name": "Name",
-					"path": "Path",
-					"description": "Description",
-					"tags": "Tags",
-					"pattern": "Pattern",
-					"ignoreRules": "Ignore rules",
-					"convertRar": "Convert RAR/CBR",
-					"deleteConversions": "Delete converted files",
-					"watch": "Watch directory for changes",
-					"processMetadata": "Process metadata",
-					"generateFileHashes": "Generate file hashes",
-					"generateKoreaderHashes": "Generate KoReader hashes",
-					"scaleEvenlyByFactor": "Evenly Scale",
-					"exact": "Exact Size",
-					"scaleDimension": "Explicitly Sized"
+					"generateThumbnails": "生成缩略图",
+					"processThumbnailColors": "处理缩略图颜色",
+					"mode": "模式",
+					"format": "格式",
+					"quality": "质量",
+					"name": "名称",
+					"path": "路径",
+					"description": "描述",
+					"tags": "标签",
+					"pattern": "模式",
+					"ignoreRules": "忽略规则",
+					"convertRar": "转换 RAR/CBR",
+					"deleteConversions": "删除转换后的文件",
+					"watch": "监视目录变化",
+					"processMetadata": "处理元数据",
+					"generateFileHashes": "生成文件哈希值",
+					"generateKoreaderHashes": "生成 KoReader 哈希值",
+					"scaleEvenlyByFactor": "按比例缩放",
+					"exact": "精确大小",
+					"scaleDimension": "按维度缩放"
 				}
 			},
 			"buttons": {
-				"confirm": "Create Library"
+				"confirm": "新建书库"
 			}
 		}
 	},
 	"fileExplorer": {
 		"uploadModal": {
 			"title": {
-				"books": "Upload books",
-				"series": "Upload series"
+				"books": "上传书籍",
+				"series": "上传系列"
 			},
 			"description": {
-				"books": "Add books directly to the current path in the file explorer",
-				"series": "Add a series directly to the current path in the file explorer"
+				"books": "直接将书籍添加到文件浏览器中的当前路径",
+				"series": "直接将一个系列添加到文件浏览器中的当前路径"
 			},
 			"seriesDisclaimer": [
-				"It must be a ",
-				"zipped file",
-				"containing the folder which should be the series, with all the books inside"
+				"它必须是一个 ",
+				"压缩文件",
+				"包含应作为系列的文件夹，其中包含所有书籍"
 			],
 			"dropzone": {
-				"books": "Drag and drop books here",
-				"series": "Drag and drop a zip file here",
-				"alt": "Or click to browse your computer for books to upload"
+				"books": "拖拽书籍到此处",
+				"series": "拖拽压缩文件到此处",
+				"alt": "或点击浏览你电脑中的书籍进行上传"
 			},
-			"addedFiles": "Added files"
+			"addedFiles": "已添加文件"
 		}
 	},
 	"librarySettingsScene": {
-		"heading": "Settings",
-		"subtitle": "Manage your library here. If you want a refresh on these settings, check out the",
-		"subtitleLink": "relevant documentation",
+		"heading": "设置",
+		"subtitle": "在此管理您的资料库。如果您想要在这些设置上刷新，请查看",
+		"subtitleLink": "相关文档",
 		"sidebar": {
-			"basics": "Basics",
+			"basics": "基础",
 			"options": {
-				"general": "General",
-				"reading": "Reading",
-				"scanning": "Scanning",
-				"thumbnails": "Thumbnails",
-				"ignore-rules": "Ignore Rules",
-				"analysis": "Analysis",
-				"label": "Options"
+				"general": "通用",
+				"reading": "阅读",
+				"scanning": "扫描",
+				"thumbnails": "缩略图",
+				"ignore-rules": "忽略规则",
+				"analysis": "分析",
+				"label": "选项"
 			},
 			"danger-zone": {
-				"access-control": "Access Control",
-				"delete": "Deletion",
-				"label": "Danger Zone"
+				"access-control": "访问控制",
+				"delete": "删除",
+				"label": "危险操作"
 			}
 		},
 		"basics": {
-			"title": "Basic Information",
-			"description": "The details of this library, including its name, path, and description",
+			"title": "基础信息",
+			"description": "该书库的详细信息，包括名称、路径和描述",
 			"form": {
-				"submit": "Update library"
+				"submit": "更新书库"
 			}
 		},
 		"options/reading": {
-			"title": "Reading",
-			"description": "The default reader settings to use for books in this library. Any book can override these settings"
+			"title": "阅读",
+			"description": "该书库中书籍使用的默认阅读器设置。任何书籍都可以覆盖这些设置"
 		},
 		"options/scanning": {
-			"title": "Scanning",
-			"description": "Settings related to how Stump scans this library",
+			"title": "扫描",
+			"description": "Stump 如何扫描此资料库的相关设置",
 			"sections": {
 				"configureScan": {
-					"heading": "Configure scan",
-					"description": "A scan with additional options for more fine-grained control",
+					"heading": "配置扫描",
+					"description": "具有额外选项的扫描，以实现更细粒度的控制",
 					"form": {
-						"alert": "These will override corresponding library-wide settings",
+						"alert": "这些设置将覆盖库范围内的相应设置",
 						"options": {
 							"forceRebuild": {
-								"label": "Force rebuild",
-								"description": "Rebuild every book in the library on disk",
-								"alert": "This will rebuild every book in the library from scratch, including metadata and hashes"
+								"label": "强制重建",
+								"description": "重建磁盘上书库中的每本书",
+								"alert": "这将从零开始重建书库中的每本书，包括元数据和哈希值"
 							},
 							"custom": {
-								"label": "Custom",
-								"description": "Customize the scan configuration",
+								"label": "自定义",
+								"description": "自定义扫描配置",
 								"validation": {
-									"noSelection": "At least one option must be enabled"
+									"noSelection": "至少必须启用一个选项"
 								}
 							},
 							"rebuildMeta": {
-								"label": "Rebuild metadata",
-								"description": "Rebuild metadata for books in the library"
+								"label": "重建元数据",
+								"description": "重建书库中书籍的元数据"
 							},
 							"regenHashes": {
-								"label": "Regenerate hashes",
-								"description": "Recreate hashes for books in the library"
+								"label": "重新生成哈希值",
+								"description": "重新创建书库中书籍的哈希值"
 							}
 						}
 					}
 				},
 				"defaultScan": {
-					"heading": "Default scan",
-					"description": "A standard scan to index your library for new content"
+					"heading": "默认扫描",
+					"description": "为你的书库建立索引以发现新内容的标准扫描"
 				},
 				"history": {
-					"heading": "Scan history",
-					"description": "The history of all scans recorded for this library",
-					"empty": "There are no scans recorded for this library",
-					"runScan": "Run scan",
-					"inspect": "See details",
+					"heading": "扫描历史",
+					"description": "该书库记录的所有扫描历史",
+					"empty": "该书库没有扫描记录",
+					"runScan": "运行扫描",
+					"inspect": "查看详情",
 					"inspector": {
-						"title": "Scan record",
-						"description": "A detailed view of this scan record",
+						"title": "扫描记录",
+						"description": "该扫描记录的详细视图",
 						"fields": {
-							"library": "Library",
-							"date": "Date",
-							"config": "Config",
-							"jobOutput": "Job output",
-							"logs": "Logs"
+							"library": "书库",
+							"date": "日期",
+							"config": "配置",
+							"jobOutput": "任务输出",
+							"logs": "日志"
 						},
-						"logsPresent": "Logs were persisted for this job",
-						"seeLogs": "See logs"
+						"logsPresent": "此任务的日志已保存",
+						"seeLogs": "查看日志"
 					},
 					"table": {
 						"columns": {
-							"timestamp": "Scanned at",
-							"config": "Config"
+							"timestamp": "扫描时间",
+							"config": "配置"
 						},
-						"default": "Default",
-						"custom": "Custom"
+						"default": "默认",
+						"custom": "自定义"
 					},
-					"clearHistory": "Delete scan history"
+					"clearHistory": "删除扫描历史"
 				}
 			}
 		},
 		"options/thumbnails": {
-			"title": "Thumbnails",
-			"description": "Settings and management options for thumbnails in this library",
+			"title": "缩略图",
+			"description": "该书库中缩略图的设置和管理选项",
 			"sections": {
 				"management": {
-					"heading": "Manage thumbnails",
-					"description": "Manage the existing thumbnails for this library",
+					"heading": "管理缩略图",
+					"description": "管理此库现有的缩略图",
 					"thumbnailSelector": {},
 					"deleteThumbnails": {}
 				}
 			}
 		},
 		"options/analysis": {
-			"title": "Analysis",
-			"description": "Analyze the contents of this library to identify potential issues or improvements",
+			"title": "分析",
+			"description": "分析这个图书馆的内容，以确定潜在的问题或改进",
 			"sections": {
 				"analyzeBooks": {
-					"heading": "Analyze books",
-					"description": "Analyze the books in this library to attach additional metadata in the database, such as page dimensions for image-based books",
-					"disclaimerTitle": "This process is resource-intensive",
-					"disclaimer": "It may take a while to complete. In the future, it will be more configurable",
-					"analyzeButton": "Analyze books"
+					"heading": "分析书籍",
+					"description": "分析该书库中的书籍以在数据库中附加额外元数据，例如图像类书籍的页面尺寸",
+					"disclaimerTitle": "这一进程是资源密集型的",
+					"disclaimer": "可能需要一些时间才能完成。今后它将更容易配置",
+					"analyzeButton": "分析书籍"
 				},
 				"missingFiles": {
-					"heading": "Missing files",
-					"description": "Files that are referenced in the database but cannot be located on disk",
-					"noMissingFiles": "There are no missing files in this library"
+					"heading": "缺失文件",
+					"description": "数据库中引用但磁盘上找不到的文件",
+					"noMissingFiles": "该书库中没有缺失文件"
 				},
 				"duplicateFiles": {
-					"heading": "Duplicate files",
-					"description": "Files that are potentially duplicated on disk",
-					"noDuplicateFiles": "There are no duplicate files detected for this library"
+					"heading": "重复文件",
+					"description": "磁盘上可能重复的文件",
+					"noDuplicateFiles": "该书库未检测到重复文件"
 				}
 			}
 		},
 		"danger-zone/access-control": {
-			"title": "Access Control",
-			"description": "Control who can access the content in this library",
+			"title": "访问控制",
+			"description": "控制谁可以访问该书库中的内容",
 			"sections": {
 				"libraryExclusions": {
-					"heading": "Exclude users",
-					"description": "Prevent certain users from accessing this library or its contents",
-					"noUsersTitle": "No users to exclude",
-					"noUsers": "There are no other registered users to exclude from this library",
-					"updated": "Exclusions updated",
-					"failure": "Failed to update exclusions"
+					"heading": "排除用户",
+					"description": "阻止特定用户访问该书库或其内容",
+					"noUsersTitle": "没有用户可删除",
+					"noUsers": "没有其他注册用户可从此库中排除",
+					"updated": "排除列表已更新",
+					"failure": "更新排除列表失败"
 				}
 			}
 		},
 		"danger-zone/delete": {
-			"title": "Deletion",
-			"description": "Permanently delete this library and all of its contents or certain resources",
+			"title": "删除",
+			"description": "永久删除该书库及其全部内容或特定资源",
 			"sections": {
 				"cleanLibrary": {
-					"heading": "Clean library",
-					"description": "Remove all media and series that cannot be located on disk",
-					"disclaimerTitle": "No files will be deleted",
-					"disclaimer": "While this action will not delete any files, it will permanently delete all records relating to media and series which have a missing status",
+					"heading": "清理书库",
+					"description": "移除所有无法在磁盘上定位的媒体和系列",
+					"disclaimerTitle": "没有文件将被删除",
+					"disclaimer": "虽然此操作不会删除任何文件，但会永久删除所有与状态为缺失的媒体和系列相关的记录",
 					"confirmation": {
-						"label": "Clean library",
-						"text": "Are you sure you want to clean this library?"
+						"label": "清理书库",
+						"text": "你确定要清理此书库吗？"
 					},
-					"emptyText": "There was nothing to clean",
+					"emptyText": "没有可以清理的内容",
 					"missingEntitiesTable": {
 						"columns": {
-							"id": "ID",
-							"path": "Path",
-							"type": "Type"
+							"id": "充值账号ID",
+							"path": "路径",
+							"type": "类型"
 						},
 						"types": {
-							"BOOK": "Book",
-							"SERIES": "Series",
-							"LIBRARY": "Library"
+							"BOOK": "书籍",
+							"SERIES": "系列",
+							"LIBRARY": "书库"
 						},
-						"emptyHeading": "Nothing is missing for this library",
-						"emptySubtitle": "All files referenced in the database were located on disk"
+						"emptyHeading": "此库没有缺失内容",
+						"emptySubtitle": "数据库中引用的所有文件都在磁盘上"
 					}
 				},
 				"deleteLibrary": {
-					"heading": "Delete library",
+					"heading": "删除书库",
 					"description": [
-						"Permanently delete this library and all its contents.",
-						"This action cannot be undone"
+						"永久删除该书库及其全部内容。",
+						"此操作不可撤销"
 					]
 				}
 			}
 		}
 	},
 	"errorScene": {
-		"heading": "lol, oops",
-		"message": "An error occurred:",
+		"heading": "哎呀，出错了",
+		"message": "发生错误：",
 		"buttons": {
-			"report": "Report Bug",
-			"copy": "Copy Error Details",
-			"goHome": "Go Home"
+			"report": "反馈Bug",
+			"copy": "复制错误详情",
+			"goHome": "返回首页"
 		}
 	},
 	"homeScene": {
 		"onDeck": {
-			"title": "Your next read",
+			"title": "您的下一个阅读",
 			"emptyState": {
-				"heading": "No books on deck",
-				"message": "Your next recommended books will show up here"
+				"heading": "幻灯片上没有书",
+				"message": "您的下一个推荐书将显示在这里"
 			}
 		},
 		"continueReading": {
-			"title": "Continue reading",
+			"title": "继续阅读",
 			"emptyState": {
-				"heading": "Nothing to show",
-				"message": "Any in-progress books you start will show up here"
+				"heading": "没有可显示的内容",
+				"message": "你开始阅读的任何进行中的书籍都会显示在这里"
 			}
 		},
 		"recentlyAddedSeries": {
-			"title": "Recently added series",
+			"title": "最近添加的系列",
 			"emptyState": {
-				"heading": "No series to display",
-				"message": "Any series you add to your libraries will show up here"
+				"heading": "没有要显示的系列",
+				"message": "您添加到书库的任何系列都会在此显示"
 			}
 		},
 		"recentlyAddedBooks": {
-			"title": "Recently added books",
+			"title": "最近添加的书籍",
 			"emptyState": {
-				"heading": "Nothing to show",
-				"message": "Any recent books you add will show up here"
+				"heading": "没有可显示的内容",
+				"message": "你最近添加的任何书籍都会显示在这里"
 			}
 		}
 	},
 	"metadataEditor": {
 		"labels": {
-			"ageRating": "Age rating",
-			"characters": "Characters",
-			"colorists": "Colorists",
-			"coverArtists": "Cover artists",
-			"day": "Day",
-			"editors": "Editors",
-			"format": "Format",
-			"identifierAmazon": "Amazon ID",
+			"ageRating": "年龄分级",
+			"characters": "角色",
+			"colorists": "上色师",
+			"coverArtists": "封面艺术家",
+			"day": "日",
+			"editors": "编辑",
+			"format": "格式",
+			"identifierAmazon": "亚马逊 ID",
 			"identifierCalibre": "Calibre ID",
 			"identifierGoogle": "Google ID",
 			"identifierIsbn": "ISBN",
 			"identifierMobiAsin": "Mobi ASIN",
-			"identifierUuid": "Book UUID",
-			"genres": "Genres",
-			"inkers": "Inkers",
-			"language": "Language",
-			"letterers": "Letterers",
-			"links": "Links",
-			"month": "Month",
-			"notes": "Notes",
-			"number": "Number",
-			"pageCount": "Pages",
-			"pencillers": "Pencillers",
-			"publisher": "Publisher",
-			"series": "Series",
-			"seriesGroup": "Series group",
-			"storyArc": "Story arc",
-			"storyArcNumber": "Story arc number",
-			"summary": "Summary",
-			"teams": "Teams",
-			"title": "Title",
-			"titleSort": "Title sort",
-			"volume": "Volume",
-			"writers": "Writers",
-			"year": "Year",
-			"metaType": "Type",
-			"imprint": "Imprint",
-			"comicid": "Comic ID",
-			"booktype": "Book type",
-			"status": "Status",
-			"totalIssues": "Total issues",
-			"publicationRun": "Publication run",
-			"comicImage": "Comic image",
-			"descriptionFormatted": "Description (formatted)"
+			"identifierUuid": "书籍 UUID",
+			"genres": "流派",
+			"inkers": "印墨师",
+			"language": "语言",
+			"letterers": "文字设计师",
+			"links": "链接",
+			"month": "月",
+			"notes": "备注",
+			"number": "数字",
+			"pageCount": "页数",
+			"pencillers": "线稿师",
+			"publisher": "出版社",
+			"series": "系列",
+			"seriesGroup": "系列组",
+			"storyArc": "故事弧线",
+			"storyArcNumber": "故事弧线编号",
+			"summary": "摘要",
+			"teams": "团队",
+			"title": "标题",
+			"titleSort": "标题排序",
+			"volume": "卷",
+			"writers": "作者",
+			"year": "年",
+			"metaType": "类型",
+			"imprint": "出版印记",
+			"comicid": "漫画 ID",
+			"booktype": "书籍类型",
+			"status": "状态",
+			"totalIssues": "问题总数",
+			"publicationRun": "出版周期",
+			"comicImage": "漫画图像",
+			"descriptionFormatted": "描述 (格式化)"
 		},
 		"addFields": {
-			"description": "Add each addition on its own line"
+			"description": "在自己的行上添加每个添加"
 		}
 	},
 	"seriesOverviewScene": {
 		"buttons": {
-			"continueReading": "Continue Reading",
-			"downloadSeries": "Download Series"
+			"continueReading": "继续阅读",
+			"downloadSeries": "下载系列"
 		}
 	},
 	"createOrUpdateSmartListForm": {
 		"validation": {
-			"nameTooShort": "Name must be at least 2 characters",
-			"nameTaken": "Cannot use this name"
+			"nameTooShort": "名称至少需要 2 个字符",
+			"nameTaken": "不能使用此名称"
 		},
 		"fields": {
 			"name": {
-				"label": "Name",
-				"placeholder": "My smart list",
-				"description": "Must be unique, but can be changed later"
+				"label": "名称",
+				"placeholder": "我的智能列表",
+				"description": "必须唯一，但稍后可以更改"
 			},
 			"description": {
-				"label": "Description",
-				"placeholder": "A very intelligent list",
-				"description": "An optional description of your smart list"
+				"label": "描述",
+				"placeholder": "一个非常智能的列表",
+				"description": "你的智能列表的可选描述"
 			},
 			"visibility": {
-				"label": "Visibility",
+				"label": "可见性",
 				"options": {
 					"public": {
-						"label": "Public",
-						"description": "Accessible to all users on the server"
+						"label": "公开",
+						"description": "服务器上的所有用户均可访问"
 					},
 					"shared": {
-						"label": "Shared",
-						"description": "Specific users can access this smart list",
-						"createDisclaimer": "You can select who this list is shared with after creation"
+						"label": "共享",
+						"description": "特定用户可以访问此智能列表",
+						"createDisclaimer": "你可以在创建后选择与此列表共享的用户"
 					},
 					"private": {
-						"label": "Private",
-						"description": "Only you can access this smart list"
+						"label": "私密",
+						"description": "只有你可以访问此智能列表"
 					}
 				}
 			},
 			"queryBuilder": {
-				"uiPerformance": "This feature is missing performance optimizations on the UI and may be slow with filters which produce large result sets. This will be improved in the future",
+				"uiPerformance": "此功能在 UI 上缺少性能优化，在产生大量结果集的筛选器下可能会较慢。将来会改进",
 				"rootJoiner": {
 					"and": {
-						"label": "AND",
-						"description": "All filter groups must be true for a book to be matched"
+						"label": "且",
+						"description": "所有筛选组都必须为真，书籍才匹配"
 					},
 					"or": {
-						"label": "OR",
-						"description": "At least one filter group must be true for a book to be matched"
+						"label": "或",
+						"description": "至少一个筛选组为真，书籍才匹配"
 					}
 				},
 				"groupJoiner": {
 					"and": {
-						"label": "AND",
-						"description": "All must be true"
+						"label": "且",
+						"description": "所有条件都必须为真"
 					},
 					"or": {
-						"label": "OR",
-						"description": "At least one must be true"
+						"label": "或",
+						"description": "至少一个条件为真"
 					},
 					"not": {
-						"label": "NOT",
-						"description": "None can be true"
+						"label": "非",
+						"description": "所有条件都不能为真"
 					}
 				},
 				"grouping": {
-					"label": "Group by",
-					"description": "How the books in this smart list should be grouped",
+					"label": "分组依据",
+					"description": "该智能列表中的书籍应如何分组",
 					"options": {
 						"by_books": {
-							"label": "None"
+							"label": "无"
 						},
 						"by_series": {
-							"label": "Series"
+							"label": "系列"
 						},
 						"by_library": {
-							"label": "Library"
+							"label": "书库"
 						}
 					}
 				},
 				"filters": {
-					"emptyState": "Add a group to get started",
+					"emptyState": "添加一个组以开始",
 					"actions": {
-						"addFilter": "Add filter",
-						"addGroup": "Add group",
-						"deleteFilter": "Delete filter",
-						"deleteGroup": "Delete group"
+						"addFilter": "添加筛选",
+						"addGroup": "添加组",
+						"deleteFilter": "删除筛选",
+						"deleteGroup": "删除组"
 					},
-					"is": "is",
+					"is": "是",
 					"fieldSelect": {
-						"placeholder": "Attribute",
+						"placeholder": "属性",
 						"source": {
-							"label": "Source",
-							"back": "Back",
+							"label": "来源",
+							"back": "返回",
 							"book": {
-								"label": "Book",
+								"label": "书籍",
 								"attributes": {
-									"name": "Filename",
-									"size": "Size",
-									"extension": "Extension",
-									"status": "Status",
-									"path": "Path",
-									"pages": "Pages",
-									"tags": "Tags",
-									"createdAt": "Created at",
-									"updatedAt": "Updated at"
+									"name": "文件名",
+									"size": "大小",
+									"extension": "扩展名",
+									"status": "状态",
+									"path": "路径",
+									"pages": "页数",
+									"tags": "标签",
+									"createdAt": "创建时间",
+									"updatedAt": "更新时间"
 								}
 							},
 							"book_meta": {
-								"label": "Book Meta",
+								"label": "书籍元数据",
 								"attributes": {
-									"title": "Title",
-									"summary": "Summary",
-									"notes": "Notes",
-									"writers": "Writers",
-									"pencillers": "Pencillers",
-									"inkers": "Inkers",
-									"letterers": "Letterers",
-									"editors": "Editors",
-									"publisher": "Publisher",
-									"colorists": "Colorist",
-									"links": "Links",
-									"characters": "Characters",
-									"teams": "Teams",
-									"genres": "Genre",
-									"coverArtists": "Cover artists",
-									"ageRating": "Age rating",
-									"year": "Year",
-									"month": "Month",
-									"day": "Day"
+									"title": "标题",
+									"summary": "摘要",
+									"notes": "笔记",
+									"writers": "编剧",
+									"pencillers": "线稿师",
+									"inkers": "描线师",
+									"letterers": "文字设计师",
+									"editors": "编辑",
+									"publisher": "出版社",
+									"colorists": "上色师",
+									"links": "链接",
+									"characters": "角色",
+									"teams": "团队",
+									"genres": "类型",
+									"coverArtists": "封面艺术家",
+									"ageRating": "年龄分级",
+									"year": "年",
+									"month": "月",
+									"day": "日"
 								}
 							},
 							"series": {
-								"label": "Series",
+								"label": "系列",
 								"attributes": {
-									"name": "Name",
-									"path": "Path"
+									"name": "名称",
+									"path": "路径"
 								}
 							},
 							"series_meta": {
-								"label": "Series Meta",
+								"label": "系列元数据",
 								"attributes": {
-									"title": "Title",
-									"summary": "Summary",
-									"publisher": "Publisher",
-									"imprint": "Imprint",
-									"comicid": "Comic ID",
-									"booktype": "Book type",
-									"status": "Status",
-									"volume": "Volume",
-									"metaType": "Type",
-									"ageRating": "Age rating",
-									"year": "Start year"
+									"title": "标题",
+									"summary": "摘要",
+									"publisher": "出版社",
+									"imprint": "出版印记",
+									"comicid": "漫画 ID",
+									"booktype": "书籍类型",
+									"status": "状态",
+									"volume": "卷",
+									"metaType": "类型",
+									"ageRating": "年龄分级",
+									"year": "起始年份"
 								}
 							},
 							"library": {
-								"label": "Library",
+								"label": "书库",
 								"attributes": {
-									"name": "Name",
-									"path": "Path"
+									"name": "名称",
+									"path": "路径"
 								}
 							}
 						}
 					},
 					"basicValue": {
-						"placeholder": "Value",
-						"date": "Date"
+						"placeholder": "值",
+						"date": "日期"
 					},
 					"rangeValue": {
 						"from": {
-							"date": "From date",
-							"number": "From"
+							"date": "起始日期",
+							"number": "从"
 						},
 						"to": {
-							"date": "To date",
-							"number": "To"
+							"date": "结束日期",
+							"number": "到"
 						},
-						"inclusive": "Inclusive"
+						"inclusive": "包含"
 					},
 					"listValue": {
-						"placeholder": "Add values",
-						"emptyState": "No values to display"
+						"placeholder": "添加值",
+						"emptyState": "没有可显示的值"
 					}
 				}
 			}
 		}
 	},
 	"createSmartListScene": {
-		"heading": "Create smart list",
-		"subtitle": "On-the-fly list creation based on a set of filters",
+		"heading": "创建智能列表",
+		"subtitle": "基于一组过滤规则创建实时列表",
 		"form": {
-			"stepLabel": "Step",
+			"stepLabel": "步骤",
 			"steps": [
 				{
-					"label": "Basics",
-					"heading": "Basic Information",
-					"description": "The details of this smart list, including its name, description, and visibility"
+					"label": "基础",
+					"heading": "基础信息",
+					"description": "该智能列表的详细信息，包括名称、描述和可见性"
 				},
 				{
-					"label": "Filters",
-					"heading": "Filters",
-					"description": "The filters to apply to this smart list"
+					"label": "筛选",
+					"heading": "筛选",
+					"description": "应用于该智能列表的筛选器"
 				},
 				{
-					"label": "Review",
-					"heading": "Review",
-					"description": "Review your smart list settings before creating it"
+					"label": "确认",
+					"heading": "确认",
+					"description": "在创建前检查你的智能列表设置"
 				}
 			],
 			"review": {
-				"yes": "Yes",
-				"no": "No",
-				"none": "None",
+				"yes": "是",
+				"no": "否",
+				"none": "无",
 				"labels": {
-					"name": "Name",
-					"description": "Description",
-					"visibility": "Visibility",
-					"grouping": "Group by"
+					"name": "名称",
+					"description": "描述",
+					"visibility": "可见性",
+					"grouping": "分组依据"
 				}
 			},
 			"buttons": {
-				"confirm": "Create list"
+				"confirm": "创建列表"
 			}
 		}
 	},
 	"createOrUpdateApiKey": {
 		"validation": {
-			"futureDate": "Expiration date must be in the future"
+			"futureDate": "过期日期必须在未来"
 		},
 		"fields": {
 			"name": {
-				"label": "Name",
-				"placeholder": "Koreader Sync"
+				"label": "名称",
+				"placeholder": "KoReader 同步"
 			},
 			"expiration": {
-				"label": "Expiration",
-				"placeholder": "Never"
+				"label": "过期时间",
+				"placeholder": "永不过期"
 			},
 			"expiresAt": {
-				"label": "Expires at",
-				"placeholder": "Never"
+				"label": "过期于",
+				"placeholder": "从不使用"
 			},
 			"permissions": {
 				"inherit": {
-					"label": "Inherit permissions",
-					"description": "The same permissions as your account"
+					"label": "继承权限",
+					"description": "与你的账户相同的权限"
 				},
 				"explicit": {
-					"label": "Explicit permissions",
-					"description": "Choose the permissions this key should have"
+					"label": "显式权限",
+					"description": "选择此密钥应具有的权限"
 				}
 			}
 		},
-		"inheritDisclaimer": "This API key will inherit your full permissions, which means it can do anything you can do. Be careful with this setting"
+		"inheritDisclaimer": "此 API 密钥将继承你的全部权限，这意味着它可以执行你能做的任何事情。请谨慎使用此设置"
 	},
 	"userSmartListsScene": {
-		"heading": "Smart lists",
-		"subtitle": "Your favorite searches and filters saved for easy access",
-		"searchPlaceholder": "Filter smart lists",
+		"heading": "智能清单",
+		"subtitle": "保存您喜欢的搜索和过滤器以便于访问",
+		"searchPlaceholder": "筛选智能列表",
 		"buttons": {
-			"createSmartList": "Create smart list"
+			"createSmartList": "创建智能列表"
 		},
 		"list": {
 			"emptyState": {
-				"heading": "No smart lists to display",
-				"noListsMessage": "Create a smart list to get started",
-				"noMatchesMessage": "Try changing your search query"
+				"heading": "没有要显示的智能列表",
+				"noListsMessage": "创建一个智能列表以开始",
+				"noMatchesMessage": "尝试更改您的搜索参数"
 			},
 			"card": {
 				"meta": {
 					"figures": {
-						"books": "book",
-						"series": "series",
-						"library": "library"
+						"books": "书",
+						"series": "系列",
+						"library": "库"
 					},
-					"matches": "Matches"
+					"matches": "匹配项"
 				}
 			}
 		}
 	},
 	"smartListSettingsScene": {
 		"sidebar": {
-			"basics": "Basics",
+			"basics": "基础",
 			"configuration": {
-				"label": "Configuration",
-				"access": "Access",
-				"filters": "Filters"
+				"label": "配置",
+				"access": "访问",
+				"filters": "筛选"
 			},
 			"danger-zone": {
-				"delete": "Deletion",
-				"label": "Danger Zone"
+				"delete": "删除",
+				"label": "危险操作"
 			}
 		},
 		"basics": {
-			"title": "Basic Information",
-			"description": "The details of this smart list, including its name and description"
+			"title": "基础信息",
+			"description": "该智能列表的详细信息，包括名称和描述"
 		},
 		"access": {
-			"title": "Access",
-			"description": "Control who can access this smart list",
+			"title": "访问",
+			"description": "控制谁可以访问该智能列表",
 			"sections": {
 				"visibility": {
 					"confirmation": {
-						"public": "This will make the list visible to everyone",
-						"private": "This will change the list to be private, hiding it from anyone who previously had access",
-						"shared": "You will need to share the list with specific users to give them access",
-						"fallback": "Are you sure you want to change the visibility of this list?"
+						"public": "这将使列表对所有人可见",
+						"private": "这将更改列表为私密，将其隐藏在以前曾经访问过的任何人上",
+						"shared": "你需要与特定用户共享列表以给予他们访问权限",
+						"fallback": "你确定要更改此列表的可见性吗？"
 					}
 				},
 				"accessManager": {
-					"disclaimer": "Sharing is not ready yet. Please check back later!"
+					"disclaimer": "共享功能尚未准备就绪。请稍后再试！"
 				}
 			}
 		},
 		"filters": {
-			"title": "Filter Builder",
-			"description": "Manage the filters which construct this smart list"
+			"title": "筛选构建器",
+			"description": "管理构成该智能列表的筛选器"
 		},
 		"danger-zone/delete": {
-			"title": "Deletion Actions",
-			"description": "Permanently delete this smart list and all of its contents or certain resources",
+			"title": "删除操作",
+			"description": "永久删除该智能列表及其全部内容或特定资源",
 			"sections": {
 				"deleteList": {
-					"heading": "Delete list",
+					"heading": "删除列表",
 					"description": [
-						"Permanently delete this smart list and all its contents.",
-						"This action cannot be undone"
+						"永久删除该智能列表及其全部内容。",
+						"此操作不可撤销"
 					],
 					"confirmation": {
-						"title": "Delete list",
-						"description": "Are you sure you want to delete this smart list?",
-						"confirm": "Delete list"
+						"title": "删除列表",
+						"description": "你确定要删除该智能列表吗？",
+						"confirm": "删除列表"
 					}
 				}
 			}
@@ -1156,73 +1156,73 @@
 	},
 	"userSmartListScene": {
 		"navigation": {
-			"items": "Items",
-			"settings": "Settings"
+			"items": "项目",
+			"settings": "设置"
 		},
 		"layout": {
-			"missingIdError": "This scene requires an ID in the URL",
-			"smartListNotFound": "Smart list not found",
-			"viewCreateError": "Failed to create view",
-			"viewSaveError": "Failed to save view"
+			"missingIdError": "此场景需要 URL 中的 ID",
+			"smartListNotFound": "未找到智能列表",
+			"viewCreateError": "创建视图失败",
+			"viewSaveError": "保存视图失败"
 		},
 		"header": {
-			"backLink": "Lists"
+			"backLink": "列表"
 		},
 		"itemsScene": {
-			"smartListNotFound": "Smart list not found",
+			"smartListNotFound": "未找到智能列表",
 			"actionHeader": {
 				"viewSelector": {
-					"customView": "Custom view",
-					"defaultView": "Default view",
-					"noViewsSaved": "No views saved",
-					"selectView": "Select a saved view"
+					"customView": "自定义视图",
+					"defaultView": "默认视图",
+					"noViewsSaved": "没有保存的视图",
+					"selectView": "选择一个已保存视图"
 				},
 				"filterDrawer": {
-					"heading": "Smart list filters",
-					"description": "Change the filters for this viewing session",
+					"heading": "智能列表筛选器",
+					"description": "更改此视图会话的过滤器",
 					"rawData": {
-						"heading": "Raw filter data",
-						"description": "This is how Stump will process the filters"
+						"heading": "原始过滤器数据",
+						"description": "Stump 将如何处理过滤器"
 					},
 					"buttons": {
-						"save": "Save",
-						"cancel": "Cancel"
+						"save": "保存",
+						"cancel": "取消"
 					}
 				},
 				"search": {
-					"placeholder": "Quick filter"
+					"placeholder": "快速筛选"
 				},
 				"viewManager": {
-					"updateSelected": "Update view",
-					"deleteSelected": "Delete view",
-					"create": "Create new view",
+					"updateSelected": "更新视图",
+					"deleteSelected": "删除视图",
+					"create": "创建新视图",
 					"modal": {
 						"heading": {
-							"create": "Create view",
-							"update": "Update view"
+							"create": "创建视图",
+							"update": "更新视图"
 						},
 						"description": {
-							"create": "Create a new view for this smart list",
-							"update": "Update the view"
+							"create": "为此智能列表创建新视图",
+							"update": "更新视图"
 						},
 						"createForm": {
 							"name": {
-								"label": "Name",
-								"placeholder": "My view",
-								"description": "A friendly name to uniquely identify this view"
+								"label": "名称",
+								"placeholder": "我的视图",
+								"description": "识别此视图的友好唯一名称"
 							}
 						},
 						"updateForm": {
 							"name": {
-								"label": "Name",
-								"placeholder": "My view",
-								"description": "The updated name for this view, if desired"
+								"label": "名称",
+								"placeholder": "我的视图",
+								"description": "此视图的更新名称（如果需要）"
 							}
 						}
 					},
 					"deleteModal": {
-						"title": "Delete view",
-						"description": "Are you sure you want to delete this view?"
+						"title": "删除视图",
+						"description": "你确定要删除该视图吗？"
 					}
 				}
 			}
@@ -1230,1203 +1230,1203 @@
 	},
 	"settingsScene": {
 		"navigation": {
-			"general": "General",
-			"logs": "Logs",
-			"server": "Server",
-			"jobs": "Jobs and Configuration",
-			"users": "User Management",
-			"desktop": "Desktop"
+			"general": "通用",
+			"logs": "日志",
+			"server": "服务器",
+			"jobs": "任务和配置",
+			"users": "用户管理",
+			"desktop": "桌面"
 		},
 		"sidebar": {
 			"personal": {
-				"account": "Account",
-				"appearance": "Preferences",
-				"api keys": "API keys",
-				"reader": "Reader",
-				"desktop": "Desktop",
-				"label": "Personal"
+				"account": "帐户",
+				"appearance": "首选项",
+				"api keys": "API 密钥",
+				"reader": "阅读器",
+				"desktop": "桌面",
+				"label": "个人"
 			},
 			"management": {
-				"general": "Server",
-				"logs": "Logs",
-				"users": "Users",
-				"jobs": "Jobs",
-				"access": "Access",
-				"email": "Email",
-				"notifications": "Notifications",
-				"label": "Management"
+				"general": "服务器",
+				"logs": "日志",
+				"users": "用户",
+				"jobs": "任务",
+				"access": "访问",
+				"email": "电子邮件地址",
+				"notifications": "通知",
+				"label": "管理"
 			}
 		},
 		"app/account": {
-			"helmet": "Account settings",
-			"title": "Account settings",
-			"description": "Settings related to your account",
+			"helmet": "账户设置",
+			"title": "账户设置",
+			"description": "与您的帐户相关的设置",
 			"sections": {
 				"account": {
 					"validation": {
-						"invalidUrl": "Please enter a valid URL",
-						"missingUsername": "Username is required"
+						"invalidUrl": "请输入有效的 URL 地址",
+						"missingUsername": "用户名为必填项"
 					},
 					"labels": {
-						"username": "Username",
-						"password": "Password",
-						"activeChangesPrompt": "You have unsaved changes"
+						"username": "用户名",
+						"password": "密码",
+						"activeChangesPrompt": "您有未保存的更改"
 					},
 					"errors": {
-						"updateFailed": "A server error occurred while updating your profile. Please try again."
+						"updateFailed": "更新您的个人资料时服务器发生错误。请重试。"
 					},
 					"avatarPicker": {
-						"label": "Avatar",
-						"heading": "Upload avatar",
-						"subtitle": "You can upload any image to use as your avatar for social features in Stump",
-						"dropzone": "Drop an image or click to select",
-						"changeImage": "Change Image",
-						"removeImage": "Remove Image",
-						"removeSelection": "Remove uploaded image",
-						"uploadFailed": "Failed to upload avatar",
-						"removeFailed": "Failed to remove avatar"
+						"label": "头像",
+						"heading": "上传头像",
+						"subtitle": "您可以上传任何图片作为您在Stump 中的社交功能的头像",
+						"dropzone": "拖放图片到此处或点击以选择",
+						"changeImage": "更改图像",
+						"removeImage": "删除图片",
+						"removeSelection": "删除上传的图像",
+						"uploadFailed": "头像上传失败",
+						"removeFailed": "删除头像失败"
 					},
 					"buttons": {
-						"confirm": "Save Changes"
+						"confirm": "保存更改"
 					}
 				},
 				"locale": {
 					"localeSelector": {
-						"label": "Language"
+						"label": "语言"
 					},
-					"heading": "Language and locale",
+					"heading": "语言及地区",
 					"subtitle": [
-						"Stump supports multiple languages and locales, set your preferences below. Please consider helping improve the quality of",
-						"Stump's translations",
-						"if you're able to!"
+						"Stump 支持多种语言和本地化，在下方设置您的偏好。请考虑帮助提升质量",
+						"Stump的翻译",
+						"如果你可以！"
 					]
 				}
 			}
 		},
 		"app/preferences": {
-			"helmet": "Preferences",
-			"title": "Preferences",
-			"description": "Customize the look and feel of the application",
+			"helmet": "首选项",
+			"title": "首选项",
+			"description": "自定义应用的外观与风格",
 			"sections": {
 				"themeAndAppearance": {
-					"label": "Theme and appearance",
-					"description": "The basic look and feel options for Stump"
+					"label": "主题和外观",
+					"description": "Stump 的基本外观和风格选项"
 				},
 				"themeSelect": {
-					"label": "Theme",
+					"label": "主题",
 					"description": [
-						"If you're interested in creating your own custom theme, check out the",
-						"documentation"
+						"如果你有兴趣创建自己的自定义主题，请查看",
+						"文档"
 					],
 					"options": {
-						"system": "System",
-						"light": "Light",
-						"dark": "Dark",
-						"bronze": "Bronze light",
-						"ocean": "Ocean",
-						"autumn": "Autumn",
-						"cosmic": "Cosmic",
-						"pumpkin": "Pumpkin",
-						"matrix": "Matrix"
+						"system": "系统",
+						"light": "亮色",
+						"dark": "深色",
+						"bronze": "青铜",
+						"ocean": "海洋",
+						"autumn": "秋色",
+						"cosmic": "宇宙",
+						"pumpkin": "南瓜",
+						"matrix": "矩阵"
 					}
 				},
 				"gradientToggle": {
-					"label": "Enable gradients",
-					"description": "Some themes optionally support gradients for a more dynamic look"
+					"label": "启用渐变",
+					"description": "一些主题可选地支持更动态的渐变"
 				},
 				"fontSelect": {
-					"label": "Font",
-					"description": "Customize the font used in the application"
+					"label": "字体",
+					"description": "自定义应用使用的字体"
 				},
 				"thumbnailRatioSelect": {
-					"label": "Thumbnail Ratio",
-					"description": "The aspect ratio to use for thumbnails"
+					"label": "缩略图比率",
+					"description": "缩略图中使用的宽高比"
 				},
 				"thumbnailPlaceholder": {
-					"label": "Thumbnail placeholder",
-					"description": "The style to use for thumbnail placeholders",
+					"label": "缩略图占位符",
+					"description": "缩略图占位符使用的样式",
 					"options": {
 						"grayscale": "Grayscale",
-						"averageColor": "Average color",
-						"colorful": "Colorful",
-						"thumbhash": "Thumbhash"
+						"averageColor": "平均颜色",
+						"colorful": "彩色化",
+						"thumbhash": "缩略图哈希"
 					}
 				},
 				"layoutAndArrangement": {
-					"label": "Layout and arrangement",
-					"description": "Customize how Stump displays information and organizes content"
+					"label": "布局和安排",
+					"description": "自定义Stump 如何显示信息和组织内容"
 				},
 				"primaryNavigation": {
-					"label": "Primary navigation",
-					"description": "Choose between a minimal sidebar or a topbar navigation",
+					"label": "主要导航",
+					"description": "选择最小侧边栏或顶栏导航",
 					"options": {
-						"sidebar": "Sidebar",
-						"topbar": "Topbar"
+						"sidebar": "侧边栏",
+						"topbar": "顶部工具条"
 					},
-					"disclaimer": "* Settings for the unselected option will be disabled or hidden"
+					"disclaimer": "* 未选中选项的设置将被禁用或隐藏"
 				},
 				"doubleSidebar": {
-					"label": "Settings sidebar",
-					"description": "Enables the sidebar navigation for the settings pages. If you frequently use a smaller screen, you may want to disable this."
+					"label": "设置边栏",
+					"description": "为设置页面启用侧边栏导航。如果您经常使用一个较小的屏幕，您可能希望禁用它。"
 				},
 				"replacePrimarySidebar": {
-					"label": "Replace primary sidebar",
-					"description": "Any instance of a secondary sidebar will replace the primary sidebar instead of being displayed next to it",
+					"label": "替换主侧边栏",
+					"description": "任何次要侧边栏的实例都将取代主侧边栏，而不是在它旁边显示",
 					"tooltips": {
-						"doubleSidebar": "This setting requires the settings sidebar to be enabled",
-						"topbar": "This setting is not currently supported when the primary navigation is set to top bar"
+						"doubleSidebar": "此设置需要启用侧边栏",
+						"topbar": "当主导航设置为顶部栏时，当前不支持此设置"
 					}
 				},
 				"navigationArrangement": {
-					"label": "Navigation arrangement",
+					"label": "导航排列",
 					"description": {
-						"sidebar": "Arrange and customize the navigation items in the sidebar",
-						"topbar": "Arrange and customize the navigation items in the topbar"
+						"sidebar": "在侧边栏中排列和自定义导航项",
+						"topbar": "在顶部栏中排列和自定义导航项"
 					},
-					"isLocked": "Arrangement is locked",
-					"lock": "Lock arrangement",
-					"unlock": "Unlock arrangement",
+					"isLocked": "排列已锁定",
+					"lock": "锁定排列",
+					"unlock": "解锁排列",
 					"options": {
-						"HOME": "Home",
-						"EXPLORE": "Explore",
-						"LIBRARIES": "Libraries",
-						"BOOK_CLUBS": "Book clubs",
-						"SMART_LISTS": "Smart lists"
+						"HOME": "首页",
+						"EXPLORE": "发现",
+						"LIBRARIES": "库",
+						"BOOK_CLUBS": "读书俱乐部",
+						"SMART_LISTS": "智能列表"
 					},
 					"entityOptions": {
 						"createAction": {
-							"label": "Show create action",
-							"help": "Show the create action in the navigation"
+							"label": "显示创建操作",
+							"help": "在导航中显示创建操作"
 						},
 						"linkToAll": {
-							"label": "See all link",
-							"help": "A link to a page dedicated to viewing all items of this type"
+							"label": "查看全部链接",
+							"help": "指向用于查看该类型所有项的页面的链接"
 						}
 					}
 				},
 				"displaySpacing": {
-					"label": "Display spacing",
-					"description": "Adjusts the overall spacing between elements throughout the app",
+					"label": "显示间距",
+					"description": "调整整个应用程序元素之间的总间距",
 					"options": {
-						"default": "Default",
-						"compact": "Compact"
+						"default": "默认",
+						"compact": "紧凑"
 					},
-					"disclaimer": "* Compact display mode is not implemented yet"
+					"disclaimer": "* 简洁显示模式尚未实现"
 				},
 				"maxWidthPreference": {
-					"label": "Adjusted width",
-					"description": "Stump applies a max-width to the viewport. This setting allows you to adjust or remove this limit",
-					"tooltip": "This setting is not currently supported when the primary navigation is set to sidebar"
+					"label": "调整宽度",
+					"description": "Stump 对视图端口应用最大宽度。此设置允许您调整或删除此限制",
+					"tooltip": "当主导航设置为侧边栏时，当前不支持此设置"
 				},
 				"additionalPreferences": {
-					"label": "Additional preferences",
-					"description": "Customize the appearance and behavior of Stump with these additional settings"
+					"label": "其他偏好",
+					"description": "通过这些附加设置自定义Stump的外观和行为"
 				},
 				"showThumbnailsInHeader": {
-					"label": "Show thumbnails in headers",
-					"description": "If you prefer to see thumbnails more often, this setting will show them in more places",
+					"label": "在标题中显示缩略图",
+					"description": "如果您希望更经常地看到缩略图，此设置将在更多地方显示缩略图",
 					"tooltips": {
-						"enabled": "This setting will show thumbnails in more places",
-						"disabled": "This setting will not show thumbnails in more places"
+						"enabled": "此设置将在更多地方显示缩略图",
+						"disabled": "此设置将不会在更多地方显示缩略图"
 					}
 				},
 				"hideScrollbarToggle": {
-					"label": "Hide scrollbar",
-					"description": "Some pages simply look better without a scrollbar, this setting will hide it when possible",
+					"label": "启用隐藏滚动条",
+					"description": "某些页面只是在没有滚动条的情况下看起来更好，这个设置将在可能时隐藏它",
 					"tooltips": {
-						"enabled": "This setting will hide the scrollbar on some pages",
-						"disabled": "This setting will show the scrollbar on some pages"
+						"enabled": "此设置将隐藏某些页面的滚动条",
+						"disabled": "此设置将在某些页面上显示滚动条"
 					}
 				},
 				"enableAlphabetFiltering": {
-					"label": "Alphabet filtering",
-					"description": "Show an alphabet filter when applicable"
+					"label": "字母筛选视图",
+					"description": "在适用时显示字母过滤器"
 				},
 				"enableFancyAnimations": {
-					"label": "Fancy animations",
-					"description": "A broad opt-in for fancier animations throughout the app"
+					"label": "动画效果",
+					"description": "在整个应用程序中提供丰富的动画效果选项"
 				},
 				"queryIndicatorToggle": {
-					"label": "Background fetch indicator",
-					"description": "Show a loading indicator whenever a query is running in the background"
+					"label": "背景获取指示器",
+					"description": "当查询在后台运行时显示加载指示器"
 				},
 				"liveRefetchToggle": {
-					"label": "Live refetch",
-					"description": "Refetch queries on the fly to hydrate the UI with new data as it comes in. This can be resource intensive"
+					"label": "实时重新获取",
+					"description": "当出现新数据时，在运行时重新获取查询以更新界面。这可能会消耗较多资源"
 				},
 				"enableJobOverlayToggle": {
-					"label": "Job overlay",
-					"description": "Show a floating overlay while a job is running"
+					"label": "作业叠加",
+					"description": "当作业运行时显示浮动叠加层"
 				}
 			}
 		},
 		"app/apiKeys": {
-			"helmet": "API keys",
-			"title": "API keys",
-			"description": "Manage your generated Stump API keys",
+			"helmet": "API 密钥",
+			"title": "API 密钥",
+			"description": "管理你生成的 Stump API 密钥",
 			"shared": {
 				"fields": {
-					"name": "Name",
-					"expiration": "Expiration",
-					"last_used": "Last used",
-					"created": "Created",
-					"permissions": "Permissions",
-					"inherited": "Inherited",
-					"explicit": "Explicit"
+					"name": "名称",
+					"expiration": "过期时间",
+					"last_used": "上次使用",
+					"created": "创建时间",
+					"permissions": "权限",
+					"inherited": "继承",
+					"explicit": "显式"
 				}
 			},
 			"sections": {
 				"inspector": {
-					"heading": "API key",
-					"description": "A detailed view of this key",
+					"heading": "API 密钥",
+					"description": "此密钥的详细视图",
 					"unrestrictedKey": {
-						"heading": "Unrestricted key",
-						"description": "Since you are the server owner, this key has unrestricted access when configured to inherit permissions. Please be careful."
+						"heading": "无限制密钥",
+						"description": "由于你是服务器所有者，当配置为继承权限时，此密钥具有无限制访问权限。请谨慎。"
 					}
 				},
 				"createKey": {
 					"modal": {
-						"trigger": "Create API key",
+						"trigger": "创建 API 密钥",
 						"heading": {
-							"creating": "Create API key",
-							"created": "Created key"
+							"creating": "创建 API 密钥",
+							"created": "已创建密钥"
 						},
 						"description": {
-							"creating": "API keys are long-lived credentials that can be used to authenticate with the API",
-							"created": "Your new API key has been created. Save the secret somewhere safe, as it will not be shown again"
+							"creating": "API 密钥是可用于与 API 进行身份验证的长期凭据",
+							"created": "你的新 API 密钥已创建。请将密钥保存到安全的地方，因为它不会再次显示"
 						},
-						"inheritDisclaimer": "This API key will inherit your full permissions, which means it can do anything you can do. Be careful with this setting",
-						"createdKey": "Created key",
-						"savedConfirm": "I saved my key",
-						"submit": "Create key"
+						"inheritDisclaimer": "此 API 密钥将继承你的全部权限，这意味着它可以执行你能做的任何事情。请谨慎使用此设置",
+						"createdKey": "已创建密钥",
+						"savedConfirm": "我已保存我的密钥",
+						"submit": "创建密钥"
 					}
 				},
 				"table": {
-					"title": "Your keys",
-					"description": "These are the API keys you have created",
+					"title": "你的密钥",
+					"description": "这些是你已创建的 API 密钥",
 					"actionMenu": {
-						"inspect": "Inspect",
-						"delete": "Delete"
+						"inspect": "查看",
+						"delete": "删除"
 					},
 					"empty": {
-						"title": "You haven't created any keys yet",
-						"action": "Create an API key to get started"
+						"title": "你尚未创建任何密钥",
+						"action": "创建一个 API 密钥以开始使用"
 					},
-					"noExpiration": "No expiration set"
+					"noExpiration": "未设置过期时间"
 				}
 			}
 		},
 		"app/reader": {
-			"helmet": "Reader settings",
-			"title": "Reader settings",
-			"description": "Default options for the Stump readers. These are bound to your current device only",
+			"helmet": "阅读设置",
+			"title": "阅读设置",
+			"description": "Stump 阅读器的默认选项。这些选项仅绑定到当前设备",
 			"sections": {
 				"universal": {
 					"sections": {
 						"readingDirection": {
-							"label": "Reading direction",
-							"description": "The direction in which the reader will progress through pages"
+							"label": "阅读方向",
+							"description": "阅读器翻页的方向"
 						}
 					}
 				},
 				"imageBasedBooks": {
-					"label": "Image-based books",
-					"description": "Comic books, manga, and other image-based books",
+					"label": "图书",
+					"description": "卡通、漫画和其他以图为主的书",
 					"sections": {
 						"preloadAheadCount": {
-							"label": "Preload ahead count",
-							"description": "The number of pages to preload ahead of the current page"
+							"label": "向前预加载数量",
+							"description": "预加载到当前页面之后的页数"
 						},
 						"preloadBehindCount": {
-							"label": "Preload behind count",
-							"description": "The number of pages to preload behind the current page"
+							"label": "向后预加载数量",
+							"description": "预加载到当前页面之前的页数"
 						}
 					}
 				},
 				"textBasedBooks": {
-					"label": "Ebook reader",
-					"description": "Default settings for text-based books",
+					"label": "电子书阅读器",
+					"description": "文本类书籍的默认设置",
 					"sections": {
 						"fontSize": {
-							"label": "Font size",
-							"description": "The size of the font used in the reader"
+							"label": "字体大小",
+							"description": "阅读器中使用的字体大小"
 						},
 						"fontFamily": {
-							"label": "Font family",
-							"description": "The font used in the reader"
+							"label": "字体族",
+							"description": "阅读器中使用的字体"
 						},
 						"lineHeight": {
-							"label": "Line height",
-							"description": "The height of the lines in the reader"
+							"label": "行高",
+							"description": "阅读器中的行高"
 						}
 					}
 				},
 				"data": {
 					"sections": {
 						"clearStore": {
-							"label": "Clear preferences",
-							"description": "Reset all individual book settings that override the defaults",
-							"button": "Clear preferences"
+							"label": "清除偏好设置",
+							"description": "重置所有覆盖默认值的单本书设置",
+							"button": "清除偏好设置"
 						}
 					}
 				}
 			}
 		},
 		"app/desktop": {
-			"helmet": "Desktop settings",
-			"title": "Desktop settings",
-			"description": "Settings related to the Stump desktop application",
+			"helmet": "桌面设置",
+			"title": "桌面设置",
+			"description": "Stump 桌面应用程序相关设置",
 			"sections": {
 				"configuredServers": {
-					"label": "Configured servers",
-					"description": "The list of Stump servers you can connect to",
-					"getStarted": "Add a server to get started",
+					"label": "已配置的服务器",
+					"description": "你可以连接的 Stump 服务器列表",
+					"getStarted": "添加一个服务器以开始使用",
 					"unreachableServer": {
-						"tooltip": "Server unreachable"
+						"tooltip": "服务器不可达"
 					},
 					"activeServer": {
-						"tooltip": "Current server"
+						"tooltip": "当前服务器"
 					},
 					"addOrEditServer": {
 						"validation": {
-							"nameExists": "A server with this name already exists",
-							"nameForbidden": "This name is reserved",
-							"urlExists": "A server with this URL already exists"
+							"nameExists": "已存在同名服务器",
+							"nameForbidden": "此名称被保留",
+							"urlExists": "已存在相同 URL 的服务器"
 						},
 						"fields": {
 							"name": {
-								"label": "Name",
-								"description": "A friendly name to identify this server",
-								"placeholder": "My server"
+								"label": "名称",
+								"description": "用于识别此服务器的友好名称",
+								"placeholder": "我的服务器"
 							},
 							"uri": {
 								"label": "URI",
-								"description": "The URL of the Stump server",
+								"description": "Stump 服务器的 URL",
 								"placeholder": "https://stump.example.com"
 							}
 						}
 					},
 					"addServer": {
-						"trigger": "Add server",
-						"title": "Add a new server",
-						"description": "Add a new Stump server to the desktop application",
-						"confirm": "Add server"
+						"trigger": "添加服务器",
+						"title": "添加新服务器",
+						"description": "向桌面版应用添加新的 Stump 服务器",
+						"confirm": "添加服务器"
 					},
 					"editServer": {
-						"tooltip": "Edit server",
-						"title": "Edit server",
-						"description": "Edit the details of this server",
-						"confirm": "Save changes"
+						"tooltip": "编辑服务器",
+						"title": "编辑服务器",
+						"description": "编辑此服务器的详细信息",
+						"confirm": "保存更改"
 					},
 					"deleteServer": {
-						"tooltip": "Delete server",
+						"tooltip": "删除服务器",
 						"confirmation": {
-							"title": "Delete this server",
-							"description": "This will remove the server from the desktop application",
-							"disclaimerActiveServer": "This server is currently active. You will be logged out",
-							"disclaimerLastServer": "This is the last configured server. You will be logged out and have to reconfigure any servers in the initialization process",
-							"confirm": "Delete server"
+							"title": "删除此服务器",
+							"description": "这将从桌面版应用中移除该服务器",
+							"disclaimerActiveServer": "此服务器当前为活跃服务器。你将被登出",
+							"disclaimerLastServer": "这是最后一个配置的服务器。你将被登出，并在初始化过程中重新配置任何服务器",
+							"confirm": "删除服务器"
 						}
 					},
 					"switchToServer": {
-						"tooltip": "Switch to server",
+						"tooltip": "切换到服务器",
 						"confirmation": {
-							"title": "Switch to this server",
-							"description": "This will log you out of your current server",
-							"confirm": "Switch to server",
-							"server": "Server",
+							"title": "切换到此服务器",
+							"description": "这将登出你当前的服务器",
+							"confirm": "切换到服务器",
+							"server": "服务器",
 							"uri": "URL"
 						}
 					},
 					"resetConfiguration": {
-						"label": "Delete all servers",
+						"label": "删除所有服务器",
 						"description": [
-							"Delete all configured servers from the desktop application",
-							"This action cannot be undone"
+							"从桌面版应用中删除所有配置的服务器",
+							"此操作不可撤销"
 						],
 						"confirmation": {
-							"trigger": "Delete all servers",
-							"title": "Delete all servers",
-							"description": "This will remove all servers from the desktop application",
-							"disclaimer": "You will be logged out and have to reconfigure any servers in the initialization process",
-							"confirm": "Delete all servers"
+							"trigger": "删除所有服务器",
+							"title": "删除所有服务器",
+							"description": "这将从桌面版应用中移除所有服务器",
+							"disclaimer": "你将被登出，并在初始化过程中重新配置任何服务器",
+							"confirm": "删除所有服务器"
 						}
 					},
 					"resetTokens": {
-						"label": "Delete tokens",
+						"label": "删除令牌",
 						"description": [
-							"Remove all securely-stored tokens for your servers, including API keys",
-							"You will have to re-authenticate with and/or re-configure each server"
+							"移除所有安全存储的服务器令牌，包括API密钥",
+							"你将需要重新在每个服务器上进行身份验证"
 						],
 						"confirmation": {
-							"trigger": "Delete tokens",
-							"title": "Delete tokens",
-							"description": "Are you sure you want to delete all stored tokens?",
-							"confirm": "Delete tokens"
+							"trigger": "删除令牌",
+							"title": "删除令牌",
+							"description": "你确定要删除所有令牌吗？",
+							"confirm": "删除令牌"
 						}
 					}
 				},
 				"optionalFeatures": {
-					"label": "Optional features",
-					"description": "Manage the optional features unique to the desktop application",
+					"label": "可选功能",
+					"description": "管理桌面版应用独有的可选功能",
 					"bundledServer": {
-						"label": "Bundled server",
-						"description": "Run the bundled server in the background while the desktop application is running (requires restart)"
+						"label": "捆绑服务器",
+						"description": "在桌面版应用运行时在后台运行捆绑服务器（需要重启）"
 					},
 					"discordPresence": {
-						"label": "Discord Presence",
-						"description": "Display your Stump activity in Discord using Discord Rich Presence",
-						"reconnect": "Reconnect to Discord"
+						"label": "Discord 状态",
+						"description": "使用 Discord Rich Presence 在 Discord 中显示你的 Stump 活动",
+						"reconnect": "重新连接到 Discord"
 					}
 				}
 			}
 		},
 		"server/general": {
-			"helmet": "Server settings",
-			"title": "Server settings",
-			"description": "General settings related to your Stump server instance",
+			"helmet": "服务器设置",
+			"title": "服务器设置",
+			"description": "与您的 Stump 服务器实例相关的常规设置",
 			"sections": {
 				"updateAvailable": {
-					"message": "Your server is not up to date. Please update to the latest version!"
+					"message": "您的服务器不是最新版本。请更新到最新版本！"
 				},
 				"serverInfo": {
-					"title": "Server information",
-					"description": "Basic details about your Stump server instance",
+					"title": "服务器信息",
+					"description": "Stump 服务器实例的基本详细信息",
 					"build": {
-						"label": "Build",
-						"description": "Details about the version and build",
+						"label": "构建",
+						"description": "关于版本和构建的细节",
 						"version": {
-							"semver": "Version",
-							"commitHash": "Exact commit",
-							"date": "Build date"
+							"semver": "版本",
+							"commitHash": "确切提交",
+							"date": "编译日期"
 						}
 					},
 					"nonStableChannel": {
-						"title": "You are running a non-stable build of Stump",
+						"title": "您正在运行一个不稳定的Stump 构建",
 						"description": [
-							"It looks like you are running the",
-							"build channel"
+							"看起来您正在运行",
+							"构建频道"
 						]
 					}
 				},
 				"helpfulLinks": {
-					"title": "Helpful links",
-					"description": "Links to resources that may be helpful for managing your Stump server instance",
+					"title": "帮助链接",
+					"description": "可能有助于管理Stump 服务器实例的资源链接",
 					"links": {
-						"documentation": "Documentation",
-						"changelog": "Changelog"
+						"documentation": "文档",
+						"changelog": "更改日志"
 					}
 				},
 				"serverPublicUrl": {
-					"label": "Public URL",
-					"description": "The URL that your server is accessible from outside your network, if applicable. This will enable invite links and other features"
+					"label": "公共 URL",
+					"description": "如果适用，你的服务器从外部网络可访问的 URL。这将启用邀请链接和其他功能"
 				},
 				"customEmojis": {
-					"title": "Custom emojis",
-					"description": "Upload and manage custom image emojis for your server",
-					"dropzone": "Drop an image or click to select",
+					"title": "自定义表情",
+					"description": "为您的服务器上传和管理自定义图像 emoji",
+					"dropzone": "拖放图片到此处或点击以选择",
 					"input": {
-						"label": "Emoji name",
-						"placeholder": "e.g. party_parrot"
+						"label": "表情符号名称",
+						"placeholder": "例如：party_parrot"
 					},
 					"deleteModal": {
-						"title": "Delete emoji",
-						"description": "Are you sure you want to delete this emoji?"
+						"title": "删除表情",
+						"description": "确实要删除此录音？"
 					},
-					"noCustomEmojis": "No custom emojis have been added yet",
-					"invalidName": "Please enter a valid name for your emoji",
-					"uploadError": "Failed to upload emoji",
-					"uploadSuccess": "Emoji uploaded",
-					"renameSuccess": "Emoji renamed",
-					"renameError": "Failed to rename emoji",
-					"deleteSuccess": "Emoji deleted",
-					"deleteError": "Failed to delete emoji"
+					"noCustomEmojis": "尚未添加自定义表情",
+					"invalidName": "请输入有效的表情名称",
+					"uploadError": "头像上传失败",
+					"uploadSuccess": "表情已上传",
+					"renameSuccess": "Emoji重命名了",
+					"renameError": "重命名表情失败",
+					"deleteSuccess": "表情已删除",
+					"deleteError": "删除表情失败"
 				}
 			}
 		},
 		"server/logs": {
-			"helmet": "Logs",
-			"title": "Logs",
-			"description": "The logs generated by your Stump server instance",
+			"helmet": "日志",
+			"title": "日志",
+			"description": "Stump 服务器实例生成的日志",
 			"sections": {
 				"persistedLogs": {
-					"title": "Persisted logs",
-					"description": "These logs have been manually persisted to the database, typically associated with a specific job or event",
+					"title": "已存日志",
+					"description": "这些日志已手动保存在数据库中，通常与特定任务或事件关联",
 					"table": {
 						"columns": {
-							"level": "Level",
-							"message": "Message",
-							"timestamp": "Timestamp"
+							"level": "级别",
+							"message": "消息",
+							"timestamp": "时间戳"
 						},
-						"emptyHeading": "No logs to display",
-						"emptySubtitle": "Your server is either very healthy or very unhealthy"
+						"emptyHeading": "没有可显示的日志",
+						"emptySubtitle": "您的服务器非常健康或很不健康"
 					},
 					"deleteLogs": {
-						"title": "Delete logs",
-						"description": "Permanently delete all persisted logs from the database",
-						"disclaimer": "This action cannot be undone",
-						"confirm": "Delete logs"
+						"title": "删除日志",
+						"description": "永久从数据库删除所有持久化日志",
+						"disclaimer": "此操作不可撤销",
+						"confirm": "删除日志"
 					}
 				},
 				"liveLogs": {
-					"title": "Live logs feed",
-					"description": "Streamed directly from your Stump server instance in real-time"
+					"title": "实时日志",
+					"description": "直接实时从 Stump 服务器串流"
 				}
 			}
 		},
 		"server/jobs": {
-			"helmet": "Jobs",
-			"title": "Jobs",
-			"description": "Background jobs that run on your Stump server instance",
+			"helmet": "任务",
+			"title": "任务",
+			"description": "Stump 服务器实例上运行的后台任务",
 			"sections": {
 				"scheduling": {
-					"title": "Scheduled Jobs",
-					"description": "Some jobs can be configured to automatically run on a schedule",
-					"disclaimer": "The job scheduler is really basic and will be improved in the future. Please reach out for feedback or suggestions!",
+					"title": "计划任务",
+					"description": "一些作业可以配置为自动运行计划",
+					"disclaimer": "工作计划器目前较基础，将来会得到改进。欢迎提供反馈或建议！",
 					"createOrUpdateConfig": {
 						"fields": {
 							"intervalSecs": {
-								"label": "Interval",
-								"description": "How often the job should run (in seconds)",
-								"placeholder": "e.g. \"86400\" for once a day"
+								"label": "间隔",
+								"description": "任务运行频率(秒)",
+								"placeholder": "例如：\"86400\" 每日一次"
 							},
 							"intervalPreset": {
-								"label": "Preset",
+								"label": "预设值",
 								"options": {
-									"everySixHours": "Every 6 hours",
-									"everyTwelveHours": "Every 12 hours",
-									"oncePerDay": "Once a day",
-									"oncePerWeek": "Once a week",
-									"oncePerMonth": "Once a month"
+									"everySixHours": "每 6 小时",
+									"everyTwelveHours": "每 12 小时",
+									"oncePerDay": "每天一次",
+									"oncePerWeek": "每周一次",
+									"oncePerMonth": "每月一次"
 								}
 							},
 							"includedLibraryIds": {
-								"label": "Included libraries",
-								"description": "Choose which libraries are included"
+								"label": "包含的库",
+								"description": "选择包含哪些库"
 							}
 						},
-						"restartRequired": "Changes to this configuration will take effect after a server restart"
+						"restartRequired": "更改此配置将在服务器重启后生效"
 					}
 				},
 				"history": {
-					"title": "History",
-					"description": "A record of jobs that have been run on your Stump server instance",
+					"title": "历史记录",
+					"description": "Stump 服务器上已运行的任务记录",
 					"table": {
 						"columns": {
-							"name": "Type",
-							"description": "Description",
-							"status": "Status",
-							"createdAt": "Started At",
-							"elapsed": "Elapsed",
-							"tasks": "Tasks"
+							"name": "类型",
+							"description": "描述",
+							"status": "状态",
+							"createdAt": "开始于",
+							"elapsed": "已用时",
+							"tasks": "任务"
 						},
-						"emptyHeading": "There are no jobs to display",
-						"emptySubtitle": "You can't have a job if you don't have a job",
-						"deleteAllMessage": "Job history and statistics may be deleted from the database at any time. This action cannot be undone"
+						"emptyHeading": "没有要显示的任务",
+						"emptySubtitle": "如果你没有任务，你就不可能有任务",
+						"deleteAllMessage": "任务历史和统计可以随时从数据库中删除。此操作不能撤消"
 					},
 					"deleteJobHistory": {
-						"title": "Delete job history",
-						"description": "Permanently delete all job history from the database",
-						"confirmText": "Are you sure you want to delete all job history?",
-						"confirm": "Delete",
-						"emptyState": "No jobs to clear"
+						"title": "删除扫描历史",
+						"description": "永久从数据库删除所有持久化日志",
+						"confirmText": "你确定要删除全部历史吗？",
+						"confirm": "删除",
+						"emptyState": "没有要清除的任务"
 					}
 				}
 			}
 		},
 		"server/users": {
-			"helmet": "User management",
-			"title": "Users",
-			"description": "Manage the users on this server",
+			"helmet": "用户管理",
+			"title": "用户",
+			"description": "管理此服务器上的用户",
 			"createUser": {
-				"helmet": "Create user",
-				"title": "Create user",
-				"description": "Create a new user on this server"
+				"helmet": "创建用户",
+				"title": "创建用户",
+				"description": "在此服务器上创建新用户"
 			},
 			"updateUser": {
-				"helmet": "Update user",
-				"title": "Update user",
-				"description": "Update the details of this user"
+				"helmet": "更新用户",
+				"title": "更新用户",
+				"description": "更新此用户的详细信息"
 			},
 			"createOrUpdateForm": {
 				"accessControl": {
-					"heading": "Access control and restrictions",
+					"heading": "访问控制和限制",
 					"subtitle": [
-						"Configure any restrictions you want to apply to this user. For more information about access control, see the",
-						"documentation"
+						"配置您想要对此用户应用的任何限制。欲了解更多有关访问控制的信息，请参阅",
+						"文档"
 					],
 					"ageRestriction": {
-						"label": "Age restriction",
-						"description": "Restricts the user from accessing content above the set age rating threshold",
+						"label": "年龄限制",
+						"description": "限制用户访问设定年龄分级阈值以上的内容",
 						"placeholder": "13",
 						"enforceUnset": {
-							"label": "Enforce on unset",
-							"description": "If enabled, users will be restricted from accessing content with no age rating available"
+							"label": "在未设置时生效",
+							"description": "如果启用此选项，用户将被限制访问没有年龄评级的内容"
 						}
 					},
 					"tagRestriction": {
-						"label": "Tag restrictions",
-						"description": "Restricts the user from accessing content with the selected tags",
-						"placeholder": "Adult, Gore"
+						"label": "标签限制",
+						"description": "限制用户访问选中标签的内容",
+						"placeholder": "成人, 血腥"
 					}
 				},
 				"permissions": {
-					"heading": "Permissions",
+					"heading": "权限",
 					"subtitle": [
-						"Select the permissions you want to grant to this user. For more information on what each permission does, see the",
-						"documentation"
+						"选择您想要授予此用户的权限。欲了解更多关于每个权限的信息，请查看",
+						"文档"
 					],
 					"bookclub": {
-						"label": "Book Clubs",
+						"label": "读书俱乐部",
 						"read": {
-							"label": "Access book club features",
-							"description": "Allows the user to access book club features, including viewing and joining book clubs"
+							"label": "读书俱乐部功能访问",
+							"description": "允许用户访问读书俱乐部功能，包括查看和加入读书俱乐部"
 						},
 						"create": {
-							"label": "Create book clubs",
-							"description": "Allows the user to create new book clubs"
+							"label": "创建读书俱乐部",
+							"description": "允许用户创建新的读书俱乐部"
 						}
 					},
 					"feature": {
-						"label": "Feature Opt-In",
+						"label": "功能选择",
 						"api_keys": {
-							"label": "API keys",
-							"description": "Allow the user to manage their own API keys"
+							"label": "API 密钥",
+							"description": "允许用户管理自己的 API 密钥"
 						},
 						"koreader_sync": {
-							"label": "KoReader sync",
-							"description": "Allow the user to access the KoReader sync integration"
+							"label": "KoReader 同步",
+							"description": "允许用户访问 KoReader 同步集成"
 						}
 					},
 					"file": {
-						"label": "File Management",
+						"label": "文件管理",
 						"explorer": {
-							"label": "File explorer",
-							"description": "Allows the user to access the various file explorers.\nContent restriction cannot be guaranteed when this feature is granted"
+							"label": "文件浏览器",
+							"description": "允许用户访问各种文件浏览器。若启用此功能则无法保证内容限制"
 						},
 						"download": {
-							"label": "Download files",
-							"description": "Allows the user to download files from the server"
+							"label": "下载文件",
+							"description": "允许用户从服务器下载文件"
 						},
 						"upload": {
-							"label": "Upload files",
-							"description": "Allows the user to upload files to the server"
+							"label": "上传文件",
+							"description": "允许用户上传文件到服务器"
 						}
 					},
 					"emailer": {
-						"label": "Emailers",
+						"label": "邮件发送器",
 						"read": {
-							"label": "Access emailers",
-							"description": "Allows the user to view the configured emailers"
+							"label": "访问邮件发送器",
+							"description": "允许用户查看已配置的邮件发送器"
 						},
 						"create": {
-							"label": "Create emailers",
-							"description": "Allows the user to create new emailers"
+							"label": "创建邮件发送器",
+							"description": "允许用户创建新的邮件发送器"
 						},
 						"manage": {
-							"label": "Manage emailers",
-							"description": "Allows the user to manage existing emailers"
+							"label": "管理邮件发送器",
+							"description": "允许用户管理现有的邮件发送器"
 						}
 					},
 					"email": {
-						"label": "Emailing",
+						"label": "邮件发送",
 						"send": {
-							"label": "Send emails",
-							"description": "Allows the user to send emails from the server to any configured aliases"
+							"label": "发送邮件",
+							"description": "允许用户从服务器向任何配置的别名发送邮件"
 						},
 						"arbitrary_send": {
-							"label": "Send arbitrary emails",
-							"description": "Allows the user to send emails from the server to any email address"
+							"label": "发送任意邮件",
+							"description": "允许用户从服务器向任何邮箱地址发送邮件"
 						}
 					},
 					"library": {
-						"label": "Library Management",
+						"label": "书库管理",
 						"create": {
-							"label": "Create libraries",
-							"description": "Allows the user to create new libraries.\nIncludes permissions to edit and scan"
+							"label": "新建书库",
+							"description": "允许用户创建新的书库。\n包括扫描和编辑的权限"
 						},
 						"scan": {
-							"label": "Scan libraries",
-							"description": "Allows the user to initiate scans for existing libraries"
+							"label": "扫描书库",
+							"description": "允许用户对现有书库启动扫描"
 						},
 						"edit": {
-							"label": "Edit libraries",
-							"description": "Allows the user to edit basic details for existing libraries"
+							"label": "编辑书库",
+							"description": "允许用户编辑现有书库的基本信息"
 						},
 						"manage": {
-							"label": "Manage libraries",
-							"description": "Allows the user to manage advanced settings for existing libraries.\nIncludes permissions to edit and scan"
+							"label": "管理书库",
+							"description": "允许用户管理现有书库的高级设置。\n包括扫描和编辑的权限"
 						},
 						"delete": {
-							"label": "Delete libraries",
-							"description": "Allows the user to delete existing libraries.\nIncludes permissions to edit, manage, and scan"
+							"label": "删除书库",
+							"description": "允许用户删除现有的书库。\n包括扫描、管理和编辑的权限"
 						}
 					},
 					"server": {
-						"label": "Server Management",
+						"label": "服务器管理",
 						"manage": {
-							"label": "Manage server",
-							"description": "Allows the user to manage the server.\nIncludes *many* other permissions"
+							"label": "管理服务器",
+							"description": "允许用户管理服务器。\n包括*许多*其他权限"
 						}
 					},
 					"user": {
-						"label": "User Management",
+						"label": "用户管理",
 						"read": {
-							"label": "Read users",
-							"description": "Allows the user to query other users on the server. This is required for some other features, e.g. excluding users from accessing a library"
+							"label": "读取用户",
+							"description": "允许用户查询服务器上的其他用户。这对于某些功能是必需的，例如排除用户访问书库"
 						},
 						"manage": {
-							"label": "Manage users",
-							"description": "Allows the user to manage other users on the server.\nIncludes permissions to read, create, and update"
+							"label": "管理用户",
+							"description": "允许用户管理服务器上的其他用户。\n包括读、创建和更新的权限"
 						}
 					},
 					"smartlist": {
-						"label": "Smart Lists",
+						"label": "智能列表",
 						"read": {
-							"label": "Access smart list feature",
-							"description": "Allows the user to access smart lists features. Granular permissions are not yet implemented, so this\nincludes permissions to read, create, and update their own lists"
+							"label": "访问智能列表功能",
+							"description": "允许用户访问智能列表功能。 Granular 权限尚未实现，\n包括读、创建和更新他们自己的列表的权限"
 						}
 					}
 				},
 				"validation": {
-					"ageRestrictionTooLow": "Age restriction cannot be less than 0",
-					"missingUsername": "Username is required",
-					"missingPassword": "Password is required",
-					"usernameAlreadyExists": "Username already exists"
+					"ageRestrictionTooLow": "年龄限制不能小于0",
+					"missingUsername": "用户名为必填项",
+					"missingPassword": "密码为必填项",
+					"usernameAlreadyExists": "用户名已存在"
 				},
-				"createSubmitButton": "Create user",
-				"updateSubmitButton": "Update user"
+				"createSubmitButton": "创建用户",
+				"updateSubmitButton": "更新用户"
 			},
 			"loginActivity": {
 				"deleteConfirmation": {
-					"title": "Delete activity",
-					"description": "All records of login activity will be permanently deleted from the database",
-					"confirm": "Delete"
+					"title": "删除活动",
+					"description": "登录活动的所有记录将从数据库中永久删除",
+					"confirm": "删除"
 				}
 			}
 		},
 		"server/email": {
-			"helmet": "Email settings",
-			"title": "Email",
-			"description": "Settings related to configuring an SMTP emailer for your Stump server instance",
+			"helmet": "邮件设置",
+			"title": "邮件",
+			"description": "配置 Stump 服务器实例的 SMTP 邮件功能的设置",
 			"sections": {
 				"emailers": {
-					"title": "SMTP emailers",
-					"description": "The clients you have configured for sending emails from your Stump server instance",
-					"singleInstanceDisclaimer": "While Stump supports multiple SMTP configurations in the backend, only one can be configured on the UI. This will be improved in the future",
+					"title": "SMTP 邮件发送器",
+					"description": "你配置的用于从你的 Stump 服务器实例发送邮件的客户端",
+					"singleInstanceDisclaimer": "虽然 Stump 在后端支持多个 SMTP 配置，但 UI 上只能配置一个。将来会改进",
 					"list": {
-						"emptyHeading": "No SMTP emailers configured",
-						"primaryEmailer": "Primary emailer",
+						"emptyHeading": "未配置SMTP电子邮件服务器",
+						"primaryEmailer": "首选电子邮箱",
 						"sendHistory": {
-							"heading": "Send history",
-							"description": "A record of emails sent from this emailer",
+							"heading": "发送历史",
+							"description": "从此邮件发送器发送的邮件记录",
 							"table": {
 								"columns": {
-									"to": "To",
-									"subject": "Subject",
-									"status": "Status",
-									"createdAt": "Sent at"
+									"to": "收件人",
+									"subject": "主题",
+									"status": "状态",
+									"createdAt": "发送时间"
 								}
 							},
-							"emptyHeading": "No history",
-							"emptySubtitle": "The history of this emailer is empty. It has either not been used or the history has been cleared"
+							"emptyHeading": "无历史记录",
+							"emptySubtitle": "此邮件发送器的历史为空。它要么未被使用，要么历史已被清除"
 						}
 					}
 				},
 				"devices": {
-					"title": "Email devices",
-					"description": "The device aliases you have configured for receiving emails from your Stump server instance",
-					"addDevice": "Add device alias",
+					"title": "邮件设备",
+					"description": "你配置的用于从你的 Stump 服务器实例接收邮件的设备别名",
+					"addDevice": "添加设备别名",
 					"addOrUpdateDevice": {
 						"title": {
-							"create": "Create device alias",
-							"update": "Update device alias"
+							"create": "创建设备别名",
+							"update": "更新设备别名"
 						},
 						"name": {
-							"label": "Name",
-							"description": "A friendly name to uniquely identify this device alias"
+							"label": "名称",
+							"description": "用于唯一标识此设备别名的友好名称"
 						},
 						"email": {
-							"label": "Email",
-							"description": "The email address this alias will be associated with"
+							"label": "邮箱",
+							"description": "此别名将关联的邮箱地址"
 						},
 						"forbidden": {
-							"label": "Forbidden",
-							"description": "When enabled, no user may send emails to the address associated with this alias"
+							"label": "禁止",
+							"description": "启用后，任何用户都不能向与此别名关联的地址发送邮件"
 						},
 						"submit": {
-							"create": "Create device alias",
-							"update": "Update device alias"
+							"create": "创建设备别名",
+							"update": "更新设备别名"
 						}
 					},
 					"table": {
-						"emptyHeading": "No devices registered",
-						"emptySubtitle": "Create a new device alias for future use"
+						"emptyHeading": "没有已注册的设备",
+						"emptySubtitle": "创建一个新的设备别名以供将来使用"
 					}
 				}
 			},
 			"createOrUpdateForm": {
 				"name": {
-					"label": "Name",
-					"description": "A friendly name to uniquely identify this emailer"
+					"label": "名称",
+					"description": "用于唯一标识此邮件发送器的友好名称"
 				},
 				"smtpSettings": {
-					"heading": "SMTP settings",
-					"description": "The SMTP-specific settings for this emailer"
+					"heading": "SMTP 设置",
+					"description": "此邮件发送器的 SMTP 特定设置"
 				},
 				"smtpProvider": {
-					"label": "SMTP provider preset",
-					"description": "The provider of the SMTP server. This is used to prefill some common settings, but doesn't capture all providers"
+					"label": "SMTP 提供商预设",
+					"description": "SMTP 服务器的提供商。这用于预填充一些常见设置，但并非涵盖所有提供商"
 				},
 				"smtpHost": {
-					"label": "SMTP host",
-					"description": "The hostname of the SMTP server"
+					"label": "SMTP 主机",
+					"description": "SMTP 服务器的主机名"
 				},
 				"smtpPort": {
-					"label": "SMTP port",
-					"description": "The port of the SMTP server"
+					"label": "SMTP 端口",
+					"description": "SMTP 服务器的端口"
 				},
 				"tlsEnabled": {
-					"label": "TLS enabled",
-					"description": "If enabled, the connection to the SMTP server will be encrypted"
+					"label": "启用 TLS",
+					"description": "如果启用，与 SMTP 服务器的连接将被加密"
 				},
 				"username": {
-					"label": "Username",
-					"description": "The username for authenticating with the SMTP server. This is typically the email address"
+					"label": "用户名",
+					"description": "用于与 SMTP 服务器进行身份验证的用户名。这通常是邮箱地址"
 				},
 				"password": {
-					"label": "Password",
-					"description": "The password for authenticating with the SMTP server. If you're using Gmail, you may need to generate an app-specific password"
+					"label": "密码",
+					"description": "用于与 SMTP 服务器进行身份验证的密码。如果你使用 Gmail，可能需要生成应用专用密码"
 				},
 				"senderSettings": {
-					"heading": "Sender settings",
-					"description": "The settings for the sender of the email"
+					"heading": "发送者设置",
+					"description": "邮件发送者的设置"
 				},
 				"senderDisplayName": {
-					"label": "Sender display name",
-					"description": "The name that will be displayed to recipients"
+					"label": "发送者显示名称",
+					"description": "将显示给收件人的名称"
 				},
 				"senderEmail": {
-					"label": "Sender email address",
-					"description": "The email address that will be displayed to recipients"
+					"label": "发送者邮箱地址",
+					"description": "将显示给收件人的邮箱地址"
 				},
 				"additionalSettings": {
-					"heading": "Additional settings",
-					"description": "Additional settings for the emailer"
+					"heading": "附加设置",
+					"description": "邮件发送器的附加设置"
 				},
 				"maxAttachmentSize": {
-					"label": "Max attachment size",
-					"description": "The maximum size, in bytes, that an attachment can be"
+					"label": "最大附件大小",
+					"description": "附件的最大字节大小"
 				},
 				"submit": {
-					"create": "Create emailer",
-					"update": "Update emailer"
+					"create": "创建邮件发送器",
+					"update": "更新邮件发送器"
 				},
 				"testEmailer": {
-					"button": "Send test email",
-					"recipientLabel": "Test recipient",
-					"recipientDescription": "An email address to send the test email to",
-					"success": "Test email sent successfully",
+					"button": "电子邮件发送测试",
+					"recipientLabel": "测试收件人",
+					"recipientDescription": "发送测试邮件的电子邮件地址",
+					"success": "发送测试邮件成功",
 					"error": {
-						"title": "Failed to send test email",
-						"description": "Check your SMTP settings and try again"
+						"title": "测试邮件发送失败",
+						"description": "检查您的 SMTP 设置并重试"
 					}
 				}
 			},
 			"createEmailer": {
-				"helmet": "Create emailer",
-				"title": "Create emailer",
-				"description": "Create a new SMTP emailer for your Stump server instance"
+				"helmet": "创建邮件发送器",
+				"title": "创建邮件发送器",
+				"description": "为你的 Stump 服务器实例创建新的 SMTP 邮件发送器"
 			},
 			"updateEmailer": {
-				"helmet": "Update emailer",
-				"title": "Update emailer",
-				"description": "Update the details of this SMTP emailer"
+				"helmet": "更新邮件发送器",
+				"title": "更新邮件发送器",
+				"description": "更新此用户的详细信息"
 			}
 		}
 	},
 	"jobOverlay": {
-		"backupHeading": "Job in Progress"
+		"backupHeading": "正在执行的任务"
 	},
 	"libraryStats": {
-		"seriesCount": "Total Series",
-		"bookCount": "Total Books",
-		"diskUsage": "Disk Usage"
+		"seriesCount": "总系列数",
+		"bookCount": "书籍总数",
+		"diskUsage": "磁盘使用量"
 	},
 	"noLibraries": {
-		"heading": "Nothing to see here",
-		"messagePrefix": "You can't see what you don't have",
+		"heading": "暂无内容",
+		"messagePrefix": "你不能看到你没有的内容",
 		"message": {
-			"create": "Create a library to get started",
-			"wait": "Once libraries are created, they'll be displayed here"
+			"create": "创建一个库以开始使用",
+			"wait": "一旦创建了库，它们将会显示在这里"
 		},
 		"links": {
-			"create": "Create library",
-			"settings": "Go to settings"
+			"create": "新建书库",
+			"settings": "前往设置"
 		}
 	},
 	"pagination": {
 		"buttons": {
-			"next": "Next",
-			"previous": "Previous"
+			"next": "下一页",
+			"previous": "上一页"
 		},
 		"popover": {
-			"heading": "Go to page",
+			"heading": "转到页面",
 			"buttons": {
-				"confirm": "Go",
-				"cancel": "Cancel"
+				"confirm": "跳转",
+				"cancel": "取消"
 			}
 		}
 	},
 	"signOutModal": {
-		"title": "Sign out",
-		"message": "Are you sure you want to sign out?",
+		"title": "退出登录",
+		"message": "您确定要退出登录吗？",
 		"buttons": {
-			"cancel": "Cancel",
-			"signOut": "Sign out"
+			"cancel": "取消",
+			"signOut": "退出登录"
 		}
 	},
 	"sidebar": {
 		"buttons": {
-			"home": "Home",
-			"libraries": "Libraries",
-			"books": "Explore",
-			"bookClubs": "Book clubs",
-			"createLibrary": "Create library",
-			"noLibraries": "No libraries",
-			"createBookClub": "Create book club",
-			"noBookClubs": "No book clubs",
-			"settings": "Settings",
-			"themeToggle": "Toggle Theme",
-			"goForward": "Go Forward",
-			"goBack": "Go Back",
-			"smartlists": "Smart lists",
-			"noSmartlists": "No smart lists",
-			"createSmartlist": "Create smart list",
-			"seeAll": "See all"
+			"home": "首页",
+			"libraries": "书库",
+			"books": "浏览",
+			"bookClubs": "读书俱乐部",
+			"createLibrary": "新建书库",
+			"noLibraries": "暂无书库",
+			"createBookClub": "创建读书俱乐部",
+			"noBookClubs": "暂无读书俱乐部",
+			"settings": "设置",
+			"themeToggle": "切换主题",
+			"goForward": "向前",
+			"goBack": "后退",
+			"smartlists": "智能列表",
+			"noSmartlists": "暂无智能列表",
+			"createSmartlist": "创建智能列表",
+			"seeAll": "查看全部"
 		},
 		"libraryOptions": {
-			"scanLibrary": "Scan",
-			"fileExplorer": "Files",
-			"manageLibrary": "Settings",
-			"deleteLibrary": "Delete"
+			"scanLibrary": "扫描",
+			"fileExplorer": "文件",
+			"manageLibrary": "设置",
+			"deleteLibrary": "删除"
 		},
 		"versionInformation": {
-			"heading": "Version Information",
-			"semVer": "Semantic Version",
-			"commitHash": "Commit Hash",
-			"buildDate": "Build Date"
+			"heading": "版本信息",
+			"semVer": "语义化版本",
+			"commitHash": "提交哈希",
+			"buildDate": "构建日期"
 		}
 	},
 	"search": {
-		"placeholder": "Search"
+		"placeholder": "搜索"
 	},
 	"serverSOS": {
-		"heading": "Server Unavailable",
+		"heading": "服务器不可用",
 		"desktop": {
-			"message": "A network error occurred that suggests your Stump server is currently unavailable. Please ensure that it is running and accessible from this device.\nIf your server URL has changed, you can update it using the form below"
+			"message": "出现网络错误，您的 Stump 服务器目前不可用。请确保它正在运行并且可以在此设备上访问。\n如果您的服务器 URL 已经更改，您可以使用下面的表单更新它"
 		},
 		"web": {
-			"message": "A network error occurred that suggests your Stump server is currently unavailable. Please ensure that it is running and accessible from this device"
+			"message": "网络错误，您的 Stump 服务器目前不可用。请确保它正在运行并且可以从此设备访问"
 		},
-		"reconnected": "Reconnected to server! Redirecting...",
-		"reconnectionFailed": "Something went wrong!"
+		"reconnected": "重连到服务器！正在重定向......",
+		"reconnectionFailed": "出了些问题！"
 	},
 	"serverStatusOverlay": {
-		"heading": "Server isn't connected",
+		"heading": "服务器未连接",
 		"message": [
-			"Please check your internet connection",
-			"Click here",
-			"to change your server URL"
+			"请检查您的网络连接",
+			"点击此处",
+			"更改您的服务器 URL"
 		]
 	},
 	"slidingList": {
-		"empty": "No items to display",
+		"empty": "没有可显示的项目",
 		"buttons": {
-			"next": "Seek Ahead",
-			"previous": "Seek Backwards"
+			"next": "快进",
+			"previous": "快退"
 		}
 	},
 	"tagSelect": {
-		"placeholder": "Select or create tag",
-		"placeholderNoTags": "No tags available"
+		"placeholder": "选择或创建标签",
+		"placeholderNoTags": "没有可用的标签"
 	},
 	"thumbnailDropdown": {
-		"label": "Select thumbnail",
+		"label": "选择缩略图",
 		"options": {
-			"selectFromBooks": "Select from books",
-			"uploadImage": "Upload image"
+			"selectFromBooks": "从书中选择",
+			"uploadImage": "上传图片"
 		},
 		"uploadImage": {
-			"emptyState": "A preview of your image will appear here",
-			"prompt": "Drop image here or click to select",
-			"remove": "Remove image"
+			"emptyState": "图片预览将显示在这里",
+			"prompt": "拖放图片到此处或点击以选择",
+			"remove": "删除图像"
 		}
 	},
 	"common": {
-		"add": "Add",
-		"cancel": "Cancel",
-		"clear": "Clear",
-		"confirm": "Confirm",
-		"delete": "Delete",
-		"enter": "Enter",
-		"save": "Save",
-		"send": "Send",
-		"saveChanges": "Save changes",
-		"noChanges": "No changes",
-		"create": "Create",
-		"edit": "Edit",
-		"update": "Update",
-		"upload": "Upload",
-		"uploading": "Uploading",
-		"uploadingEllipsis": "Uploading...",
-		"unimplemented": "This functionality is not yet implemented! Check back later",
-		"limitedFunctionality": "This is not yet fully implemented and is lacking some features. Check back later",
-		"logIn": "Log in",
-		"login": "Login",
-		"seeError": "See error",
-		"remove": "Remove",
-		"goBack": "Go back",
-		"goToServers": "Go to servers",
-		"notReady": "This feature is not ready",
-		"notUsedYet": "Not used yet",
-		"never": "Never",
-		"scan": "Scan",
-		"somethingWentWrong": "Something went wrong",
+		"add": "添加",
+		"cancel": "取消",
+		"clear": "清除",
+		"confirm": "确认",
+		"delete": "删除",
+		"enter": "进入",
+		"save": "保存",
+		"send": "发送",
+		"saveChanges": "保存更改",
+		"noChanges": "没有更改",
+		"create": "创建",
+		"edit": "编辑",
+		"update": "更新",
+		"upload": "上传",
+		"uploading": "上传中",
+		"uploadingEllipsis": "正在上传......",
+		"unimplemented": "此功能尚未实现！稍后再试",
+		"limitedFunctionality": "这尚未完全实现，并且缺少一些功能。请稍后再试",
+		"logIn": "登录",
+		"login": "登录",
+		"seeError": "查看错误",
+		"remove": "移除",
+		"goBack": "返回",
+		"goToServers": "前往服务器",
+		"notReady": "此功能尚未准备好",
+		"notUsedYet": "暂未使用",
+		"never": "从不",
+		"scan": "扫描",
+		"somethingWentWrong": "出了些问题",
 		"fileUpload": {
-			"someRejected": "Some files were rejected. Please check the file types and try again",
-			"tooManyFiles": "You have selected too many files",
-			"noValidFiles": "No valid files were selected"
+			"someRejected": "有些文件被拒绝。请检查文件类型并重试",
+			"tooManyFiles": "您选择了太多的文件",
+			"noValidFiles": "没有选择有效的文件"
 		}
 	},
 	"userPermissions": {
 		"ACCESS_API_KEYS": {
-			"label": "API keys",
-			"description": "Allows the user to manage their own API keys"
+			"label": "API 密钥",
+			"description": "允许用户管理自己的 API 密钥"
 		},
 		"ACCESS_BOOK_CLUB": {
-			"label": "Book Clubs",
-			"description": "Allows the user to access book club features, including viewing and joining book clubs"
+			"label": "读书俱乐部",
+			"description": "允许用户访问读书俱乐部功能，包括查看和加入读书俱乐部"
 		},
 		"ACCESS_KOREADER_SYNC": {
-			"label": "KoReader sync",
-			"description": "Allows the user to access the KoReader sync integration"
+			"label": "KoReader 同步",
+			"description": "允许用户访问 KoReader 同步集成"
 		},
 		"ACCESS_SMART_LIST": {
-			"label": "Smart Lists",
-			"description": "Allows the user to access smart list features, including creating and managing smart lists"
+			"label": "智能列表",
+			"description": "允许用户访问智能列表功能，包括查看和创建智能列表"
 		},
 		"CREATE_BOOK_CLUB": {
-			"label": "Create book clubs",
-			"description": "Allows the user to create new book clubs"
+			"label": "创建读书俱乐部",
+			"description": "允许用户创建新的读书俱乐部"
 		},
 		"CREATE_LIBRARY": {
-			"label": "Create libraries",
-			"description": "Allows the user to create new libraries"
+			"label": "新建书库",
+			"description": "允许用户创建新的书库"
 		},
 		"CREATE_NOTIFIER": {
-			"label": "Create notifiers",
-			"description": "Allows the user to create new notification systems"
+			"label": "创建通知器",
+			"description": "允许用户创建新的通知系统"
 		},
 		"DELETE_LIBRARY": {
-			"label": "Delete libraries",
-			"description": "Allows the user to delete existing libraries"
+			"label": "删除书库",
+			"description": "允许用户管理现有的邮件发送器"
 		},
 		"DELETE_NOTIFIER": {
-			"label": "Delete notifiers",
-			"description": "Allows the user to delete notification systems"
+			"label": "删除通知",
+			"description": "允许用户删除通知系统"
 		},
 		"DOWNLOAD_FILE": {
-			"label": "Download files",
-			"description": "Allows the user to download files from the server"
+			"label": "下载文件",
+			"description": "允许用户从服务器下载文件"
 		},
 		"EDIT_LIBRARY": {
-			"label": "Edit libraries",
-			"description": "Allows the user to modify existing libraries"
+			"label": "编辑书库",
+			"description": "允许用户管理现有的邮件发送器"
 		},
 		"EMAILER_CREATE": {
-			"label": "Create emailer",
-			"description": "Allows the user to create email configuration"
+			"label": "创建邮件发送器",
+			"description": "允许用户创建电子邮件配置"
 		},
 		"EMAILER_MANAGE": {
-			"label": "Manage emailer",
-			"description": "Allows the user to manage email configuration and settings"
+			"label": "管理邮件发送器",
+			"description": "允许用户管理电子邮件配置和设置"
 		},
 		"EMAILER_READ": {
-			"label": "Read emailer",
-			"description": "Allows the user to view email configuration"
+			"label": "访问邮件发送器",
+			"description": "允许用户查看电子邮件配置"
 		},
 		"EMAIL_ARBITRARY_SEND": {
-			"label": "Send arbitrary emails",
-			"description": "Allows the user to send custom emails to any address"
+			"label": "发送任意邮件",
+			"description": "允许用户向任何地址发送自定义电子邮件"
 		},
 		"EMAIL_SEND": {
-			"label": "Send emails",
-			"description": "Allows the user to send emails through the system"
+			"label": "发送邮件",
+			"description": "允许用户通过系统发送电子邮件"
 		},
 		"FILE_EXPLORER": {
-			"label": "File explorer",
-			"description": "Allows the user to browse and explore the server filesystem"
+			"label": "文件浏览器",
+			"description": "允许用户浏览和探索服务器文件系统"
 		},
 		"MANAGE_LIBRARY": {
-			"label": "Manage libraries",
-			"description": "Allows the user to manage library settings and configuration"
+			"label": "管理书库",
+			"description": "允许用户管理库设置和配置"
 		},
 		"MANAGE_NOTIFIER": {
-			"label": "Manage notifiers",
-			"description": "Allows the user to manage notification system settings"
+			"label": "管理通知方案",
+			"description": "允许用户管理通知系统设置"
 		},
 		"MANAGE_SERVER": {
-			"label": "Manage server",
-			"description": "Allows the user to manage server configuration and settings"
+			"label": "管理服务器",
+			"description": "允许用户管理服务器配置和设置"
 		},
 		"MANAGE_USERS": {
-			"label": "Manage users",
-			"description": "Allows the user to create, edit, and delete user accounts"
+			"label": "管理用户",
+			"description": "允许用户创建、编辑和删除用户帐户"
 		},
 		"READ_JOBS": {
-			"label": "Read jobs",
-			"description": "Allows the user to view system jobs and their status"
+			"label": "读取任务",
+			"description": "允许用户查看系统任务及其状态"
 		},
 		"READ_NOTIFIER": {
-			"label": "Read notifiers",
-			"description": "Allows the user to view notification system configuration"
+			"label": "读取通知器",
+			"description": "允许用户查看通知系统配置"
 		},
 		"READ_PERSISTED_LOGS": {
-			"label": "Read persisted logs",
-			"description": "Allows the user to view stored system logs"
+			"label": "读取持续日志",
+			"description": "允许用户查看存储的系统日志"
 		},
 		"READ_SYSTEM_LOGS": {
-			"label": "Read system logs",
-			"description": "Allows the user to view real-time system logs"
+			"label": "读取系统日志",
+			"description": "允许用户查看实时系统日志"
 		},
 		"READ_USERS": {
-			"label": "Read users",
-			"description": "Allows the user to view user account information"
+			"label": "读取用户",
+			"description": "允许用户查看用户帐户信息"
 		},
 		"SCAN_LIBRARY": {
-			"label": "Scan libraries",
-			"description": "Allows the user to trigger library scans to discover new content"
+			"label": "扫描书库",
+			"description": "允许用户触发库扫描以发现新内容"
 		},
 		"UPLOAD_FILE": {
-			"label": "Upload files",
-			"description": "Allows the user to upload files to the server"
+			"label": "上传文件",
+			"description": "允许用户上传文件到服务器"
 		},
 		"MANAGE_JOBS": {
-			"label": "Manage jobs",
-			"description": "Allows the user to manage any queued jobs"
+			"label": "工作管理",
+			"description": "允许用户管理任何队列任务"
 		},
 		"EDIT_METADATA": {
-			"label": "Edit metadata",
-			"description": "Allows the user to edit metadata for books and series"
+			"label": "编辑书本信息",
+			"description": "允许用户编辑书籍和系列片的元数据"
 		},
 		"WRITE_BACK_METADATA": {
-			"label": "Write back metadata",
-			"description": "Allows the user to write metadata changes back to the source files"
+			"label": "写回传元数据",
+			"description": "允许用户写入元数据更改返回源文件"
 		},
 		"EDIT_THUMBNAILS": {
-			"label": "Edit thumbnails",
-			"description": "Allows the user to edit thumbnails for books and series"
+			"label": "编辑缩略图",
+			"description": "允许用户编辑书籍和系列片的缩略图"
 		}
 	}
 }

From 0b7118bd7f3b0cefb7120eb64f020443d571738a Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Fri, 3 Apr 2026 13:43:58 -0700
Subject: [PATCH 18/32] :recycle: Adjust darkreader meta tag behavior (#1043)

Updated to factor dark variant themes, not just the literal `dark` theme
---
 .../src/hooks/__tests__/useApplyTheme.test.ts | 127 ++++++++++++++++++
 packages/browser/src/hooks/useApplyTheme.ts   |  15 ++-
 2 files changed, 141 insertions(+), 1 deletion(-)
 create mode 100644 packages/browser/src/hooks/__tests__/useApplyTheme.test.ts

diff --git a/packages/browser/src/hooks/__tests__/useApplyTheme.test.ts b/packages/browser/src/hooks/__tests__/useApplyTheme.test.ts
new file mode 100644
index 0000000000..a232a2f99b
--- /dev/null
+++ b/packages/browser/src/hooks/__tests__/useApplyTheme.test.ts
@@ -0,0 +1,127 @@
+import { SupportedFont } from '@stump/graphql'
+import { renderHook } from '@testing-library/react'
+import { useMediaMatch } from 'rooks'
+
+import { useApplyTheme } from '../useApplyTheme'
+import { DARK_THEMES } from '../useTheme'
+
+jest.mock('rooks', () => ({
+	useMediaMatch: jest.fn(),
+}))
+
+describe('useApplyTheme', () => {
+	afterEach(() => {
+		const meta = document.querySelector('meta[name="color-scheme"]')
+		if (meta) {
+			meta.remove()
+		}
+		document.documentElement.className = ''
+	})
+
+	describe('Dark theme meta tag creation', () => {
+		it('should create meta tag when theme is literally dark', () => {
+			jest.mocked(useMediaMatch).mockReturnValue(false)
+
+			renderHook(() => useApplyTheme({ appTheme: 'dark', appFont: SupportedFont.Inter }))
+
+			const meta = document.querySelector('meta[name="color-scheme"]')
+			expect(meta).toBeTruthy()
+			expect(meta?.getAttribute('name')).toBe('color-scheme')
+			expect(meta?.getAttribute('content')).toBe('dark')
+		})
+
+		it('should create meta tag when theme is a dark variant', () => {
+			jest.mocked(useMediaMatch).mockReturnValue(false)
+
+			for (const appTheme of DARK_THEMES) {
+				renderHook(() => useApplyTheme({ appTheme, appFont: SupportedFont.Inter }))
+
+				const meta = document.querySelector('meta[name="color-scheme"]')
+				expect(meta).toBeTruthy()
+				expect(meta?.getAttribute('content')).toBe('dark')
+			}
+		})
+
+		it('should create meta tag when theme is system and user prefers dark', () => {
+			jest.mocked(useMediaMatch).mockReturnValue(true)
+
+			renderHook(() => useApplyTheme({ appTheme: 'system', appFont: SupportedFont.Inter }))
+
+			const meta = document.querySelector('meta[name="color-scheme"]')
+			expect(meta).toBeTruthy()
+			expect(meta?.getAttribute('content')).toBe('dark')
+		})
+
+		it('should not create meta tag when theme is light', () => {
+			jest.mocked(useMediaMatch).mockReturnValue(false)
+
+			renderHook(() => useApplyTheme({ appTheme: 'light', appFont: SupportedFont.Inter }))
+
+			const meta = document.querySelector('meta[name="color-scheme"]')
+			expect(meta).toBeFalsy()
+		})
+
+		it('should not create meta tag when theme is system and user prefers light', () => {
+			jest.mocked(useMediaMatch).mockReturnValue(false)
+
+			renderHook(() => useApplyTheme({ appTheme: 'system', appFont: SupportedFont.Inter }))
+
+			const meta = document.querySelector('meta[name="color-scheme"]')
+			expect(meta).toBeFalsy()
+		})
+	})
+
+	describe('Meta tag behavior on theme changes', () => {
+		it('should create meta tag when switching from light to dark theme', () => {
+			jest.mocked(useMediaMatch).mockReturnValue(false)
+
+			const { rerender } = renderHook(
+				({ theme }) => useApplyTheme({ appTheme: theme, appFont: SupportedFont.Inter }),
+				{ initialProps: { theme: 'light' } },
+			)
+
+			expect(document.querySelector('meta[name="color-scheme"]')).toBeFalsy()
+
+			rerender({ theme: 'dark' })
+
+			const meta = document.querySelector('meta[name="color-scheme"]')
+			expect(meta).toBeTruthy()
+			expect(meta?.getAttribute('content')).toBe('dark')
+		})
+
+		it('should remove meta tag when switching from dark to light theme', () => {
+			jest.mocked(useMediaMatch).mockReturnValue(false)
+
+			const { rerender } = renderHook(
+				({ theme }) => useApplyTheme({ appTheme: theme, appFont: SupportedFont.Inter }),
+				{ initialProps: { theme: 'dark' } },
+			)
+
+			let meta = document.querySelector('meta[name="color-scheme"]')
+			expect(meta).toBeTruthy()
+			expect(meta?.getAttribute('content')).toBe('dark')
+
+			rerender({ theme: 'light' })
+
+			meta = document.querySelector('meta[name="color-scheme"]')
+			expect(meta).toBeFalsy()
+		})
+
+		it('should handle system theme with changing user preference', () => {
+			jest.mocked(useMediaMatch).mockReturnValue(false)
+
+			const { rerender } = renderHook(() =>
+				useApplyTheme({ appTheme: 'system', appFont: SupportedFont.Inter }),
+			)
+
+			expect(document.querySelector('meta[name="color-scheme"]')).toBeFalsy()
+
+			jest.mocked(useMediaMatch).mockReturnValue(true)
+			rerender()
+
+			const meta = document.querySelector('meta[name="color-scheme"]')
+			expect(meta).toBeTruthy()
+			expect(meta?.getAttribute('content')).toBe('dark')
+		})
+	})
+})
diff --git a/packages/browser/src/hooks/useApplyTheme.ts b/packages/browser/src/hooks/useApplyTheme.ts
index e847dca1b6..6454a814fc 100644
--- a/packages/browser/src/hooks/useApplyTheme.ts
+++ b/packages/browser/src/hooks/useApplyTheme.ts
@@ -2,6 +2,8 @@ import { SupportedFont } from '@stump/graphql'
 import { useEffect } from 'react'
 import { useMediaMatch } from 'rooks'
 
+import { DARK_THEMES } from './useTheme'
+
 /**
  * The parameters for the `useApplyTheme` hook
  */
@@ -46,8 +48,11 @@ export function useApplyTheme({ appTheme, appFont = SupportedFont.Inter }: Param
 			html?.classList.add(resolvedTheme)
 		}
 
+		const isDarkTheme =
+			DARK_THEMES.includes(resolvedTheme) || (resolvedTheme === 'system' && prefersDark)
+
 		// https://github.com/darkreader/darkreader/discussions/15128
-		if (resolvedTheme === 'dark') {
+		if (isDarkTheme) {
 			let meta = document.querySelector('meta[name="color-scheme"]')
 			if (!meta) {
 				meta = document.createElement('meta')
@@ -57,6 +62,14 @@ export function useApplyTheme({ appTheme, appFont = SupportedFont.Inter }: Param
 				meta.content = 'dark'
 				document.head.appendChild(meta)
 			}
+		} else {
+			// if we're switching to a light theme, we need to remove it so dark reader can mess with the colors
+			// i imagine folks running dark reader won't hit this since why would they switch to light lol but
+			// figure this is "correct" so
+			const meta = document.querySelector('meta[name="color-scheme"]')
+			if (meta) {
+				document.head.removeChild(meta)
+			}
 		}
 	}, [appTheme, prefersDark])
 

From a500ffdacfe870de128e86be26889aa34c3d1b61 Mon Sep 17 00:00:00 2001
From: Marc Plano-Lesay <marc.planolesay@gmail.com>
Date: Sat, 4 Apr 2026 10:00:43 +1100
Subject: [PATCH 19/32] =?UTF-8?q?=E2=9C=A8=20Tags=20management=20page=20(#?=
 =?UTF-8?q?1040)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ✨ Add tag management settings page

Add a settings page for creating/deleting tags, under Settings ->
Management -> Tags. Gated behind the `ManageLibrary` permission.

* 🐛 Fix TagSelect showing stale tags after deletion

When a tag is deleted, prune it from the selected values so it doesn't
appear as a ghost value in selector.

* ✨ Sort tags alphabetically in TagSelect and tag management table

* ✨ Add tag rename support

This introduces a new renameTag GraphQL mutation, as well as a rename
modal in the tag settings page.
---
 crates/graphql/schema.graphql                 |   5 +
 crates/graphql/src/mutation/tag.rs            | 127 +++++++++++-
 packages/browser/src/components/TagSelect.tsx |  29 ++-
 .../src/scenes/settings/SettingsRouter.tsx    |   6 +
 .../browser/src/scenes/settings/routes.ts     |   8 +
 .../settings/server/tags/CreateTagModal.tsx   | 103 ++++++++++
 .../server/tags/DeleteTagConfirmModal.tsx     |  60 ++++++
 .../settings/server/tags/RenameTagModal.tsx   |  99 ++++++++++
 .../settings/server/tags/TagSettingsScene.tsx |  38 ++++
 .../scenes/settings/server/tags/TagTable.tsx  | 180 ++++++++++++++++++
 .../src/scenes/settings/server/tags/index.ts  |   1 +
 packages/graphql/src/client/gql.ts            |  24 +++
 packages/graphql/src/client/graphql.ts        |  70 +++++++
 packages/i18n/src/locales/en-US.json          |  50 +++++
 14 files changed, 789 insertions(+), 11 deletions(-)
 create mode 100644 packages/browser/src/scenes/settings/server/tags/CreateTagModal.tsx
 create mode 100644 packages/browser/src/scenes/settings/server/tags/DeleteTagConfirmModal.tsx
 create mode 100644 packages/browser/src/scenes/settings/server/tags/RenameTagModal.tsx
 create mode 100644 packages/browser/src/scenes/settings/server/tags/TagSettingsScene.tsx
 create mode 100644 packages/browser/src/scenes/settings/server/tags/TagTable.tsx
 create mode 100644 packages/browser/src/scenes/settings/server/tags/index.ts

diff --git a/crates/graphql/schema.graphql b/crates/graphql/schema.graphql
index 7dcf144f9c..12b79080a2 100644
--- a/crates/graphql/schema.graphql
+++ b/crates/graphql/schema.graphql
@@ -1646,6 +1646,11 @@ type Mutation {
 	"""
 	createTags(tags: [String!]!): [Tag!]!
 	"""
+	Rename a tag. Returns the updated tag, or an error if the tag was not found or the new
+	name already exists.
+	"""
+	renameTag(id: Int!, name: String!): Tag!
+	"""
 	Delete tags. Returns a list containing the deleted tags, or an error if deletion failed.
 	
 	* `tags` - A non-empty list of tags to create.
diff --git a/crates/graphql/src/mutation/tag.rs b/crates/graphql/src/mutation/tag.rs
index 996b22368e..76e8fdb25e 100644
--- a/crates/graphql/src/mutation/tag.rs
+++ b/crates/graphql/src/mutation/tag.rs
@@ -2,8 +2,8 @@ use crate::{data::CoreContext, object::tag::Tag};
 use async_graphql::{Context, Object, Result};
 use models::entity::tag;
 use sea_orm::{
-	prelude::*, ActiveValue::Set, DatabaseConnection, DatabaseTransaction, QuerySelect,
-	TransactionTrait,
+	prelude::*, ActiveValue::Set, DatabaseConnection, DatabaseTransaction,
+	IntoActiveModel, QuerySelect, TransactionTrait,
 };
 use std::collections::HashSet;
 
@@ -26,6 +26,13 @@ impl TagMutation {
 		create_tags(conn, tags).await
 	}
 
+	/// Rename a tag. Returns the updated tag, or an error if the tag was not found or the new
+	/// name already exists.
+	async fn rename_tag(&self, ctx: &Context<'_>, id: i32, name: String) -> Result<Tag> {
+		let conn = ctx.data::<CoreContext>()?.conn.as_ref();
+		rename_tag(conn, id, name).await
+	}
+
 	/// Delete tags. Returns a list containing the deleted tags, or an error if deletion failed.
 	///
 	/// * `tags` - A non-empty list of tags to create.
@@ -105,6 +112,36 @@ async fn create_tags(conn: &DatabaseConnection, tags: Vec<String>) -> Result<Vec
 	Ok(inserted_tags.into_iter().map(Tag::from).collect())
 }
 
+async fn rename_tag(conn: &DatabaseConnection, id: i32, name: String) -> Result<Tag> {
+	let name = name.trim().to_string();
+	if name.is_empty() {
+		return Err("Tag name cannot be empty".into());
+	}
+
+	let existing = tag::Entity::find()
+		.filter(tag::Column::Name.eq(name.clone()))
+		.one(conn)
+		.await?;
+	if let Some(existing) = existing {
+		if existing.id != id {
+			return Err(format!("A tag with name '{}' already exists", name).into());
+		}
+		// Name is unchanged, just return it
+		return Ok(Tag::from(existing));
+	}
+
+	let model = tag::Entity::find_by_id(id)
+		.one(conn)
+		.await?
+		.ok_or("Tag not found")?;
+
+	let mut active_model = model.into_active_model();
+	active_model.name = Set(name);
+	let updated = active_model.update(conn).await?;
+
+	Ok(Tag::from(updated))
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -198,4 +235,90 @@ mod tests {
 		let unique_tags = get_unique_tags(&txn, tags).await.unwrap();
 		assert_eq!(unique_tags, vec!["hello".to_string()]);
 	}
+
+	#[tokio::test]
+	async fn test_rename_tag() {
+		let original = tag::Model {
+			id: 1,
+			name: "old_name".to_string(),
+		};
+		let renamed = tag::Model {
+			id: 1,
+			name: "new_name".to_string(),
+		};
+
+		// Query 1: find by name (no conflict) -> empty
+		// Query 2: find by id -> original
+		// Query 3: update -> renamed
+		let conn = MockDatabase::new(sea_orm::DatabaseBackend::Sqlite)
+			.append_query_results::<tag::Model, Vec<_>, Vec<Vec<_>>>(vec![
+				vec![],
+				vec![original],
+				vec![renamed.clone()],
+			])
+			.append_exec_results(vec![MockExecResult {
+				last_insert_id: 1,
+				rows_affected: 1,
+			}])
+			.into_connection();
+
+		let result = rename_tag(&conn, 1, "new_name".to_string()).await.unwrap();
+		assert_eq!(result, Tag { model: renamed });
+	}
+
+	#[tokio::test]
+	async fn test_rename_tag_empty_name() {
+		let conn = MockDatabase::new(sea_orm::DatabaseBackend::Sqlite).into_connection();
+
+		let result = rename_tag(&conn, 1, "   ".to_string()).await;
+		assert!(result.is_err());
+	}
+
+	#[tokio::test]
+	async fn test_rename_tag_conflict() {
+		let conflicting = tag::Model {
+			id: 2,
+			name: "taken".to_string(),
+		};
+
+		// Query 1: find by name -> found with different id
+		let conn = MockDatabase::new(sea_orm::DatabaseBackend::Sqlite)
+			.append_query_results::<tag::Model, Vec<_>, Vec<Vec<_>>>(vec![vec![
+				conflicting,
+			]])
+			.into_connection();
+
+		let result = rename_tag(&conn, 1, "taken".to_string()).await;
+		assert!(result.is_err());
+	}
+
+	#[tokio::test]
+	async fn test_rename_tag_unchanged() {
+		let existing = tag::Model {
+			id: 1,
+			name: "same".to_string(),
+		};
+
+		// Query 1: find by name -> found with same id (no-op)
+		let conn = MockDatabase::new(sea_orm::DatabaseBackend::Sqlite)
+			.append_query_results::<tag::Model, Vec<_>, Vec<Vec<_>>>(vec![vec![
+				existing.clone()
+			]])
+			.into_connection();
+
+		let result = rename_tag(&conn, 1, "same".to_string()).await.unwrap();
+		assert_eq!(result, Tag { model: existing });
+	}
+
+	#[tokio::test]
+	async fn test_rename_tag_not_found() {
+		// Query 1: find by name -> empty (no conflict)
+		// Query 2: find by id -> empty (not found)
+		let conn = MockDatabase::new(sea_orm::DatabaseBackend::Sqlite)
+			.append_query_results::<tag::Model, Vec<_>, Vec<Vec<_>>>(vec![vec![], vec![]])
+			.into_connection();
+
+		let result = rename_tag(&conn, 999, "new_name".to_string()).await;
+		assert!(result.is_err());
+	}
 }
diff --git a/packages/browser/src/components/TagSelect.tsx b/packages/browser/src/components/TagSelect.tsx
index 7e06e5b2ff..02b4ed65de 100644
--- a/packages/browser/src/components/TagSelect.tsx
+++ b/packages/browser/src/components/TagSelect.tsx
@@ -31,19 +31,30 @@ export default function TagSelect({ label, description, selected = [], onChange
 	} = useSuspenseGraphQL(query, sdk.cacheKey('tags'))
 
 	const [options, setOptions] = useState<TagOption[]>(
-		tags.map((tag) => ({ label: tag.name, value: tag.name.toLowerCase() })),
+		tags
+			.map((tag) => ({ label: tag.name, value: tag.name.toLowerCase() }))
+			.sort((a, b) => a.label.localeCompare(b.label)),
 	)
 
 	useEffect(() => {
 		setOptions((curr) =>
-			tags.map((tag) => {
-				const exists = curr.find((option) => option.label === tag.name)
-				if (!exists) {
-					return { label: tag.name, value: tag.name.toLowerCase() }
-				}
-				return exists
-			}),
+			tags
+				.map((tag) => {
+					const exists = curr.find((option) => option.label === tag.name)
+					if (!exists) {
+						return { label: tag.name, value: tag.name.toLowerCase() }
+					}
+					return exists
+				})
+				.sort((a, b) => a.label.localeCompare(b.label)),
 		)
+
+		// Remove any selected tags that no longer exist
+		const tagNames = new Set(tags.map((tag) => tag.name.toLowerCase()))
+		const filtered = selected.filter((s) => tagNames.has(s.value))
+		if (filtered.length !== selected.length) {
+			onChange(filtered.length > 0 ? filtered : undefined)
+		}
 	}, [tags])
 
 	const handleChange = useCallback(
@@ -66,7 +77,7 @@ export default function TagSelect({ label, description, selected = [], onChange
 			label={label || 'Tags'}
 			description={description}
 			options={options}
-			value={selected.map(({ value }) => value)}
+			value={[...selected].sort((a, b) => a.label.localeCompare(b.label)).map(({ value }) => value)}
 			onChange={handleChange}
 			onAddOption={(option) => setOptions((curr) => [...curr, option])}
 			isMultiSelect
diff --git a/packages/browser/src/scenes/settings/SettingsRouter.tsx b/packages/browser/src/scenes/settings/SettingsRouter.tsx
index c4d1cd3442..0da8b37f06 100644
--- a/packages/browser/src/scenes/settings/SettingsRouter.tsx
+++ b/packages/browser/src/scenes/settings/SettingsRouter.tsx
@@ -20,6 +20,7 @@ const GeneralServerSettingsScene = lazy(
 )
 const ServerLogsScene = lazy(() => import('./server/logs/ServerLogsScene.tsx'))
 const JobSettingsScene = lazy(() => import('./server/jobs/JobSettingsScene.tsx'))
+const TagSettingsScene = lazy(() => import('./server/tags'))
 
 /**
  * The main router for the settings scene(s). Mostly just a collection of nested routers
@@ -42,6 +43,10 @@ export default function SettingsRouter() {
 		() => checkPermission(UserPermission.EmailerManage),
 		[checkPermission],
 	)
+	const canManageLibrary = useMemo(
+		() => checkPermission(UserPermission.ManageLibrary),
+		[checkPermission],
+	)
 
 	return (
 		<Routes>
@@ -59,6 +64,7 @@ export default function SettingsRouter() {
 				{canManageServer && <Route path="jobs" element={<JobSettingsScene />} />}
 				{canManageUsers && <Route path="users/*" element={<UsersRouter />} />}
 				{canManageEmail && <Route path="email/*" element={<EmailSettingsRouter />} />}
+				{canManageLibrary && <Route path="tags" element={<TagSettingsScene />} />}
 
 				<Route path="*" element={<Navigate to="account" replace />} />
 			</Route>
diff --git a/packages/browser/src/scenes/settings/routes.ts b/packages/browser/src/scenes/settings/routes.ts
index a880322353..2fcce1c8fe 100644
--- a/packages/browser/src/scenes/settings/routes.ts
+++ b/packages/browser/src/scenes/settings/routes.ts
@@ -11,6 +11,7 @@ import {
 	PcCase,
 	ScrollText,
 	Server,
+	Tag,
 	UserCircle,
 	Users,
 } from 'lucide-react'
@@ -155,6 +156,13 @@ export const createRouteGroups = (client: QueryClient, api: Api): RouteGroup[] =
 				permissions: [UserPermission.ReadNotifier],
 				to: '/settings/notifications',
 			},
+			{
+				icon: Tag,
+				label: 'Tags',
+				localeKey: 'server/tags',
+				permissions: [UserPermission.ManageLibrary],
+				to: '/settings/tags',
+			},
 		],
 		label: 'Management',
 	},
diff --git a/packages/browser/src/scenes/settings/server/tags/CreateTagModal.tsx b/packages/browser/src/scenes/settings/server/tags/CreateTagModal.tsx
new file mode 100644
index 0000000000..a4c00e8ecb
--- /dev/null
+++ b/packages/browser/src/scenes/settings/server/tags/CreateTagModal.tsx
@@ -0,0 +1,103 @@
+import { useGraphQLMutation, useSDK } from '@stump/client'
+import { Button, Dialog, Input } from '@stump/components'
+import { graphql } from '@stump/graphql'
+import { useLocaleContext } from '@stump/i18n'
+import { useQueryClient } from '@tanstack/react-query'
+import { useCallback, useEffect, useState } from 'react'
+import { toast } from 'sonner'
+
+const mutation = graphql(`
+	mutation CreateTagModal($tags: [String!]!) {
+		createTags(tags: $tags) {
+			id
+			name
+		}
+	}
+`)
+
+export default function CreateTagModal() {
+	const [isOpen, setIsOpen] = useState(false)
+	const [name, setName] = useState('')
+
+	const client = useQueryClient()
+	const { t } = useLocaleContext()
+	const { sdk } = useSDK()
+
+	const { mutate: createTags, isPending } = useGraphQLMutation(mutation, {
+		onSuccess: () => {
+			client.refetchQueries({
+				exact: false,
+				predicate: ({ queryKey }) => queryKey.includes(sdk.cacheKeys.tags),
+			})
+			setIsOpen(false)
+		},
+		onError: (error) => {
+			console.error('Failed to create tag', error)
+			toast.error(String(error))
+		},
+	})
+
+	const handleCreate = useCallback(() => {
+		const trimmed = name.trim()
+		if (trimmed) {
+			createTags({ tags: [trimmed] })
+		}
+	}, [name, createTags])
+
+	useEffect(() => {
+		if (!isOpen) {
+			const timeout = setTimeout(() => setName(''), 150)
+			return () => clearTimeout(timeout)
+		}
+	}, [isOpen])
+
+	return (
+		<Dialog open={isOpen} onOpenChange={isPending ? undefined : setIsOpen}>
+			<Dialog.Trigger asChild>
+				<Button size="sm" variant="secondary">
+					{t(getKey('trigger'))}
+				</Button>
+			</Dialog.Trigger>
+
+			<Dialog.Content size="sm">
+				<Dialog.Header>
+					<Dialog.Title>{t(getKey('modal.heading'))}</Dialog.Title>
+					<Dialog.Description>{t(getKey('modal.description'))}</Dialog.Description>
+				</Dialog.Header>
+
+				<form
+					onSubmit={(e) => {
+						e.preventDefault()
+						handleCreate()
+					}}
+				>
+					<Input
+						label={t(getKey('modal.name.label'))}
+						placeholder={t(getKey('modal.name.placeholder'))}
+						value={name}
+						onChange={(e) => setName(e.target.value)}
+						autoFocus
+					/>
+				</form>
+
+				<Dialog.Footer>
+					<Button disabled={isPending} onClick={() => setIsOpen(false)} size="sm">
+						{t('common.cancel')}
+					</Button>
+
+					<Button
+						disabled={isPending || !name.trim()}
+						variant="primary"
+						size="sm"
+						onClick={handleCreate}
+					>
+						{t(getKey('modal.submit'))}
+					</Button>
+				</Dialog.Footer>
+			</Dialog.Content>
+		</Dialog>
+	)
+}
+
+const LOCALE_BASE = 'settingsScene.server/tags.sections.createTag'
+const getKey = (key: string) => `${LOCALE_BASE}.${key}`
diff --git a/packages/browser/src/scenes/settings/server/tags/DeleteTagConfirmModal.tsx b/packages/browser/src/scenes/settings/server/tags/DeleteTagConfirmModal.tsx
new file mode 100644
index 0000000000..614d655bea
--- /dev/null
+++ b/packages/browser/src/scenes/settings/server/tags/DeleteTagConfirmModal.tsx
@@ -0,0 +1,60 @@
+import { useGraphQLMutation, useSDK } from '@stump/client'
+import { ConfirmationModal } from '@stump/components'
+import { graphql, Tag } from '@stump/graphql'
+import { useLocaleContext } from '@stump/i18n'
+import { useQueryClient } from '@tanstack/react-query'
+import { useCallback } from 'react'
+
+const mutation = graphql(`
+	mutation DeleteTagConfirmModal($tags: [String!]!) {
+		deleteTags(tags: $tags) {
+			id
+			name
+		}
+	}
+`)
+
+type Props = {
+	tag: Tag | null
+	onClose: () => void
+}
+
+export default function DeleteTagConfirmModal({ tag, onClose }: Props) {
+	const { sdk } = useSDK()
+	const { t } = useLocaleContext()
+
+	const client = useQueryClient()
+
+	const { mutate: deleteTags, isPending } = useGraphQLMutation(mutation, {
+		onSuccess: () => {
+			client.refetchQueries({
+				exact: false,
+				predicate: ({ queryKey }) => queryKey.includes(sdk.cacheKeys.tags),
+			})
+			onClose()
+		},
+	})
+
+	const handleConfirm = useCallback(() => {
+		if (tag) {
+			deleteTags({ tags: [tag.name] })
+		}
+	}, [tag, deleteTags])
+
+	return (
+		<ConfirmationModal
+			title={t(getKey('title'))}
+			description={t(getKey('description'))}
+			confirmText={t(getKey('confirm'))}
+			confirmVariant="danger"
+			isOpen={!!tag}
+			onClose={onClose}
+			onConfirm={handleConfirm}
+			confirmIsLoading={isPending}
+			trigger={null}
+		/>
+	)
+}
+
+const LOCALE_BASE = 'settingsScene.server/tags.sections.deleteTag'
+const getKey = (key: string) => `${LOCALE_BASE}.${key}`
diff --git a/packages/browser/src/scenes/settings/server/tags/RenameTagModal.tsx b/packages/browser/src/scenes/settings/server/tags/RenameTagModal.tsx
new file mode 100644
index 0000000000..544e1c5f29
--- /dev/null
+++ b/packages/browser/src/scenes/settings/server/tags/RenameTagModal.tsx
@@ -0,0 +1,99 @@
+import { useGraphQLMutation, useSDK } from '@stump/client'
+import { Button, Dialog, Input } from '@stump/components'
+import { graphql, Tag } from '@stump/graphql'
+import { useLocaleContext } from '@stump/i18n'
+import { useQueryClient } from '@tanstack/react-query'
+import { useCallback, useEffect, useState } from 'react'
+import { toast } from 'sonner'
+
+const mutation = graphql(`
+	mutation RenameTagModal($id: Int!, $name: String!) {
+		renameTag(id: $id, name: $name) {
+			id
+			name
+		}
+	}
+`)
+
+type Props = {
+	tag: Tag | null
+	onClose: () => void
+}
+
+export default function RenameTagModal({ tag, onClose }: Props) {
+	const [name, setName] = useState('')
+
+	const client = useQueryClient()
+	const { t } = useLocaleContext()
+	const { sdk } = useSDK()
+
+	const { mutate: renameTag, isPending } = useGraphQLMutation(mutation, {
+		onSuccess: () => {
+			client.refetchQueries({
+				exact: false,
+				predicate: ({ queryKey }) => queryKey.includes(sdk.cacheKeys.tags),
+			})
+			onClose()
+		},
+		onError: (error) => {
+			console.error('Failed to rename tag', error)
+			toast.error(String(error))
+		},
+	})
+
+	const handleRename = useCallback(() => {
+		if (tag && name.trim()) {
+			renameTag({ id: tag.id, name: name.trim() })
+		}
+	}, [tag, name, renameTag])
+
+	useEffect(() => {
+		if (tag) {
+			setName(tag.name)
+		}
+	}, [tag])
+
+	return (
+		<Dialog open={!!tag} onOpenChange={isPending ? undefined : (open) => !open && onClose()}>
+			<Dialog.Content size="sm">
+				<Dialog.Header>
+					<Dialog.Title>{t(getKey('heading'))}</Dialog.Title>
+					<Dialog.Description>{t(getKey('description'))}</Dialog.Description>
+				</Dialog.Header>
+
+				<form
+					onSubmit={(e) => {
+						e.preventDefault()
+						handleRename()
+					}}
+				>
+					<Input
+						label={t(getKey('name.label'))}
+						placeholder={t(getKey('name.placeholder'))}
+						value={name}
+						onChange={(e) => setName(e.target.value)}
+						autoFocus
+					/>
+				</form>
+
+				<Dialog.Footer>
+					<Button disabled={isPending} onClick={onClose} size="sm">
+						{t('common.cancel')}
+					</Button>
+
+					<Button
+						disabled={isPending || !name.trim() || name.trim() === tag?.name}
+						variant="primary"
+						size="sm"
+						onClick={handleRename}
+					>
+						{t(getKey('submit'))}
+					</Button>
+				</Dialog.Footer>
+			</Dialog.Content>
+		</Dialog>
+	)
+}
+
+const LOCALE_BASE = 'settingsScene.server/tags.sections.renameTag.modal'
+const getKey = (key: string) => `${LOCALE_BASE}.${key}`
diff --git a/packages/browser/src/scenes/settings/server/tags/TagSettingsScene.tsx b/packages/browser/src/scenes/settings/server/tags/TagSettingsScene.tsx
new file mode 100644
index 0000000000..f09334891e
--- /dev/null
+++ b/packages/browser/src/scenes/settings/server/tags/TagSettingsScene.tsx
@@ -0,0 +1,38 @@
+import { Heading, Text } from '@stump/components'
+import { useLocaleContext } from '@stump/i18n'
+import { Suspense } from 'react'
+
+import { ContentContainer, SceneContainer } from '@/components/container'
+
+import CreateTagModal from './CreateTagModal'
+import TagTable from './TagTable'
+
+export default function TagSettingsScene() {
+	const { t } = useLocaleContext()
+
+	return (
+		<SceneContainer>
+			<ContentContainer>
+				<div className="flex flex-col gap-4">
+					<div className="flex items-end justify-between">
+						<div>
+							<Heading size="sm">{t(getKey('title'))}</Heading>
+							<Text size="sm" variant="muted" className="mt-1">
+								{t(getKey('description'))}
+							</Text>
+						</div>
+
+						<CreateTagModal />
+					</div>
+
+					<Suspense>
+						<TagTable />
+					</Suspense>
+				</div>
+			</ContentContainer>
+		</SceneContainer>
+	)
+}
+
+const LOCALE_BASE = 'settingsScene.server/tags.sections.table'
+const getKey = (key: string) => `${LOCALE_BASE}.${key}`
diff --git a/packages/browser/src/scenes/settings/server/tags/TagTable.tsx b/packages/browser/src/scenes/settings/server/tags/TagTable.tsx
new file mode 100644
index 0000000000..b6d60a5244
--- /dev/null
+++ b/packages/browser/src/scenes/settings/server/tags/TagTable.tsx
@@ -0,0 +1,180 @@
+import { useSDK, useSuspenseGraphQL } from '@stump/client'
+import { Button, Card, Dropdown, Text } from '@stump/components'
+import { graphql, Tag } from '@stump/graphql'
+import { useLocaleContext } from '@stump/i18n'
+import {
+	createColumnHelper,
+	flexRender,
+	getCoreRowModel,
+	useReactTable,
+} from '@tanstack/react-table'
+import { Ellipsis, Slash, Tag as TagIcon } from 'lucide-react'
+import { useMemo, useState } from 'react'
+
+import { getCommonPinningStyles } from '@/components/table/Table'
+
+import DeleteTagConfirmModal from './DeleteTagConfirmModal'
+import RenameTagModal from './RenameTagModal'
+
+const query = graphql(`
+	query TagTable {
+		tags {
+			id
+			name
+		}
+	}
+`)
+
+export default function TagTable() {
+	const { sdk } = useSDK()
+
+	const {
+		data: { tags },
+	} = useSuspenseGraphQL(query, sdk.cacheKey('tags'))
+
+	const { t } = useLocaleContext()
+
+	const sortedTags = useMemo(
+		() => [...(tags || [])].sort((a, b) => a.name.localeCompare(b.name)),
+		[tags],
+	)
+
+	const [deletingTag, setDeletingTag] = useState<Tag | null>(null)
+	const [renamingTag, setRenamingTag] = useState<Tag | null>(null)
+
+	const columns = useMemo(
+		() => [
+			columnHelper.accessor('name', {
+				header: () => (
+					<Text size="sm" variant="secondary">
+						{t(getColumnKey('name'))}
+					</Text>
+				),
+				cell: ({ getValue }) => <Text size="sm">{getValue()}</Text>,
+			}),
+			columnHelper.display({
+				id: 'actions',
+				header: () => null,
+				cell: ({ row: { original: tag } }) => (
+					<div className="flex items-center justify-center">
+						<Dropdown modal={false}>
+							<Dropdown.Trigger asChild>
+								<Button size="icon" variant="ghost">
+									<Ellipsis className="h-4 w-4 text-foreground" />
+								</Button>
+							</Dropdown.Trigger>
+
+							<Dropdown.Content align="end">
+								<Dropdown.Group>
+									<Dropdown.Item onClick={() => setRenamingTag(tag)}>
+										<span>{t(getActionKey('rename'))}</span>
+									</Dropdown.Item>
+									<Dropdown.Item onClick={() => setDeletingTag(tag)}>
+										<span>{t('common.delete')}</span>
+									</Dropdown.Item>
+								</Dropdown.Group>
+							</Dropdown.Content>
+						</Dropdown>
+					</div>
+				),
+				size: 20,
+			}),
+		],
+		[t],
+	)
+
+	const table = useReactTable({
+		columns,
+		data: sortedTags,
+		getCoreRowModel: getCoreRowModel(),
+		state: {
+			columnPinning: { right: ['actions'] },
+		},
+	})
+	const { rows } = table.getRowModel()
+
+	if (!tags?.length) {
+		return (
+			<Card className="flex items-center justify-center border-dashed border-edge-subtle p-6">
+				<div className="flex flex-col space-y-3">
+					<div className="relative flex justify-center">
+						<span className="flex items-center justify-center rounded-lg bg-background-surface p-2">
+							<TagIcon className="h-6 w-6 text-foreground-muted" />
+							<Slash className="absolute h-6 w-6 scale-x-[-1] transform text-foreground opacity-80" />
+						</span>
+					</div>
+
+					<div className="text-center">
+						<Text>{t(getKey('empty.title'))}</Text>
+						<Text size="sm" variant="muted">
+							{t(getKey('empty.action'))}
+						</Text>
+					</div>
+				</div>
+			</Card>
+		)
+	}
+
+	return (
+		<>
+			<RenameTagModal tag={renamingTag} onClose={() => setRenamingTag(null)} />
+			<DeleteTagConfirmModal tag={deletingTag} onClose={() => setDeletingTag(null)} />
+
+			<Card className="overflow-x-auto">
+				<table
+					className="min-w-full"
+					style={{
+						width: table.getCenterTotalSize(),
+					}}
+				>
+					<thead className="border-b border-edge">
+						<tr>
+							{table.getFlatHeaders().map((header) => (
+								<th
+									key={header.id}
+									className="sticky !top-0 z-[2] h-10 bg-background-surface/50 px-2 shadow-sm"
+									style={getCommonPinningStyles(header.column)}
+								>
+									<div
+										className="flex items-center"
+										style={{
+											width: header.getSize(),
+										}}
+									>
+										{flexRender(header.column.columnDef.header, header.getContext())}
+									</div>
+								</th>
+							))}
+						</tr>
+					</thead>
+
+					<tbody className="divide divide-y divide-edge">
+						{rows.map((row) => (
+							<tr key={row.id}>
+								{row.getVisibleCells().map((cell) => (
+									<td
+										className="h-14 bg-background px-2 last:px-0"
+										key={cell.id}
+										style={{
+											width: cell.column.getSize(),
+											...getCommonPinningStyles(cell.column),
+										}}
+									>
+										{flexRender(cell.column.columnDef.cell, cell.getContext())}
+									</td>
+								))}
+							</tr>
+						))}
+					</tbody>
+				</table>
+			</Card>
+		</>
+	)
+}
+
+const columnHelper = createColumnHelper<Tag>()
+
+const LOCALE_BASE = 'settingsScene.server/tags.sections.table'
+const getColumnKey = (key: string) => `${LOCALE_BASE}.columns.${key}`
+const getActionKey = (key: string) => `${LOCALE_BASE}.actionMenu.${key}`
+const getKey = (key: string) => `${LOCALE_BASE}.${key}`
diff --git a/packages/browser/src/scenes/settings/server/tags/index.ts b/packages/browser/src/scenes/settings/server/tags/index.ts
new file mode 100644
index 0000000000..1d896c6aa5
--- /dev/null
+++ b/packages/browser/src/scenes/settings/server/tags/index.ts
@@ -0,0 +1 @@
+export { default } from './TagSettingsScene'
diff --git a/packages/graphql/src/client/gql.ts b/packages/graphql/src/client/gql.ts
index 9e2bd1d9e3..3256d8e878 100644
--- a/packages/graphql/src/client/gql.ts
+++ b/packages/graphql/src/client/gql.ts
@@ -265,6 +265,10 @@ type Documents = {
     "\n\tsubscription LiveLogsFeed {\n\t\ttailLogFile\n\t}\n": typeof types.LiveLogsFeedDocument,
     "\n\tmutation DeleteLogs {\n\t\tdeleteLogs {\n\t\t\tdeleted\n\t\t}\n\t}\n": typeof types.DeleteLogsDocument,
     "\n\tquery PersistedLogs(\n\t\t$filter: LogFilterInput!\n\t\t$pagination: Pagination!\n\t\t$orderBy: [LogModelOrderBy!]!\n\t) {\n\t\tlogs(filter: $filter, pagination: $pagination, orderBy: $orderBy) {\n\t\t\tnodes {\n\t\t\t\tid\n\t\t\t\ttimestamp\n\t\t\t\tlevel\n\t\t\t\tmessage\n\t\t\t\tjobId\n\t\t\t\tcontext\n\t\t\t}\n\t\t\tpageInfo {\n\t\t\t\t__typename\n\t\t\t\t... on OffsetPaginationInfo {\n\t\t\t\t\ttotalPages\n\t\t\t\t\tcurrentPage\n\t\t\t\t\tpageSize\n\t\t\t\t\tpageOffset\n\t\t\t\t\tpageOffset\n\t\t\t\t\tzeroBased\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n": typeof types.PersistedLogsDocument,
+    "\n\tmutation CreateTagModal($tags: [String!]!) {\n\t\tcreateTags(tags: $tags) {\n\t\t\tid\n\t\t\tname\n\t\t}\n\t}\n": typeof types.CreateTagModalDocument,
+    "\n\tmutation DeleteTagConfirmModal($tags: [String!]!) {\n\t\tdeleteTags(tags: $tags) {\n\t\t\tid\n\t\t\tname\n\t\t}\n\t}\n": typeof types.DeleteTagConfirmModalDocument,
+    "\n\tmutation RenameTagModal($id: Int!, $name: String!) {\n\t\trenameTag(id: $id, name: $name) {\n\t\t\tid\n\t\t\tname\n\t\t}\n\t}\n": typeof types.RenameTagModalDocument,
+    "\n\tquery TagTable {\n\t\ttags {\n\t\t\tid\n\t\t\tname\n\t\t}\n\t}\n": typeof types.TagTableDocument,
     "\n\tquery UserStats {\n\t\tuserCount\n\t\ttopReaders(take: 1) {\n\t\t\tid\n\t\t\tusername\n\t\t\tfinishedReadingSessionsCount\n\t\t}\n\t\tactiveReadingSessionCount\n\t\tfinishedReadingSessionCount\n\t}\n": typeof types.UserStatsDocument,
     "\n\tmutation CreateOrUpdateUserFormUpdateUser($id: ID!, $input: UpdateUserInput!) {\n\t\tupdateUser(id: $id, input: $input) {\n\t\t\tid\n\t\t\tusername\n\t\t\tageRestriction {\n\t\t\t\tage\n\t\t\t\trestrictOnUnset\n\t\t\t}\n\t\t\tpermissions\n\t\t\tmaxSessionsAllowed\n\t\t}\n\t}\n": typeof types.CreateOrUpdateUserFormUpdateUserDocument,
     "\n\tmutation CreateOrUpdateUserFormCreateUser($input: CreateUserInput!) {\n\t\tcreateUser(input: $input) {\n\t\t\tid\n\t\t}\n\t}\n": typeof types.CreateOrUpdateUserFormCreateUserDocument,
@@ -542,6 +546,10 @@ const documents: Documents = {
     "\n\tsubscription LiveLogsFeed {\n\t\ttailLogFile\n\t}\n": types.LiveLogsFeedDocument,
     "\n\tmutation DeleteLogs {\n\t\tdeleteLogs {\n\t\t\tdeleted\n\t\t}\n\t}\n": types.DeleteLogsDocument,
     "\n\tquery PersistedLogs(\n\t\t$filter: LogFilterInput!\n\t\t$pagination: Pagination!\n\t\t$orderBy: [LogModelOrderBy!]!\n\t) {\n\t\tlogs(filter: $filter, pagination: $pagination, orderBy: $orderBy) {\n\t\t\tnodes {\n\t\t\t\tid\n\t\t\t\ttimestamp\n\t\t\t\tlevel\n\t\t\t\tmessage\n\t\t\t\tjobId\n\t\t\t\tcontext\n\t\t\t}\n\t\t\tpageInfo {\n\t\t\t\t__typename\n\t\t\t\t... on OffsetPaginationInfo {\n\t\t\t\t\ttotalPages\n\t\t\t\t\tcurrentPage\n\t\t\t\t\tpageSize\n\t\t\t\t\tpageOffset\n\t\t\t\t\tpageOffset\n\t\t\t\t\tzeroBased\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n": types.PersistedLogsDocument,
+    "\n\tmutation CreateTagModal($tags: [String!]!) {\n\t\tcreateTags(tags: $tags) {\n\t\t\tid\n\t\t\tname\n\t\t}\n\t}\n": types.CreateTagModalDocument,
+    "\n\tmutation DeleteTagConfirmModal($tags: [String!]!) {\n\t\tdeleteTags(tags: $tags) {\n\t\t\tid\n\t\t\tname\n\t\t}\n\t}\n": types.DeleteTagConfirmModalDocument,
+    "\n\tmutation RenameTagModal($id: Int!, $name: String!) {\n\t\trenameTag(id: $id, name: $name) {\n\t\t\tid\n\t\t\tname\n\t\t}\n\t}\n": types.RenameTagModalDocument,
+    "\n\tquery TagTable {\n\t\ttags {\n\t\t\tid\n\t\t\tname\n\t\t}\n\t}\n": types.TagTableDocument,
     "\n\tquery UserStats {\n\t\tuserCount\n\t\ttopReaders(take: 1) {\n\t\t\tid\n\t\t\tusername\n\t\t\tfinishedReadingSessionsCount\n\t\t}\n\t\tactiveReadingSessionCount\n\t\tfinishedReadingSessionCount\n\t}\n": types.UserStatsDocument,
     "\n\tmutation CreateOrUpdateUserFormUpdateUser($id: ID!, $input: UpdateUserInput!) {\n\t\tupdateUser(id: $id, input: $input) {\n\t\t\tid\n\t\t\tusername\n\t\t\tageRestriction {\n\t\t\t\tage\n\t\t\t\trestrictOnUnset\n\t\t\t}\n\t\t\tpermissions\n\t\t\tmaxSessionsAllowed\n\t\t}\n\t}\n": types.CreateOrUpdateUserFormUpdateUserDocument,
     "\n\tmutation CreateOrUpdateUserFormCreateUser($input: CreateUserInput!) {\n\t\tcreateUser(input: $input) {\n\t\t\tid\n\t\t}\n\t}\n": types.CreateOrUpdateUserFormCreateUserDocument,
@@ -1569,6 +1577,22 @@ export function graphql(source: "\n\tmutation DeleteLogs {\n\t\tdeleteLogs {\n\t
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
 export function graphql(source: "\n\tquery PersistedLogs(\n\t\t$filter: LogFilterInput!\n\t\t$pagination: Pagination!\n\t\t$orderBy: [LogModelOrderBy!]!\n\t) {\n\t\tlogs(filter: $filter, pagination: $pagination, orderBy: $orderBy) {\n\t\t\tnodes {\n\t\t\t\tid\n\t\t\t\ttimestamp\n\t\t\t\tlevel\n\t\t\t\tmessage\n\t\t\t\tjobId\n\t\t\t\tcontext\n\t\t\t}\n\t\t\tpageInfo {\n\t\t\t\t__typename\n\t\t\t\t... on OffsetPaginationInfo {\n\t\t\t\t\ttotalPages\n\t\t\t\t\tcurrentPage\n\t\t\t\t\tpageSize\n\t\t\t\t\tpageOffset\n\t\t\t\t\tpageOffset\n\t\t\t\t\tzeroBased\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n"): typeof import('./graphql').PersistedLogsDocument;
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n\tmutation CreateTagModal($tags: [String!]!) {\n\t\tcreateTags(tags: $tags) {\n\t\t\tid\n\t\t\tname\n\t\t}\n\t}\n"): typeof import('./graphql').CreateTagModalDocument;
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n\tmutation DeleteTagConfirmModal($tags: [String!]!) {\n\t\tdeleteTags(tags: $tags) {\n\t\t\tid\n\t\t\tname\n\t\t}\n\t}\n"): typeof import('./graphql').DeleteTagConfirmModalDocument;
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n\tmutation RenameTagModal($id: Int!, $name: String!) {\n\t\trenameTag(id: $id, name: $name) {\n\t\t\tid\n\t\t\tname\n\t\t}\n\t}\n"): typeof import('./graphql').RenameTagModalDocument;
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n\tquery TagTable {\n\t\ttags {\n\t\t\tid\n\t\t\tname\n\t\t}\n\t}\n"): typeof import('./graphql').TagTableDocument;
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/packages/graphql/src/client/graphql.ts b/packages/graphql/src/client/graphql.ts
index 33ad7f118a..1940480db8 100644
--- a/packages/graphql/src/client/graphql.ts
+++ b/packages/graphql/src/client/graphql.ts
@@ -1723,6 +1723,11 @@ export type Mutation = {
   removeBookClubMember: BookClubMember;
   /** Remove your own suggestion (only before it's resolved) */
   removeSuggestion: BookClubBookSuggestion;
+  /**
+   * Rename a tag. Returns the updated tag, or an error if the tag was not found or the new
+   * name already exists.
+   */
+  renameTag: Tag;
   /** Reorder uncompleted books in the club's queue. Completed books cannot be reordered since they are effectively archived */
   reorderBooks: BookClub;
   resetLibraryMetadata: Library;
@@ -2206,6 +2211,12 @@ export type MutationRemoveSuggestionArgs = {
 };
 
 
+export type MutationRenameTagArgs = {
+  id: Scalars['Int']['input'];
+  name: Scalars['String']['input'];
+};
+
+
 export type MutationReorderBooksArgs = {
   bookClubId: Scalars['ID']['input'];
   bookIds: Array<Scalars['String']['input']>;
@@ -5853,6 +5864,33 @@ export type PersistedLogsQueryVariables = Exact<{
 
 export type PersistedLogsQuery = { __typename?: 'Query', logs: { __typename?: 'PaginatedLogResponse', nodes: Array<{ __typename?: 'Log', id: number, timestamp: any, level: LogLevel, message: string, jobId?: string | null, context?: string | null }>, pageInfo: { __typename: 'CursorPaginationInfo' } | { __typename: 'OffsetPaginationInfo', totalPages: number, currentPage: number, pageSize: number, pageOffset: number, zeroBased: boolean } } };
 
+export type CreateTagModalMutationVariables = Exact<{
+  tags: Array<Scalars['String']['input']> | Scalars['String']['input'];
+}>;
+
+
+export type CreateTagModalMutation = { __typename?: 'Mutation', createTags: Array<{ __typename?: 'Tag', id: number, name: string }> };
+
+export type DeleteTagConfirmModalMutationVariables = Exact<{
+  tags: Array<Scalars['String']['input']> | Scalars['String']['input'];
+}>;
+
+
+export type DeleteTagConfirmModalMutation = { __typename?: 'Mutation', deleteTags: Array<{ __typename?: 'Tag', id: number, name: string }> };
+
+export type RenameTagModalMutationVariables = Exact<{
+  id: Scalars['Int']['input'];
+  name: Scalars['String']['input'];
+}>;
+
+
+export type RenameTagModalMutation = { __typename?: 'Mutation', renameTag: { __typename?: 'Tag', id: number, name: string } };
+
+export type TagTableQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type TagTableQuery = { __typename?: 'Query', tags: Array<{ __typename?: 'Tag', id: number, name: string }> };
+
 export type UserStatsQueryVariables = Exact<{ [key: string]: never; }>;
 
 
@@ -11176,6 +11214,38 @@ export const PersistedLogsDocument = new TypedDocumentString(`
   }
 }
     `) as unknown as TypedDocumentString<PersistedLogsQuery, PersistedLogsQueryVariables>;
+export const CreateTagModalDocument = new TypedDocumentString(`
+    mutation CreateTagModal($tags: [String!]!) {
+  createTags(tags: $tags) {
+    id
+    name
+  }
+}
+    `) as unknown as TypedDocumentString<CreateTagModalMutation, CreateTagModalMutationVariables>;
+export const DeleteTagConfirmModalDocument = new TypedDocumentString(`
+    mutation DeleteTagConfirmModal($tags: [String!]!) {
+  deleteTags(tags: $tags) {
+    id
+    name
+  }
+}
+    `) as unknown as TypedDocumentString<DeleteTagConfirmModalMutation, DeleteTagConfirmModalMutationVariables>;
+export const RenameTagModalDocument = new TypedDocumentString(`
+    mutation RenameTagModal($id: Int!, $name: String!) {
+  renameTag(id: $id, name: $name) {
+    id
+    name
+  }
+}
+    `) as unknown as TypedDocumentString<RenameTagModalMutation, RenameTagModalMutationVariables>;
+export const TagTableDocument = new TypedDocumentString(`
+    query TagTable {
+  tags {
+    id
+    name
+  }
+}
+    `) as unknown as TypedDocumentString<TagTableQuery, TagTableQueryVariables>;
 export const UserStatsDocument = new TypedDocumentString(`
     query UserStats {
   userCount
diff --git a/packages/i18n/src/locales/en-US.json b/packages/i18n/src/locales/en-US.json
index c1c94f3a73..8696397851 100644
--- a/packages/i18n/src/locales/en-US.json
+++ b/packages/i18n/src/locales/en-US.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -2143,6 +2144,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {

From 7995b61a0b5c451fb4aa6aee789e6516b04ca0b1 Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Fri, 3 Apr 2026 16:57:23 -0700
Subject: [PATCH 20/32] :rotating_light: Fix prettier lints

---
 apps/docs/pages/guides/configuration/theming.mdx     |  5 +++--
 .../scenes/settings/server/tags/TagSettingsScene.tsx |  2 +-
 .../src/scenes/settings/server/tags/TagTable.tsx     | 12 ++++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/apps/docs/pages/guides/configuration/theming.mdx b/apps/docs/pages/guides/configuration/theming.mdx
index 2c90c4b10d..4a80037244 100644
--- a/apps/docs/pages/guides/configuration/theming.mdx
+++ b/apps/docs/pages/guides/configuration/theming.mdx
@@ -23,7 +23,7 @@ For example, let's create a "midnight" theme that is based on the dark theme, bu
 	/* MARK: backgrounds */
 	--color-background: #000000;
 	--color-background-inverse: #ffffff;
-	
+
 	/* ... other theme colors ... */
 }
 ```
@@ -182,5 +182,6 @@ There are some restrictions for which fonts can be added:
 ## Future plans
 
 <Callout type="info">
-Support for arbitrary, local CSS files to override Stump's default themes is planned. You can track the progress of this feature in [issue #383](https://github.com/stumpapp/stump/issues/383).
+	Support for arbitrary, local CSS files to override Stump's default themes is planned. You can
+	track the progress of this feature in [issue #383](https://github.com/stumpapp/stump/issues/383).
 </Callout>
diff --git a/packages/browser/src/scenes/settings/server/tags/TagSettingsScene.tsx b/packages/browser/src/scenes/settings/server/tags/TagSettingsScene.tsx
index f09334891e..90ac64d906 100644
--- a/packages/browser/src/scenes/settings/server/tags/TagSettingsScene.tsx
+++ b/packages/browser/src/scenes/settings/server/tags/TagSettingsScene.tsx
@@ -13,7 +13,7 @@ export default function TagSettingsScene() {
 	return (
 		<SceneContainer>
 			<ContentContainer>
-				<div className="flex flex-col gap-4">
+				<div className="gap-4 flex flex-col">
 					<div className="flex items-end justify-between">
 						<div>
 							<Heading size="sm">{t(getKey('title'))}</Heading>
diff --git a/packages/browser/src/scenes/settings/server/tags/TagTable.tsx b/packages/browser/src/scenes/settings/server/tags/TagTable.tsx
index b6d60a5244..ebdf400a6e 100644
--- a/packages/browser/src/scenes/settings/server/tags/TagTable.tsx
+++ b/packages/browser/src/scenes/settings/server/tags/TagTable.tsx
@@ -95,12 +95,12 @@ export default function TagTable() {
 
 	if (!tags?.length) {
 		return (
-			<Card className="flex items-center justify-center border-dashed border-edge-subtle p-6">
-				<div className="flex flex-col space-y-3">
+			<Card className="p-6 flex items-center justify-center border-dashed border-edge-subtle">
+				<div className="space-y-3 flex flex-col">
 					<div className="relative flex justify-center">
-						<span className="flex items-center justify-center rounded-lg bg-background-surface p-2">
+						<span className="rounded-lg p-2 flex items-center justify-center bg-background-surface">
 							<TagIcon className="h-6 w-6 text-foreground-muted" />
-							<Slash className="absolute h-6 w-6 scale-x-[-1] transform text-foreground opacity-80" />
+							<Slash className="h-6 w-6 absolute scale-x-[-1] transform text-foreground opacity-80" />
 						</span>
 					</div>
 
@@ -132,7 +132,7 @@ export default function TagTable() {
 							{table.getFlatHeaders().map((header) => (
 								<th
 									key={header.id}
-									className="sticky !top-0 z-[2] h-10 bg-background-surface/50 px-2 shadow-sm"
+									className="!top-0 h-10 px-2 shadow-sm sticky z-[2] bg-background-surface/50"
 									style={getCommonPinningStyles(header.column)}
 								>
 									<div
@@ -153,7 +153,7 @@ export default function TagTable() {
 							<tr key={row.id}>
 								{row.getVisibleCells().map((cell) => (
 									<td
-										className="h-14 bg-background px-2 last:px-0"
+										className="h-14 px-2 last:px-0 bg-background"
 										key={cell.id}
 										style={{
 											width: cell.column.getSize(),

From ba9aa2ebaa80cb750736e49a0744f3bce503bae8 Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Sat, 4 Apr 2026 12:51:37 -0700
Subject: [PATCH 21/32] :globe_with_meridians: Update translations (#1045)

* New translations en-us.json (Italian)

* New translations en-us.json (Dutch)

* New translations en-us.json (Spanish)

* New translations en-us.json (Romanian)

* New translations en-us.json (French)

* New translations en-us.json (Afrikaans)

* New translations en-us.json (Arabic)

* New translations en-us.json (Catalan)

* New translations en-us.json (Czech)

* New translations en-us.json (Danish)

* New translations en-us.json (German)

* New translations en-us.json (Greek)

* New translations en-us.json (Finnish)

* New translations en-us.json (Hebrew)

* New translations en-us.json (Hungarian)

* New translations en-us.json (Japanese)

* New translations en-us.json (Korean)

* New translations en-us.json (Norwegian)

* New translations en-us.json (Polish)

* New translations en-us.json (Portuguese)

* New translations en-us.json (Russian)

* New translations en-us.json (Serbian (Cyrillic))

* New translations en-us.json (Swedish)

* New translations en-us.json (Turkish)

* New translations en-us.json (Ukrainian)

* New translations en-us.json (Chinese Simplified)

* New translations en-us.json (Chinese Traditional)

* New translations en-us.json (Vietnamese)

* New translations en-us.json (Portuguese, Brazilian)

* New translations en-us.json (English, United Kingdom)

* New translations en-us.json (Spanish)

* New translations en-us.json (Romanian)

* New translations en-us.json (French)

* New translations en-us.json (Afrikaans)

* New translations en-us.json (Arabic)

* New translations en-us.json (Catalan)

* New translations en-us.json (Czech)

* New translations en-us.json (Danish)

* New translations en-us.json (German)

* New translations en-us.json (Greek)

* New translations en-us.json (Finnish)

* New translations en-us.json (Hebrew)

* New translations en-us.json (Hungarian)

* New translations en-us.json (Italian)

* New translations en-us.json (Dutch)

* New translations en-us.json (Japanese)

* New translations en-us.json (Korean)

* New translations en-us.json (Norwegian)

* New translations en-us.json (Polish)

* New translations en-us.json (Portuguese)

* New translations en-us.json (Russian)

* New translations en-us.json (Serbian (Cyrillic))

* New translations en-us.json (Swedish)

* New translations en-us.json (Turkish)

* New translations en-us.json (Ukrainian)

* New translations en-us.json (Chinese Simplified)

* New translations en-us.json (Chinese Traditional)

* New translations en-us.json (English)

* New translations en-us.json (Vietnamese)

* New translations en-us.json (Portuguese, Brazilian)

* New translations en-us.json (English, United Kingdom)

* New translations en-us.json (Polish)

* New translations en-us.json (Polish)

* New translations en-us.json (Polish)

* New translations en-us.json (Polish)

* fix typos
---
 packages/i18n/src/locales/af-ZA.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/ar-SA.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/ca-ES.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/cs-CZ.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/da-DK.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/de-DE.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/el-GR.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/en-GB.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/en-US.json |   5 +-
 packages/i18n/src/locales/es-ES.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/fi-FI.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/fr-FR.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/he-IL.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/hu-HU.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/it-IT.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/ja-JP.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/ko-KR.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/nl-NL.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/no-NO.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/pl-PL.json | 406 ++++++++++++++++++++++++++-
 packages/i18n/src/locales/pt-BR.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/pt-PT.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/ro-RO.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/ru-RU.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/sr-SP.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/sv-SE.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/tr-TR.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/uk-UA.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/vi-VN.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/zh-CN.json | 402 ++++++++++++++++++++++++++
 packages/i18n/src/locales/zh-TW.json | 402 ++++++++++++++++++++++++++
 31 files changed, 12064 insertions(+), 5 deletions(-)

diff --git a/packages/i18n/src/locales/af-ZA.json b/packages/i18n/src/locales/af-ZA.json
index ee3184ae35..a0f30c4274 100644
--- a/packages/i18n/src/locales/af-ZA.json
+++ b/packages/i18n/src/locales/af-ZA.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/ar-SA.json b/packages/i18n/src/locales/ar-SA.json
index 0d79e61031..44ee02e38f 100644
--- a/packages/i18n/src/locales/ar-SA.json
+++ b/packages/i18n/src/locales/ar-SA.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/ca-ES.json b/packages/i18n/src/locales/ca-ES.json
index 0d79e61031..44ee02e38f 100644
--- a/packages/i18n/src/locales/ca-ES.json
+++ b/packages/i18n/src/locales/ca-ES.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/cs-CZ.json b/packages/i18n/src/locales/cs-CZ.json
index 10037f7719..62ac612c91 100644
--- a/packages/i18n/src/locales/cs-CZ.json
+++ b/packages/i18n/src/locales/cs-CZ.json
@@ -1254,6 +1254,7 @@
 				"access": "Přístup",
 				"email": "E-mail",
 				"notifications": "Notifikace",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Podzim",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Upravit e-mailer",
 				"description": "Upravit podrobnosti o tomto SMTP e-maileru"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/da-DK.json b/packages/i18n/src/locales/da-DK.json
index 188274fb1f..bbc31ba380 100644
--- a/packages/i18n/src/locales/da-DK.json
+++ b/packages/i18n/src/locales/da-DK.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/de-DE.json b/packages/i18n/src/locales/de-DE.json
index a1a3417bfc..d570118e15 100644
--- a/packages/i18n/src/locales/de-DE.json
+++ b/packages/i18n/src/locales/de-DE.json
@@ -1254,6 +1254,7 @@
 				"access": "Zugriff",
 				"email": "E-Mail",
 				"notifications": "Benachrichtigungen",
+				"tags": "Tags",
 				"label": "Verwaltung"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Herbst",
 						"cosmic": "Kosmisch",
 						"pumpkin": "Kürbis",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Mailserver aktualisieren",
 				"description": "Details dieses SMTP-Mailservers aktualisieren"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Vorschaubilder bearbeiten",
 			"description": "Erlaubt dem Benutzer Vorschaubilder für Bücher und Serien zu bearbeiten"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/el-GR.json b/packages/i18n/src/locales/el-GR.json
index 0d79e61031..44ee02e38f 100644
--- a/packages/i18n/src/locales/el-GR.json
+++ b/packages/i18n/src/locales/el-GR.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/en-GB.json b/packages/i18n/src/locales/en-GB.json
index 77e784305e..a5efa5a1e1 100644
--- a/packages/i18n/src/locales/en-GB.json
+++ b/packages/i18n/src/locales/en-GB.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/en-US.json b/packages/i18n/src/locales/en-US.json
index 75139b7453..6850c1ee54 100644
--- a/packages/i18n/src/locales/en-US.json
+++ b/packages/i18n/src/locales/en-US.json
@@ -2698,7 +2698,7 @@
 			},
 			"stump": {
 				"label": "Stump",
-				"description": "Stump features are optional and can be turn them off if you do not need them",
+				"description": "Stump features are optional and can be turned off if you do not need them",
 				"bookClubsEnabled": "Book Club Features"
 			},
 			"autoSyncLocalData": "Auto-Sync Local Data",
@@ -2715,8 +2715,7 @@
 						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
 						"deleteFailed": {
 							"title": "Deletion Failed",
-							"description": "There was an error deleting all all downloads from {{serverName}}"
-
+							"description": "There was an error deleting all downloads from {{serverName}}"
 						}
 					},
 					"noDownloads": "No downloaded files for this server",
diff --git a/packages/i18n/src/locales/es-ES.json b/packages/i18n/src/locales/es-ES.json
index f2dead5784..5e6c5097da 100644
--- a/packages/i18n/src/locales/es-ES.json
+++ b/packages/i18n/src/locales/es-ES.json
@@ -1254,6 +1254,7 @@
 				"access": "Acceso",
 				"email": "Correo electrónico",
 				"notifications": "Notificaciones",
+				"tags": "Tags",
 				"label": "Servidor"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/fi-FI.json b/packages/i18n/src/locales/fi-FI.json
index 0d79e61031..44ee02e38f 100644
--- a/packages/i18n/src/locales/fi-FI.json
+++ b/packages/i18n/src/locales/fi-FI.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/fr-FR.json b/packages/i18n/src/locales/fr-FR.json
index b00a95acc8..edb2a02a63 100644
--- a/packages/i18n/src/locales/fr-FR.json
+++ b/packages/i18n/src/locales/fr-FR.json
@@ -1254,6 +1254,7 @@
 				"access": "Accéder",
 				"email": "E-mail",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Serveur"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Automne",
 						"cosmic": "Cosmique",
 						"pumpkin": "Citrouille",
+						"midnight": "Midnight",
 						"matrix": "Matrice"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Créer un expéditeur",
 				"description": "Mettre à jour les informations de l'expéditeur SMTP"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/he-IL.json b/packages/i18n/src/locales/he-IL.json
index 0d79e61031..44ee02e38f 100644
--- a/packages/i18n/src/locales/he-IL.json
+++ b/packages/i18n/src/locales/he-IL.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/hu-HU.json b/packages/i18n/src/locales/hu-HU.json
index 3c2ea867f9..0fdbc47d37 100644
--- a/packages/i18n/src/locales/hu-HU.json
+++ b/packages/i18n/src/locales/hu-HU.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/it-IT.json b/packages/i18n/src/locales/it-IT.json
index 16f94b43d6..8da4f9d3f4 100644
--- a/packages/i18n/src/locales/it-IT.json
+++ b/packages/i18n/src/locales/it-IT.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/ja-JP.json b/packages/i18n/src/locales/ja-JP.json
index ad3385153f..bdc20df6d6 100644
--- a/packages/i18n/src/locales/ja-JP.json
+++ b/packages/i18n/src/locales/ja-JP.json
@@ -1254,6 +1254,7 @@
 				"access": "アクセス",
 				"email": "メール",
 				"notifications": "通知",
+				"tags": "Tags",
 				"label": "サーバー"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "秋",
 						"cosmic": "宇宙",
 						"pumpkin": "パンプキン",
+						"midnight": "Midnight",
 						"matrix": "マトリックス"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/ko-KR.json b/packages/i18n/src/locales/ko-KR.json
index 41011df351..7a0c229d2e 100644
--- a/packages/i18n/src/locales/ko-KR.json
+++ b/packages/i18n/src/locales/ko-KR.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/nl-NL.json b/packages/i18n/src/locales/nl-NL.json
index e930d7f5de..e73be126e5 100644
--- a/packages/i18n/src/locales/nl-NL.json
+++ b/packages/i18n/src/locales/nl-NL.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/no-NO.json b/packages/i18n/src/locales/no-NO.json
index 0d79e61031..44ee02e38f 100644
--- a/packages/i18n/src/locales/no-NO.json
+++ b/packages/i18n/src/locales/no-NO.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/pl-PL.json b/packages/i18n/src/locales/pl-PL.json
index a2971a4fa8..ffc8fe9a4b 100644
--- a/packages/i18n/src/locales/pl-PL.json
+++ b/packages/i18n/src/locales/pl-PL.json
@@ -7,7 +7,7 @@
 	},
 	"authScene": {
 		"claimHeading": "Inicjalizuj serwer",
-		"claimText": "Ten serwer Stump nie został zainicjalizowany. Użyj formularza poniżej aby stworzyć konto. Gdy będzie już ono stworzone, uzyskasz pełen dostęp do wszystkich funkcji serwera.",
+		"claimText": "Ten serwer Stump nie został zainicjowany. Użyj formularza poniżej, aby stworzyć konto. Gdy będzie już ono stworzone, uzyskasz pełen dostęp do wszystkich funkcji serwera.",
 		"form": {
 			"validation": {
 				"missingUsername": "Nazwa użytkownika jest wymagana",
@@ -1254,6 +1254,7 @@
 				"access": "Dostęp",
 				"email": "Adres e-mail",
 				"notifications": "Powiadomienia",
+				"tags": "Etykiety",
 				"label": "Zarządzanie"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Jesień",
 						"cosmic": "Kosmiczny",
 						"pumpkin": "Dynia",
+						"midnight": "Północ",
 						"matrix": "Matrix"
 					}
 				},
@@ -1635,7 +1637,7 @@
 							"description": "Spowoduje to wylogowanie z bieżącego serwera",
 							"confirm": "Przełącz na serwer",
 							"server": "Serwer",
-							"uri": "Adres URL"
+							"uri": "Odnośnik"
 						}
 					},
 					"resetConfiguration": {
@@ -2143,6 +2145,55 @@
 				"title": "Aktualizuj wysyłkę",
 				"description": "Aktualizuj detale tej wysyłki SMTP"
 			}
+		},
+		"server/tags": {
+			"helmet": "Zarządzanie etykietami",
+			"title": "Etykiety",
+			"description": "Utwórz i zarządzaj etykietami w celu organizacji treści",
+			"sections": {
+				"table": {
+					"title": "Etykiety",
+					"description": "Wszystkie etykiety dostępne na tym serwerze",
+					"empty": {
+						"title": "Brak etykiet",
+						"action": "Utwórz swoją pierwszą etykietę, aby rozpocząć"
+					},
+					"columns": {
+						"name": "Nazwa"
+					},
+					"actionMenu": {
+						"rename": "Zmień nazwę"
+					}
+				},
+				"createTag": {
+					"trigger": "Utwórz etykietę",
+					"modal": {
+						"heading": "Utwórz nową etykietę",
+						"description": "Etykiety mogą być przypisywane do książek, serii lub bibliotek",
+						"name": {
+							"label": "Nazwa",
+							"placeholder": "Wprowadź nazwę etykiety"
+						},
+						"submit": "Utwórz"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Zmień nazwę etykiety",
+						"description": "Zmień nazwę tej etykiety we wszystkich przypisanych pozycjach",
+						"name": {
+							"label": "Nazwa",
+							"placeholder": "Wprowadź nową nazwę etykiety"
+						},
+						"submit": "Zmień nazwę"
+					}
+				},
+				"deleteTag": {
+					"title": "Usuń etykietę",
+					"description": "Etykieta zostanie usunięta ze wszystkich książek, serii i bibliotek. Operacji tej nie można cofnąć.",
+					"confirm": "Usuń"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edycja miniatur",
 			"description": "Pozwala użytkownikowi na edycję miniatur książek i serii"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Dodaj serwer",
+				"subtitle": "Skonfiguruj nowy serwer, aby uzyskać dostęp do swojej zawartości"
+			},
+			"editServer": {
+				"title": "Edytuj serwer",
+				"subtitle": "Edytuj serwer"
+			},
+			"kind": "Wariant",
+			"customHeaders": {
+				"label": "Niestandardowe nagłówki",
+				"addHeader": "Dodaj nagłówek",
+				"invalidHeader": "Nieprawidłowy nagłówek"
+			},
+			"auth": {
+				"label": "Autoryzacja",
+				"default": {
+					"label": "Logowanie",
+					"description": "Zostaniesz poproszony w razie potrzeby o zalogowanie się podczas dostępu do zawartości"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Token"
+				},
+				"basic": "Podstawowe"
+			},
+			"serverNamePlaceholder": "Mój serwer",
+			"catalogUrl": "Odnośnik do katalogu",
+			"failedToConnect": "Połączenie z serwerem nie powiodło się",
+			"didConnect": "Połączono",
+			"checkConnection": "Sprawdź połączenie",
+			"setAsDefaultServer": "Ustaw jako domyślny serwer",
+			"enableOPDS": "Włącz OPDS",
+			"validation": {
+				"nameAlreadyExists": "Podana nazwa jest już używana",
+				"cannotSetAuthorizationHeader": "Nie można ustawić nagłówka uwierzytelnienia"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Oznacz jako przeczytane",
+				"confirmation": "Czy na pewno chcesz oznaczyć {{bookTitle}} jako przeczytane?"
+			},
+			"clearProgress": {
+				"label": "Wyczyść postęp",
+				"confirmation": "Czy na pewno chcesz wyczyścić postęp dla {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Usuń książkę",
+				"confirmation": "Czy na pewno chcesz usunąć {{bookTitle}}?"
+			},
+			"seeDetails": "Zobacz szczegóły"
+		},
+		"bookMetadata": {
+			"ageRating": "Klasyfikacja wiekowa",
+			"downloadedAt": "Pobrane",
+			"format": "Format",
+			"genres": "Gatunki",
+			"language": "Język",
+			"publisher": "Wydawca",
+			"size": "Rozmiar",
+			"volume": "Tom",
+			"year": "Rok"
+		},
+		"common": {
+			"cancel": "Anuluj",
+			"chapter": "Rozdział",
+			"clear": "Wyczyść",
+			"confirm": "Potwierdź",
+			"details": "Szczegóły",
+			"delete": "Usuń",
+			"downloads": "Pobrane",
+			"edit": "Edytuj",
+			"enabled": "Aktywne",
+			"enable": "Aktywuj",
+			"error": "Błąd",
+			"name": "Nazwa",
+			"none": "Brak",
+			"options": "Ustawienia",
+			"page": "Strona",
+			"pages": "Strony",
+			"password": "Hasło",
+			"progress": "Postęp",
+			"readTime": "Czas czytania",
+			"readMore": "Dowiedz się więcej",
+			"save": "Zapisz",
+			"select": "Zaznacz",
+			"settings": "Ustawienia",
+			"servers": "Serwery",
+			"thisBook": "ta książka",
+			"thisServer": "ten serwer",
+			"unknown": "Nieznany",
+			"unknownTitle": "Bez tytułu",
+			"url": "Odnośnik",
+			"username": "Nazwa użytkownika",
+			"value": "Wartość",
+			"version": "Wersja"
+		},
+		"emptyState": {
+			"noStumpServers": "Nie dodano żadnych serwerów Stump",
+			"noOPDSServers": "Nie dodano żadnych serwerów OPDS",
+			"noServers": "Nie skonfigurowano żadnych serwerów",
+			"cta": "Zacznij od dodania serwera, aby uzyskać do swojej kolekcji książek",
+			"seeDocumentation": "Zobacz dokumentację"
+		},
+		"tabs": {
+			"servers": "Serwery",
+			"localLibrary": "Biblioteka",
+			"settings": "Ustawienia"
+		},
+		"localLibrary": {
+			"title": "Biblioteka lokalna",
+			"emptyState": {
+				"all": {
+					"title": "Brak pozycji do czytania",
+					"description": "Tutaj pojawią się pobrane książki"
+				},
+				"imported": {
+					"title": "Brak zaimportowanych książek",
+					"description": "Zaimportuj książki, aby przeczytać je offline"
+				},
+				"server": {
+					"title": "Brak pobranych książek",
+					"description": "Pobierz książki z biblioteki, aby odczytać je w trybie offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Pobieranie",
+				"failed": "Niepowodzenie",
+				"nothingDownloading": "Nic nie jest pobierane",
+				"noActiveDownloads": "Brak aktywnych pobrań",
+				"noFailedDownloads": "Brak nieudanych pobrań",
+				"downloadStarting": "Rozpoczynanie..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Usuń książki",
+					"confirmation": "Czy na pewno chcesz usunąć lokalną bibliotekę?",
+					"disclaimer": "Tej czynności nie można cofnąć."
+				},
+				"seeProblems": "Zobacz problemy ({{problemCount}})",
+				"hideCurated": "Ukryj wyselekcjonowane",
+				"showCurated": "Pokaż wyselekcjonowane",
+				"attemptSync": "Spróbuj zsynchronizować"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Nazwa",
+					"ADDED_AT": "Data dodania",
+					"SERIES": "Seria"
+				},
+				"sortDirection": {
+					"ASC": "Rosnąco",
+					"DESC": "Malejąco"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Najpierw najstarsze",
+					"DESC": "Najpierw najnowsze"
+				},
+				"sourceFilter": {
+					"all": "Wszystkie książki",
+					"server": "Pobrane",
+					"imported": "Zaimportowane"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Nieudane pobierania",
+				"noFailedDownloads": "Brak nieudanych pobrań",
+				"retryAll": "Ponów wszystkie",
+				"dismissAll": "Odrzucić wszystkie"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferencje",
+				"appTheme": {
+					"label": "Motyw",
+					"options": {
+						"light": "Jasny",
+						"dark": "Ciemny"
+					}
+				},
+				"appPrimaryColor": "Akcent",
+				"appLanguage": "Język",
+				"defaultServer": "Domyślny serwer",
+				"thumbnailRatio": "Współczynnik miniatur",
+				"thumbnailPlaceholder": {
+					"label": "Miniatury zastępcze",
+					"options": {
+						"grayscale": "Odcienie szarości",
+						"averageColor": "Średnie wartości kolorów",
+						"colorful": "Kolorowe",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Skalowanie miniatur",
+					"options": {
+						"cover": "Okładka",
+						"stretch": "Rozciągnij",
+						"fit": "Dopasuj"
+					}
+				}
+			},
+			"reading": {
+				"label": "Czytane",
+				"preferNativePdf": "Preferuj natywny PDF",
+				"preferMinimalReader": "Preferuj minimalny czytnik",
+				"disableDismissGesture": "Wyłącz gest odrzucania"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Funkcje Stump są opcjonalne i, jeśli ich nie potrzebujesz, możesz je wyłączyć",
+				"bookClubsEnabled": "Funkcje klubu książki"
+			},
+			"autoSyncLocalData": "Automatycznie synchronizuj dane lokalne",
+			"management": {
+				"label": "Zarządzanie",
+				"dataUsage": {
+					"label": "Wykorzystanie danych",
+					"nonStumpData": "Dane inne niż Stump",
+					"serversTotal": "Łącznie serwerów",
+					"totalFiles": "Łącznie plików",
+					"totalSize": "Łączny rozmiar",
+					"deleteDownloads": {
+						"label": "Usuń pobrane",
+						"confirmation": "Czy na pewno chcesz usunąć wszystkie pobrania z {{serverName}}?",
+						"deleteFailed": {
+							"title": "Usunięcie nie powiodło się",
+							"description": "Wystąpił błąd podczas usuwania wszystkich pobrań z {{serverName}}"
+						}
+					},
+					"noDownloads": "Brak pobranych plików z tego serwera",
+					"storedPreferences": {
+						"label": "Zapisane preferencje",
+						"description": "Różne dane, takie jak preferencje książek, czasy odczytu, itp."
+					},
+					"clearPreferences": "Wyczyść preferencje"
+				}
+			},
+			"debug": {
+				"label": "Debugowanie",
+				"clearCache": {
+					"memory": {
+						"button": "Pamięć",
+						"success": "Wyczyszczono pamięć"
+					},
+					"disk": {
+						"button": "Dysk",
+						"success": "Wyczyszczono pamięć podręczną"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Usuń bazę danych",
+					"success": {
+						"title": "Usunięto bazę danych",
+						"description": "Proszę uruchom aplikację ponownie"
+					},
+					"error": {
+						"title": "Usunięcie nie powiodło się",
+						"description": "Wystąpił błąd podczas usuwania bazy danych"
+					}
+				},
+				"performanceMonitor": "Monitor wydajności",
+				"reduceAnimations": "Ogranicz animacje",
+				"maskUrls": "Ukryj odnośniki",
+				"debugAnalytics": {
+					"label": "Analityka debugowania",
+					"description": "Wyślij dodatkowe zdarzenia związane z debugowaniem, aby pomóc w rozwiązywaniu problemów"
+				}
+			},
+			"contactInfo": {
+				"label": "Kontakt",
+				"email": "Adres e-mail",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Informacje o kompilacji",
+				"version": "Wersja: {{version}}",
+				"suuportIdentifier": "Identyfikator wsparcia: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Ustawienia czytnika",
+			"sections": {
+				"mode": "Tryb",
+				"imageOptions": "Ustawienia obrazów",
+				"controls": "Sterowanie"
+			},
+			"readingMode": {
+				"label": "Kierunek",
+				"options": {
+					"PAGED": "Strony",
+					"CONTINUOUS_HORIZONTAL": "Przewijanie (poziome)",
+					"CONTINUOUS_VERTICAL": "Przewijanie (pionowe)"
+				}
+			},
+			"readingDirection": {
+				"label": "Kierunek",
+				"options": {
+					"RTL": "Od prawej do lewej",
+					"LTR": "Od lewej do prawej"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Podwójna strona",
+				"options": {
+					"always": "Zawsze",
+					"auto": "Automatycznie",
+					"off": "Wyłączone"
+				}
+			},
+			"separateSecondPage": "Oddziel drugą stronę",
+			"imageScaling": {
+				"label": "Skalowanie",
+				"options": {
+					"AUTO": "Automatyczne",
+					"HEIGHT": "Dopasuj wysokość",
+					"WIDTH": "Dopasuj szerokość",
+					"NONE": "Brak"
+				}
+			},
+			"allowDownscaling": "Skalowanie zmniejszające",
+			"tapSidesToNavigate": "Dotknij boki, aby nawigować",
+			"footerControls": {
+				"label": "Stopka",
+				"options": {
+					"images": "Galeria obrazów",
+					"slider": "Suwak"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Wyczyść pamięć podręczną",
+			"discardTokens": {
+				"label": "Wyczyść tokeny",
+				"description": "Dotyczy tylko tokenów logowania"
+			},
+			"deleteServer": {
+				"title": "Usuń serwer",
+				"confirmation": "Czy na pewno chcesz usunąć {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/pt-BR.json b/packages/i18n/src/locales/pt-BR.json
index 200a05f110..fe6fed561d 100644
--- a/packages/i18n/src/locales/pt-BR.json
+++ b/packages/i18n/src/locales/pt-BR.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/pt-PT.json b/packages/i18n/src/locales/pt-PT.json
index c1c94f3a73..6850c1ee54 100644
--- a/packages/i18n/src/locales/pt-PT.json
+++ b/packages/i18n/src/locales/pt-PT.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/ro-RO.json b/packages/i18n/src/locales/ro-RO.json
index 0d79e61031..44ee02e38f 100644
--- a/packages/i18n/src/locales/ro-RO.json
+++ b/packages/i18n/src/locales/ro-RO.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/ru-RU.json b/packages/i18n/src/locales/ru-RU.json
index 025128010c..1d4450746f 100644
--- a/packages/i18n/src/locales/ru-RU.json
+++ b/packages/i18n/src/locales/ru-RU.json
@@ -1254,6 +1254,7 @@
 				"access": "Права доступа",
 				"email": "Электронная почта",
 				"notifications": "Уведомления",
+				"tags": "Tags",
 				"label": "Сервер"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Осень",
 						"cosmic": "Космическая",
 						"pumpkin": "Тыквенная",
+						"midnight": "Midnight",
 						"matrix": "Матрица"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Обновить модуль отправки",
 				"description": "Обновить сведения об этом SMTP модуля отправки"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/sr-SP.json b/packages/i18n/src/locales/sr-SP.json
index 0d79e61031..44ee02e38f 100644
--- a/packages/i18n/src/locales/sr-SP.json
+++ b/packages/i18n/src/locales/sr-SP.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/sv-SE.json b/packages/i18n/src/locales/sv-SE.json
index 1edfe0f01b..9a4f1e0e96 100644
--- a/packages/i18n/src/locales/sv-SE.json
+++ b/packages/i18n/src/locales/sv-SE.json
@@ -1254,6 +1254,7 @@
 				"access": "Åtkomst",
 				"email": "E-post",
 				"notifications": "Notifikationer",
+				"tags": "Tags",
 				"label": "Hantering"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Höst",
 						"cosmic": "Kosmiskt",
 						"pumpkin": "Pumpa",
+						"midnight": "Midnight",
 						"matrix": "Matris"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Uppdatera e-postare",
 				"description": "Uppdatera detaljer för denna SMTP-e-postare"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/tr-TR.json b/packages/i18n/src/locales/tr-TR.json
index f6d7033f84..e4041d04b6 100644
--- a/packages/i18n/src/locales/tr-TR.json
+++ b/packages/i18n/src/locales/tr-TR.json
@@ -1254,6 +1254,7 @@
 				"access": "Erişim",
 				"email": "E-posta",
 				"notifications": "Bildirimler",
+				"tags": "Tags",
 				"label": "Yönetim"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/uk-UA.json b/packages/i18n/src/locales/uk-UA.json
index 0d79e61031..44ee02e38f 100644
--- a/packages/i18n/src/locales/uk-UA.json
+++ b/packages/i18n/src/locales/uk-UA.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/vi-VN.json b/packages/i18n/src/locales/vi-VN.json
index 0d79e61031..44ee02e38f 100644
--- a/packages/i18n/src/locales/vi-VN.json
+++ b/packages/i18n/src/locales/vi-VN.json
@@ -1254,6 +1254,7 @@
 				"access": "Access",
 				"email": "Email",
 				"notifications": "Notifications",
+				"tags": "Tags",
 				"label": "Management"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/zh-CN.json b/packages/i18n/src/locales/zh-CN.json
index cb1b24240f..567cf797d1 100644
--- a/packages/i18n/src/locales/zh-CN.json
+++ b/packages/i18n/src/locales/zh-CN.json
@@ -1254,6 +1254,7 @@
 				"access": "访问",
 				"email": "电子邮件地址",
 				"notifications": "通知",
+				"tags": "Tags",
 				"label": "管理"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "秋色",
 						"cosmic": "宇宙",
 						"pumpkin": "南瓜",
+						"midnight": "Midnight",
 						"matrix": "矩阵"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "更新邮件发送器",
 				"description": "更新此用户的详细信息"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "编辑缩略图",
 			"description": "允许用户编辑书籍和系列片的缩略图"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }
diff --git a/packages/i18n/src/locales/zh-TW.json b/packages/i18n/src/locales/zh-TW.json
index 43258807cc..f97fb070ce 100644
--- a/packages/i18n/src/locales/zh-TW.json
+++ b/packages/i18n/src/locales/zh-TW.json
@@ -1254,6 +1254,7 @@
 				"access": "访问权限",
 				"email": "Email",
 				"notifications": "通知",
+				"tags": "Tags",
 				"label": "服务器"
 			}
 		},
@@ -1327,6 +1328,7 @@
 						"autumn": "Autumn",
 						"cosmic": "Cosmic",
 						"pumpkin": "Pumpkin",
+						"midnight": "Midnight",
 						"matrix": "Matrix"
 					}
 				},
@@ -2143,6 +2145,55 @@
 				"title": "Update emailer",
 				"description": "Update the details of this SMTP emailer"
 			}
+		},
+		"server/tags": {
+			"helmet": "Tag management",
+			"title": "Tags",
+			"description": "Create and manage tags for organizing your content",
+			"sections": {
+				"table": {
+					"title": "Tags",
+					"description": "All tags available on this server",
+					"empty": {
+						"title": "No tags",
+						"action": "Create your first tag to get started"
+					},
+					"columns": {
+						"name": "Name"
+					},
+					"actionMenu": {
+						"rename": "Rename"
+					}
+				},
+				"createTag": {
+					"trigger": "Create tag",
+					"modal": {
+						"heading": "Create new tag",
+						"description": "Tags can be assigned to books, series, and libraries",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter tag name"
+						},
+						"submit": "Create"
+					}
+				},
+				"renameTag": {
+					"modal": {
+						"heading": "Rename tag",
+						"description": "Change the name of this tag across all assigned items",
+						"name": {
+							"label": "Name",
+							"placeholder": "Enter new tag name"
+						},
+						"submit": "Rename"
+					}
+				},
+				"deleteTag": {
+					"title": "Delete tag",
+					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
+					"confirm": "Delete"
+				}
+			}
 		}
 	},
 	"jobOverlay": {
@@ -2428,5 +2479,356 @@
 			"label": "Edit thumbnails",
 			"description": "Allows the user to edit thumbnails for books and series"
 		}
+	},
+	"mobileApp": {
+		"addOrEditServer": {
+			"addServer": {
+				"title": "Add Server",
+				"subtitle": "Configure a new server to access your content"
+			},
+			"editServer": {
+				"title": "Edit Server",
+				"subtitle": "Edit Server"
+			},
+			"kind": "Kind",
+			"customHeaders": {
+				"label": "Custom Headers",
+				"addHeader": "Add header",
+				"invalidHeader": "Invalid header"
+			},
+			"auth": {
+				"label": "Auth",
+				"default": {
+					"label": "Login",
+					"description": "You will be prompted to login when accessing content as needed"
+				},
+				"token": {
+					"label": "Token",
+					"placeholder": "Raw token"
+				},
+				"basic": "Basic"
+			},
+			"serverNamePlaceholder": "My Server",
+			"catalogUrl": "Catalog URL",
+			"failedToConnect": "Failed to connect to server",
+			"didConnect": "Connected",
+			"checkConnection": "Check connection",
+			"setAsDefaultServer": "Set as default server",
+			"enableOPDS": "Enable OPDS",
+			"validation": {
+				"nameAlreadyExists": "Name already exists",
+				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+			}
+		},
+		"bookActions": {
+			"markAsRead": {
+				"label": "Mark as read",
+				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+			},
+			"clearProgress": {
+				"label": "Clear progress",
+				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+			},
+			"deleteBook": {
+				"label": "Delete book",
+				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+			},
+			"seeDetails": "See Details"
+		},
+		"bookMetadata": {
+			"ageRating": "Age Rating",
+			"downloadedAt": "Downloaded",
+			"format": "Format",
+			"genres": "Genres",
+			"language": "Language",
+			"publisher": "Publisher",
+			"size": "Size",
+			"volume": "Volume",
+			"year": "Year"
+		},
+		"common": {
+			"cancel": "Cancel",
+			"chapter": "Chapter",
+			"clear": "Clear",
+			"confirm": "Confirm",
+			"details": "Details",
+			"delete": "Delete",
+			"downloads": "Downloads",
+			"edit": "Edit",
+			"enabled": "Enabled",
+			"enable": "Enable",
+			"error": "Error",
+			"name": "Name",
+			"none": "None",
+			"options": "Options",
+			"page": "Page",
+			"pages": "Pages",
+			"password": "Password",
+			"progress": "Progress",
+			"readTime": "Read time",
+			"readMore": "Read more",
+			"save": "Save",
+			"select": "Select",
+			"settings": "Settings",
+			"servers": "Servers",
+			"thisBook": "this book",
+			"thisServer": "this server",
+			"unknown": "Unknown",
+			"unknownTitle": "Untitled",
+			"url": "URL",
+			"username": "Username",
+			"value": "Value",
+			"version": "Version"
+		},
+		"emptyState": {
+			"noStumpServers": "No Stump servers added",
+			"noOPDSServers": "No OPDS servers added",
+			"noServers": "No servers have been configured",
+			"cta": "Get started by adding a server to access your book collections",
+			"seeDocumentation": "See Documentation"
+		},
+		"tabs": {
+			"servers": "Servers",
+			"localLibrary": "Library",
+			"settings": "Settings"
+		},
+		"localLibrary": {
+			"title": "Local Library",
+			"emptyState": {
+				"all": {
+					"title": "Nothing to read yet",
+					"description": "Once you have books for offline reading, they will appear here"
+				},
+				"imported": {
+					"title": "No imported books",
+					"description": "Import books to read them offline"
+				},
+				"server": {
+					"title": "No downloaded books",
+					"description": "Download books from your library to read them offline"
+				}
+			},
+			"downloadQueue": {
+				"downloading": "Downloading",
+				"failed": "Failed",
+				"nothingDownloading": "Nothing is being downloaded",
+				"noActiveDownloads": "No active downloads",
+				"noFailedDownloads": "No failed downloads",
+				"downloadStarting": "Starting..."
+			},
+			"downloadsHeaderMenu": {
+				"deleteAllDownloads": {
+					"label": "Delete Books",
+					"confirmation": "Are you sure you want to delete your local library?",
+					"disclaimer": "This action cannot be undone."
+				},
+				"seeProblems": "See Problems ({{problemCount}})",
+				"hideCurated": "Hide Curated",
+				"showCurated": "Show Curated",
+				"attemptSync": "Attempt Sync"
+			},
+			"downloadsHeaderSortMenu": {
+				"sortBy": {
+					"NAME": "Name",
+					"ADDED_AT": "Date Added",
+					"SERIES": "Series"
+				},
+				"sortDirection": {
+					"ASC": "Ascending",
+					"DESC": "Descending"
+				},
+				"sortDirectionText": {
+					"ASC": "A → Z",
+					"DESC": "Z → A"
+				},
+				"sortDirectionDate": {
+					"ASC": "Oldest First",
+					"DESC": "Newest First"
+				},
+				"sourceFilter": {
+					"all": "All Books",
+					"server": "Downloaded",
+					"imported": "Imported"
+				}
+			},
+			"downloadProblemsSheet": {
+				"title": "Failed Downloads",
+				"noFailedDownloads": "No failed downloads",
+				"retryAll": "Retry All",
+				"dismissAll": "Dismiss All"
+			}
+		},
+		"settings": {
+			"preferences": {
+				"label": "Preferences",
+				"appTheme": {
+					"label": "Theme",
+					"options": {
+						"light": "Light",
+						"dark": "Dark"
+					}
+				},
+				"appPrimaryColor": "Accent",
+				"appLanguage": "Language",
+				"defaultServer": "Default Server",
+				"thumbnailRatio": "Thumbnail Ratio",
+				"thumbnailPlaceholder": {
+					"label": "Thumbnail Placeholder",
+					"options": {
+						"grayscale": "Grayscale",
+						"averageColor": "Average color",
+						"colorful": "Colorful",
+						"thumbhash": "Thumbhash"
+					}
+				},
+				"thumbnailResizeMode": {
+					"label": "Thumbnail Resize",
+					"options": {
+						"cover": "Cover",
+						"stretch": "Stretch",
+						"fit": "Fit"
+					}
+				}
+			},
+			"reading": {
+				"label": "Reading",
+				"preferNativePdf": "Prefer Native PDF",
+				"preferMinimalReader": "Prefer Minimal Reader",
+				"disableDismissGesture": "Disable Dismiss Gesture"
+			},
+			"stump": {
+				"label": "Stump",
+				"description": "Stump features are optional and can be turned off if you do not need them",
+				"bookClubsEnabled": "Book Club Features"
+			},
+			"autoSyncLocalData": "Auto-Sync Local Data",
+			"management": {
+				"label": "Management",
+				"dataUsage": {
+					"label": "Data Usage",
+					"nonStumpData": "Non-Stump data",
+					"serversTotal": "Servers total",
+					"totalFiles": "Total files",
+					"totalSize": "Total size",
+					"deleteDownloads": {
+						"label": "Delete Downloads",
+						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"deleteFailed": {
+							"title": "Deletion Failed",
+							"description": "There was an error deleting all downloads from {{serverName}}"
+						}
+					},
+					"noDownloads": "No downloaded files for this server",
+					"storedPreferences": {
+						"label": "Stored preferences",
+						"description": "Miscellaneous data like book preferences, reading timers, etc"
+					},
+					"clearPreferences": "Clear Preferences"
+				}
+			},
+			"debug": {
+				"label": "Debug",
+				"clearCache": {
+					"memory": {
+						"button": "Memory",
+						"success": "Memory cache cleared"
+					},
+					"disk": {
+						"button": "Disk",
+						"success": "Disk cache cleared"
+					}
+				},
+				"deleteDatabase": {
+					"label": "Delete Database",
+					"success": {
+						"title": "Database deleted",
+						"description": "Please restart the app"
+					},
+					"error": {
+						"title": "Deletion failed",
+						"description": "There was an error deleting the database"
+					}
+				},
+				"performanceMonitor": "Performance Monitor",
+				"reduceAnimations": "Reduce Animations",
+				"maskUrls": "Mask URLs",
+				"debugAnalytics": {
+					"label": "Debug Analytics",
+					"description": "Send additional debug-related events to help troubleshoot issues"
+				}
+			},
+			"contactInfo": {
+				"label": "Contact",
+				"email": "Email",
+				"discord": "Discord",
+				"github": "GitHub"
+			},
+			"supportInfo": {
+				"buildInformation": "Build Information",
+				"version": "Version: {{version}}",
+				"suuportIdentifier": "Support Identifier: {{supportID}}"
+			}
+		},
+		"readerSettings": {
+			"title": "Reader Settings",
+			"sections": {
+				"mode": "Mode",
+				"imageOptions": "Image Options",
+				"controls": "Controls"
+			},
+			"readingMode": {
+				"label": "Flow",
+				"options": {
+					"PAGED": "Paged",
+					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+				}
+			},
+			"readingDirection": {
+				"label": "Direction",
+				"options": {
+					"RTL": "Right to left",
+					"LTR": "Left to right"
+				}
+			},
+			"doublePageBehavior": {
+				"label": "Double Paged",
+				"options": {
+					"always": "Always",
+					"auto": "Auto",
+					"off": "Off"
+				}
+			},
+			"separateSecondPage": "Separate Second Page",
+			"imageScaling": {
+				"label": "Scaling",
+				"options": {
+					"AUTO": "Auto",
+					"HEIGHT": "Fit Height",
+					"WIDTH": "Fit Width",
+					"NONE": "None"
+				}
+			},
+			"allowDownscaling": "Downscaling",
+			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"footerControls": {
+				"label": "Footer",
+				"options": {
+					"images": "Image Gallery",
+					"slider": "Slider"
+				}
+			}
+		},
+		"savedServerActions": {
+			"clearCache": "Clear Cache",
+			"discardTokens": {
+				"label": "Discard Tokens",
+				"description": "Affects login tokens only"
+			},
+			"deleteServer": {
+				"title": "Delete Server",
+				"confirmation": "Are you sure you want to delete {{serverName}}?"
+			}
+		}
 	}
 }

From 48273d9cdb57d19dfe900da1112b5e90b325dd12 Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Sun, 5 Apr 2026 13:20:04 -0700
Subject: [PATCH 22/32] :globe_with_meridians: (Polish) Update translations
 (#1050)

* New translations en-us.json (Polish)

* New translations en-us.json (Polish)

From 8e8925ef449d8fd1d5adb948d862ed05aab2270f Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Mon, 6 Apr 2026 09:06:23 -0700
Subject: [PATCH 23/32] :globe_with_meridians: (German): Update translations
 (#1058)

* New translations en-us.json (German)

* New translations en-us.json (German)

* New translations en-us.json (German)

* New translations en-us.json (German)
---
 packages/i18n/src/locales/de-DE.json | 400 +++++++++++++--------------
 1 file changed, 200 insertions(+), 200 deletions(-)

diff --git a/packages/i18n/src/locales/de-DE.json b/packages/i18n/src/locales/de-DE.json
index d570118e15..a6d1227014 100644
--- a/packages/i18n/src/locales/de-DE.json
+++ b/packages/i18n/src/locales/de-DE.json
@@ -7,7 +7,7 @@
 	},
 	"authScene": {
 		"claimHeading": "Initialisiere deinen Server",
-		"claimText": "Dieser Stump-Server ist noch nicht initialisiert. Benutze das untenstehende Formular, um ein Konto zu erstellen. Danach erhältst du vollen Zugriff auf alle Serverfunktionen.",
+		"claimText": "Dieser Stump Server ist noch nicht initialisiert. Benutze das untenstehende Formular, um ein Konto zu erstellen. Danach erhältst du vollen Zugriff auf alle Serverfunktionen.",
 		"form": {
 			"validation": {
 				"missingUsername": "Ein Benutzername ist erforderlich",
@@ -780,7 +780,7 @@
 			"identifierIsbn": "ISBN",
 			"identifierMobiAsin": "Mobi ASIN",
 			"identifierUuid": "Buch UUID",
-			"genres": "Genre",
+			"genres": "Genres",
 			"inkers": "Zeichner",
 			"language": "Sprache",
 			"letterers": "Schriftsteller",
@@ -1310,7 +1310,7 @@
 			"description": "Passe das Aussehen und die Bedienung der Anwendung an",
 			"sections": {
 				"themeAndAppearance": {
-					"label": "Theme und Erscheinung",
+					"label": "Design und Erscheinung",
 					"description": "Die grundlegenden Erscheinungseinstellungen für Stump"
 				},
 				"themeSelect": {
@@ -1328,7 +1328,7 @@
 						"autumn": "Herbst",
 						"cosmic": "Kosmisch",
 						"pumpkin": "Kürbis",
-						"midnight": "Midnight",
+						"midnight": "Mitternacht",
 						"matrix": "Matrix"
 					}
 				},
@@ -2147,51 +2147,51 @@
 			}
 		},
 		"server/tags": {
-			"helmet": "Tag management",
+			"helmet": "Tag-Verwaltung",
 			"title": "Tags",
-			"description": "Create and manage tags for organizing your content",
+			"description": "Erstelle und verwalte Tags für die Organisation deiner Inhalte",
 			"sections": {
 				"table": {
 					"title": "Tags",
-					"description": "All tags available on this server",
+					"description": "Alle auf diesem Server verfügbaren Tags",
 					"empty": {
-						"title": "No tags",
-						"action": "Create your first tag to get started"
+						"title": "Keine Tags",
+						"action": "Erstelle deinen ersten Tag um loszulegen"
 					},
 					"columns": {
 						"name": "Name"
 					},
 					"actionMenu": {
-						"rename": "Rename"
+						"rename": "Umbenennen"
 					}
 				},
 				"createTag": {
-					"trigger": "Create tag",
+					"trigger": "Tag erstellen",
 					"modal": {
-						"heading": "Create new tag",
-						"description": "Tags can be assigned to books, series, and libraries",
+						"heading": "Erstelle einen neuen Tag",
+						"description": "Tags können Büchern, Serien und Bibliotheken zugewiesen werden",
 						"name": {
 							"label": "Name",
-							"placeholder": "Enter tag name"
+							"placeholder": "Tag-Name eingeben"
 						},
-						"submit": "Create"
+						"submit": "Erstellen"
 					}
 				},
 				"renameTag": {
 					"modal": {
-						"heading": "Rename tag",
-						"description": "Change the name of this tag across all assigned items",
+						"heading": "Tag umbenennen",
+						"description": "Ändere den Namen dieses Tags über alle zugewiesenen Elemente",
 						"name": {
 							"label": "Name",
-							"placeholder": "Enter new tag name"
+							"placeholder": "Neuen Tag-Namen eingeben"
 						},
-						"submit": "Rename"
+						"submit": "Umbenennen"
 					}
 				},
 				"deleteTag": {
-					"title": "Delete tag",
-					"description": "This tag will be removed from all books, series, and libraries. This cannot be undone.",
-					"confirm": "Delete"
+					"title": "Tag löschen",
+					"description": "Dieser Tag wird von allen Büchern, Serien und Bibliotheken entfernt. Dies kann nicht rückgängig gemacht werden.",
+					"confirm": "Löschen"
 				}
 			}
 		}
@@ -2483,238 +2483,238 @@
 	"mobileApp": {
 		"addOrEditServer": {
 			"addServer": {
-				"title": "Add Server",
-				"subtitle": "Configure a new server to access your content"
+				"title": "Server hinzufügen",
+				"subtitle": "Konfiguriere einen neuen Server, um auf deine Inhalte zuzugreifen"
 			},
 			"editServer": {
-				"title": "Edit Server",
-				"subtitle": "Edit Server"
+				"title": "Server bearbeiten",
+				"subtitle": "Server bearbeiten"
 			},
-			"kind": "Kind",
+			"kind": "Art",
 			"customHeaders": {
-				"label": "Custom Headers",
-				"addHeader": "Add header",
-				"invalidHeader": "Invalid header"
+				"label": "Benutzerdefinierte Header",
+				"addHeader": "Header hinzufügen",
+				"invalidHeader": "Ungültiger Header"
 			},
 			"auth": {
-				"label": "Auth",
+				"label": "Authentifizierung",
 				"default": {
 					"label": "Login",
-					"description": "You will be prompted to login when accessing content as needed"
+					"description": "Du wirst aufgefordert, dich nach Bedarf anzumelden, wenn du auf Inhalte zugreifst"
 				},
 				"token": {
 					"label": "Token",
-					"placeholder": "Raw token"
+					"placeholder": "Raw Token"
 				},
-				"basic": "Basic"
+				"basic": "Einfach"
 			},
-			"serverNamePlaceholder": "My Server",
-			"catalogUrl": "Catalog URL",
-			"failedToConnect": "Failed to connect to server",
-			"didConnect": "Connected",
-			"checkConnection": "Check connection",
-			"setAsDefaultServer": "Set as default server",
-			"enableOPDS": "Enable OPDS",
+			"serverNamePlaceholder": "Mein Server",
+			"catalogUrl": "Katalog URL",
+			"failedToConnect": "Die Verbindung zum Server ist fehlgeschlagen",
+			"didConnect": "Verbunden",
+			"checkConnection": "Verbindung überprüfen",
+			"setAsDefaultServer": "Als Standardserver festlegen",
+			"enableOPDS": "OPDS aktivieren",
 			"validation": {
-				"nameAlreadyExists": "Name already exists",
-				"cannotSetAuthorizationHeader": "Cannot set Authorization header"
+				"nameAlreadyExists": "Name ist bereits vorhanden",
+				"cannotSetAuthorizationHeader": "Authorisierungsheader kann nicht gesetzt werden"
 			}
 		},
 		"bookActions": {
 			"markAsRead": {
-				"label": "Mark as read",
-				"confirmation": "Are you sure you want to mark {{bookTitle}} as read?"
+				"label": "Als gelesen markieren",
+				"confirmation": "Bist du dir sicher, dass du {{bookTitle}} als gelesen markieren möchtest?"
 			},
 			"clearProgress": {
-				"label": "Clear progress",
-				"confirmation": "Are you sure you want to clear your progress for {{bookTitle}}?"
+				"label": "Fortschritt löschen",
+				"confirmation": "Bist du dir sicher, dass du den Fortschritt für {{bookTitle}} löschen möchtest?"
 			},
 			"deleteBook": {
-				"label": "Delete book",
-				"confirmation": "Are you sure you want to delete {{bookTitle}}?"
+				"label": "Buch löschen",
+				"confirmation": "Bist du dir sicher, dass du {{bookTitle}} löschen möchtest?"
 			},
-			"seeDetails": "See Details"
+			"seeDetails": "Details anzeigen"
 		},
 		"bookMetadata": {
-			"ageRating": "Age Rating",
-			"downloadedAt": "Downloaded",
+			"ageRating": "Altersfreigabe",
+			"downloadedAt": "Heruntergeladen",
 			"format": "Format",
 			"genres": "Genres",
-			"language": "Language",
-			"publisher": "Publisher",
-			"size": "Size",
-			"volume": "Volume",
-			"year": "Year"
+			"language": "Sprache",
+			"publisher": "Verlag",
+			"size": "Größe",
+			"volume": "Band",
+			"year": "Jahr"
 		},
 		"common": {
-			"cancel": "Cancel",
-			"chapter": "Chapter",
-			"clear": "Clear",
-			"confirm": "Confirm",
+			"cancel": "Abbrechen",
+			"chapter": "Kapitel",
+			"clear": "Löschen",
+			"confirm": "Bestätigen",
 			"details": "Details",
-			"delete": "Delete",
+			"delete": "Löschen",
 			"downloads": "Downloads",
-			"edit": "Edit",
-			"enabled": "Enabled",
-			"enable": "Enable",
-			"error": "Error",
+			"edit": "Bearbeiten",
+			"enabled": "Aktiviert",
+			"enable": "Aktivieren",
+			"error": "Fehler",
 			"name": "Name",
-			"none": "None",
-			"options": "Options",
-			"page": "Page",
-			"pages": "Pages",
-			"password": "Password",
-			"progress": "Progress",
-			"readTime": "Read time",
-			"readMore": "Read more",
-			"save": "Save",
-			"select": "Select",
-			"settings": "Settings",
-			"servers": "Servers",
-			"thisBook": "this book",
-			"thisServer": "this server",
-			"unknown": "Unknown",
-			"unknownTitle": "Untitled",
+			"none": "Keine",
+			"options": "Optionen",
+			"page": "Seite",
+			"pages": "Seiten",
+			"password": "Passwort",
+			"progress": "Fortschritt",
+			"readTime": "Lesezeit",
+			"readMore": "Mehr lesen",
+			"save": "Speichern",
+			"select": "Auswählen",
+			"settings": "Einstellungen",
+			"servers": "Server",
+			"thisBook": "dieses Buch",
+			"thisServer": "dieser Server",
+			"unknown": "Unbekannt",
+			"unknownTitle": "Unbenannt",
 			"url": "URL",
-			"username": "Username",
-			"value": "Value",
+			"username": "Benutzername",
+			"value": "Wert",
 			"version": "Version"
 		},
 		"emptyState": {
-			"noStumpServers": "No Stump servers added",
-			"noOPDSServers": "No OPDS servers added",
-			"noServers": "No servers have been configured",
-			"cta": "Get started by adding a server to access your book collections",
-			"seeDocumentation": "See Documentation"
+			"noStumpServers": "Keine Stump Server hinzugefügt",
+			"noOPDSServers": "Keine OPDS Server hinzugefügt",
+			"noServers": "Keine Server wurden konfiguriert",
+			"cta": "Lege los mit einem Server hinzuzufügen, um auf deine Buchsammlungen zuzugreifen",
+			"seeDocumentation": "Siehe Dokumentation"
 		},
 		"tabs": {
-			"servers": "Servers",
-			"localLibrary": "Library",
-			"settings": "Settings"
+			"servers": "Server",
+			"localLibrary": "Bibliothek",
+			"settings": "Einstellungen"
 		},
 		"localLibrary": {
-			"title": "Local Library",
+			"title": "Lokale Bibliothek",
 			"emptyState": {
 				"all": {
-					"title": "Nothing to read yet",
-					"description": "Once you have books for offline reading, they will appear here"
+					"title": "Noch nichts zu lesen",
+					"description": "Sobald du Bücher zum Offline-Lesen hast, werden sie hier erscheinen"
 				},
 				"imported": {
-					"title": "No imported books",
-					"description": "Import books to read them offline"
+					"title": "Keine importierten Bücher",
+					"description": "Bücher zum Offline-Lesen importieren"
 				},
 				"server": {
-					"title": "No downloaded books",
-					"description": "Download books from your library to read them offline"
+					"title": "Keine heruntergeladenen Bücher",
+					"description": "Lade Bücher aus deiner Bibliothek herunter, um diese offline zu lesen"
 				}
 			},
 			"downloadQueue": {
-				"downloading": "Downloading",
-				"failed": "Failed",
-				"nothingDownloading": "Nothing is being downloaded",
-				"noActiveDownloads": "No active downloads",
-				"noFailedDownloads": "No failed downloads",
-				"downloadStarting": "Starting..."
+				"downloading": "Wird heruntergeladen",
+				"failed": "Fehlgeschlagen",
+				"nothingDownloading": "Es wird nichts heruntergeladen",
+				"noActiveDownloads": "Keine aktiven Downloads",
+				"noFailedDownloads": "Keine fehlgeschlagenen Downloads",
+				"downloadStarting": "Wird gestartet..."
 			},
 			"downloadsHeaderMenu": {
 				"deleteAllDownloads": {
-					"label": "Delete Books",
-					"confirmation": "Are you sure you want to delete your local library?",
-					"disclaimer": "This action cannot be undone."
+					"label": "Bücher löschen",
+					"confirmation": "Bist du sicher, dass du deine lokale Bibliothek löschen möchtest?",
+					"disclaimer": "Diese Aktion kann nicht rückgängig gemacht werden."
 				},
-				"seeProblems": "See Problems ({{problemCount}})",
-				"hideCurated": "Hide Curated",
-				"showCurated": "Show Curated",
-				"attemptSync": "Attempt Sync"
+				"seeProblems": "Siehe Probleme ({{problemCount}})",
+				"hideCurated": "Kuratiert ausblenden",
+				"showCurated": "Kuratiert anzeigen",
+				"attemptSync": "Versuche Synchronisierung"
 			},
 			"downloadsHeaderSortMenu": {
 				"sortBy": {
 					"NAME": "Name",
-					"ADDED_AT": "Date Added",
-					"SERIES": "Series"
+					"ADDED_AT": "Datum Hinzugefügt",
+					"SERIES": "Serien"
 				},
 				"sortDirection": {
-					"ASC": "Ascending",
-					"DESC": "Descending"
+					"ASC": "Aufsteigend",
+					"DESC": "Absteigend"
 				},
 				"sortDirectionText": {
 					"ASC": "A → Z",
 					"DESC": "Z → A"
 				},
 				"sortDirectionDate": {
-					"ASC": "Oldest First",
-					"DESC": "Newest First"
+					"ASC": "Älteste Zuerst",
+					"DESC": "Neueste Zuerst"
 				},
 				"sourceFilter": {
-					"all": "All Books",
-					"server": "Downloaded",
-					"imported": "Imported"
+					"all": "Alle Bücher",
+					"server": "Heruntergeladen",
+					"imported": "Importiert"
 				}
 			},
 			"downloadProblemsSheet": {
-				"title": "Failed Downloads",
-				"noFailedDownloads": "No failed downloads",
-				"retryAll": "Retry All",
-				"dismissAll": "Dismiss All"
+				"title": "Fehlgeschlagene Downloads",
+				"noFailedDownloads": "Keine fehlgeschlagenen Downloads",
+				"retryAll": "Alle erneut versuchen",
+				"dismissAll": "Alle verwerfen"
 			}
 		},
 		"settings": {
 			"preferences": {
-				"label": "Preferences",
+				"label": "Präferenzen",
 				"appTheme": {
-					"label": "Theme",
+					"label": "Design",
 					"options": {
-						"light": "Light",
-						"dark": "Dark"
+						"light": "Hell",
+						"dark": "Dunkel"
 					}
 				},
-				"appPrimaryColor": "Accent",
-				"appLanguage": "Language",
-				"defaultServer": "Default Server",
-				"thumbnailRatio": "Thumbnail Ratio",
+				"appPrimaryColor": "Akzent",
+				"appLanguage": "Sprache",
+				"defaultServer": "Standardserver",
+				"thumbnailRatio": "Vorschaubildverhältnis",
 				"thumbnailPlaceholder": {
-					"label": "Thumbnail Placeholder",
+					"label": "Vorschaubild-Platzhalter",
 					"options": {
-						"grayscale": "Grayscale",
-						"averageColor": "Average color",
-						"colorful": "Colorful",
+						"grayscale": "Graustufen",
+						"averageColor": "Durchschnittsfarbe",
+						"colorful": "Farbenfroh",
 						"thumbhash": "Thumbhash"
 					}
 				},
 				"thumbnailResizeMode": {
-					"label": "Thumbnail Resize",
+					"label": "Vorschaubildgrößenanpassung",
 					"options": {
 						"cover": "Cover",
-						"stretch": "Stretch",
-						"fit": "Fit"
+						"stretch": "Strecken",
+						"fit": "Anpassen"
 					}
 				}
 			},
 			"reading": {
-				"label": "Reading",
-				"preferNativePdf": "Prefer Native PDF",
-				"preferMinimalReader": "Prefer Minimal Reader",
-				"disableDismissGesture": "Disable Dismiss Gesture"
+				"label": "Lesen",
+				"preferNativePdf": "Native PDF bevorzugen",
+				"preferMinimalReader": "Minimalen Leser bevorzugen",
+				"disableDismissGesture": "Deaktiviere Zurück-Geste"
 			},
 			"stump": {
 				"label": "Stump",
-				"description": "Stump features are optional and can be turned off if you do not need them",
-				"bookClubsEnabled": "Book Club Features"
+				"description": "Stump-Funktionen sind optional und können deaktiviert, wenn du diese nicht benötigst",
+				"bookClubsEnabled": "Buchclubfunktionen"
 			},
-			"autoSyncLocalData": "Auto-Sync Local Data",
+			"autoSyncLocalData": "Lokale Daten automatisch synchronisieren",
 			"management": {
-				"label": "Management",
+				"label": "Verwaltung",
 				"dataUsage": {
-					"label": "Data Usage",
-					"nonStumpData": "Non-Stump data",
-					"serversTotal": "Servers total",
-					"totalFiles": "Total files",
-					"totalSize": "Total size",
+					"label": "Datennutzung",
+					"nonStumpData": "Nicht-Stump Daten",
+					"serversTotal": "Server insgesamt",
+					"totalFiles": "Dateien gesamt",
+					"totalSize": "Gesamtgröße",
 					"deleteDownloads": {
-						"label": "Delete Downloads",
-						"confirmation": "Are you sure you want to delete all downloads from {{serverName}}?",
+						"label": "Downloads löschen",
+						"confirmation": "Bist du dir sicher, dass du alle Downloads von {{serverName}} löschen möchtest?",
 						"deleteFailed": {
-							"title": "Deletion Failed",
+							"title": "Löschen fehlgeschlagen",
 							"description": "There was an error deleting all downloads from {{serverName}}"
 						}
 					},
@@ -2730,8 +2730,8 @@
 				"label": "Debug",
 				"clearCache": {
 					"memory": {
-						"button": "Memory",
-						"success": "Memory cache cleared"
+						"button": "Speicher",
+						"success": "Speicher Cache geleert"
 					},
 					"disk": {
 						"button": "Disk",
@@ -2739,95 +2739,95 @@
 					}
 				},
 				"deleteDatabase": {
-					"label": "Delete Database",
+					"label": "Datenbank löschen",
 					"success": {
-						"title": "Database deleted",
-						"description": "Please restart the app"
+						"title": "Datenbank gelöscht",
+						"description": "Bitte starte die App neu"
 					},
 					"error": {
-						"title": "Deletion failed",
-						"description": "There was an error deleting the database"
+						"title": "Löschen fehlgeschlagen",
+						"description": "Es ist ein Fehler beim Löschen der Datenbank aufgetreten"
 					}
 				},
-				"performanceMonitor": "Performance Monitor",
-				"reduceAnimations": "Reduce Animations",
-				"maskUrls": "Mask URLs",
+				"performanceMonitor": "Leistungsüberwachung",
+				"reduceAnimations": "Animationen verringern",
+				"maskUrls": "URLs verstecken",
 				"debugAnalytics": {
-					"label": "Debug Analytics",
-					"description": "Send additional debug-related events to help troubleshoot issues"
+					"label": "Debug-Analysen",
+					"description": "Sende zusätzliche Debug-bezogene Ereignisse, um bei der Fehlerbehebung zu helfen"
 				}
 			},
 			"contactInfo": {
-				"label": "Contact",
-				"email": "Email",
+				"label": "Kontakt",
+				"email": "E-Mail",
 				"discord": "Discord",
 				"github": "GitHub"
 			},
 			"supportInfo": {
-				"buildInformation": "Build Information",
+				"buildInformation": "Versionsinformationen",
 				"version": "Version: {{version}}",
-				"suuportIdentifier": "Support Identifier: {{supportID}}"
+				"suuportIdentifier": "Support-Identifikator: {{supportID}}"
 			}
 		},
 		"readerSettings": {
-			"title": "Reader Settings",
+			"title": "Readereinstellungen",
 			"sections": {
-				"mode": "Mode",
-				"imageOptions": "Image Options",
-				"controls": "Controls"
+				"mode": "Modus",
+				"imageOptions": "Bildoptionen",
+				"controls": "Steuerung"
 			},
 			"readingMode": {
-				"label": "Flow",
+				"label": "Fließend",
 				"options": {
-					"PAGED": "Paged",
-					"CONTINUOUS_HORIZONTAL": "Scroll (Horizontal)",
-					"CONTINUOUS_VERTICAL": "Scroll (Vertical)"
+					"PAGED": "Geseitigt",
+					"CONTINUOUS_HORIZONTAL": "Scrollen (Horizontal)",
+					"CONTINUOUS_VERTICAL": "Scrollen (Vertikal)"
 				}
 			},
 			"readingDirection": {
-				"label": "Direction",
+				"label": "Richtung",
 				"options": {
-					"RTL": "Right to left",
-					"LTR": "Left to right"
+					"RTL": "Rechts nach links",
+					"LTR": "Links nach rechts"
 				}
 			},
 			"doublePageBehavior": {
-				"label": "Double Paged",
+				"label": "Zweiseitig",
 				"options": {
-					"always": "Always",
+					"always": "Immer",
 					"auto": "Auto",
-					"off": "Off"
+					"off": "Aus"
 				}
 			},
-			"separateSecondPage": "Separate Second Page",
+			"separateSecondPage": "Separate zweite Seite",
 			"imageScaling": {
-				"label": "Scaling",
+				"label": "Skalierung",
 				"options": {
 					"AUTO": "Auto",
-					"HEIGHT": "Fit Height",
-					"WIDTH": "Fit Width",
-					"NONE": "None"
+					"HEIGHT": "Höhe anpassen",
+					"WIDTH": "Breite anpassen",
+					"NONE": "Keine"
 				}
 			},
-			"allowDownscaling": "Downscaling",
-			"tapSidesToNavigate": "Tap Sides to Navigate",
+			"allowDownscaling": "Herabskalieren",
+			"tapSidesToNavigate": "Seiten zum Navigieren antippen",
 			"footerControls": {
 				"label": "Footer",
 				"options": {
-					"images": "Image Gallery",
-					"slider": "Slider"
+					"images": "Bildergalerie",
+					"slider": "Schieberegler"
 				}
 			}
 		},
 		"savedServerActions": {
-			"clearCache": "Clear Cache",
+			"clearCache": "Cache leeren",
 			"discardTokens": {
-				"label": "Discard Tokens",
-				"description": "Affects login tokens only"
+				"label": "Token verwerfen",
+				"description": "Betrifft nur Login-Tokens"
 			},
 			"deleteServer": {
-				"title": "Delete Server",
-				"confirmation": "Are you sure you want to delete {{serverName}}?"
+				"title": "Server löschen",
+				"confirmation": "Bist du dir sicher, dass du {{serverName}} löschen möchtest?"
 			}
 		}
 	}

From 601686b134f325e257e7f7835ed93a657ef978af Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Mon, 6 Apr 2026 09:27:03 -0700
Subject: [PATCH 24/32] :memo: Update 0.1.0 documentation language

---
 apps/docs/pages/guides/breaking-changes/0.1.0.mdx | 3 ---
 apps/docs/theme.config.tsx                        | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/docs/pages/guides/breaking-changes/0.1.0.mdx b/apps/docs/pages/guides/breaking-changes/0.1.0.mdx
index 51c6ef1a38..59b0118397 100644
--- a/apps/docs/pages/guides/breaking-changes/0.1.0.mdx
+++ b/apps/docs/pages/guides/breaking-changes/0.1.0.mdx
@@ -84,9 +84,6 @@ Be sure your old Stump instance is fully stopped as well. At this point, you can
 
 <Callout emoji="">
 	The `backfill.sql` script will be one of the downloadable assets in the release page for `0.1.0`.
-	You may be viewing this guide before the release is published. Until then, the link referenced
-	below will not work. You can find the script in the `nightly` or `experimental` branches at
-	[`/crates/migrations/backfill.sql`](https://github.com/stumpapp/stump/blob/nightly/crates/migrations/backfill.sql)
 </Callout>
 
 Download the `backfill.sql` script from the [release page for 0.1.0](https://github.com/stumpapp/stump/releases/tag/v0.1.0).
diff --git a/apps/docs/theme.config.tsx b/apps/docs/theme.config.tsx
index cdd3ae262c..0b86c4a5ac 100644
--- a/apps/docs/theme.config.tsx
+++ b/apps/docs/theme.config.tsx
@@ -16,7 +16,7 @@ export default {
 		key: 'sea-orm-migration',
 		content: (
 			<Link href="/guides/breaking-changes/0.1.0">
-				🚧 Stump will soon have major updates! Please read about upcoming breaking changes 💥
+				Stump 0.1.0 is out! Please read about the breaking changes if you are upgrading 💥
 			</Link>
 		),
 	},

From 9ded63df5116b4de876298f716b05a21e5d82012 Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Mon, 6 Apr 2026 09:30:48 -0700
Subject: [PATCH 25/32] :fire: Remove Prisma-to-SeaORM backfilling

This operation should only be done in `0.1.0` since I cannot feasibly maintain it for versions beyond that
---
 crates/cli/src/commands/system.rs |  98 +----
 crates/migrations/backfill.sql    | 621 ------------------------------
 2 files changed, 2 insertions(+), 717 deletions(-)
 delete mode 100644 crates/migrations/backfill.sql

diff --git a/crates/cli/src/commands/system.rs b/crates/cli/src/commands/system.rs
index ca792022fc..f34c531e72 100644
--- a/crates/cli/src/commands/system.rs
+++ b/crates/cli/src/commands/system.rs
@@ -1,7 +1,7 @@
-use std::{path::PathBuf, str::FromStr};
+use std::str::FromStr;
 
 use clap::Subcommand;
-use dialoguer::{Confirm, Input};
+use dialoguer::Confirm;
 use sea_orm::{ConnectionTrait, DatabaseBackend, Statement};
 use stump_core::{
 	config::StumpConfig,
@@ -20,7 +20,6 @@ pub enum System {
 		#[clap(long)]
 		mode: JournalMode,
 	},
-	SeaOrmMigration,
 }
 
 pub async fn handle_system_command(
@@ -29,7 +28,6 @@ pub async fn handle_system_command(
 ) -> CliResult<()> {
 	match command {
 		System::SetJournalMode { mode } => set_journal_mode(mode, config).await,
-		System::SeaOrmMigration => backfill_prisma_to_seaorm(config).await,
 	}
 }
 
@@ -80,95 +78,3 @@ async fn set_journal_mode(mode: JournalMode, config: &StumpConfig) -> CliResult<
 
 	Ok(())
 }
-
-async fn backfill_prisma_to_seaorm(config: &StumpConfig) -> CliResult<()> {
-	let did_run_migrations = Confirm::new()
-		.with_prompt("You must run Stump after migrating to SeaORM to generate a new database. Have you done this?")
-		.interact()?;
-
-	if !did_run_migrations {
-		println!("Exiting...");
-		return Ok(());
-	}
-
-	let backfill_script = Input::new()
-		.with_prompt("Enter the path to the backfill.sql file")
-		.allow_empty(false)
-		.validate_with(|input: &String| -> Result<(), &str> {
-			let path_buf = PathBuf::from(input);
-			if !path_buf.exists() {
-				Err("The specified file does not exist")
-			} else if path_buf.extension().is_some_and(|ext| ext != "sql") {
-				Err("The specified file is not a valid SQL file")
-			} else {
-				Ok(())
-			}
-		})
-		.interact_text()?;
-
-	let legacy_db = Input::new()
-		.with_prompt("Enter the path to the legacy database file (i.e. the one with the data you want to migrate)")
-		.allow_empty(false)
-		.validate_with(|input: &String| -> Result<(), &str> {
-			let path_buf = PathBuf::from(input);
-			if !path_buf.exists() {
-				Err("The specified file does not exist")
-			} else if path_buf
-				.extension()
-				.is_some_and(|ext| ext != "db" && ext != "sqlite")
-			{
-				Err("The specified file is not a valid database file")
-			} else {
-				Ok(())
-			}
-		})
-		.interact_text()?;
-
-	let database_path = config
-		.db_path
-		.as_ref()
-		.map(PathBuf::from)
-		.unwrap_or_else(|| PathBuf::from(&config.config_dir).join("stump.db"));
-
-	let confirmation = Confirm::new()
-		.with_prompt(format!(
-			"Are you sure you want to run the backfill script on {}? This will overwrite existing data.",
-			database_path.display()
-		))
-		.interact()?;
-
-	if !confirmation {
-		println!("Exiting...");
-		return Ok(());
-	}
-
-	if !database_path.exists() {
-		return Err(CliError::Unknown(format!(
-			"Database file does not exist at {}",
-			database_path.display()
-		)));
-	}
-
-	// Load the script as string, replace the following:
-	// /replace/with/full/path/to/stump-before-migration.db -> {backup_db}
-
-	let script = std::fs::read_to_string(backfill_script)
-		.map_err(|e| CliError::Unknown(format!("Failed to read backfill script: {}", e)))?
-		.replace(
-			"/replace/with/full/path/to/stump-before-migration.db",
-			&legacy_db,
-		);
-
-	let conn = connect(config).await?;
-
-	let progress = default_progress_spinner();
-	progress.set_message("Running backfill script...");
-
-	let _result = conn.execute_unprepared(&script).await.map_err(|e| {
-		CliError::Unknown(format!("Failed to execute backfill script: {}", e))
-	})?;
-
-	progress.finish_with_message("Backfill script executed successfully");
-
-	Ok(())
-}
diff --git a/crates/migrations/backfill.sql b/crates/migrations/backfill.sql
deleted file mode 100644
index df91e73525..0000000000
--- a/crates/migrations/backfill.sql
+++ /dev/null
@@ -1,621 +0,0 @@
--- This SQL file is used to 'fix' the data in the database after the migration. BE SURE TO BACKUP BEFORE UPDATING:
-
--- 1. open the newly migrated database in your preferred SQLite client, I use TablePlus but it doesn't matter. You may also use the CLI e.g. sqlite3 stump.db < resolve-missing-data.sql
---    you must use absolute paths to the databases, replace with your path
-ATTACH DATABASE '/replace/with/full/path/to/stump-before-migration.db' as 'backup';
-
--- 2. run the following SQL to copy the data from the old database to the new database:
-BEGIN;
-PRAGMA foreign_keys = OFF;
-PRAGMA defer_foreign_keys = ON;
-
--- Libraries which users cannot access via explicit join record
-INSERT INTO "library_exclusions"("library_id", "user_id")
-SELECT "A",
-    "B"
-FROM backup."_LibraryToUser";
-
--- Backfilling the tags will be a bit of a dance. The big thing to consider is that the 
--- new definition uses auto-incrementing integers as the ID, but all the existing mappings
--- use the old string IDs:
-
--- Step 1: A temporary mapping table to track old tag IDs to new ones
-CREATE TABLE "tag_id_map" (
-    "old_id" TEXT NOT NULL,
-    "new_id" INTEGER NOT NULL,
-    PRIMARY KEY ("old_id")
-);
-
--- Step 2: Insert the existing tags from backup into the new database
-INSERT INTO "tags" ("name")
-SELECT "name"
-FROM backup."tags";
-
--- Step 3: Create a mapping of old tag IDs to new tag IDs
-INSERT INTO "tag_id_map" ("old_id", "new_id")
-SELECT t_old."id",
-    t_new."id"
-FROM backup."tags" t_old
-    JOIN "tags" t_new ON t_old."name" = t_new."name";
-
--- Step 4: Backfill all the tag-related join tables using the mapping table
-
--- Media tags
-INSERT INTO "media_tags" ("media_id", "tag_id")
-SELECT mtg."A",
-    map."new_id"
-FROM backup."_MediaToTag" mtg
-    JOIN "tag_id_map" map ON mtg."B" = map."old_id";
-
--- Series tags
-INSERT INTO "series_tags" ("series_id", "tag_id")
-SELECT stg."A",
-    map."new_id"
-FROM backup."_SeriesToTag" stg
-    JOIN "tag_id_map" map ON stg."B" = map."old_id";
-
--- Library tags
-INSERT INTO "library_tags" ("library_id", "tag_id")
-SELECT ltg."A",
-    map."new_id"
-FROM backup."_LibraryToTag" ltg
-    JOIN "tag_id_map" map ON ltg."B" = map."old_id";
-
--- Step 5: Clean up the temporary mapping table. We should be done at this point with tags
-DROP TABLE "tag_id_map";
-
--- Backfill the library and library-related tables:
--- Library configs now use auto-incrementing integer IDs, so we need mapping like user preferences
-
--- Step 1: Create a temporary mapping table for library config IDs
-CREATE TABLE "library_config_id_map" (
-    "old_id" TEXT NOT NULL,
-    "new_id" INTEGER NOT NULL,
-    PRIMARY KEY ("old_id")
-);
-
--- Step 2: Insert library configs with new auto-increment IDs (excluding the old text ID)
--- Note: Can't backfill default_reading_mode
-INSERT INTO "library_configs"(
-        "convert_rar_to_zip",
-        "hard_delete_conversions",
-        "default_reading_dir",
-        "default_reading_mode",
-        "default_reading_image_scale_fit",
-        "generate_file_hashes",
-        "generate_koreader_hashes",
-        "process_metadata",
-        "library_pattern",
-        "watch",
-        "library_id"
-    )
-SELECT "convert_rar_to_zip",
-    "hard_delete_conversions",
-    UPPER("default_reading_dir"),
-    'PAGED',
-    UPPER("default_reading_image_scale_fit"),
-    "generate_file_hashes",
-    "generate_koreader_hashes",
-    "process_metadata",
-    "library_pattern",
-    "watch",
-    "library_id"
-FROM backup."library_configs";
-
--- Step 3: Create mapping of old library config IDs to new ones by insertion order
-INSERT INTO "library_config_id_map" ("old_id", "new_id")
-SELECT lc_old."id",
-    lc_new."id"
-FROM (
-    SELECT "id", ROW_NUMBER() OVER (ORDER BY "id") as rn
-    FROM backup."library_configs"
-) lc_old
-JOIN (
-    SELECT "id", ROW_NUMBER() OVER (ORDER BY "id") as rn
-    FROM "library_configs"
-) lc_new ON lc_old.rn = lc_new.rn;
-
--- Step 4: Insert libraries with mapped config_id
-INSERT INTO "libraries"(
-        "id",
-        "name",
-        "description",
-        "path",
-        "status",
-        "updated_at",
-        "created_at",
-        "emoji",
-        "config_id",
-        "last_scanned_at"
-    )
-SELECT "id",
-    "name",
-    "description",
-    "path",
-    UPPER("status"),
-    datetime("updated_at"/1000, 'unixepoch'),
-    datetime("created_at"/1000, 'unixepoch'),
-    "emoji",
-    map."new_id", -- Use mapped config_id
-    CASE WHEN "last_scanned_at" IS NOT NULL THEN datetime("last_scanned_at"/1000, 'unixepoch') ELSE NULL END
-FROM backup."libraries" lib
-JOIN "library_config_id_map" map ON lib."config_id" = map."old_id";
-
--- Step 5: Clean up the library config mapping table
-DROP TABLE "library_config_id_map";
-
--- Step 6: Ensure the configs reference the correct library IDs
--- See https://github.com/stumpapp/stump/issues/799#issuecomment-3418391958
-DELETE FROM library_configs
-WHERE NOT EXISTS (
-    SELECT 1
-    FROM libraries
-    WHERE libraries.config_id = library_configs.id
-);
-UPDATE library_configs
-SET library_id = (
-    SELECT id
-    FROM libraries
-    WHERE libraries.config_id = library_configs.id
-)
-WHERE EXISTS (
-    SELECT 1
-    FROM libraries
-    WHERE libraries.config_id = library_configs.id
-);
-
-
--- Backfill the series and series metadata tables:
-
-INSERT INTO "series"(
-        "id",
-        "name",
-        "description",
-        "updated_at",
-        "created_at",
-        "path",
-        "status",
-        "library_id"
-    )
-SELECT "id",
-    "name",
-    "description",
-    datetime("updated_at"/1000, 'unixepoch'),
-    datetime("created_at"/1000, 'unixepoch'),
-    "path",
-    UPPER("status"),
-    "library_id"
-FROM backup."series";
--- TODO: metadata
-
--- Backfill the media and media metadata tables:
-
-INSERT INTO "media"(
-        "id",
-        "name",
-        "size",
-        "extension",
-        "pages",
-        "updated_at",
-        "created_at",
-        "modified_at",
-        "hash",
-        "path",
-        "status",
-        "series_id",
-        "deleted_at",
-        "koreader_hash"
-    )
-SELECT "id",
-    "name",
-    "size",
-    "extension",
-    "pages",
-    datetime("updated_at"/1000, 'unixepoch'),
-    datetime("created_at"/1000, 'unixepoch'),
-    CASE WHEN "modified_at" IS NOT NULL THEN datetime("modified_at"/1000, 'unixepoch') ELSE NULL END,
-    "hash",
-    "path",
-    UPPER("status"),
-    "series_id",
-    CASE WHEN "deleted_at" IS NOT NULL THEN datetime("deleted_at"/1000, 'unixepoch') ELSE NULL END,
-    "koreader_hash"
-FROM backup."media";
-
--- Dump pretty much everything from the backup table, excluding ID since it is auto-incrementing in the new schema
--- Missing: page_analysis
-INSERT INTO "media_metadata"(
-        "title",
-        "series",
-        "number",
-        "volume",
-        "summary",
-        "notes",
-        "genres",
-        "year",
-        "month",
-        "day",
-        "writers",
-        "pencillers",
-        "inkers",
-        "colorists",
-        "letterers",
-        "cover_artists",
-        "editors",
-        "publisher",
-        "links",
-        "characters",
-        "teams",
-        "page_count",
-        "media_id",
-        "age_rating"
-    )
-SELECT "title",
-    "series",
-    "number",
-    "volume",
-    "summary",
-    "notes",
-    "genres",
-    "year",
-    "month",
-    "day",
-    "writers",
-    "pencillers",
-    "inkers",
-    "colorists",
-    "letterers",
-    "cover_artists",
-    "editors",
-    "publisher",
-    "links",
-    "characters",
-    "teams",
-    "page_count",
-    "media_id",
-    "age_rating"
-FROM backup."media_metadata";
-
--- Now just go in alpha-ish order and dump everything:
-
--- Note: It is not feasible to port over the api_keys because a few columns were changed
--- Note: It is not feasible to port over the api_keys because a few columns were changed
--- Note: It is not feasible to port over bookmarks because the table was dropped and recreated with a new locator-based schema
-
-INSERT INTO "emailer_send_records"(
-        "id",
-        "emailer_id",
-        "recipient_email",
-        "attachment_meta",
-        "sent_at",
-        "sent_by_user_id"
-    )
-SELECT "id",
-    "emailer_id",
-    "recipient_email",
-    "attachment_meta",
-    datetime("sent_at"/1000, 'unixepoch'),
-    "sent_by_user_id"
-FROM backup."emailer_send_records";
-
-INSERT INTO "emailers"(
-        "id",
-        "name",
-        "is_primary",
-        "sender_email",
-        "sender_display_name",
-        "username",
-        "encrypted_password",
-        "smtp_host",
-        "smtp_port",
-        "tls_enabled",
-        "max_attachment_size_bytes",
-        "last_used_at"
-    )
-SELECT "id",
-    "name",
-    "is_primary",
-    "sender_email",
-    "sender_display_name",
-    "username",
-    "encrypted_password",
-    "smtp_host",
-    "smtp_port",
-    "tls_enabled",
-    "max_attachment_size_bytes",
-    CASE WHEN "last_used_at" IS NOT NULL THEN datetime("last_used_at"/1000, 'unixepoch') ELSE NULL END
-FROM backup."emailers";
-
-INSERT INTO "jobs"(
-        "id",
-        "name",
-        "description",
-        "status",
-        "save_state",
-        "output_data",
-        "ms_elapsed",
-        "created_at",
-        "completed_at"
-    )
-SELECT "id",
-    "name",
-    "description",
-    UPPER("status"),
-    "save_state",
-    "output_data",
-    "ms_elapsed",
-    datetime("created_at"/1000, 'unixepoch'),
-    CASE WHEN "completed_at" IS NOT NULL THEN datetime("completed_at"/1000, 'unixepoch') ELSE NULL END
-FROM backup."jobs";
-
-INSERT INTO "library_scan_records"(
-        "id",
-        "options",
-        "timestamp",
-        "library_id",
-        "job_id"
-    )
-SELECT "id",
-    "options",
-    datetime("timestamp"/1000, 'unixepoch'),
-    "library_id",
-    "job_id"
-FROM backup."library_scan_records";
-
-INSERT INTO "logs"(
-        "id",
-        "level",
-        "message",
-        "context",
-        "timestamp",
-        "job_id"
-    )
-SELECT "id",
-    "level",
-    "message",
-    "context",
-    datetime("timestamp"/1000, 'unixepoch'),
-    "job_id"
-FROM backup."logs";
-
--- Note: It is not feasible to port over media_annotations because the schema was completely rewritten to use the Readium locator model
-
-INSERT INTO "registered_email_devices"(
-        "id",
-        "name",
-        "email",
-        "forbidden"
-    )
-SELECT "id",
-    "name",
-    "email",
-    "forbidden"
-FROM backup."registered_email_devices";
-
-INSERT INTO "registered_reading_devices"(
-        "id",
-        "name",
-        "kind"
-    )
-SELECT "id",
-    "name",
-    "kind"
-FROM backup."registered_reading_devices";
-
--- Missing: permissions
--- Note: user_preferences_id will be updated after we create the mapping
-INSERT INTO "users"(
-        "id",
-        "username",
-        "hashed_password",
-        "is_server_owner",
-        "avatar_url",
-        "created_at",
-        "deleted_at",
-        "is_locked",
-        "max_sessions_allowed"
-    )
-SELECT "id",
-    "username",
-    "hashed_password",
-    "is_server_owner",
-    "avatar_url",
-    datetime("created_at"/1000, 'unixepoch'),
-    CASE WHEN "deleted_at" IS NOT NULL THEN datetime("deleted_at"/1000, 'unixepoch') ELSE NULL END,
-    "is_locked",
-    "max_sessions_allowed"
-FROM backup."users";
-
--- Backfilling user preferences requires mapping old IDs to new auto-increment IDs
--- Step 1: Create a temporary mapping table for user preferences
-CREATE TABLE "user_preferences_id_map" (
-    "old_id" TEXT NOT NULL,
-    "new_id" INTEGER NOT NULL,
-    PRIMARY KEY ("old_id")
-);
-
--- Step 2: Insert user preferences with new auto-increment IDs
--- Missing: app_font, navigation_arrangement, home_arrangement
-INSERT INTO "user_preferences"(
-        "preferred_layout_mode",
-        "locale",
-        "app_theme",
-        "primary_navigation_mode",
-        "layout_max_width_px",
-        "show_query_indicator",
-        "enable_live_refetch",
-        "enable_discord_presence",
-        "enable_compact_display",
-        "enable_gradients",
-        "enable_double_sidebar",
-        "enable_replace_primary_sidebar",
-        "enable_hide_scrollbar",
-        "prefer_accent_color",
-        "show_thumbnails_in_headers",
-        "enable_job_overlay",
-        "enable_alphabet_select",
-        "app_font"
-    )
-SELECT "preferred_layout_mode",
-    "locale",
-    "app_theme",
-    "primary_navigation_mode",
-    "layout_max_width_px",
-    "show_query_indicator",
-    "enable_live_refetch",
-    "enable_discord_presence",
-    "enable_compact_display",
-    "enable_gradients",
-    "enable_double_sidebar",
-    "enable_replace_primary_sidebar",
-    "enable_hide_scrollbar",
-    "prefer_accent_color",
-    "show_thumbnails_in_headers",
-    "enable_job_overlay",
-    0, -- "enable_alphabet_select" is not in the old database (FALSE = 0 in SQLite)
-    'INTER'
-FROM backup."user_preferences";
-
--- Step 3: Create mapping of old user preferences IDs to new ones
--- We need to match each old record to its corresponding new record by insertion order
-INSERT INTO "user_preferences_id_map" ("old_id", "new_id")
-SELECT up_old."id",
-    up_new."id"
-FROM (
-    SELECT "id", ROW_NUMBER() OVER (ORDER BY "id") as rn
-    FROM backup."user_preferences"
-) up_old
-JOIN (
-    SELECT "id", ROW_NUMBER() OVER (ORDER BY "id") as rn
-    FROM "user_preferences"
-) up_new ON up_old.rn = up_new.rn;
-
--- Step 4: Update users table with mapped user_preferences_id
-UPDATE "users" 
-SET "user_preferences_id" = (
-    SELECT map."new_id" 
-    FROM "user_preferences_id_map" map 
-    JOIN backup."users" bu ON bu."user_preferences_id" = map."old_id"
-    WHERE bu."id" = "users"."id"
-)
-WHERE EXISTS (
-    SELECT 1 
-    FROM backup."users" bu 
-    JOIN "user_preferences_id_map" map ON bu."user_preferences_id" = map."old_id"
-    WHERE bu."id" = "users"."id"
-);
-
--- Step 5: Update user_preferences table with user_id to complete the relationship
-UPDATE "user_preferences" 
-SET "user_id" = (
-    SELECT u."id"
-    FROM "users" u
-    WHERE u."user_preferences_id" = "user_preferences"."id"
-)
-WHERE EXISTS (
-    SELECT 1 
-    FROM "users" u
-    WHERE u."user_preferences_id" = "user_preferences"."id"
-);
-
--- Step 6: Clean up the temporary mapping table
-DROP TABLE "user_preferences_id_map";
-
-INSERT INTO "user_login_activity"(
-        "ip_address",
-        "user_agent",
-        "authentication_successful",
-        "timestamp",
-        "user_id"
-    )
-SELECT "ip_address",
-    "user_agent",
-    "authentication_successful",
-    datetime("timestamp"/1000, 'unixepoch'),
-    "user_id"
-FROM backup."user_login_activity";
-
-INSERT INTO "age_restrictions"(
-        "age",
-        "restrict_on_unset",
-        "user_id"
-    )
-SELECT "age",
-    "restrict_on_unset",
-    "user_id"
-FROM backup."age_restrictions";
-
-INSERT INTO "reading_sessions"(
-        "page",
-        "percentage_completed",
-        "epubcfi",
-        "koreader_progress",
-        "started_at",
-        "updated_at",
-        "media_id",
-        "user_id",
-        "device_id",
-        "elapsed_seconds"
-    )
-SELECT "page",
-    "percentage_completed",
-    "epubcfi",
-    "koreader_progress",
-    datetime("started_at"/1000, 'unixepoch'),
-    datetime("updated_at"/1000, 'unixepoch'),
-    "media_id",
-    "user_id",
-    "device_id",
-    "elapsed_seconds"
-FROM backup."reading_sessions";
-
-INSERT INTO "finished_reading_sessions"(
-        "started_at",
-        "completed_at",
-        "media_id",
-        "user_id",
-        "device_id",
-        "elapsed_seconds"
-    )
-SELECT datetime("started_at"/1000, 'unixepoch'),
-    datetime("completed_at"/1000, 'unixepoch'),
-    "media_id",
-    "user_id",
-    "device_id",
-    "elapsed_seconds"
-FROM backup."finished_reading_sessions";
-
-INSERT INTO "last_library_visits"(
-        "user_id",
-        "library_id",
-        "timestamp"
-    )
-SELECT "user_id",
-    "library_id",
-    datetime("timestamp"/1000, 'unixepoch')
-FROM backup."last_library_visits";
-
--- Remove the current server_config
-DELETE FROM "server_config";
--- Insert the server_config from the backup database
-INSERT INTO "server_config"(
-        "public_url",
-        "initial_wal_setup_complete",
-        "encryption_key"
-    )
-SELECT "public_url",
-    "initial_wal_setup_complete",
-    "encryption_key"
-FROM backup."server_config";
-
-PRAGMA foreign_keys = ON;
-PRAGMA defer_foreign_keys = OFF;
-PRAGMA foreign_key_check;
-COMMIT;
-
--- There are a few features which simply could not be migrated due to complexity of the change:
--- 1. Smart Lists
--- 2. Scheduled Jobs
--- 3. API Keys (columns were changed)
--- 4. Bookmarks (table dropped and recreated with new locator-based schema)
--- 5. Media Annotations (schema completely rewritten to use Readium locator model)
\ No newline at end of file

From b5034ceaaafb26054c8d3965357a13add9b05f51 Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Mon, 6 Apr 2026 13:31:39 -0700
Subject: [PATCH 26/32] :memo: Update documentation, fix landing page style
 resolution

---
 apps/docs/components/Feedback.tsx     |  6 +++---
 apps/docs/components/Hero.tsx         |  6 +++---
 apps/docs/components/MobileApp.tsx    | 10 ++++++----
 apps/docs/globals.css                 | 18 ++++++++++++++++++
 apps/docs/pages/guides/mobile/faq.mdx | 16 ++++++++++++----
 5 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/apps/docs/components/Feedback.tsx b/apps/docs/components/Feedback.tsx
index a4d1a3b18f..a4b46fe11b 100644
--- a/apps/docs/components/Feedback.tsx
+++ b/apps/docs/components/Feedback.tsx
@@ -5,9 +5,9 @@ export default function Feedback() {
 	return (
 		<div className="max-w-7xl gap-20 px-6 py-10 lg:px-8 lg:py-24 mx-auto flex w-full flex-col">
 			<div className="gap-5 flex flex-col">
-				<h2 className="text-2xl font-bold tracking-tight text-black sm:text-4xl dark:text-neutral-100">
-					Feedback
-				</h2>
+				<div className="text-2xl sm:text-4xl">
+					<h2 className="font-bold tracking-tight text-black dark:text-neutral-100">Feedback</h2>
+				</div>
 
 				<p className="text-neutral-650 text-base sm:text-lg md:max-w-3xl md:text-xl dark:text-neutral-400">
 					Stump is a community-driven project. The best way to improve the software is to hear and
diff --git a/apps/docs/components/Hero.tsx b/apps/docs/components/Hero.tsx
index 2b7adf5aec..ed65a25fde 100644
--- a/apps/docs/components/Hero.tsx
+++ b/apps/docs/components/Hero.tsx
@@ -109,14 +109,14 @@ export default function Hero() {
 									initial="hidden"
 									animate="visible"
 									variants={wordVariants}
-									className="last:mr-0 mr-[0.25em] inline-block"
+									className="last:mr-0 text-4xl sm:text-6xl mr-[0.25em] inline-block"
 								>
 									{word}
 								</motion.span>
 							))}
 						</h1>
 
-						<motion.p
+						<motion.div
 							initial="hidden"
 							animate="visible"
 							variants={descriptionVariants}
@@ -124,7 +124,7 @@ export default function Hero() {
 						>
 							Designed to be fast, beautiful, and simple. Curate your digital libraries and stream
 							your media to any device.
-						</motion.p>
+						</motion.div>
 					</div>
 
 					<div className="space-x-2 md:mt-8 md:justify-start flex justify-center">
diff --git a/apps/docs/components/MobileApp.tsx b/apps/docs/components/MobileApp.tsx
index 9d746e301d..48425ccc68 100644
--- a/apps/docs/components/MobileApp.tsx
+++ b/apps/docs/components/MobileApp.tsx
@@ -6,11 +6,13 @@ export default function MobileApp() {
 		<div className="bg-white w-full dark:bg-[#0E0E0E]">
 			<div className="max-w-7xl gap-16 px-6 py-10 lg:gap-20 lg:px-8 lg:py-24 mx-auto flex min-h-screen flex-col items-center">
 				<div className="max-w-2xl md:text-center lg:mx-0 lg:max-w-xl lg:pt-8 mx-auto shrink-0">
-					<h2 className="text-2xl font-bold tracking-tight text-black sm:text-4xl dark:text-neutral-100">
-						Mobile app in early alpha
-					</h2>
+					<div className="text-2xl sm:text-4xl">
+						<h2 className="font-bold tracking-tight text-black dark:text-neutral-100">
+							Mobile app in early alpha
+						</h2>
+					</div>
 
-					<p className="text-neutral-650 mt-5 max-w-md text-base sm:text-lg md:max-w-3xl md:text-xl dark:text-neutral-400 mx-auto">
+					<p className="text-neutral-650 mt-5! max-w-md text-base sm:text-lg md:max-w-3xl md:text-xl dark:text-neutral-400 mx-auto">
 						An app for both iOS and Android is in the works, with a more tailored mobile-first
 						experience
 					</p>
diff --git a/apps/docs/globals.css b/apps/docs/globals.css
index 60d76cf90b..ccff960c97 100644
--- a/apps/docs/globals.css
+++ b/apps/docs/globals.css
@@ -5,3 +5,21 @@
 @source './theme.config.tsx';
 
 @custom-variant dark (&:is(.dark, .dark *));
+
+/*
+i added this because i am pretty sure nextra is winning in specificity for header styles which fucked
+up some of the landing page. i am too lazy to do this correctly, so am basically just resetting
+all header styles to override nextra
+*/
+* {
+	h1,
+	h2,
+	h3,
+	h4,
+	h5,
+	h6 {
+		font-size: revert-layer;
+		font-weight: revert-layer;
+		line-height: revert-layer;
+	}
+}
diff --git a/apps/docs/pages/guides/mobile/faq.mdx b/apps/docs/pages/guides/mobile/faq.mdx
index 8bed7618b2..e6d1f07c0d 100644
--- a/apps/docs/pages/guides/mobile/faq.mdx
+++ b/apps/docs/pages/guides/mobile/faq.mdx
@@ -4,17 +4,25 @@ import { Callout } from 'nextra/components'
 
 Frequently asked questions about the mobile app
 
-## Pricing
+## What is the pricing model for the app?
 
 <Callout emoji="⚠️" type="warning">
 	The price has yet to be determined and **subject to change**. I am trying to keep it as affordable
 	as possible while still being sustainable for continued development. The current price range I'm
 	considering is between $10 and $20 USD, which is comparable to similar apps in the market.
+
+  That said, I understand that no matter the price there will still be people who are not able to afford it. If you are in that situation, please feel free to reach out to me directly and we can work out a sliding scale cost or pull from the pool of promo codes that I will be setting aside. 
 </Callout>
 
 Once the app is more stable and feature-complete, it will be released as a paid app on both iOS and Android. The price is not finalized, but it will be a one-time purchase with **no required recurring fees or subscriptions** that otherwise gate features.
 
-The app will remain free for alpha testers via TestFlight and Google Play, however it will be used as a testing ground for new features and changes before they are released to the public. Therefore, alpha testers should expect more bugs and instability compared to the paid version.
+The app will remain free for alpha testers via TestFlight, however it will be used as a testing ground for new features and changes before they are released to the public. Therefore, alpha testers should expect more bugs and instability compared to the paid version. For Google Play alpha testers, I have a pool of promo codes I refresh each start of the year so cannot blanket guarantee free access to all new alpha testers indefinitely.
+
+## When will the app be released?
+
+There is no official release date for the app at this time. Stump as a whole is a project I build out after work during my spare time, and the mobile app is just a slice of that overall effort. So, committing to dates is not something I like to make a habit of doing. 
+
+I have very loose goals to release the app by 2027, but that entirely depends on where life takes me between now and then.
 
 ## Why React Native?
 
@@ -28,9 +36,9 @@ Regardless, I am confident that it is at least a good fit for Stump, as it is a
 	to help out, please feel free to reach out!
 </Callout>
 
-## Will there be translations?
+## How can I help with translations?
 
-Yes! The app will be translated into multiple languages in the same way the web app is. I plan to start this effort once the app is more stable and feature-complete.
+If you'd like to help translate Stump into other languages, you can do so [here](https://crowdin.com/project/stump). You can do as little or as much as you'd like at a time! If you don't see your language listed, feel free to reach out to me via a GitHub issue.
 
 ## How can I provide feedback or report bugs?
 

From 202e7fcf2990c77422dc0aff37540401e67ec803 Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Mon, 6 Apr 2026 13:44:29 -0700
Subject: [PATCH 27/32] =?UTF-8?q?=F0=9F=8C=90=20(German):=20Update=20trans?=
 =?UTF-8?q?lations=20(#1061)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/i18n/src/locales/de-DE.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/i18n/src/locales/de-DE.json b/packages/i18n/src/locales/de-DE.json
index a6d1227014..c13ae2f33f 100644
--- a/packages/i18n/src/locales/de-DE.json
+++ b/packages/i18n/src/locales/de-DE.json
@@ -2715,15 +2715,15 @@
 						"confirmation": "Bist du dir sicher, dass du alle Downloads von {{serverName}} löschen möchtest?",
 						"deleteFailed": {
 							"title": "Löschen fehlgeschlagen",
-							"description": "There was an error deleting all downloads from {{serverName}}"
+							"description": "Es gab einen Fehler beim Löschen aller Downloads von {{serverName}}"
 						}
 					},
-					"noDownloads": "No downloaded files for this server",
+					"noDownloads": "Keine heruntergeladenen Dateien für diesen Server",
 					"storedPreferences": {
-						"label": "Stored preferences",
-						"description": "Miscellaneous data like book preferences, reading timers, etc"
+						"label": "Gespeicherte Präferenzen",
+						"description": "Sonstige Daten wie Buchpräferenzen, Lesezeiten, etc"
 					},
-					"clearPreferences": "Clear Preferences"
+					"clearPreferences": "Präferenzen löschen"
 				}
 			},
 			"debug": {
@@ -2731,11 +2731,11 @@
 				"clearCache": {
 					"memory": {
 						"button": "Speicher",
-						"success": "Speicher Cache geleert"
+						"success": "Speicher-Cache geleert"
 					},
 					"disk": {
-						"button": "Disk",
-						"success": "Disk cache cleared"
+						"button": "Festplatte",
+						"success": "Festplatten-Cache geleert"
 					}
 				},
 				"deleteDatabase": {

From ea7e079faf22f9275bd69b551c4c6f881686f10f Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Mon, 6 Apr 2026 18:03:45 -0700
Subject: [PATCH 28/32] :bug: Fix unique constraint violation during OIDC
 account migration (#1059)

* :bug: Fix unique constraint violation during OIDC account migration

* wip: update oidc migration comment more thoroughly

realized there are quite a few entities which could also be transferred

* wip: make it werk

* wow, add test for oidc migration logic
---
 Cargo.lock                                 |   1 +
 crates/cli/Cargo.toml                      |   1 +
 crates/cli/src/commands/account.rs         | 746 ++++++++++++++++++++-
 crates/models/src/entity/library_config.rs |   1 +
 crates/models/src/entity/review.rs         |  19 +-
 crates/models/src/entity/session.rs        |  17 +-
 6 files changed, 765 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d51138cdd4..47f9b4d133 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1269,6 +1269,7 @@ dependencies = [
  "clap 4.5.48",
  "dialoguer",
  "indicatif",
+ "migrations",
  "models",
  "prettytable-rs",
  "sea-orm",
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index 0d332345b7..780c62e6b9 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -10,6 +10,7 @@ path = "bin/main.rs"
 [dependencies]
 stump_core = { path = "../../core" }
 models = { path = "../models" }
+migrations = { path = "../migrations" }
 
 sea-orm = { workspace = true }
 tokio = { workspace = true }
diff --git a/crates/cli/src/commands/account.rs b/crates/cli/src/commands/account.rs
index ca9d279373..9917d27f49 100644
--- a/crates/cli/src/commands/account.rs
+++ b/crates/cli/src/commands/account.rs
@@ -3,7 +3,10 @@ use std::{thread, time::Duration};
 use clap::Subcommand;
 use dialoguer::{theme::ColorfulTheme, Confirm, Input, Password};
 use models::entity::{
-	bookmark, finished_reading_session, reading_session, session, user,
+	api_key, book_club_member, bookmark, favorite_library, favorite_media,
+	favorite_series, finished_reading_session, last_library_visit, library_exclusion,
+	media_annotation, reading_session, refresh_token, review, session, user,
+	user_login_activity, user_preferences,
 };
 use sea_orm::{
 	prelude::*, ActiveValue::Set, IntoActiveModel, QueryTrait, TransactionTrait,
@@ -309,6 +312,20 @@ async fn migrate_oidc_account(
 
 	progress.finish_and_clear();
 
+	let mut is_server_owner = local_user.is_server_owner;
+
+	// i went back and forth a bit on whether to even handle this here, since there is a dedicated command for changing server ownership.
+	// ultimately i added it, but with extra confirmation
+	if local_user.is_server_owner {
+		is_server_owner = Confirm::new()
+            .with_prompt(format!(
+                "The local account '{}' is currently the server owner. Do you want to transfer server ownership to the OIDC account '{}' as part of this migration?",
+                local_user.username, oidc_user.username
+            ))
+            .default(false)
+            .interact()?;
+	}
+
 	println!("\nMigration Summary:");
 	println!(
 		"  Local account: {} (ID: {})",
@@ -320,7 +337,7 @@ async fn migrate_oidc_account(
 	);
 	println!("\nThis will:");
 	println!("  1. Transfer all reading sessions and history");
-	println!("  2. Transfer bookmarks");
+	println!("  2. Transfer all user-associated data like bookmarks and annotations");
 	println!("  3. Transfer user preferences");
 	println!("  4. Transfer permissions");
 	println!(
@@ -328,6 +345,9 @@ async fn migrate_oidc_account(
 		local_user.username
 	);
 	println!("  6. Delete local account '{}'", local_user.username);
+	if is_server_owner {
+		println!("  7. Transfer server ownership to OIDC account");
+	}
 
 	let confirmation = Confirm::new()
 		.with_prompt("\nAre you sure you want to continue?")
@@ -341,9 +361,57 @@ async fn migrate_oidc_account(
 
 	let progress = default_progress_spinner();
 
+	conn.execute_unprepared("PRAGMA foreign_keys = OFF").await?;
+
+	let result = do_migrate_oidc_account(
+		local_user,
+		oidc_user,
+		&conn,
+		|message| progress.set_message(message.to_string()),
+		is_server_owner,
+	)
+	.await;
+
+	conn.execute_unprepared("PRAGMA foreign_keys = ON").await?;
+
+	match result {
+		Ok(_) => {
+			progress.finish_with_message(format!(
+				"Successfully migrated local account '{}' to OIDC account!",
+				username
+			));
+			Ok(())
+		},
+		Err(e) => {
+			progress.abandon_with_message(format!("Migration failed: {}", e));
+			Err(e)
+		},
+	}
+}
+
+async fn do_migrate_oidc_account<F>(
+	local_user: user::Model,
+	oidc_user: user::Model,
+	conn: &DatabaseConnection,
+	post_message: F,
+	is_server_owner: bool,
+) -> CliResult<()>
+where
+	F: Fn(&str),
+{
 	let txn = conn.begin().await?;
 
-	progress.set_message("Transferring reading sessions...");
+	post_message("Transferring reviews...");
+	review::Entity::update_many()
+		.col_expr(
+			review::Column::UserId,
+			sea_orm::sea_query::Expr::value(oidc_user.id.clone()),
+		)
+		.filter(review::Column::UserId.eq(local_user.id.clone()))
+		.exec(&txn)
+		.await?;
+
+	post_message("Transferring reading sessions...");
 	reading_session::Entity::update_many()
 		.col_expr(
 			reading_session::Column::UserId,
@@ -353,7 +421,7 @@ async fn migrate_oidc_account(
 		.exec(&txn)
 		.await?;
 
-	progress.set_message("Transferring finished reading sessions...");
+	post_message("Transferring finished reading sessions...");
 	finished_reading_session::Entity::update_many()
 		.col_expr(
 			finished_reading_session::Column::UserId,
@@ -363,7 +431,73 @@ async fn migrate_oidc_account(
 		.exec(&txn)
 		.await?;
 
-	progress.set_message("Transferring bookmarks...");
+	// running list of user-associated entities:
+	// - bookmarks
+	// - media annotations
+	// - favorites (library, media, series)
+	// - visit tracking (library)
+	// - book club memberships and favorite books within those memberships
+	//
+	// more sensative ones:
+	// - api_keys (arguably)
+	// - login activity
+	// - library exclusions
+	//
+	// these, however, will be deleted for security:
+	// - refresh tokens
+	// - sessions
+
+	post_message("Transferring library visit tracking...");
+	last_library_visit::Entity::update_many()
+		.col_expr(
+			last_library_visit::Column::UserId,
+			sea_orm::sea_query::Expr::value(oidc_user.id.clone()),
+		)
+		.filter(last_library_visit::Column::UserId.eq(local_user.id.clone()))
+		.exec(&txn)
+		.await?;
+
+	post_message("Transferring library exclusions...");
+	library_exclusion::Entity::update_many()
+		.col_expr(
+			library_exclusion::Column::UserId,
+			sea_orm::sea_query::Expr::value(oidc_user.id.clone()),
+		)
+		.filter(library_exclusion::Column::UserId.eq(local_user.id.clone()))
+		.exec(&txn)
+		.await?;
+
+	post_message("Deleting refresh tokens and any active auth sessions...");
+	refresh_token::Entity::delete_many()
+		.filter(refresh_token::Column::UserId.eq(local_user.id.clone()))
+		.exec(&txn)
+		.await?;
+	session::Entity::delete_many()
+		.filter(session::Column::UserId.eq(local_user.id.clone()))
+		.exec(&txn)
+		.await?;
+
+	post_message("Transferring login activity...");
+	user_login_activity::Entity::update_many()
+		.col_expr(
+			user_login_activity::Column::UserId,
+			sea_orm::sea_query::Expr::value(oidc_user.id.clone()),
+		)
+		.filter(user_login_activity::Column::UserId.eq(local_user.id.clone()))
+		.exec(&txn)
+		.await?;
+
+	post_message("Transferring API keys...");
+	api_key::Entity::update_many()
+		.col_expr(
+			api_key::Column::UserId,
+			sea_orm::sea_query::Expr::value(oidc_user.id.clone()),
+		)
+		.filter(api_key::Column::UserId.eq(local_user.id.clone()))
+		.exec(&txn)
+		.await?;
+
+	post_message("Transferring bookmarks...");
 	bookmark::Entity::update_many()
 		.col_expr(
 			bookmark::Column::UserId,
@@ -373,23 +507,603 @@ async fn migrate_oidc_account(
 		.exec(&txn)
 		.await?;
 
-	progress.set_message("Transferring user preferences and permissions...");
-	let mut oidc_active = oidc_user.clone().into_active_model();
+	post_message("Transferring annotations...");
+	media_annotation::Entity::update_many()
+		.col_expr(
+			media_annotation::Column::UserId,
+			sea_orm::sea_query::Expr::value(oidc_user.id.clone()),
+		)
+		.filter(media_annotation::Column::UserId.eq(local_user.id.clone()))
+		.exec(&txn)
+		.await?;
+
+	post_message("Transferring favorites...");
+	favorite_library::Entity::update_many()
+		.col_expr(
+			favorite_library::Column::UserId,
+			sea_orm::sea_query::Expr::value(oidc_user.id.clone()),
+		)
+		.filter(favorite_library::Column::UserId.eq(local_user.id.clone()))
+		.exec(&txn)
+		.await?;
+	favorite_media::Entity::update_many()
+		.col_expr(
+			favorite_media::Column::UserId,
+			sea_orm::sea_query::Expr::value(oidc_user.id.clone()),
+		)
+		.filter(favorite_media::Column::UserId.eq(local_user.id.clone()))
+		.exec(&txn)
+		.await?;
+	favorite_series::Entity::update_many()
+		.col_expr(
+			favorite_series::Column::UserId,
+			sea_orm::sea_query::Expr::value(oidc_user.id.clone()),
+		)
+		.filter(favorite_series::Column::UserId.eq(local_user.id.clone()))
+		.exec(&txn)
+		.await?;
+
+	post_message("Transferring book club memberships...");
+	book_club_member::Entity::update_many()
+		.col_expr(
+			book_club_member::Column::UserId,
+			sea_orm::sea_query::Expr::value(oidc_user.id.clone()),
+		)
+		.filter(book_club_member::Column::UserId.eq(local_user.id.clone()))
+		.exec(&txn)
+		.await?;
+
+	post_message("Transferring user preferences and permissions...");
+
+	if let Some(oidc_prefs_id) = oidc_user.user_preferences_id {
+		user_preferences::Entity::delete_by_id(oidc_prefs_id)
+			.exec(&txn)
+			.await?;
+	}
+
+	post_message("Deleting local account...");
+	user::Entity::delete_by_id(local_user.id).exec(&txn).await?;
+
+	post_message("Updating OIDC account with local account data...");
+
+	let oidc_user_in_txn = user::Entity::find_by_id(oidc_user.id.clone())
+		.one(&txn)
+		.await?
+		.ok_or_else(|| {
+			CliError::OperationFailed("OIDC user not found in transaction".to_string())
+		})?;
+
+	let mut oidc_active = oidc_user_in_txn.into_active_model();
 	oidc_active.user_preferences_id = Set(local_user.user_preferences_id);
 	oidc_active.permissions = Set(local_user.permissions);
 	oidc_active.username = Set(local_user.username.clone());
+	oidc_active.is_server_owner = Set(is_server_owner);
 	oidc_active.update(&txn).await?;
 
-	progress.set_message("Deleting local account...");
-	user::Entity::delete_by_id(local_user.id).exec(&txn).await?;
-
-	progress.set_message("Committing changes...");
+	post_message("Committing changes...");
 	txn.commit().await?;
 
-	progress.finish_with_message(format!(
-		"Successfully migrated local account '{}' to OIDC account!",
-		username
-	));
-
 	Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+	use migrations::{Migrator, MigratorTrait};
+	use models::{
+		entity::{
+			api_key, bookmark, favorite_library, favorite_media, favorite_series,
+			finished_reading_session, last_library_visit, library, library_config,
+			library_exclusion, media, media_annotation, reading_session, refresh_token,
+			review, series, session, user, user_login_activity, user_preferences,
+		},
+		shared::{
+			api_key::APIKeyPermissions,
+			enums::{
+				FileStatus, LibraryPattern, LibraryViewMode, ReadingDirection,
+				ReadingImageScaleFit, ReadingMode,
+			},
+			readium::ReadiumLocator,
+		},
+	};
+	use sea_orm::{
+		prelude::DateTimeWithTimeZone, sqlx::types::chrono::Utc, ActiveModelTrait,
+		ColumnTrait, ConnectionTrait, Database, DbConn, EntityTrait, QueryFilter, Set,
+	};
+
+	use super::do_migrate_oidc_account;
+
+	async fn test_database() -> DbConn {
+		let db = Database::connect("sqlite::memory:")
+			.await
+			.expect("failed to connect to test database");
+
+		Migrator::up(&db, None).await.expect("Failed to migrate");
+
+		db
+	}
+
+	#[derive(Default)]
+	struct ExampleUser {}
+
+	impl ExampleUser {
+		fn active_model() -> user::ActiveModel {
+			user::ActiveModel {
+				username: sea_orm::Set("oromei".to_string()),
+				hashed_password: sea_orm::Set("hashed_password".to_string()),
+				is_server_owner: sea_orm::Set(true),
+				is_locked: sea_orm::Set(false),
+				..Default::default()
+			}
+		}
+
+		async fn insert(
+			&self,
+			db: &DbConn,
+			user: Option<user::ActiveModel>,
+		) -> user::Model {
+			let model = user.unwrap_or_else(|| Self::active_model());
+
+			let user = model.insert(db).await.expect("could not insert user");
+			let _user_preferences = user_preferences::ActiveModel {
+				user_id: Set(Some(user.id.clone())),
+				..Default::default()
+			}
+			.insert(db)
+			.await
+			.expect("could not insert user preferences");
+
+			user
+		}
+	}
+
+	fn library_config() -> library_config::ActiveModel {
+		library_config::ActiveModel {
+			convert_rar_to_zip: Set(false),
+			hard_delete_conversions: Set(false),
+			default_reading_dir: Set(ReadingDirection::Ltr),
+			default_reading_mode: Set(ReadingMode::Paged),
+			default_reading_image_scale_fit: Set(ReadingImageScaleFit::Height),
+			generate_file_hashes: Set(false),
+			generate_koreader_hashes: Set(false),
+			process_metadata: Set(true),
+			watch: Set(false),
+			library_pattern: Set(LibraryPattern::SeriesBased),
+			default_library_view_mode: Set(LibraryViewMode::Series),
+			hide_series_view: Set(false),
+			skip_book_overview: Set(false),
+			process_thumbnail_colors_even_without_config: Set(false),
+			..Default::default()
+		}
+	}
+
+	async fn setup_oidc_migration_test(local_user: &user::Model, db: &DbConn) {
+		let library_config_1 = library_config()
+			.insert(db)
+			.await
+			.expect("could not insert library config");
+
+		let library = library::ActiveModel {
+			name: Set("Test Library".to_string()),
+			path: Set("/test/library".to_string()),
+			status: Set(FileStatus::Ready),
+			config_id: Set(library_config_1.id),
+			..Default::default()
+		}
+		.insert(db)
+		.await
+		.expect("could not insert library");
+
+		let library_config_2 = library_config()
+			.insert(db)
+			.await
+			.expect("could not insert library config");
+
+		let excluded_from_local_user_library = library::ActiveModel {
+			name: Set("Test Library EXCLUDED".to_string()),
+			path: Set("/test/library-excluded".to_string()),
+			status: Set(FileStatus::Ready),
+			config_id: Set(library_config_2.id),
+			..Default::default()
+		}
+		.insert(db)
+		.await
+		.expect("could not insert library");
+
+		let series = series::ActiveModel {
+			name: Set("Test Series".to_string()),
+			library_id: Set(Some(library.id.clone())),
+			path: Set("/test/series".to_string()),
+			status: Set(FileStatus::Ready),
+			..Default::default()
+		}
+		.insert(db)
+		.await
+		.expect("could not insert series");
+
+		for i in 0..5 {
+			let _media = media::ActiveModel {
+				name: Set(format!("Test Media {}", i + 1)),
+				path: Set(format!("/test/series/media{}", i + 1)),
+				series_id: Set(Some(series.id.clone())),
+				extension: Set("cbz".to_string()),
+				pages: Set(100 + i),
+				status: Set(FileStatus::Ready),
+				size: Set(1024),
+				..Default::default()
+			}
+			.insert(db)
+			.await
+			.expect("could not insert media");
+		}
+
+		let media_list = media::Entity::find()
+			.filter(media::Column::SeriesId.eq(series.id.clone()))
+			.all(db)
+			.await
+			.expect("could not fetch media");
+
+		// let's have an active session for books 0 and 2, and a finished reading session for book 1
+		for i in 0..3 {
+			if i == 1 {
+				finished_reading_session::ActiveModel {
+					user_id: Set(local_user.id.clone()),
+					media_id: Set(media_list[1].id.clone()),
+					started_at: Set(DateTimeWithTimeZone::from(Utc::now())),
+					completed_at: Set(DateTimeWithTimeZone::from(Utc::now())),
+					..Default::default()
+				}
+				.insert(db)
+				.await
+				.expect("could not insert finished reading session for media 1");
+			} else {
+				reading_session::ActiveModel {
+					page: Set(Some(10)),
+					user_id: Set(local_user.id.clone()),
+					media_id: Set(media_list[i].id.clone()),
+					..Default::default()
+				}
+				.insert(db)
+				.await
+				.expect(&format!("could not insert reading session for media {}", i));
+			}
+		}
+
+		// let's create a review for media 0 as well
+		review::ActiveModel {
+			user_id: Set(local_user.id.clone()),
+			media_id: Set(media_list[0].id.clone()),
+			rating: Set(4),
+			content: Set(Some("Great book!".to_string())),
+			is_private: Set(false),
+			..Default::default()
+		}
+		.insert(db)
+		.await
+		.expect("could not insert review for media 0");
+
+		// bookmark for media 2
+		bookmark::ActiveModel {
+			user_id: Set(local_user.id.clone()),
+			media_id: Set(media_list[2].id.clone()),
+			locator: Set(Some(ReadiumLocator {
+				chapter_title: "Chapter Foo".to_string(),
+				href: "chapter1.html".to_string(),
+				locations: None,
+				text: None,
+				title: Some("Chapter 1".to_string()),
+				r#type: "application/xhtml+xml".to_string(),
+			})),
+			..Default::default()
+		}
+		.insert(db)
+		.await
+		.expect("could not insert bookmark for media 2");
+
+		// media annotation for media 3
+		media_annotation::ActiveModel {
+			user_id: Set(local_user.id.clone()),
+			media_id: Set(media_list[3].id.clone()),
+			locator: Set(ReadiumLocator {
+				chapter_title: "Chapter 3".to_string(),
+				href: "chapter3.html".to_string(),
+				locations: None,
+				text: None,
+				title: Some("Chapter 3".to_string()),
+				r#type: "application/xhtml+xml".to_string(),
+			}),
+			annotation_text: Set(Some("Important note!".to_string())),
+			..Default::default()
+		}
+		.insert(db)
+		.await
+		.expect("could not insert media annotation for media 3");
+
+		favorite_library::ActiveModel {
+			user_id: Set(local_user.id.clone()),
+			library_id: Set(library.id.clone()),
+			..Default::default()
+		}
+		.insert(db)
+		.await
+		.expect("could not insert favorite library");
+
+		favorite_media::ActiveModel {
+			user_id: Set(local_user.id.clone()),
+			media_id: Set(media_list[0].id.clone()),
+			..Default::default()
+		}
+		.insert(db)
+		.await
+		.expect("could not insert favorite media");
+
+		favorite_series::ActiveModel {
+			user_id: Set(local_user.id.clone()),
+			series_id: Set(series.id.clone()),
+			..Default::default()
+		}
+		.insert(db)
+		.await
+		.expect("could not insert favorite series");
+
+		last_library_visit::ActiveModel {
+			user_id: Set(local_user.id.clone()),
+			library_id: Set(library.id.clone()),
+			timestamp: Set(DateTimeWithTimeZone::from(Utc::now())),
+			..Default::default()
+		}
+		.insert(db)
+		.await
+		.expect("could not insert last library visit");
+
+		library_exclusion::ActiveModel {
+			user_id: Set(local_user.id.clone()),
+			library_id: Set(excluded_from_local_user_library.id.clone()),
+			..Default::default()
+		}
+		.insert(db)
+		.await
+		.expect("could not insert library exclusion for local user");
+
+		api_key::ActiveModel {
+			user_id: Set(local_user.id.clone()),
+			long_token_hash: Set("hashed_token".to_string()),
+			short_token: Set("short".to_string()),
+			name: Set("Test API Key".to_string()),
+			permissions: Set(APIKeyPermissions::inherit()),
+			..Default::default()
+		}
+		.insert(db)
+		.await
+		.expect("could not insert API key for local user");
+
+		// give them an auth session, refresh token, and one login activity record each as well
+		session::ActiveModel {
+			user_id: Set(local_user.id.clone()),
+			session_id: Set("session123".to_string()),
+			// i know now = expired but its fine for this
+			expiry_time: Set(DateTimeWithTimeZone::from(Utc::now())),
+			..Default::default()
+		}
+		.insert(db)
+		.await
+		.expect("could not insert session for local user");
+
+		refresh_token::ActiveModel {
+			id: Set("refresh123".to_string()),
+			expires_at: Set(DateTimeWithTimeZone::from(Utc::now())),
+			user_id: Set(local_user.id.clone()),
+			..Default::default()
+		}
+		.insert(db)
+		.await
+		.expect("could not insert refresh token for local user");
+
+		for i in 0..2 {
+			user_login_activity::ActiveModel {
+				user_id: Set(local_user.id.clone()),
+				authentication_successful: Set(i % 2 == 0),
+				ip_address: Set("localhost".to_string()),
+				timestamp: Set(DateTimeWithTimeZone::from(Utc::now())),
+				user_agent: Set("TestAgent/1.0".to_string()),
+				..Default::default()
+			}
+			.insert(db)
+			.await
+			.expect("could not insert login activity for local user");
+		}
+	}
+
+	#[tokio::test]
+	async fn test_oidc_user_migration() {
+		let db = test_database().await;
+
+		let local_user = ExampleUser {}.insert(&db, None).await;
+		let oidc_user = ExampleUser {}
+			.insert(
+				&db,
+				Some(user::ActiveModel {
+					username: Set("oidc_user".to_string()),
+					oidc_email: Set(Some("user@proton.me".to_string())),
+					oidc_issuer_id: Set(Some("https://example.com/oidc".to_string())),
+					is_server_owner: Set(false),
+					..ExampleUser::active_model()
+				}),
+			)
+			.await;
+
+		setup_oidc_migration_test(&local_user, &db).await;
+
+		db.execute_unprepared("PRAGMA foreign_keys = OFF")
+			.await
+			.expect("Failed to disable foreign keys");
+
+		let result = do_migrate_oidc_account(
+			local_user.clone(),
+			oidc_user.clone(),
+			&db,
+			|_| {},
+			true,
+		)
+		.await;
+
+		db.execute_unprepared("PRAGMA foreign_keys = ON")
+			.await
+			.expect("Failed to re-enable foreign keys");
+
+		assert!(result.is_ok(), "Migration failed: {:?}", result.err());
+
+		let local_user_check = user::Entity::find_by_id(&local_user.id)
+			.one(&db)
+			.await
+			.expect("Failed to query local user");
+		assert!(local_user_check.is_none(), "Local user should be deleted");
+
+		let updated_oidc_user = user::Entity::find_by_id(&oidc_user.id)
+			.one(&db)
+			.await
+			.expect("Failed to query OIDC user")
+			.expect("OIDC user should exist");
+		assert_eq!(
+			updated_oidc_user.username, local_user.username,
+			"OIDC user should have local user's username"
+		);
+		assert_eq!(
+			updated_oidc_user.user_preferences_id, local_user.user_preferences_id,
+			"OIDC user should have local user's preferences"
+		);
+		assert!(
+			updated_oidc_user.is_server_owner,
+			"OIDC user should be server owner"
+		);
+
+		let reading_sessions = reading_session::Entity::find()
+			.filter(reading_session::Column::UserId.eq(&oidc_user.id))
+			.all(&db)
+			.await
+			.expect("Failed to query reading sessions");
+		assert_eq!(
+			reading_sessions.len(),
+			2,
+			"Should have 2 reading sessions transferred"
+		);
+
+		let finished_sessions = finished_reading_session::Entity::find()
+			.filter(finished_reading_session::Column::UserId.eq(&oidc_user.id))
+			.all(&db)
+			.await
+			.expect("Failed to query finished reading sessions");
+		assert_eq!(
+			finished_sessions.len(),
+			1,
+			"Should have 1 finished reading session transferred"
+		);
+
+		let reviews = review::Entity::find()
+			.filter(review::Column::UserId.eq(&oidc_user.id))
+			.all(&db)
+			.await
+			.expect("Failed to query reviews");
+		assert_eq!(reviews.len(), 1, "Should have 1 review transferred");
+
+		let bookmarks = bookmark::Entity::find()
+			.filter(bookmark::Column::UserId.eq(&oidc_user.id))
+			.all(&db)
+			.await
+			.expect("Failed to query bookmarks");
+		assert_eq!(bookmarks.len(), 1, "Should have 1 bookmark transferred");
+
+		let annotations = media_annotation::Entity::find()
+			.filter(media_annotation::Column::UserId.eq(&oidc_user.id))
+			.all(&db)
+			.await
+			.expect("Failed to query annotations");
+		assert_eq!(annotations.len(), 1, "Should have 1 annotation transferred");
+
+		let favorite_libraries = favorite_library::Entity::find()
+			.filter(favorite_library::Column::UserId.eq(&oidc_user.id))
+			.all(&db)
+			.await
+			.expect("Failed to query favorite libraries");
+		assert_eq!(
+			favorite_libraries.len(),
+			1,
+			"Should have 1 favorite library transferred"
+		);
+
+		let favorite_media_list = favorite_media::Entity::find()
+			.filter(favorite_media::Column::UserId.eq(&oidc_user.id))
+			.all(&db)
+			.await
+			.expect("Failed to query favorite media");
+		assert_eq!(
+			favorite_media_list.len(),
+			1,
+			"Should have 1 favorite media transferred"
+		);
+
+		let favorite_series_list = favorite_series::Entity::find()
+			.filter(favorite_series::Column::UserId.eq(&oidc_user.id))
+			.all(&db)
+			.await
+			.expect("Failed to query favorite series");
+		assert_eq!(
+			favorite_series_list.len(),
+			1,
+			"Should have 1 favorite series transferred"
+		);
+
+		let exclusions = library_exclusion::Entity::find()
+			.filter(library_exclusion::Column::UserId.eq(&oidc_user.id))
+			.all(&db)
+			.await
+			.expect("Failed to query library exclusions");
+		assert_eq!(
+			exclusions.len(),
+			1,
+			"Should have 1 library exclusion transferred"
+		);
+
+		let visits = last_library_visit::Entity::find()
+			.filter(last_library_visit::Column::UserId.eq(&oidc_user.id))
+			.all(&db)
+			.await
+			.expect("Failed to query library visits");
+		assert_eq!(visits.len(), 1, "Should have 1 library visit transferred");
+
+		let api_keys = api_key::Entity::find()
+			.filter(api_key::Column::UserId.eq(&oidc_user.id))
+			.all(&db)
+			.await
+			.expect("Failed to query API keys");
+		assert_eq!(api_keys.len(), 1, "Should have 1 API key transferred");
+
+		let login_activity = user_login_activity::Entity::find()
+			.filter(user_login_activity::Column::UserId.eq(&oidc_user.id))
+			.all(&db)
+			.await
+			.expect("Failed to query login activity");
+		assert_eq!(
+			login_activity.len(),
+			2,
+			"Should have 2 login activity records transferred"
+		);
+
+		let sessions = session::Entity::find()
+			.filter(session::Column::UserId.eq(&local_user.id))
+			.all(&db)
+			.await
+			.expect("Failed to query sessions");
+		assert_eq!(sessions.len(), 0, "Local user's sessions should be deleted"); // not transferred
+
+		let refresh_tokens = refresh_token::Entity::find()
+			.filter(refresh_token::Column::UserId.eq(&local_user.id))
+			.all(&db)
+			.await
+			.expect("Failed to query refresh tokens");
+		assert_eq!(
+			refresh_tokens.len(),
+			0,
+			"Local user's refresh tokens should be deleted"
+		); // not transferred
+	}
+}
diff --git a/crates/models/src/entity/library_config.rs b/crates/models/src/entity/library_config.rs
index 22c0a8093b..e64d4ffce6 100644
--- a/crates/models/src/entity/library_config.rs
+++ b/crates/models/src/entity/library_config.rs
@@ -74,4 +74,5 @@ impl Related<super::library::Entity> for Entity {
 	}
 }
 
+// TODO(testing): Impl this so that we can have a reasonable baseline for testing
 impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/models/src/entity/review.rs b/crates/models/src/entity/review.rs
index 28b11f67c2..57e47d8541 100644
--- a/crates/models/src/entity/review.rs
+++ b/crates/models/src/entity/review.rs
@@ -1,4 +1,7 @@
-use sea_orm::entity::prelude::*;
+use sea_orm::{entity::prelude::*, prelude::async_trait::async_trait, ActiveValue};
+
+// TODO(reviews): Add timestamp
+// TODO(reviews): Rename content to review_text or something
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "reviews")]
@@ -47,4 +50,16 @@ impl Related<super::user::Entity> for Entity {
 	}
 }
 
-impl ActiveModelBehavior for ActiveModel {}
+#[async_trait]
+impl ActiveModelBehavior for ActiveModel {
+	async fn before_save<C>(mut self, _db: &C, insert: bool) -> Result<Self, DbErr>
+	where
+		C: ConnectionTrait,
+	{
+		if insert {
+			self.id = ActiveValue::Set(Uuid::new_v4().to_string());
+		}
+
+		Ok(self)
+	}
+}
diff --git a/crates/models/src/entity/session.rs b/crates/models/src/entity/session.rs
index 3da85ab86f..de0528a801 100644
--- a/crates/models/src/entity/session.rs
+++ b/crates/models/src/entity/session.rs
@@ -1,4 +1,5 @@
-use sea_orm::entity::prelude::*;
+use chrono::Utc;
+use sea_orm::{entity::prelude::*, prelude::async_trait::async_trait, ActiveValue};
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "sessions")]
@@ -31,4 +32,16 @@ impl Related<super::user::Entity> for Entity {
 	}
 }
 
-impl ActiveModelBehavior for ActiveModel {}
+#[async_trait]
+impl ActiveModelBehavior for ActiveModel {
+	async fn before_save<C>(mut self, _db: &C, insert: bool) -> Result<Self, DbErr>
+	where
+		C: ConnectionTrait,
+	{
+		if insert {
+			self.created_at = ActiveValue::Set(DateTimeWithTimeZone::from(Utc::now()));
+		}
+
+		Ok(self)
+	}
+}

From 1520ee31a4834106ceb3f64f68aed6617f54af62 Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Tue, 7 Apr 2026 16:56:09 -0700
Subject: [PATCH 29/32] :adhesive_bandage: Ensure OIDC migration remaps
 preferences (#1067)

if preferences are not remapped, previously it would break the accounts ability to log in. i have also added logic to just recreate if missing upon access in gql so should be fixed on both fronts
---
 crates/cli/src/commands/account.rs | 47 ++++++++++++++++++++++++++++--
 crates/graphql/src/object/user.rs  | 27 +++++++++++++++--
 2 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/crates/cli/src/commands/account.rs b/crates/cli/src/commands/account.rs
index 9917d27f49..3bbf45d150 100644
--- a/crates/cli/src/commands/account.rs
+++ b/crates/cli/src/commands/account.rs
@@ -561,6 +561,19 @@ where
 			.await?;
 	}
 
+	// if we do not swap the user_preferences_id the account "breaks" because no preferences exist.
+	// i added a fix for that, however the migration should still to the remap as it is correct
+	if let Some(local_prefs_id) = local_user.user_preferences_id {
+		user_preferences::Entity::update_many()
+			.col_expr(
+				user_preferences::Column::UserId,
+				sea_orm::sea_query::Expr::value(Some(oidc_user.id.clone())),
+			)
+			.filter(user_preferences::Column::Id.eq(local_prefs_id))
+			.exec(&txn)
+			.await?;
+	}
+
 	post_message("Deleting local account...");
 	user::Entity::delete_by_id(local_user.id).exec(&txn).await?;
 
@@ -644,7 +657,7 @@ mod tests {
 			let model = user.unwrap_or_else(|| Self::active_model());
 
 			let user = model.insert(db).await.expect("could not insert user");
-			let _user_preferences = user_preferences::ActiveModel {
+			let user_preferences = user_preferences::ActiveModel {
 				user_id: Set(Some(user.id.clone())),
 				..Default::default()
 			}
@@ -652,7 +665,21 @@ mod tests {
 			.await
 			.expect("could not insert user preferences");
 
-			user
+			user::Entity::update_many()
+				.col_expr(
+					user::Column::UserPreferencesId,
+					sea_orm::sea_query::Expr::value(Some(user_preferences.id)),
+				)
+				.filter(user::Column::Id.eq(user.id.clone()))
+				.exec(db)
+				.await
+				.expect("could not update user with preferences id");
+
+			user::Entity::find_by_id(user.id)
+				.one(db)
+				.await
+				.expect("could not find updated user")
+				.expect("user should exist after update")
 		}
 	}
 
@@ -976,6 +1003,22 @@ mod tests {
 			"OIDC user should be server owner"
 		);
 
+		if let Some(prefs_id) = updated_oidc_user.user_preferences_id {
+			let preferences = user_preferences::Entity::find_by_id(prefs_id)
+				.one(&db)
+				.await
+				.expect("Failed to query user preferences")
+				.expect("User preferences should exist");
+			// see https://discord.com/channels/972593831172272148/1490415985524609264/1491118111401705494
+			assert_eq!(
+				preferences.user_id,
+				Some(oidc_user.id.clone()),
+				"User preferences should point back to OIDC user"
+			);
+		} else {
+			panic!("OIDC user should have preferences");
+		}
+
 		let reading_sessions = reading_session::Entity::find()
 			.filter(reading_session::Column::UserId.eq(&oidc_user.id))
 			.all(&db)
diff --git a/crates/graphql/src/object/user.rs b/crates/graphql/src/object/user.rs
index 453fac6aea..c8ff4860ed 100644
--- a/crates/graphql/src/object/user.rs
+++ b/crates/graphql/src/object/user.rs
@@ -8,7 +8,7 @@ use models::{
 	},
 	shared::{enums::UserPermission, permission_set::PermissionSet},
 };
-use sea_orm::{prelude::*, QueryOrder};
+use sea_orm::{prelude::*, ActiveValue, QueryOrder};
 
 use crate::{
 	data::{CoreContext, ServiceContext},
@@ -86,11 +86,32 @@ impl User {
 	async fn preferences(&self, ctx: &Context<'_>) -> Result<UserPreferences> {
 		let conn = ctx.data::<CoreContext>()?.conn.as_ref();
 
-		let preferences = user_preferences::Entity::find()
+		let preferences = match user_preferences::Entity::find()
 			.filter(user_preferences::Column::UserId.eq(&self.model.id))
 			.one(conn)
 			.await?
-			.ok_or("User preferences not found")?;
+		{
+			Some(prefs) => prefs,
+			None => {
+				// this is a bit of an edge case, originally cropping up after an oidc account migration where the cli command
+				// did not remap the preferences back to the user. this manifested in an error after login, effectively bricking the
+				// account. obv not ideal, so while i don't expect this to be common id rather just recreate in this scenario and
+				// let the user reconfig their preferences. worst case is a dangling preferences record
+				// see https://discord.com/channels/972593831172272148/1490415985524609264/1491118111401705494
+				tracing::warn!(
+					user = self.model.username,
+					"Failed to load preferences for user. Recreating with defaults..."
+				);
+				let new_preferences = user_preferences::ActiveModel {
+					user_id: ActiveValue::Set(Some(self.model.id.clone())),
+					..Default::default()
+				}
+				.insert(conn)
+				.await?;
+
+				new_preferences
+			},
+		};
 
 		Ok(preferences.into())
 	}

From 4191b52970b34fc08d600505e88e1b4ac9846b40 Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Wed, 8 Apr 2026 18:20:28 -0700
Subject: [PATCH 30/32] :bug: Fix conversion of thumbnail config for
 `resizeMethod` of `null` (#1070)

---
 .../createOrUpdate/__tests__/schema.test.ts   | 200 ++++++++++++++++++
 .../library/createOrUpdate/schema.ts          |  37 ++--
 2 files changed, 213 insertions(+), 24 deletions(-)
 create mode 100644 packages/browser/src/components/library/createOrUpdate/__tests__/schema.test.ts

diff --git a/packages/browser/src/components/library/createOrUpdate/__tests__/schema.test.ts b/packages/browser/src/components/library/createOrUpdate/__tests__/schema.test.ts
new file mode 100644
index 0000000000..b46e8aed73
--- /dev/null
+++ b/packages/browser/src/components/library/createOrUpdate/__tests__/schema.test.ts
@@ -0,0 +1,200 @@
+import { Dimension, SupportedImageFormat } from '@stump/graphql'
+
+import { intoFormThumbnailConfig, intoThumbnailConfig } from '../schema'
+
+describe('intoThumbnailConfig', () => {
+	it('should return null when thumbnails are not enabled', () => {
+		const config = {
+			enabled: false,
+			format: SupportedImageFormat.Webp,
+			quality: 75,
+			resizeMethod: {
+				mode: 'scaleEvenlyByFactor' as const,
+				factor: 0.65,
+			},
+		}
+
+		const result = intoThumbnailConfig(config)
+
+		expect(result).toBeNull()
+	})
+
+	it('should return expected config object for each resize method', () => {
+		const scaleByFactorConfig = {
+			enabled: true,
+			format: SupportedImageFormat.Webp,
+			quality: 75,
+			resizeMethod: {
+				mode: 'scaleEvenlyByFactor' as const,
+				factor: 0.65,
+			},
+		}
+
+		const scaleByFactorResult = intoThumbnailConfig(scaleByFactorConfig)
+		expect(scaleByFactorResult).toEqual({
+			format: SupportedImageFormat.Webp,
+			quality: 75,
+			resizeMethod: {
+				scaleEvenlyByFactor: {
+					factor: 0.65,
+				},
+			},
+		})
+
+		const scaleDimensionConfig = {
+			enabled: true,
+			format: SupportedImageFormat.Jpeg,
+			quality: 80,
+			resizeMethod: {
+				mode: 'scaleDimension' as const,
+				dimension: Dimension.Width,
+				size: 800,
+			},
+		}
+
+		const scaleDimensionResult = intoThumbnailConfig(scaleDimensionConfig)
+		expect(scaleDimensionResult).toEqual({
+			format: SupportedImageFormat.Jpeg,
+			quality: 80,
+			resizeMethod: {
+				scaleDimension: {
+					dimension: Dimension.Width,
+					size: 800,
+				},
+			},
+		})
+
+		const exactConfig = {
+			enabled: true,
+			format: SupportedImageFormat.Png,
+			quality: 90,
+			resizeMethod: {
+				mode: 'exact' as const,
+				width: 200,
+				height: 300,
+			},
+		}
+
+		const exactResult = intoThumbnailConfig(exactConfig)
+		expect(exactResult).toEqual({
+			format: SupportedImageFormat.Png,
+			quality: 90,
+			resizeMethod: {
+				exact: {
+					width: 200,
+					height: 300,
+				},
+			},
+		})
+
+		const noResizeConfig = {
+			enabled: true,
+			format: SupportedImageFormat.Webp,
+			quality: 75,
+			resizeMethod: null,
+		}
+
+		const noResizeResult = intoThumbnailConfig(noResizeConfig)
+		expect(noResizeResult).toEqual({
+			format: SupportedImageFormat.Webp,
+			quality: 75,
+			resizeMethod: null,
+		})
+	})
+})
+
+describe('intoFormThumbnailConfig', () => {
+	it('should return disabled config with defaults when no config is provided', () => {
+		const result = intoFormThumbnailConfig(null)
+
+		expect(result).toEqual({
+			enabled: false,
+			format: SupportedImageFormat.Webp, // still the default, just trashed when not enabled
+			quality: undefined,
+			resizeMethod: undefined,
+		})
+	})
+
+	it('should transform GraphQL config into form config for each resize method', () => {
+		const scaleByFactorConfig = {
+			__typename: 'ImageProcessorOptions' as const,
+			format: SupportedImageFormat.Webp,
+			quality: 75,
+			resizeMethod: {
+				__typename: 'ScaleEvenlyByFactor' as const,
+				factor: '0.65',
+			},
+		}
+
+		const scaleByFactorResult = intoFormThumbnailConfig(scaleByFactorConfig)
+		expect(scaleByFactorResult).toEqual({
+			enabled: true,
+			format: SupportedImageFormat.Webp,
+			quality: 75,
+			resizeMethod: {
+				mode: 'scaleEvenlyByFactor',
+				factor: 0.65,
+			},
+		})
+
+		const scaleDimensionConfig = {
+			__typename: 'ImageProcessorOptions' as const,
+			format: SupportedImageFormat.Jpeg,
+			quality: 80,
+			resizeMethod: {
+				__typename: 'ScaledDimensionResize' as const,
+				dimension: Dimension.Width,
+				size: 800,
+			},
+		}
+
+		const scaleDimensionResult = intoFormThumbnailConfig(scaleDimensionConfig)
+		expect(scaleDimensionResult).toEqual({
+			enabled: true,
+			format: SupportedImageFormat.Jpeg,
+			quality: 80,
+			resizeMethod: {
+				mode: 'scaleDimension',
+				dimension: Dimension.Width,
+				size: 800,
+			},
+		})
+
+		const exactConfig = {
+			__typename: 'ImageProcessorOptions' as const,
+			format: SupportedImageFormat.Png,
+			quality: 90,
+			resizeMethod: {
+				__typename: 'ExactDimensionResize' as const,
+				width: 200,
+				height: 300,
+			},
+		}
+
+		const exactResult = intoFormThumbnailConfig(exactConfig)
+		expect(exactResult).toEqual({
+			enabled: true,
+			format: SupportedImageFormat.Png,
+			quality: 90,
+			resizeMethod: {
+				mode: 'exact',
+				width: 200,
+				height: 300,
+			},
+		})
+
+		const noResizeConfig = {
+			__typename: 'ImageProcessorOptions' as const,
+			format: SupportedImageFormat.Webp,
+			quality: 75,
+			resizeMethod: null,
+		}
+
+		const noResizeResult = intoFormThumbnailConfig(noResizeConfig)
+		expect(noResizeResult).toEqual({
+			enabled: true,
+			format: SupportedImageFormat.Webp,
+			quality: 75,
+		})
+	})
+})
diff --git a/packages/browser/src/components/library/createOrUpdate/schema.ts b/packages/browser/src/components/library/createOrUpdate/schema.ts
index 156a2ea186..d0451e85a9 100644
--- a/packages/browser/src/components/library/createOrUpdate/schema.ts
+++ b/packages/browser/src/components/library/createOrUpdate/schema.ts
@@ -1,4 +1,3 @@
-import { PickSelect } from '@stump/components'
 import {
 	CreateLibrarySceneExistingLibrariesQuery,
 	LibraryConfigInput,
@@ -250,7 +249,8 @@ export const intoThumbnailConfig = (
 	const converted = match(config.resizeMethod)
 		.with({ mode: 'scaleEvenlyByFactor' }, ({ factor }) => {
 			return {
-				...config,
+				format: config.format,
+				quality: config.quality,
 				resizeMethod: {
 					scaleEvenlyByFactor: {
 						factor,
@@ -260,7 +260,8 @@ export const intoThumbnailConfig = (
 		})
 		.with({ mode: 'scaleDimension' }, ({ dimension, size }) => {
 			return {
-				...config,
+				format: config.format,
+				quality: config.quality,
 				resizeMethod: {
 					scaleDimension: {
 						dimension: dimension as ScaledDimensionResize['dimension'],
@@ -271,7 +272,8 @@ export const intoThumbnailConfig = (
 		})
 		.with({ mode: 'exact' }, ({ height, width }) => {
 			return {
-				...config,
+				format: config.format,
+				quality: config.quality,
 				resizeMethod: {
 					exact: {
 						height,
@@ -280,7 +282,13 @@ export const intoThumbnailConfig = (
 				},
 			}
 		})
-		.otherwise(() => null)
+		.otherwise(() => {
+			return {
+				format: config.format,
+				quality: config.quality,
+				resizeMethod: null,
+			}
+		})
 
 	return omit(converted, 'enabled')
 }
@@ -343,22 +351,3 @@ export const intoFormThumbnailConfig = (
 
 	return baseConfig
 }
-
-/**
- * A function to ensure that the thumbnail config is valid before returning it
- */
-export const ensureValidThumbnailConfig = (
-	config: PickSelect<CreateOrUpdateLibrarySchema, 'thumbnailConfig'>,
-) => {
-	const { enabled, resizeMethod } = config
-	if (!enabled || !resizeMethod) {
-		return null
-	}
-
-	const parseResult = thumbnailConfig.safeParse(intoThumbnailConfig(config))
-	if (!parseResult.success) {
-		console.warn('Invalid thumbnail config:', parseResult.error.format())
-		return null
-	}
-	return parseResult.data
-}

From 851a2458174a1550745ae74edb2823e3088e5259 Mon Sep 17 00:00:00 2001
From: Danylo Vitkovskyi <x3665107@gmail.com>
Date: Fri, 10 Apr 2026 17:16:10 +0300
Subject: [PATCH 31/32] :heavy_minus_sign: Replace `once_cell::Lazy` with
 `std::sync::LazyLock` (#1075)

---
 Cargo.lock                    |  1 -
 Cargo.toml                    |  1 -
 apps/server/Cargo.toml        |  1 -
 apps/server/src/config/jwt.rs | 11 ++++++-----
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 47f9b4d133..3a230def3b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8355,7 +8355,6 @@ dependencies = [
  "local-ip-address",
  "maplit",
  "models",
- "once_cell",
  "openidconnect",
  "openssl",
  "prefixed-api-key",
diff --git a/Cargo.toml b/Cargo.toml
index a6ca0d27e1..32a58b5694 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,7 +49,6 @@ lettre = { version = "0.11.18", default-features = false, features = [
 ] }
 md5 = "0.8.0"
 num-traits = "0.2.19"
-once_cell = "1.21.3"
 prefixed-api-key = { version = "0.3.0", features = ["sha2"] }
 rand = "0.9.2"
 regex = "1.11.3"
diff --git a/apps/server/Cargo.toml b/apps/server/Cargo.toml
index b8b931f5e3..33fcac7e37 100644
--- a/apps/server/Cargo.toml
+++ b/apps/server/Cargo.toml
@@ -30,7 +30,6 @@ itertools.workspace = true
 jsonwebtoken = "9.3.0"
 linemux = { git = "https://github.com/jmagnuson/linemux.git", rev = "acaafc602afac5d7a9cd3e087dafc937cac1e364" }
 local-ip-address = "0.6.2"
-once_cell.workspace = true
 openidconnect = "4.0.1"
 prefixed-api-key = { workspace = true}
 rand = { workspace = true }
diff --git a/apps/server/src/config/jwt.rs b/apps/server/src/config/jwt.rs
index 69ecd5b82d..7d76114b50 100644
--- a/apps/server/src/config/jwt.rs
+++ b/apps/server/src/config/jwt.rs
@@ -1,7 +1,8 @@
+use std::sync::LazyLock;
+
 use chrono::{DateTime, Duration, FixedOffset, Utc};
 use jsonwebtoken::{decode, encode, DecodingKey, EncodingKey, Header, Validation};
 use models::entity::refresh_token;
-use once_cell::sync::Lazy;
 use rand::distr::{Alphanumeric, SampleString};
 use sea_orm::{prelude::*, ActiveValue, IntoActiveModel};
 use serde::{Deserialize, Serialize};
@@ -16,12 +17,12 @@ use crate::{
 ///
 /// Note: _Technically_ it will only be initialized after the first attempt to use it, not
 /// necessarily when the server starts. I don't see an issue with this, but it's worth noting.
-static ACCESS_TOKEN_SECRET: Lazy<String> =
-	Lazy::new(|| Alphanumeric.sample_string(&mut rand::rng(), 60));
+static ACCESS_TOKEN_SECRET: LazyLock<String> =
+	LazyLock::new(|| Alphanumeric.sample_string(&mut rand::rng(), 60));
 
 /// The secret used to sign the refresh tokens, recycles every time the server is restarted*
-static REFRESH_TOKEN_SECRET: Lazy<String> =
-	Lazy::new(|| Alphanumeric.sample_string(&mut rand::rng(), 60));
+static REFRESH_TOKEN_SECRET: LazyLock<String> =
+	LazyLock::new(|| Alphanumeric.sample_string(&mut rand::rng(), 60));
 
 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]

From 44bf1c71dba2965e54cef4bae63d9f9c0cf27afe Mon Sep 17 00:00:00 2001
From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com>
Date: Thu, 16 Apr 2026 12:54:10 -0700
Subject: [PATCH 32/32] :bookmark: Release v0.1.2

---
 .github/CHANGELOG.md                      | 55 +++++++++++++++++++++++
 Cargo.lock                                | 16 +++----
 Cargo.toml                                |  2 +-
 apps/desktop/package.json                 |  2 +-
 apps/desktop/src-tauri/Cargo.toml         |  2 +-
 apps/docs/package.json                    |  2 +-
 apps/docs/pages/guides/mobile/faq.mdx     |  5 ++-
 apps/expo/package.json                    |  2 +-
 apps/web/package.json                     |  2 +-
 crates/cli/Cargo.toml                     |  2 +-
 crates/macros/filter-gen/Cargo.toml       |  2 +-
 crates/macros/stump-config-gen/Cargo.toml |  2 +-
 package.json                              |  2 +-
 packages/browser/package.json             |  2 +-
 packages/client/package.json              |  2 +-
 packages/components/package.json          |  2 +-
 packages/graphql/package.json             |  2 +-
 packages/i18n/package.json                |  2 +-
 packages/sdk/package.json                 |  2 +-
 19 files changed, 82 insertions(+), 26 deletions(-)

diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index bceb2a0d49..c399f2af5c 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -1,3 +1,58 @@
+<a name="0.1.2"></a>
+## 0.1.2 (2026-04-16)
+
+### Added
+
+- ✨ Tags management page ([#1040](https://github.com/stumpapp/stump/issues/1040)) [[a500ffd](https://github.com/stumpapp/stump/commit/a500ffdacfe870de128e86be26889aa34c3d1b61)]
+- ✨ Darkreader support and new &#x60;Midnight&#x60; theme ([#1038](https://github.com/stumpapp/stump/issues/1038)) [[e28f568](https://github.com/stumpapp/stump/commit/e28f5687ed7d8dd52fde796f74a22726399165de)]
+
+### Changed
+
+- 🚨 Fix prettier lints [[7995b61](https://github.com/stumpapp/stump/commit/7995b61a0b5c451fb4aa6aee789e6516b04ca0b1)]
+- ♻️ Adjust darkreader meta tag behavior ([#1043](https://github.com/stumpapp/stump/issues/1043)) [[0b7118b](https://github.com/stumpapp/stump/commit/0b7118bd7f3b0cefb7120eb64f020443d571738a)]
+- 🔧 rerun build script when GIT_REV or BUILD_CHANNEL changes ([#1039](https://github.com/stumpapp/stump/issues/1039)) [[361b1c5](https://github.com/stumpapp/stump/commit/361b1c530781c70c11f28a24b53b0ea6af8d31a6)]
+- ⬆️ Bump @typescript-eslint/parser from 8.48.1 to 8.58.0 ([#1022](https://github.com/stumpapp/stump/issues/1022)) [[957bba8](https://github.com/stumpapp/stump/commit/957bba88d71d3e762879b1df3a2b248d41e963ee)]
+- ⬆️ Bump @graphql-codegen/near-operation-file-preset ([#1023](https://github.com/stumpapp/stump/issues/1023)) [[4291615](https://github.com/stumpapp/stump/commit/42916153a204d8f1a469d23c70cc5645c683c8fd)]
+- ⬆️ Bump jest and @types/jest ([#1020](https://github.com/stumpapp/stump/issues/1020)) [[b08557d](https://github.com/stumpapp/stump/commit/b08557d2de03b091f449851df3d477692b0b843f)]
+- ⬆️ Bump @react-native-community/slider from 5.0.1 to 5.1.2 ([#1026](https://github.com/stumpapp/stump/issues/1026)) [[6c77226](https://github.com/stumpapp/stump/commit/6c77226373f0f4d24c12635825bc16e022f2464f)]
+- ⬆️ Bump @rn-primitives/tabs from 1.2.0 to 1.4.0 ([#1027](https://github.com/stumpapp/stump/issues/1027)) [[c9e5902](https://github.com/stumpapp/stump/commit/c9e590284a414a95dd97a4d761bc22f8c0e17ac2)]
+- ⬆️ Bump eslint-plugin-prettier from 5.5.4 to 5.5.5 ([#1024](https://github.com/stumpapp/stump/issues/1024)) [[6ea6769](https://github.com/stumpapp/stump/commit/6ea6769634fc9af53c69d67b5e1f1d93328a098e)]
+- ⬆️ Bump zustand from 4.5.7 to 5.0.12 ([#997](https://github.com/stumpapp/stump/issues/997)) [[e150227](https://github.com/stumpapp/stump/commit/e1502278ad58d4f8cb8478c26dc487e5cf78964f)]
+- ⬆️ Bump i18next from 23.16.8 to 26.0.1 ([#1004](https://github.com/stumpapp/stump/issues/1004)) [[77c7aa7](https://github.com/stumpapp/stump/commit/77c7aa734f844145345d5391690cfd32c1693608)]
+- ⬆️ Upgrade tailwind ([#1016](https://github.com/stumpapp/stump/issues/1016)) [[c618747](https://github.com/stumpapp/stump/commit/c618747baace06b4c0eafb8b9251786ff5c234e5)]
+
+### Removed
+
+- ➖ Replace &#x60;once_cell::Lazy&#x60; with &#x60;std::sync::LazyLock&#x60; ([#1075](https://github.com/stumpapp/stump/issues/1075)) [[851a245](https://github.com/stumpapp/stump/commit/851a2458174a1550745ae74edb2823e3088e5259)]
+- 🔥 Remove Prisma-to-SeaORM backfilling [[9ded63d](https://github.com/stumpapp/stump/commit/9ded63df5116b4de876298f716b05a21e5d82012)]
+
+### Fixed
+
+- 🐛 Fix conversion of thumbnail config for &#x60;resizeMethod&#x60; of &#x60;null&#x60; ([#1070](https://github.com/stumpapp/stump/issues/1070)) [[4191b52](https://github.com/stumpapp/stump/commit/4191b52970b34fc08d600505e88e1b4ac9846b40)]
+- 🐛 Fix unique constraint violation during OIDC account migration ([#1059](https://github.com/stumpapp/stump/issues/1059)) [[ea7e079](https://github.com/stumpapp/stump/commit/ea7e079faf22f9275bd69b551c4c6f881686f10f)]
+- 💚 Update binary CI checkout actions ([#1048](https://github.com/stumpapp/stump/issues/1048)) [[1591f91](https://github.com/stumpapp/stump/commit/1591f91b3cc453087516595127edf67185f3e775)]
+- 🐛 Fix manifest cleanup in docker build ([#991](https://github.com/stumpapp/stump/issues/991)) [[49a8d14](https://github.com/stumpapp/stump/commit/49a8d141c7ecda69e95185085accb05b4e6feb5a)]
+
+### Miscellaneous
+
+-  Merge remote-tracking branch &#x27;origin/main&#x27; into release/v0.1.2 [[d5a48ca](https://github.com/stumpapp/stump/commit/d5a48ca48694fcac5614cc704bce7894d68c6b09)]
+- 🩹 Ensure OIDC migration remaps preferences ([#1067](https://github.com/stumpapp/stump/issues/1067)) [[1520ee3](https://github.com/stumpapp/stump/commit/1520ee31a4834106ceb3f64f68aed6617f54af62)]
+- 🌐 (German): Update translations ([#1061](https://github.com/stumpapp/stump/issues/1061)) [[202e7fc](https://github.com/stumpapp/stump/commit/202e7fcf2990c77422dc0aff37540401e67ec803)]
+- 📝 Update documentation, fix landing page style resolution [[b5034ce](https://github.com/stumpapp/stump/commit/b5034ceaaafb26054c8d3965357a13add9b05f51)]
+- 📝 Update 0.1.0 documentation language [[601686b](https://github.com/stumpapp/stump/commit/601686b134f325e257e7f7835ed93a657ef978af)]
+- 🌐 (German): Update translations ([#1058](https://github.com/stumpapp/stump/issues/1058)) [[8e8925e](https://github.com/stumpapp/stump/commit/8e8925ef449d8fd1d5adb948d862ed05aab2270f)]
+- 🌐 (Polish) Update translations ([#1050](https://github.com/stumpapp/stump/issues/1050)) [[48273d9](https://github.com/stumpapp/stump/commit/48273d9cdb57d19dfe900da1112b5e90b325dd12)]
+- 🌐 Update translations ([#1045](https://github.com/stumpapp/stump/issues/1045)) [[ba9aa2e](https://github.com/stumpapp/stump/commit/ba9aa2ebaa80cb750736e49a0744f3bce503bae8)]
+- 🔀 Merge remote-tracking branch &#x27;origin/experimental&#x27; into nightly [[6a1e36a](https://github.com/stumpapp/stump/commit/6a1e36afee137f04efd630efd6df8f5570af071f)]
+- 🌐 Update translations ([#1033](https://github.com/stumpapp/stump/issues/1033)) [[b6cda00](https://github.com/stumpapp/stump/commit/b6cda00b38c53675d9eba438907e288aad85013d)]
+- 🌐 (expo): Start localization support ([#1037](https://github.com/stumpapp/stump/issues/1037)) [[cdd0e65](https://github.com/stumpapp/stump/commit/cdd0e65e417fbdc35ec2ea0fd59201c322a9563b)]
+- 🔨 Use the same Rust version from the Nix flake ([#1034](https://github.com/stumpapp/stump/issues/1034)) [[421e71f](https://github.com/stumpapp/stump/commit/421e71ffb3c68b899d3c436873652daf46b292ba)]
+-  Merge remote-tracking branch &#x27;origin/nightly&#x27; into experimental [[2751763](https://github.com/stumpapp/stump/commit/275176382257c26907ecc7b4ea1c01b08ec60460)]
+- 🌐 Update translations ([#1030](https://github.com/stumpapp/stump/issues/1030)) [[58f170e](https://github.com/stumpapp/stump/commit/58f170e312f89ff20b911303edd6050f0b501014)]
+- 🌐 Update translations ([#1010](https://github.com/stumpapp/stump/issues/1010)) [[4b7bb22](https://github.com/stumpapp/stump/commit/4b7bb229b7e4f83a6212164505618708151446a3)]
+-  Merge remote-tracking branch &#x27;origin/nightly&#x27; into experimental [[a27583a](https://github.com/stumpapp/stump/commit/a27583a536fe866ebd66d0890f30f67c47ad76a4)]
+
+
 <a name="0.1.1"></a>
 ## 0.1.1 (2026-04-01)
 
diff --git a/Cargo.lock b/Cargo.lock
index a41c588d29..306ef2cc05 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1263,7 +1263,7 @@ checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
 [[package]]
 name = "cli"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "bcrypt",
  "clap 4.5.48",
@@ -2256,7 +2256,7 @@ dependencies = [
 
 [[package]]
 name = "email"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "async-graphql",
  "lettre",
@@ -2517,7 +2517,7 @@ dependencies = [
 
 [[package]]
 name = "filter-gen"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "heck 0.5.0",
  "itertools 0.14.0",
@@ -3086,7 +3086,7 @@ dependencies = [
 
 [[package]]
 name = "graphql"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "alphanumeric-sort",
  "async-graphql",
@@ -8228,7 +8228,7 @@ dependencies = [
 
 [[package]]
 name = "stump-config-gen"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -8242,7 +8242,7 @@ dependencies = [
 
 [[package]]
 name = "stump_core"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "alphanumeric-sort",
  "async-channel",
@@ -8308,7 +8308,7 @@ dependencies = [
 
 [[package]]
 name = "stump_desktop"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "chrono",
  "discord-rich-presence",
@@ -8329,7 +8329,7 @@ dependencies = [
 
 [[package]]
 name = "stump_server"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "alphanumeric-sort",
  "async-graphql",
diff --git a/Cargo.toml b/Cargo.toml
index e9671ab684..6d3c7a7b29 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ exclude = [
 ]
 
 [workspace.package]
-version = "0.1.1"
+version = "0.1.2"
 rust-version = "1.92.0"
 
 [workspace.dependencies]
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 308ec223d6..f5d21b7112 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@stump/desktop",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"description": "",
 	"license": "MIT",
 	"scripts": {
diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml
index 509c49ccce..2fbab7c7f5 100644
--- a/apps/desktop/src-tauri/Cargo.toml
+++ b/apps/desktop/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stump_desktop"
-version = "0.1.1"
+version = "0.1.2"
 description = ""
 authors = ["Aaron Leopold <aaronleopold1221@gmail.com>"]
 license = "MIT"
diff --git a/apps/docs/package.json b/apps/docs/package.json
index 5beb6f5e1a..7de0cc91e5 100644
--- a/apps/docs/package.json
+++ b/apps/docs/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@stump/docs",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"description": "",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/docs/pages/guides/mobile/faq.mdx b/apps/docs/pages/guides/mobile/faq.mdx
index e6d1f07c0d..5868df6645 100644
--- a/apps/docs/pages/guides/mobile/faq.mdx
+++ b/apps/docs/pages/guides/mobile/faq.mdx
@@ -11,7 +11,8 @@ Frequently asked questions about the mobile app
 	as possible while still being sustainable for continued development. The current price range I'm
 	considering is between $10 and $20 USD, which is comparable to similar apps in the market.
 
-  That said, I understand that no matter the price there will still be people who are not able to afford it. If you are in that situation, please feel free to reach out to me directly and we can work out a sliding scale cost or pull from the pool of promo codes that I will be setting aside. 
+That said, I understand that no matter the price there will still be people who are not able to afford it. If you are in that situation, please feel free to reach out to me directly and we can work out a sliding scale cost or pull from the pool of promo codes that I will be setting aside.
+
 </Callout>
 
 Once the app is more stable and feature-complete, it will be released as a paid app on both iOS and Android. The price is not finalized, but it will be a one-time purchase with **no required recurring fees or subscriptions** that otherwise gate features.
@@ -20,7 +21,7 @@ The app will remain free for alpha testers via TestFlight, however it will be us
 
 ## When will the app be released?
 
-There is no official release date for the app at this time. Stump as a whole is a project I build out after work during my spare time, and the mobile app is just a slice of that overall effort. So, committing to dates is not something I like to make a habit of doing. 
+There is no official release date for the app at this time. Stump as a whole is a project I build out after work during my spare time, and the mobile app is just a slice of that overall effort. So, committing to dates is not something I like to make a habit of doing.
 
 I have very loose goals to release the app by 2027, but that entirely depends on where life takes me between now and then.
 
diff --git a/apps/expo/package.json b/apps/expo/package.json
index 2c86f475b5..e4df68f950 100644
--- a/apps/expo/package.json
+++ b/apps/expo/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@stump/expo",
 	"main": "index.js",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"license": "GPL-3.0-only",
 	"scripts": {
 		"dev": "expo start -c --ios",
diff --git a/apps/web/package.json b/apps/web/package.json
index 0db85eeb62..586e6bd0cf 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@stump/web",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"description": "",
 	"license": "MIT",
 	"scripts": {
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index f0db0fcd58..acfdfedb84 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cli"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 
 [[bin]]
diff --git a/crates/macros/filter-gen/Cargo.toml b/crates/macros/filter-gen/Cargo.toml
index d52d5cf367..a55c448884 100644
--- a/crates/macros/filter-gen/Cargo.toml
+++ b/crates/macros/filter-gen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "filter-gen"
-version = "0.1.1"
+version = "0.1.2"
 description = "A procedural macro for generating SeaORM filters"
 edition = "2021"
 
diff --git a/crates/macros/stump-config-gen/Cargo.toml b/crates/macros/stump-config-gen/Cargo.toml
index 2c36a92274..aab8d323a7 100644
--- a/crates/macros/stump-config-gen/Cargo.toml
+++ b/crates/macros/stump-config-gen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stump-config-gen"
-version = "0.1.1"
+version = "0.1.2"
 description = "A procedural macro for generating the StumpConfig struct."
 edition = "2021"
 
diff --git a/package.json b/package.json
index d376939071..c7e2221401 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@stump/monorepo",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"repository": "https://github.com/stumpapp/stump.git",
 	"author": "Aaron Leopold <aaronleopold1221@gmail.com>",
 	"license": "SEE README.md",
diff --git a/packages/browser/package.json b/packages/browser/package.json
index ea48704afd..1b689baac7 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@stump/browser",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"description": "",
 	"license": "MIT",
 	"private": true,
diff --git a/packages/client/package.json b/packages/client/package.json
index 79481e6d00..e9276d3966 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@stump/client",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"private": true,
 	"main": "src/index.ts",
 	"exports": {
diff --git a/packages/components/package.json b/packages/components/package.json
index 278941e431..cf359c6e63 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@stump/components",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"exports": {
 		".": "./src/index.ts",
 		"./styles/overrides.css": "./src/styles/overrides.css",
diff --git a/packages/graphql/package.json b/packages/graphql/package.json
index 3525eaac55..91a060ba8d 100644
--- a/packages/graphql/package.json
+++ b/packages/graphql/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@stump/graphql",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"main": "src/index.ts",
 	"license": "MIT",
 	"dependencies": {
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 8abc601171..854a8141a3 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@stump/i18n",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"description": "",
 	"main": "src/index.ts",
 	"exports": {
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 90bce06193..eb90a69db1 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@stump/sdk",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"description": "",
 	"main": "src/index.ts",
 	"exports": {