diff --git a/apps/cyberstorm-remix/app/c/community.tsx b/apps/cyberstorm-remix/app/c/community.tsx
index 3ca4c87cd..d30ced32e 100644
--- a/apps/cyberstorm-remix/app/c/community.tsx
+++ b/apps/cyberstorm-remix/app/c/community.tsx
@@ -26,7 +26,7 @@ import {
   NewLink,
   SkeletonBox,
 } from "@thunderstore/cyberstorm";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
 import { DapperTs } from "@thunderstore/dapper-ts";
 
 import { type OutletContextShape } from "../root";
diff --git a/apps/cyberstorm-remix/app/commonComponents/CheckboxList/CheckboxList.tsx b/apps/cyberstorm-remix/app/commonComponents/CheckboxList/CheckboxList.tsx
index 9aeb6cd84..1b1efbc9c 100644
--- a/apps/cyberstorm-remix/app/commonComponents/CheckboxList/CheckboxList.tsx
+++ b/apps/cyberstorm-remix/app/commonComponents/CheckboxList/CheckboxList.tsx
@@ -8,7 +8,7 @@ import { memo } from "react";
 import { type TRISTATE } from "~/commonComponents/types";
 
 import { Actionable, NewIcon } from "@thunderstore/cyberstorm";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
 
 import "./CheckboxList.css";
 
diff --git a/apps/cyberstorm-remix/app/commonComponents/Collapsible/Collapsible.tsx b/apps/cyberstorm-remix/app/commonComponents/Collapsible/Collapsible.tsx
index 8e0f2db24..fad4c28ed 100644
--- a/apps/cyberstorm-remix/app/commonComponents/Collapsible/Collapsible.tsx
+++ b/apps/cyberstorm-remix/app/commonComponents/Collapsible/Collapsible.tsx
@@ -3,7 +3,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { type PropsWithChildren, memo } from "react";
 
 import { NewIcon } from "@thunderstore/cyberstorm";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
 
 import "./Collapsible.css";
 
diff --git a/apps/cyberstorm-remix/app/commonComponents/CollapsibleText/CollapsibleText.tsx b/apps/cyberstorm-remix/app/commonComponents/CollapsibleText/CollapsibleText.tsx
index 145d5f615..66a3be644 100644
--- a/apps/cyberstorm-remix/app/commonComponents/CollapsibleText/CollapsibleText.tsx
+++ b/apps/cyberstorm-remix/app/commonComponents/CollapsibleText/CollapsibleText.tsx
@@ -1,6 +1,6 @@
 import { type ReactElement, useState } from "react";
 
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
 
 import "./CollapsibleText.css";
 
diff --git a/apps/cyberstorm-remix/app/commonComponents/Connection/Connection.tsx b/apps/cyberstorm-remix/app/commonComponents/Connection/Connection.tsx
index a4bdf06dc..d7f3dc56b 100644
--- a/apps/cyberstorm-remix/app/commonComponents/Connection/Connection.tsx
+++ b/apps/cyberstorm-remix/app/commonComponents/Connection/Connection.tsx
@@ -2,8 +2,8 @@ import { type ReactElement } from "react";
 
 import { NewIcon, NewSwitch } from "@thunderstore/cyberstorm";
 import { type OAuthConnection } from "@thunderstore/dapper/types";
+import type { userLinkedAccountDisconnectProviders } from "@thunderstore/thunderstore-api";
 
-import { type userLinkedAccountDisconnectProviders } from "../../../../../packages/thunderstore-api/src";
 import "./Connection.css";
 
 interface ConnectionProps {
diff --git a/apps/cyberstorm-remix/app/commonComponents/CopyButton/CopyButton.tsx b/apps/cyberstorm-remix/app/commonComponents/CopyButton/CopyButton.tsx
index f7487b168..0e2b50058 100644
--- a/apps/cyberstorm-remix/app/commonComponents/CopyButton/CopyButton.tsx
+++ b/apps/cyberstorm-remix/app/commonComponents/CopyButton/CopyButton.tsx
@@ -3,7 +3,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { type Dispatch, type SetStateAction, useState } from "react";
 import React from "react";
 
-import { NewIcon, Tooltip } from "@thunderstore/cyberstorm/src";
+import { NewIcon, Tooltip } from "@thunderstore/cyberstorm";
 
 import "./CopyButton.css";
 
diff --git a/apps/cyberstorm-remix/app/commonComponents/Navigation/Navigation.tsx b/apps/cyberstorm-remix/app/commonComponents/Navigation/Navigation.tsx
index 71aa4b594..6378fd3bc 100644
--- a/apps/cyberstorm-remix/app/commonComponents/Navigation/Navigation.tsx
+++ b/apps/cyberstorm-remix/app/commonComponents/Navigation/Navigation.tsx
@@ -35,7 +35,7 @@ import {
   OverwolfLogo,
   ThunderstoreLogo,
 } from "@thunderstore/cyberstorm";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
 import { type CurrentUser } from "@thunderstore/dapper/types";
 
 import "./MobileNavigation.css";
diff --git a/apps/cyberstorm-remix/app/commonComponents/PageHeader/PageHeader.tsx b/apps/cyberstorm-remix/app/commonComponents/PageHeader/PageHeader.tsx
index 0cf65ce6b..044988faa 100644
--- a/apps/cyberstorm-remix/app/commonComponents/PageHeader/PageHeader.tsx
+++ b/apps/cyberstorm-remix/app/commonComponents/PageHeader/PageHeader.tsx
@@ -1,8 +1,8 @@
 import { type PropsWithChildren, type ReactElement, memo } from "react";
 
 import { Heading, Image } from "@thunderstore/cyberstorm";
-import type { HeadingSizes } from "@thunderstore/cyberstorm-theme/src/components";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
+import type { HeadingSizes } from "@thunderstore/cyberstorm-theme";
 
 import "./PageHeader.css";
 
diff --git a/apps/cyberstorm-remix/app/commonComponents/RadioGroup/RadioGroup.tsx b/apps/cyberstorm-remix/app/commonComponents/RadioGroup/RadioGroup.tsx
index 4c08cea03..d45679e0d 100644
--- a/apps/cyberstorm-remix/app/commonComponents/RadioGroup/RadioGroup.tsx
+++ b/apps/cyberstorm-remix/app/commonComponents/RadioGroup/RadioGroup.tsx
@@ -4,7 +4,7 @@ import * as RadixRadioGroup from "@radix-ui/react-radio-group";
 import { memo } from "react";
 
 import { NewIcon } from "@thunderstore/cyberstorm";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
 import { type Section } from "@thunderstore/dapper/types";
 
 import "./RadioGroup.css";
diff --git a/apps/cyberstorm-remix/app/commonComponents/StalenessIndicator/StalenessIndicator.tsx b/apps/cyberstorm-remix/app/commonComponents/StalenessIndicator/StalenessIndicator.tsx
index 5d3d58598..e9eea8e00 100644
--- a/apps/cyberstorm-remix/app/commonComponents/StalenessIndicator/StalenessIndicator.tsx
+++ b/apps/cyberstorm-remix/app/commonComponents/StalenessIndicator/StalenessIndicator.tsx
@@ -3,7 +3,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { type ReactNode } from "react";
 
 import { NewIcon } from "@thunderstore/cyberstorm";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
 
 import "./StalenessIndicator.css";
 
diff --git a/apps/cyberstorm-remix/app/p/packageListing.tsx b/apps/cyberstorm-remix/app/p/packageListing.tsx
index 150bcda45..3508b59c3 100644
--- a/apps/cyberstorm-remix/app/p/packageListing.tsx
+++ b/apps/cyberstorm-remix/app/p/packageListing.tsx
@@ -60,7 +60,7 @@ import {
   useToast,
 } from "@thunderstore/cyberstorm";
 import { PackageLikeAction } from "@thunderstore/cyberstorm-forms";
-import type { TagVariants } from "@thunderstore/cyberstorm-theme/src/components";
+import type { TagVariants } from "@thunderstore/cyberstorm-theme";
 import { DapperTs, type DapperTsInterface } from "@thunderstore/dapper-ts";
 import type { CurrentUser } from "@thunderstore/dapper/types";
 import {
diff --git a/apps/cyberstorm-remix/app/p/packageVersion.tsx b/apps/cyberstorm-remix/app/p/packageVersion.tsx
index a74ca6a6b..6ab2c0e15 100644
--- a/apps/cyberstorm-remix/app/p/packageVersion.tsx
+++ b/apps/cyberstorm-remix/app/p/packageVersion.tsx
@@ -43,19 +43,19 @@ import {
   NewButton,
   NewIcon,
   NewLink,
+  RelativeTime,
   SkeletonBox,
   Tabs,
-} from "@thunderstore/cyberstorm";
-import { RelativeTime } from "@thunderstore/cyberstorm/src/components/RelativeTime/RelativeTime";
-import { ThunderstoreLogo } from "@thunderstore/cyberstorm/src/svg/svg";
-import {
+  ThunderstoreLogo,
   formatFileSize,
   formatInteger,
   formatToDisplayName,
-} from "@thunderstore/cyberstorm/src/utils/utils";
+} from "@thunderstore/cyberstorm";
 import { DapperTs } from "@thunderstore/dapper-ts";
-import { getPackageVersionDetails } from "@thunderstore/dapper-ts/src/methods/packageVersion";
-import { getTeamDetails } from "@thunderstore/dapper-ts/src/methods/team";
+import {
+  getPackageVersionDetails,
+  getTeamDetails,
+} from "@thunderstore/dapper-ts";
 
 import "./packageListing.css";
 
diff --git a/apps/cyberstorm-remix/app/p/packageVersionWithoutCommunity.tsx b/apps/cyberstorm-remix/app/p/packageVersionWithoutCommunity.tsx
index 89c6d1a8b..602e78bdb 100644
--- a/apps/cyberstorm-remix/app/p/packageVersionWithoutCommunity.tsx
+++ b/apps/cyberstorm-remix/app/p/packageVersionWithoutCommunity.tsx
@@ -43,19 +43,19 @@ import {
   NewButton,
   NewIcon,
   NewLink,
+  RelativeTime,
   SkeletonBox,
   Tabs,
-} from "@thunderstore/cyberstorm";
-import { RelativeTime } from "@thunderstore/cyberstorm/src/components/RelativeTime/RelativeTime";
-import { ThunderstoreLogo } from "@thunderstore/cyberstorm/src/svg/svg";
-import {
+  ThunderstoreLogo,
   formatFileSize,
   formatInteger,
   formatToDisplayName,
-} from "@thunderstore/cyberstorm/src/utils/utils";
+} from "@thunderstore/cyberstorm";
 import { DapperTs } from "@thunderstore/dapper-ts";
-import { getPackageVersionDetails } from "@thunderstore/dapper-ts/src/methods/packageVersion";
-import { getTeamDetails } from "@thunderstore/dapper-ts/src/methods/team";
+import {
+  getPackageVersionDetails,
+  getTeamDetails,
+} from "@thunderstore/dapper-ts";
 
 import "./packageListing.css";
 
diff --git a/apps/cyberstorm-remix/app/p/tabs/Source/Source.tsx b/apps/cyberstorm-remix/app/p/tabs/Source/Source.tsx
index 5b15a0876..0d2661de4 100644
--- a/apps/cyberstorm-remix/app/p/tabs/Source/Source.tsx
+++ b/apps/cyberstorm-remix/app/p/tabs/Source/Source.tsx
@@ -11,15 +11,15 @@ import ago from "s-ago";
 import { type OutletContextShape } from "~/root";
 
 import {
+  NewAlert as Alert,
   Heading,
   NewButton,
   NewIcon,
   SkeletonBox,
+  TooltipWrapper,
 } from "@thunderstore/cyberstorm";
-import { Alert } from "@thunderstore/cyberstorm/src/newComponents/Alert/Alert";
-import { TooltipWrapper } from "@thunderstore/cyberstorm/src/primitiveComponents/utils/utils";
 import { DapperTs } from "@thunderstore/dapper-ts";
-import { getPackageSource } from "@thunderstore/dapper-ts/src/methods/package";
+import { getPackageSource } from "@thunderstore/dapper-ts";
 import { isApiError } from "@thunderstore/thunderstore-api";
 
 import { CodeBoxHTML } from "../../../commonComponents/CodeBoxHTML/CodeBoxHTML";
diff --git a/apps/cyberstorm-remix/app/p/tabs/Versions/common.tsx b/apps/cyberstorm-remix/app/p/tabs/Versions/common.tsx
index 8b4553ba0..41d215666 100644
--- a/apps/cyberstorm-remix/app/p/tabs/Versions/common.tsx
+++ b/apps/cyberstorm-remix/app/p/tabs/Versions/common.tsx
@@ -3,7 +3,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { memo } from "react";
 
 import { NewAlert, NewButton, NewIcon } from "@thunderstore/cyberstorm";
-import { ThunderstoreLogo } from "@thunderstore/cyberstorm/src/svg/svg";
+import { ThunderstoreLogo } from "@thunderstore/cyberstorm";
 
 export const ModManagerBanner = memo(function ModManagerBanner() {
   return (
diff --git a/apps/cyberstorm-remix/app/p/tabs/Wiki/Wiki.tsx b/apps/cyberstorm-remix/app/p/tabs/Wiki/Wiki.tsx
index 094921785..83907ac9f 100644
--- a/apps/cyberstorm-remix/app/p/tabs/Wiki/Wiki.tsx
+++ b/apps/cyberstorm-remix/app/p/tabs/Wiki/Wiki.tsx
@@ -16,9 +16,9 @@ import { type OutletContextShape } from "~/root";
 
 import { NewButton, NewIcon, SkeletonBox } from "@thunderstore/cyberstorm";
 import { DapperTs } from "@thunderstore/dapper-ts";
-import { getPackageWiki } from "@thunderstore/dapper-ts/src/methods/package";
+import { getPackageWiki } from "@thunderstore/dapper-ts";
+import { ApiError } from "@thunderstore/thunderstore-api";
 
-import { ApiError } from "../../../../../../packages/thunderstore-api/src";
 import "./Wiki.css";
 
 export async function loader({ params }: LoaderFunctionArgs) {
diff --git a/apps/cyberstorm-remix/app/p/tabs/Wiki/WikiFirstPage.tsx b/apps/cyberstorm-remix/app/p/tabs/Wiki/WikiFirstPage.tsx
index aea165adb..ba03090f3 100644
--- a/apps/cyberstorm-remix/app/p/tabs/Wiki/WikiFirstPage.tsx
+++ b/apps/cyberstorm-remix/app/p/tabs/Wiki/WikiFirstPage.tsx
@@ -12,9 +12,9 @@ import {
   getPackagePermissions,
   getPackageWiki,
   getPackageWikiPage,
-} from "@thunderstore/dapper-ts/src/methods/package";
+} from "@thunderstore/dapper-ts";
+import { isApiError } from "@thunderstore/thunderstore-api";
 
-import { isApiError } from "../../../../../../packages/thunderstore-api/src";
 import "./Wiki.css";
 import { WikiContent } from "./WikiContent";
 
diff --git a/apps/cyberstorm-remix/app/p/tabs/Wiki/WikiNewPage.tsx b/apps/cyberstorm-remix/app/p/tabs/Wiki/WikiNewPage.tsx
index 8f9603dfa..32ea46589 100644
--- a/apps/cyberstorm-remix/app/p/tabs/Wiki/WikiNewPage.tsx
+++ b/apps/cyberstorm-remix/app/p/tabs/Wiki/WikiNewPage.tsx
@@ -16,7 +16,7 @@ import {
   Tabs,
   useToast,
 } from "@thunderstore/cyberstorm";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
 import {
   type PackageWikiPageCreateRequestData,
   postPackageWikiPageCreate,
diff --git a/apps/cyberstorm-remix/app/p/tabs/Wiki/WikiPage.tsx b/apps/cyberstorm-remix/app/p/tabs/Wiki/WikiPage.tsx
index 5ffb26b69..cfa2132cd 100644
--- a/apps/cyberstorm-remix/app/p/tabs/Wiki/WikiPage.tsx
+++ b/apps/cyberstorm-remix/app/p/tabs/Wiki/WikiPage.tsx
@@ -3,7 +3,7 @@ import {
   getSessionTools,
 } from "cyberstorm/security/publicEnvVariables";
 import { Suspense } from "react";
-import { Await, useParams, type LoaderFunctionArgs } from "react-router";
+import { Await, type LoaderFunctionArgs, useParams } from "react-router";
 import { useLoaderData } from "react-router";
 
 import { SkeletonBox } from "@thunderstore/cyberstorm";
@@ -12,9 +12,9 @@ import {
   getPackagePermissions,
   getPackageWiki,
   getPackageWikiPage,
-} from "@thunderstore/dapper-ts/src/methods/package";
+} from "@thunderstore/dapper-ts";
+import { isApiError } from "@thunderstore/thunderstore-api";
 
-import { isApiError } from "../../../../../../packages/thunderstore-api/src";
 import "./Wiki.css";
 import { WikiContent } from "./WikiContent";
 
diff --git a/apps/cyberstorm-remix/app/p/tabs/Wiki/WikiPageEdit.tsx b/apps/cyberstorm-remix/app/p/tabs/Wiki/WikiPageEdit.tsx
index 8d13d02ba..151c89501 100644
--- a/apps/cyberstorm-remix/app/p/tabs/Wiki/WikiPageEdit.tsx
+++ b/apps/cyberstorm-remix/app/p/tabs/Wiki/WikiPageEdit.tsx
@@ -22,7 +22,7 @@ import {
   Tabs,
   useToast,
 } from "@thunderstore/cyberstorm";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
 import { DapperTs } from "@thunderstore/dapper-ts";
 import {
   type PackageWikiPageEditRequestData,
diff --git a/apps/cyberstorm-remix/app/root.tsx b/apps/cyberstorm-remix/app/root.tsx
index b2884b0cf..378c4275d 100644
--- a/apps/cyberstorm-remix/app/root.tsx
+++ b/apps/cyberstorm-remix/app/root.tsx
@@ -29,21 +29,21 @@ import {
   LinkingProvider,
   NewBreadCrumbs,
   NewBreadCrumbsLink,
+  ToastProvider,
   isRecord,
 } from "@thunderstore/cyberstorm";
 import "@thunderstore/cyberstorm-theme";
-import Toast from "@thunderstore/cyberstorm/src/newComponents/Toast";
 import { DapperTs } from "@thunderstore/dapper-ts";
 import { type CurrentUser } from "@thunderstore/dapper/types";
 import { type RequestConfig } from "@thunderstore/thunderstore-api";
-import { NamespacedStorageManager } from "@thunderstore/ts-api-react";
 import {
+  NamespacedStorageManager,
   SESSION_STORAGE_KEY,
+  StorageManager,
   getSessionContext,
   getSessionStale,
   runSessionValidationCheck,
-} from "@thunderstore/ts-api-react/src/SessionContext";
-import { StorageManager } from "@thunderstore/ts-api-react/src/storage";
+} from "@thunderstore/ts-api-react";
 
 import type { Route } from "./+types/root";
 import { Footer } from "./commonComponents/Footer/Footer";
@@ -339,7 +339,7 @@ export function Layout({ children }: { children: React.ReactNode }) {
         )}
         <div className="container container--y container--full island layout">
           <LinkingProvider value={LinkLibrary}>
-            <Toast.Provider toastDuration={10000}>
+            <ToastProvider toastDuration={10000}>
               <TooltipProvider>
                 <NavigationWrapper
                   domain={resolvedEnvVars?.VITE_API_URL || ""}
@@ -558,7 +558,7 @@ export function Layout({ children }: { children: React.ReactNode }) {
                 <Footer />
                 {shouldShowAds ? <AdsInit /> : null}
               </TooltipProvider>
-            </Toast.Provider>
+            </ToastProvider>
           </LinkingProvider>
           <ScrollRestoration />
           <Scripts />
diff --git a/apps/cyberstorm-remix/app/settings/teams/Teams.tsx b/apps/cyberstorm-remix/app/settings/teams/Teams.tsx
index 111b589d7..a6cb9617c 100644
--- a/apps/cyberstorm-remix/app/settings/teams/Teams.tsx
+++ b/apps/cyberstorm-remix/app/settings/teams/Teams.tsx
@@ -5,6 +5,7 @@ import { useReducer, useState } from "react";
 import type { MetaFunction } from "react-router";
 import { useOutletContext, useRevalidator } from "react-router";
 import { PageHeader } from "~/commonComponents/PageHeader/PageHeader";
+import { RequiredIndicator } from "~/commonComponents/RequiredIndicator/RequiredIndicator";
 
 import {
   Heading,
@@ -16,8 +17,7 @@ import {
   NewTextInput,
   useToast,
 } from "@thunderstore/cyberstorm";
-import { postTeamCreate } from "@thunderstore/dapper-ts/src/methods/team";
-import { RequiredIndicator } from "~/commonComponents/RequiredIndicator/RequiredIndicator";
+import { postTeamCreate } from "@thunderstore/dapper-ts";
 import {
   type RequestConfig,
   type TeamCreateRequestData,
@@ -27,7 +27,7 @@ import { NamespacedStorageManager } from "@thunderstore/ts-api-react";
 import {
   SESSION_STORAGE_KEY,
   setSessionStale,
-} from "@thunderstore/ts-api-react/src/SessionContext";
+} from "@thunderstore/ts-api-react";
 
 import { type OutletContextShape, type RootLoadersType } from "../../root";
 import "./Teams.css";
diff --git a/apps/cyberstorm-remix/app/settings/teams/team/tabs/Members/MembersTable.tsx b/apps/cyberstorm-remix/app/settings/teams/team/tabs/Members/MembersTable.tsx
index aa8771f85..719052b62 100644
--- a/apps/cyberstorm-remix/app/settings/teams/team/tabs/Members/MembersTable.tsx
+++ b/apps/cyberstorm-remix/app/settings/teams/team/tabs/Members/MembersTable.tsx
@@ -16,7 +16,7 @@ import {
   type SelectOption,
   useToast,
 } from "@thunderstore/cyberstorm";
-import { TableSort } from "@thunderstore/cyberstorm/src/newComponents/Table/Table";
+import { NewTableSort as TableSort } from "@thunderstore/cyberstorm";
 import {
   type RequestConfig,
   type TeamMember,
diff --git a/apps/cyberstorm-remix/app/settings/teams/team/tabs/ServiceAccounts/ServiceAccountsTable.tsx b/apps/cyberstorm-remix/app/settings/teams/team/tabs/ServiceAccounts/ServiceAccountsTable.tsx
index c9efa9747..723f5880e 100644
--- a/apps/cyberstorm-remix/app/settings/teams/team/tabs/ServiceAccounts/ServiceAccountsTable.tsx
+++ b/apps/cyberstorm-remix/app/settings/teams/team/tabs/ServiceAccounts/ServiceAccountsTable.tsx
@@ -2,7 +2,7 @@ import { type OutletContextShape } from "app/root";
 import { useOutletContext } from "react-router";
 
 import { Heading, NewTable } from "@thunderstore/cyberstorm";
-import { TableSort } from "@thunderstore/cyberstorm/src/newComponents/Table/Table";
+import { NewTableSort as TableSort } from "@thunderstore/cyberstorm";
 import { type TeamServiceAccount } from "@thunderstore/thunderstore-api";
 
 import { ServiceAccountRemoveModal } from "./ServiceAccountRemoveModal";
diff --git a/apps/cyberstorm-remix/app/settings/user/Connections/Connections.tsx b/apps/cyberstorm-remix/app/settings/user/Connections/Connections.tsx
index 03405d2a5..090d595d8 100644
--- a/apps/cyberstorm-remix/app/settings/user/Connections/Connections.tsx
+++ b/apps/cyberstorm-remix/app/settings/user/Connections/Connections.tsx
@@ -12,10 +12,9 @@ import { type OutletContextShape } from "~/root";
 
 import { NewLink, OverwolfLogo, useToast } from "@thunderstore/cyberstorm";
 import { ApiError } from "@thunderstore/thunderstore-api";
+import { userLinkedAccountDisconnect } from "@thunderstore/thunderstore-api";
 import { ApiAction } from "@thunderstore/ts-api-react-actions";
 
-import { userLinkedAccountDisconnect } from "../../../../../../packages/thunderstore-api/src";
-
 type ProvidersType = {
   name: string;
   identifier: "discord" | "github" | "overwolf";
diff --git a/apps/cyberstorm-remix/app/tools/manifest-validator/manifestValidator.tsx b/apps/cyberstorm-remix/app/tools/manifest-validator/manifestValidator.tsx
index 6a15945a2..31d198eb3 100644
--- a/apps/cyberstorm-remix/app/tools/manifest-validator/manifestValidator.tsx
+++ b/apps/cyberstorm-remix/app/tools/manifest-validator/manifestValidator.tsx
@@ -29,10 +29,7 @@ export default function ManifestValidator() {
 
   const selectOptions = currentUser
     ? currentUser.teams.map((team) => {
-        if (typeof team === "string") {
-          return { value: team, label: team };
-        }
-        return { value: team.name, label: team.name };
+        return { value: team, label: team };
       })
     : [];
 
diff --git a/apps/cyberstorm-remix/app/upload/upload.tsx b/apps/cyberstorm-remix/app/upload/upload.tsx
index 1d997da1d..a5f856cd5 100644
--- a/apps/cyberstorm-remix/app/upload/upload.tsx
+++ b/apps/cyberstorm-remix/app/upload/upload.tsx
@@ -27,9 +27,11 @@ import {
   NewTag,
   useToast,
 } from "@thunderstore/cyberstorm";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
-import { DapperTs } from "@thunderstore/dapper-ts";
-import { postPackageSubmissionMetadata } from "@thunderstore/dapper-ts/src/methods/package";
+import { classnames } from "@thunderstore/cyberstorm";
+import {
+  DapperTs,
+  postPackageSubmissionMetadata,
+} from "@thunderstore/dapper-ts";
 import {
   type PackageSubmissionResult,
   type PackageSubmissionStatus,
@@ -40,7 +42,7 @@ import {
   type IBaseUploadHandle,
   MultipartUpload,
 } from "@thunderstore/ts-uploader";
-import { type UserMedia } from "@thunderstore/ts-uploader/src/uploaders/types";
+import { type UserMedia } from "@thunderstore/ts-uploader";
 
 import { PageHeader } from "../commonComponents/PageHeader/PageHeader";
 import { type OutletContextShape } from "../root";
diff --git a/apps/cyberstorm-remix/cyberstorm/security/publicEnvVariables.ts b/apps/cyberstorm-remix/cyberstorm/security/publicEnvVariables.ts
index fbd6c0755..85675ba4c 100644
--- a/apps/cyberstorm-remix/cyberstorm/security/publicEnvVariables.ts
+++ b/apps/cyberstorm-remix/cyberstorm/security/publicEnvVariables.ts
@@ -1,4 +1,4 @@
-import { getSessionContext } from "@thunderstore/ts-api-react/src/SessionContext";
+import { getSessionContext } from "@thunderstore/ts-api-react";
 
 import { isRecord } from "../utils/typeChecks";
 
diff --git a/apps/cyberstorm-remix/cyberstorm/session/__tests__/SessionContext.test.ts b/apps/cyberstorm-remix/cyberstorm/session/__tests__/SessionContext.test.ts
index aa562106d..d1ec366d0 100644
--- a/apps/cyberstorm-remix/cyberstorm/session/__tests__/SessionContext.test.ts
+++ b/apps/cyberstorm-remix/cyberstorm/session/__tests__/SessionContext.test.ts
@@ -1,40 +1,40 @@
-import type { User } from "@thunderstore/thunderstore-api";
 import {
+  afterEach,
   assert,
+  beforeEach,
   describe,
+  expect,
   it,
-  beforeEach,
-  afterEach,
   vi,
-  expect,
 } from "vitest";
 
-vi.mock("@thunderstore/dapper-ts", () => ({
-  DapperTs: vi.fn(),
-}));
-
-let getCurrentUserMock: ReturnType<typeof vi.fn>;
-
+import type { User } from "@thunderstore/thunderstore-api";
 import {
   API_HOST_KEY,
   COOKIE_DOMAIN_KEY,
   CURRENT_USER_KEY,
   SESSION_STORAGE_KEY,
   STALE_KEY,
-  clearSession,
-  getSessionContext,
-  getCookie,
+  StorageManager,
   clearCookies,
   clearInvalidSession,
+  clearSession,
   getConfig,
-  updateCurrentUser,
+  getCookie,
+  getSessionContext,
   getSessionCurrentUser,
   getSessionStale,
   runSessionValidationCheck,
   setSessionStale,
   storeCurrentUser,
-} from "@thunderstore/ts-api-react/src/SessionContext";
-import { StorageManager } from "@thunderstore/ts-api-react/src/storage";
+  updateCurrentUser,
+} from "@thunderstore/ts-api-react";
+
+vi.mock("@thunderstore/dapper-ts", () => ({
+  DapperTs: vi.fn(),
+}));
+
+let getCurrentUserMock: ReturnType<typeof vi.fn>;
 
 describe("SessionContext", () => {
   const testApiHost = "https://api.example.invalid";
diff --git a/apps/cyberstorm-remix/cyberstorm/utils/__tests__/dapperClientLoaders.test.ts b/apps/cyberstorm-remix/cyberstorm/utils/__tests__/dapperClientLoaders.test.ts
index d2f8e9bcf..410d5c13a 100644
--- a/apps/cyberstorm-remix/cyberstorm/utils/__tests__/dapperClientLoaders.test.ts
+++ b/apps/cyberstorm-remix/cyberstorm/utils/__tests__/dapperClientLoaders.test.ts
@@ -1,5 +1,11 @@
+import { getSessionTools } from "cyberstorm/security/publicEnvVariables";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
+import { DapperTs } from "@thunderstore/dapper-ts";
+import { ApiError } from "@thunderstore/thunderstore-api";
+
+import { makeTeamSettingsTabLoader } from "../dapperClientLoaders";
+
 vi.mock("cyberstorm/security/publicEnvVariables", () => ({
   getSessionTools: vi.fn().mockReturnValue({
     getConfig: vi.fn().mockReturnValue({
@@ -20,12 +26,6 @@ vi.mock("@thunderstore/dapper-ts", () => ({
   }),
 }));
 
-import { ApiError } from "@thunderstore/thunderstore-api";
-import { DapperTs } from "@thunderstore/dapper-ts";
-import { getSessionTools } from "cyberstorm/security/publicEnvVariables";
-
-import { makeTeamSettingsTabLoader } from "../dapperClientLoaders";
-
 describe("dapperClientLoaders", () => {
   beforeEach(() => {
     vi.clearAllMocks();
@@ -37,7 +37,9 @@ describe("dapperClientLoaders", () => {
 
     const result = await loader({
       params: { namespaceId: "MyTeam" },
-    } as unknown as { params: { namespaceId: string } });
+      request: new Request("http://example.invalid"),
+      context: {},
+    } as never);
 
     expect(result).toEqual({ teamName: "MyTeam", foo: 123 });
     expect(dataFetcher).toHaveBeenCalledTimes(1);
@@ -74,7 +76,9 @@ describe("dapperClientLoaders", () => {
     try {
       await loader({
         params: { namespaceId: "MyTeam" },
-      } as unknown as { params: { namespaceId: string } });
+        request: new Request("http://example.invalid"),
+        context: {},
+      } as never);
     } catch (e) {
       thrown = e;
     }
@@ -98,7 +102,9 @@ describe("dapperClientLoaders", () => {
     try {
       await loader({
         params: { namespaceId: "MyTeam" },
-      } as unknown as { params: { namespaceId: string } });
+        request: new Request("http://example.invalid"),
+        context: {},
+      } as never);
     } catch (e) {
       const res = e as Response;
       expect(res).toBeInstanceOf(Response);
diff --git a/apps/cyberstorm-remix/cyberstorm/utils/semverCompare.ts b/apps/cyberstorm-remix/cyberstorm/utils/semverCompare.ts
index e08cd22ab..7fabf0724 100644
--- a/apps/cyberstorm-remix/cyberstorm/utils/semverCompare.ts
+++ b/apps/cyberstorm-remix/cyberstorm/utils/semverCompare.ts
@@ -1,7 +1,7 @@
 import semverCompare from "semver/functions/compare";
 
 import { type TableCompareColumnMeta } from "@thunderstore/cyberstorm";
-import { type TableRow } from "@thunderstore/cyberstorm/src/newComponents/Table/Table";
+import { type NewTableRow as TableRow } from "@thunderstore/cyberstorm";
 
 import { isSemver } from "./typeChecks";
 
diff --git a/apps/cyberstorm-remix/tsconfig.json b/apps/cyberstorm-remix/tsconfig.json
index c3d4950a7..f72114524 100644
--- a/apps/cyberstorm-remix/tsconfig.json
+++ b/apps/cyberstorm-remix/tsconfig.json
@@ -33,6 +33,7 @@
       "react": ["./node_modules/@types/react"]
     },
     "verbatimModuleSyntax": true,
+    "disableSourceOfProjectReferenceRedirect": true,
 
     // Vite takes care of building everything, not tsc.
     "noEmit": true,
diff --git a/apps/cyberstorm-remix/tsconfig.tsbuildinfo b/apps/cyberstorm-remix/tsconfig.tsbuildinfo
index 8a8584fe8..e2e8c1d83 100644
--- a/apps/cyberstorm-remix/tsconfig.tsbuildinfo
+++ b/apps/cyberstorm-remix/tsconfig.tsbuildinfo
@@ -1 +1 @@
-{"root":["./react-router.config.ts","./vite.config.ts","./vitest.config.ts","./app/routes.ts","./app/commoncomponents/types.ts","./app/commoncomponents/markdown/sanitize.ts","./cyberstorm/security/publicenvvariables.ts","./cyberstorm/session/__tests__/sessioncontext.test.ts","./cyberstorm/utils/dapperclientloaders.ts","./cyberstorm/utils/permissions.ts","./cyberstorm/utils/searchparamsutils.ts","./cyberstorm/utils/semvercompare.ts","./cyberstorm/utils/sentry.ts","./cyberstorm/utils/typechecks.ts","./cyberstorm/utils/strongform/usestrongform.ts","./cyberstorm/utils/__tests__/permissions.test.ts","./cyberstorm/utils/__tests__/sentry.test.ts","./app/entry.client.tsx","./app/entry.server.tsx","./app/healthz.tsx","./app/root.tsx","./app/c/community.tsx","./app/c/tabs/packagesearch/packagesearch.tsx","./app/commoncomponents/checkboxlist/checkboxlist.tsx","./app/commoncomponents/codeboxhtml/codeboxhtml.tsx","./app/commoncomponents/collapsible/collapsible.tsx","./app/commoncomponents/collapsibletext/collapsibletext.tsx","./app/commoncomponents/connection/connection.tsx","./app/commoncomponents/copybutton/copybutton.tsx","./app/commoncomponents/footer/footer.tsx","./app/commoncomponents/listingdependency/listingdependency.tsx","./app/commoncomponents/loading/loading.tsx","./app/commoncomponents/markdown/markdown.tsx","./app/commoncomponents/navigation/navigation.tsx","./app/commoncomponents/navigation/navigationwrapper.tsx","./app/commoncomponents/notloggedin/notloggedin.tsx","./app/commoncomponents/packagesearch/packagesearch.tsx","./app/commoncomponents/packagesearch/components/packageorder.tsx","./app/commoncomponents/packagesearch/components/categorytagcloud/categorytagcloud.tsx","./app/commoncomponents/packagesearch/components/packagecount/packagecount.tsx","./app/commoncomponents/pageheader/pageheader.tsx","./app/commoncomponents/paginateddependencies/paginateddependencies.tsx","./app/commoncomponents/radiogroup/radiogroup.tsx","./app/commoncomponents/stalenessindicator/stalenessindicator.tsx","./app/communities/communities.tsx","./app/p/packageedit.tsx","./app/p/packagelisting.tsx","./app/p/packageversion.tsx","./app/p/packageversionwithoutcommunity.tsx","./app/p/components/reportpackage/reportpackagebutton.tsx","./app/p/components/reportpackage/reportpackageform.tsx","./app/p/components/reportpackage/reportpackagemodal.tsx","./app/p/components/reportpackage/reportpackagesubmitted.tsx","./app/p/components/reportpackage/usereportpackage.tsx","./app/p/components/teammembers/teammembers.tsx","./app/p/dependants/dependants.tsx","./app/p/tabs/changelog/changelog.tsx","./app/p/tabs/readme/packageversionreadme.tsx","./app/p/tabs/readme/packageversionwithoutcommunityreadme.tsx","./app/p/tabs/readme/readme.tsx","./app/p/tabs/required/packageversionrequired.tsx","./app/p/tabs/required/packageversionwithoutcommunityrequired.tsx","./app/p/tabs/required/required.tsx","./app/p/tabs/source/source.tsx","./app/p/tabs/versions/packageversionversions.tsx","./app/p/tabs/versions/packageversionwithoutcommunityversions.tsx","./app/p/tabs/versions/versions.tsx","./app/p/tabs/versions/common.tsx","./app/p/tabs/wiki/wiki.tsx","./app/p/tabs/wiki/wikicontent.tsx","./app/p/tabs/wiki/wikifirstpage.tsx","./app/p/tabs/wiki/wikinewpage.tsx","./app/p/tabs/wiki/wikipage.tsx","./app/p/tabs/wiki/wikipageedit.tsx","./app/p/team/team.tsx","./app/settings/teams/teams.tsx","./app/settings/teams/team/teamsettings.tsx","./app/settings/teams/team/tabs/members/memberaddform.tsx","./app/settings/teams/team/tabs/members/members.tsx","./app/settings/teams/team/tabs/members/memberstable.tsx","./app/settings/teams/team/tabs/profile/profile.tsx","./app/settings/teams/team/tabs/serviceaccounts/serviceaccountremovemodal.tsx","./app/settings/teams/team/tabs/serviceaccounts/serviceaccounts.tsx","./app/settings/teams/team/tabs/serviceaccounts/serviceaccountstable.tsx","./app/settings/teams/team/tabs/settings/settings.tsx","./app/settings/user/settings.tsx","./app/settings/user/account/account.tsx","./app/settings/user/connections/connections.tsx","./app/tools/manifest-validator/manifestvalidator.tsx","./app/tools/markdown-preview/markdownpreview.tsx","./app/tools/package-format-docs/packageformatdocs.tsx","./app/upload/upload.tsx","./cyberstorm/utils/linklibrary.tsx","./cyberstorm/utils/thunderstoreauth.tsx","./.react-router/types/+future.ts","./.react-router/types/+routes.ts","./.react-router/types/+server-build.d.ts","./.react-router/types/app/+types/healthz.ts","./.react-router/types/app/+types/root.ts","./.react-router/types/app/c/+types/community.ts","./.react-router/types/app/c/tabs/packagesearch/+types/packagesearch.ts","./.react-router/types/app/communities/+types/communities.ts","./.react-router/types/app/p/+types/packageedit.ts","./.react-router/types/app/p/+types/packagelisting.ts","./.react-router/types/app/p/+types/packageversion.ts","./.react-router/types/app/p/+types/packageversionwithoutcommunity.ts","./.react-router/types/app/p/dependants/+types/dependants.ts","./.react-router/types/app/p/tabs/changelog/+types/changelog.ts","./.react-router/types/app/p/tabs/readme/+types/packageversionreadme.ts","./.react-router/types/app/p/tabs/readme/+types/packageversionwithoutcommunityreadme.ts","./.react-router/types/app/p/tabs/readme/+types/readme.ts","./.react-router/types/app/p/tabs/required/+types/packageversionrequired.ts","./.react-router/types/app/p/tabs/required/+types/packageversionwithoutcommunityrequired.ts","./.react-router/types/app/p/tabs/required/+types/required.ts","./.react-router/types/app/p/tabs/source/+types/source.ts","./.react-router/types/app/p/tabs/versions/+types/packageversionversions.ts","./.react-router/types/app/p/tabs/versions/+types/packageversionwithoutcommunityversions.ts","./.react-router/types/app/p/tabs/versions/+types/versions.ts","./.react-router/types/app/p/tabs/wiki/+types/wiki.ts","./.react-router/types/app/p/tabs/wiki/+types/wikifirstpage.ts","./.react-router/types/app/p/tabs/wiki/+types/wikinewpage.ts","./.react-router/types/app/p/tabs/wiki/+types/wikipage.ts","./.react-router/types/app/p/tabs/wiki/+types/wikipageedit.ts","./.react-router/types/app/p/team/+types/team.ts","./.react-router/types/app/settings/teams/+types/teams.ts","./.react-router/types/app/settings/teams/team/+types/teamsettings.ts","./.react-router/types/app/settings/teams/team/tabs/members/+types/members.ts","./.react-router/types/app/settings/teams/team/tabs/profile/+types/profile.ts","./.react-router/types/app/settings/teams/team/tabs/serviceaccounts/+types/serviceaccounts.ts","./.react-router/types/app/settings/teams/team/tabs/settings/+types/settings.ts","./.react-router/types/app/settings/user/+types/settings.ts","./.react-router/types/app/settings/user/account/+types/account.ts","./.react-router/types/app/settings/user/connections/+types/connections.ts","./.react-router/types/app/tools/manifest-validator/+types/manifestvalidator.ts","./.react-router/types/app/tools/markdown-preview/+types/markdownpreview.ts","./.react-router/types/app/tools/package-format-docs/+types/packageformatdocs.ts","./.react-router/types/app/upload/+types/upload.ts"],"version":"5.8.3"}
+{"root":["./react-router.config.ts","./vite.config.ts","./vitest.config.ts","./app/routes.ts","./app/commoncomponents/types.ts","./app/commoncomponents/errorboundary/index.ts","./app/commoncomponents/markdown/sanitize.ts","./cyberstorm/security/publicenvvariables.ts","./cyberstorm/session/__tests__/sessioncontext.test.ts","./cyberstorm/utils/htmlparsing.ts","./cyberstorm/utils/dapperclientloaders.ts","./cyberstorm/utils/dappersingleton.ts","./cyberstorm/utils/permissions.ts","./cyberstorm/utils/requestcache.ts","./cyberstorm/utils/searchparamsutils.ts","./cyberstorm/utils/semvercompare.ts","./cyberstorm/utils/sentry.ts","./cyberstorm/utils/typechecks.ts","./cyberstorm/utils/strongform/usestrongform.ts","./cyberstorm/utils/strongform/utils.ts","./cyberstorm/utils/strongform/validation.ts","./cyberstorm/utils/strongform/__tests__/usestrongform.test.ts","./cyberstorm/utils/strongform/__tests__/utils.test.ts","./cyberstorm/utils/strongform/__tests__/validation.test.ts","./cyberstorm/utils/__tests__/dapperclientloaders.test.ts","./cyberstorm/utils/__tests__/dappersingleton.test.ts","./cyberstorm/utils/__tests__/permissions.test.ts","./cyberstorm/utils/__tests__/requestcache.test.ts","./cyberstorm/utils/__tests__/sentry.test.ts","./app/entry.client.tsx","./app/entry.server.tsx","./app/healthz.tsx","./app/root.tsx","./app/c/community.tsx","./app/c/tabs/packagesearch/packagesearch.tsx","./app/commoncomponents/checkboxlist/checkboxlist.tsx","./app/commoncomponents/codeboxhtml/codeboxhtml.tsx","./app/commoncomponents/collapsible/collapsible.tsx","./app/commoncomponents/collapsibletext/collapsibletext.tsx","./app/commoncomponents/connection/connection.tsx","./app/commoncomponents/copybutton/copybutton.tsx","./app/commoncomponents/errorboundary/routeerrorboundary.tsx","./app/commoncomponents/footer/footer.tsx","./app/commoncomponents/listingdependency/listingdependency.tsx","./app/commoncomponents/loading/loading.tsx","./app/commoncomponents/markdown/markdown.tsx","./app/commoncomponents/navigation/navigation.tsx","./app/commoncomponents/navigation/navigationwrapper.tsx","./app/commoncomponents/notloggedin/notloggedin.tsx","./app/commoncomponents/packagesearch/packagesearch.tsx","./app/commoncomponents/packagesearch/components/packageorder.tsx","./app/commoncomponents/packagesearch/components/categorytagcloud/categorytagcloud.tsx","./app/commoncomponents/packagesearch/components/packagecount/packagecount.tsx","./app/commoncomponents/pageheader/pageheader.tsx","./app/commoncomponents/paginateddependencies/paginateddependencies.tsx","./app/commoncomponents/radiogroup/radiogroup.tsx","./app/commoncomponents/requiredindicator/requiredindicator.tsx","./app/commoncomponents/stalenessindicator/stalenessindicator.tsx","./app/communities/communities.tsx","./app/p/packageedit.tsx","./app/p/packagelisting.tsx","./app/p/packageversion.tsx","./app/p/packageversionwithoutcommunity.tsx","./app/p/components/reportpackage/reportpackagebutton.tsx","./app/p/components/reportpackage/reportpackageform.tsx","./app/p/components/reportpackage/reportpackagemodal.tsx","./app/p/components/reportpackage/reportpackagesubmitted.tsx","./app/p/components/reportpackage/usereportpackage.tsx","./app/p/components/teammembers/teammembers.tsx","./app/p/dependants/dependants.tsx","./app/p/tabs/changelog/changelog.tsx","./app/p/tabs/readme/packageversionreadme.tsx","./app/p/tabs/readme/packageversionwithoutcommunityreadme.tsx","./app/p/tabs/readme/readme.tsx","./app/p/tabs/required/packageversionrequired.tsx","./app/p/tabs/required/packageversionwithoutcommunityrequired.tsx","./app/p/tabs/required/required.tsx","./app/p/tabs/source/source.tsx","./app/p/tabs/versions/packageversionversions.tsx","./app/p/tabs/versions/packageversionwithoutcommunityversions.tsx","./app/p/tabs/versions/versions.tsx","./app/p/tabs/versions/common.tsx","./app/p/tabs/wiki/wiki.tsx","./app/p/tabs/wiki/wikicontent.tsx","./app/p/tabs/wiki/wikifirstpage.tsx","./app/p/tabs/wiki/wikinewpage.tsx","./app/p/tabs/wiki/wikipage.tsx","./app/p/tabs/wiki/wikipageedit.tsx","./app/p/team/team.tsx","./app/settings/teams/teams.tsx","./app/settings/teams/team/teamsettings.tsx","./app/settings/teams/team/tabs/members/memberaddform.tsx","./app/settings/teams/team/tabs/members/members.tsx","./app/settings/teams/team/tabs/members/memberstable.tsx","./app/settings/teams/team/tabs/profile/profile.tsx","./app/settings/teams/team/tabs/serviceaccounts/serviceaccountremovemodal.tsx","./app/settings/teams/team/tabs/serviceaccounts/serviceaccounts.tsx","./app/settings/teams/team/tabs/serviceaccounts/serviceaccountstable.tsx","./app/settings/teams/team/tabs/settings/settings.tsx","./app/settings/user/settings.tsx","./app/settings/user/account/account.tsx","./app/settings/user/connections/connections.tsx","./app/tools/manifest-validator/manifestvalidator.tsx","./app/tools/markdown-preview/markdownpreview.tsx","./app/tools/package-format-docs/packageformatdocs.tsx","./app/upload/upload.tsx","./cyberstorm/utils/linklibrary.tsx","./cyberstorm/utils/thunderstoreauth.tsx","./.react-router/types/+future.ts","./.react-router/types/+routes.ts","./.react-router/types/+server-build.d.ts","./.react-router/types/app/+types/healthz.ts","./.react-router/types/app/+types/root.ts","./.react-router/types/app/c/+types/community.ts","./.react-router/types/app/c/tabs/packagesearch/+types/packagesearch.ts","./.react-router/types/app/communities/+types/communities.ts","./.react-router/types/app/p/+types/packageedit.ts","./.react-router/types/app/p/+types/packagelisting.ts","./.react-router/types/app/p/+types/packageversion.ts","./.react-router/types/app/p/+types/packageversionwithoutcommunity.ts","./.react-router/types/app/p/dependants/+types/dependants.ts","./.react-router/types/app/p/tabs/changelog/+types/changelog.ts","./.react-router/types/app/p/tabs/readme/+types/packageversionreadme.ts","./.react-router/types/app/p/tabs/readme/+types/packageversionwithoutcommunityreadme.ts","./.react-router/types/app/p/tabs/readme/+types/readme.ts","./.react-router/types/app/p/tabs/required/+types/packageversionrequired.ts","./.react-router/types/app/p/tabs/required/+types/packageversionwithoutcommunityrequired.ts","./.react-router/types/app/p/tabs/required/+types/required.ts","./.react-router/types/app/p/tabs/source/+types/source.ts","./.react-router/types/app/p/tabs/versions/+types/packageversionversions.ts","./.react-router/types/app/p/tabs/versions/+types/packageversionwithoutcommunityversions.ts","./.react-router/types/app/p/tabs/versions/+types/versions.ts","./.react-router/types/app/p/tabs/wiki/+types/wiki.ts","./.react-router/types/app/p/tabs/wiki/+types/wikifirstpage.ts","./.react-router/types/app/p/tabs/wiki/+types/wikinewpage.ts","./.react-router/types/app/p/tabs/wiki/+types/wikipage.ts","./.react-router/types/app/p/tabs/wiki/+types/wikipageedit.ts","./.react-router/types/app/p/team/+types/team.ts","./.react-router/types/app/settings/teams/+types/teams.ts","./.react-router/types/app/settings/teams/team/+types/teamsettings.ts","./.react-router/types/app/settings/teams/team/tabs/members/+types/members.ts","./.react-router/types/app/settings/teams/team/tabs/profile/+types/profile.ts","./.react-router/types/app/settings/teams/team/tabs/serviceaccounts/+types/serviceaccounts.ts","./.react-router/types/app/settings/teams/team/tabs/settings/+types/settings.ts","./.react-router/types/app/settings/user/+types/settings.ts","./.react-router/types/app/settings/user/account/+types/account.ts","./.react-router/types/app/settings/user/connections/+types/connections.ts","./.react-router/types/app/tools/manifest-validator/+types/manifestvalidator.ts","./.react-router/types/app/tools/markdown-preview/+types/markdownpreview.ts","./.react-router/types/app/tools/package-format-docs/+types/packageformatdocs.ts","./.react-router/types/app/upload/+types/upload.ts"],"version":"5.8.3"}
diff --git a/apps/storybook/src/stories/cyberstormComponents/Alert.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/Alert.stories.tsx
index 0e8cfedc5..468648e62 100644
--- a/apps/storybook/src/stories/cyberstormComponents/Alert.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/Alert.stories.tsx
@@ -5,7 +5,7 @@ import "@thunderstore/cyberstorm-theme";
 import {
   AlertSizesList,
   AlertVariantsList,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 const meta = {
   title: "Cyberstorm/Alert",
diff --git a/apps/storybook/src/stories/cyberstormComponents/Avatar.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/Avatar.stories.tsx
index 8b155d523..dda374ee0 100644
--- a/apps/storybook/src/stories/cyberstormComponents/Avatar.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/Avatar.stories.tsx
@@ -5,7 +5,7 @@ import "@thunderstore/cyberstorm-theme";
 import {
   AvatarSizesList,
   AvatarVariantsList,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import catboy from "../assets/catboy.png";
 
diff --git a/apps/storybook/src/stories/cyberstormComponents/Button.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/Button.stories.tsx
index f3ad572f2..0a4e8ea4f 100644
--- a/apps/storybook/src/stories/cyberstormComponents/Button.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/Button.stories.tsx
@@ -7,7 +7,7 @@ import {
   ButtonModifiersList,
   ButtonSizesList,
   ButtonVariantsList,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 // More on how to set up stories at: https://storybook.js.org/docs/writing-stories#default-export
 const meta = {
diff --git a/apps/storybook/src/stories/cyberstormComponents/CardPackage.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/CardPackage.stories.tsx
index 7170ebf5e..af015f723 100644
--- a/apps/storybook/src/stories/cyberstormComponents/CardPackage.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/CardPackage.stories.tsx
@@ -2,8 +2,8 @@ import type { Meta, StoryObj } from "@storybook/react-vite";
 
 import { CardPackage } from "@thunderstore/cyberstorm";
 import "@thunderstore/cyberstorm-theme";
+import type { PackageListing } from "@thunderstore/dapper/types";
 
-import type { PackageListing } from "../../../../../packages/dapper/src/types";
 import goblin from "../assets/goblin.png";
 
 const now = new Date("2023-01-01T00:00:00Z");
diff --git a/apps/storybook/src/stories/cyberstormComponents/CodeInput.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/CodeInput.stories.tsx
index 023fa37fc..48db50016 100644
--- a/apps/storybook/src/stories/cyberstormComponents/CodeInput.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/CodeInput.stories.tsx
@@ -6,7 +6,7 @@ import {
   CodeInputModifiersList,
   CodeInputSizesList,
   CodeInputVariantsList,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import "./CodeInput.css";
 
diff --git a/apps/storybook/src/stories/cyberstormComponents/Drawer.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/Drawer.stories.tsx
index a4913b5da..0f683e3c7 100644
--- a/apps/storybook/src/stories/cyberstormComponents/Drawer.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/Drawer.stories.tsx
@@ -5,7 +5,7 @@ import "@thunderstore/cyberstorm-theme";
 import {
   DrawerSizesList,
   DrawerVariantsList,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 const meta = {
   title: "Cyberstorm/Drawer",
diff --git a/apps/storybook/src/stories/cyberstormComponents/DropDown.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/DropDown.stories.tsx
index c55b3400d..0e06097eb 100644
--- a/apps/storybook/src/stories/cyberstormComponents/DropDown.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/DropDown.stories.tsx
@@ -11,7 +11,7 @@ import {
   DropDownModifiersList,
   DropDownSizesList,
   DropDownVariantsList,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 const meta = {
   title: "Cyberstorm/DropDown",
diff --git a/apps/storybook/src/stories/cyberstormComponents/Heading.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/Heading.stories.tsx
index 307fed3fa..71ed8b74c 100644
--- a/apps/storybook/src/stories/cyberstormComponents/Heading.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/Heading.stories.tsx
@@ -6,7 +6,7 @@ import {
   HeadingModifiersList,
   HeadingSizesList,
   HeadingVariantsList,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 const meta = {
   title: "Cyberstorm/Heading",
diff --git a/apps/storybook/src/stories/cyberstormComponents/Icon.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/Icon.stories.tsx
index aff150d99..9a0fca06e 100644
--- a/apps/storybook/src/stories/cyberstormComponents/Icon.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/Icon.stories.tsx
@@ -4,7 +4,7 @@ import type { Meta, StoryObj } from "@storybook/react-vite";
 
 import { NewIcon } from "@thunderstore/cyberstorm";
 import "@thunderstore/cyberstorm-theme";
-import { IconVariantsList } from "@thunderstore/cyberstorm-theme/src/components";
+import { IconVariantsList } from "@thunderstore/cyberstorm-theme";
 
 import "./Icon.css";
 
diff --git a/apps/storybook/src/stories/cyberstormComponents/Image.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/Image.stories.tsx
index 66b0eeb56..c4254f7c4 100644
--- a/apps/storybook/src/stories/cyberstormComponents/Image.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/Image.stories.tsx
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from "@storybook/react-vite";
 
 import { Image } from "@thunderstore/cyberstorm";
 import "@thunderstore/cyberstorm-theme";
-import { ImageVariantsList } from "@thunderstore/cyberstorm-theme/src/components";
+import { ImageVariantsList } from "@thunderstore/cyberstorm-theme";
 
 import catHeim from "../assets/catheim.png";
 
diff --git a/apps/storybook/src/stories/cyberstormComponents/Link.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/Link.stories.tsx
index 7485529fb..63fe96c39 100644
--- a/apps/storybook/src/stories/cyberstormComponents/Link.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/Link.stories.tsx
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from "@storybook/react-vite";
 
 import { NewLink } from "@thunderstore/cyberstorm";
 import "@thunderstore/cyberstorm-theme";
-import { LinkVariantsList } from "@thunderstore/cyberstorm-theme/src/components";
+import { LinkVariantsList } from "@thunderstore/cyberstorm-theme";
 
 const meta = {
   title: "Cyberstorm/Link",
diff --git a/apps/storybook/src/stories/cyberstormComponents/MetaItem.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/MetaItem.stories.tsx
index 7cc9e2588..3f20dd7aa 100644
--- a/apps/storybook/src/stories/cyberstormComponents/MetaItem.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/MetaItem.stories.tsx
@@ -5,7 +5,7 @@ import "@thunderstore/cyberstorm-theme";
 import {
   MetaItemSizesList,
   MetaItemVariantsList,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 const meta = {
   title: "Cyberstorm/MetaItem",
diff --git a/apps/storybook/src/stories/cyberstormComponents/Modal.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/Modal.stories.tsx
index d4aee0010..4b31cdc48 100644
--- a/apps/storybook/src/stories/cyberstormComponents/Modal.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/Modal.stories.tsx
@@ -5,7 +5,7 @@ import "@thunderstore/cyberstorm-theme";
 import {
   ModalSizesList,
   ModalVariantsList,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 const meta = {
   title: "Cyberstorm/Modal",
diff --git a/apps/storybook/src/stories/cyberstormComponents/Pagination.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/Pagination.stories.tsx
index f11c7da15..48dd1d2bf 100644
--- a/apps/storybook/src/stories/cyberstormComponents/Pagination.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/Pagination.stories.tsx
@@ -3,8 +3,8 @@ import { useState } from "react";
 
 import { NewButton } from "@thunderstore/cyberstorm";
 import { NewPagination as Pagination } from "@thunderstore/cyberstorm";
+import type { PaginationProps } from "@thunderstore/cyberstorm";
 import "@thunderstore/cyberstorm-theme";
-import type { PaginationProps } from "@thunderstore/cyberstorm/src/newComponents/Pagination/Pagination";
 
 const meta = {
   title: "Cyberstorm/Pagination",
diff --git a/apps/storybook/src/stories/cyberstormComponents/Select.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/Select.stories.tsx
index a0514b1fd..aa4d075c8 100644
--- a/apps/storybook/src/stories/cyberstormComponents/Select.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/Select.stories.tsx
@@ -6,7 +6,7 @@ import {
   SelectModifiersList,
   SelectSizesList,
   SelectVariantsList,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 const meta = {
   title: "Cyberstorm/Select",
diff --git a/apps/storybook/src/stories/cyberstormComponents/SelectSearch.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/SelectSearch.stories.tsx
index f59b74603..d1958be3c 100644
--- a/apps/storybook/src/stories/cyberstormComponents/SelectSearch.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/SelectSearch.stories.tsx
@@ -11,7 +11,7 @@ import {
   SelectSearchModifiersList,
   SelectSearchSizesList,
   SelectSearchVariantsList,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 const meta = {
   title: "Cyberstorm/SelectSearch",
diff --git a/apps/storybook/src/stories/cyberstormComponents/Switch.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/Switch.stories.tsx
index 7a487eb2a..3c2bd9942 100644
--- a/apps/storybook/src/stories/cyberstormComponents/Switch.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/Switch.stories.tsx
@@ -6,7 +6,7 @@ import {
   SwitchModifiersList,
   SwitchSizesList,
   SwitchVariantsList,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 const meta = {
   title: "Cyberstorm/Switch",
diff --git a/apps/storybook/src/stories/cyberstormComponents/Table.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/Table.stories.tsx
index a49f704ff..3533200ba 100644
--- a/apps/storybook/src/stories/cyberstormComponents/Table.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/Table.stories.tsx
@@ -6,7 +6,7 @@ import {
   TableModifiersList,
   TableSizesList,
   TableVariantsList,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 const meta = {
   title: "Cyberstorm/Table",
diff --git a/apps/storybook/src/stories/cyberstormComponents/Tabs.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/Tabs.stories.tsx
index dfc449c3e..ac856abac 100644
--- a/apps/storybook/src/stories/cyberstormComponents/Tabs.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/Tabs.stories.tsx
@@ -7,7 +7,7 @@ import "@thunderstore/cyberstorm-theme";
 import {
   TabsSizesList,
   TabsVariantsList,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 const meta = {
   title: "Cyberstorm/Tabs",
diff --git a/apps/storybook/src/stories/cyberstormComponents/Tag.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/Tag.stories.tsx
index 843b03773..d00c2c02e 100644
--- a/apps/storybook/src/stories/cyberstormComponents/Tag.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/Tag.stories.tsx
@@ -6,7 +6,7 @@ import {
   TagModifiersList,
   TagSizesList,
   TagVariantsList,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 const modes = ["tag", "button", "link"] as const;
 
diff --git a/apps/storybook/src/stories/cyberstormComponents/TextInput.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/TextInput.stories.tsx
index 53db00f1f..491d21249 100644
--- a/apps/storybook/src/stories/cyberstormComponents/TextInput.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/TextInput.stories.tsx
@@ -6,7 +6,7 @@ import {
   TextInputModifiersList,
   TextInputSizesList,
   TextInputVariantsList,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 const meta = {
   title: "Cyberstorm/TextInput",
diff --git a/apps/storybook/src/stories/cyberstormComponents/Toast.stories.tsx b/apps/storybook/src/stories/cyberstormComponents/Toast.stories.tsx
index eb3c0531b..dbadd9df4 100644
--- a/apps/storybook/src/stories/cyberstormComponents/Toast.stories.tsx
+++ b/apps/storybook/src/stories/cyberstormComponents/Toast.stories.tsx
@@ -1,12 +1,11 @@
 import type { Meta, StoryObj } from "@storybook/react-vite";
 
-import { Toast } from "@thunderstore/cyberstorm";
+import { Toast, ToastProvider } from "@thunderstore/cyberstorm";
 import "@thunderstore/cyberstorm-theme";
 import {
   ToastSizesList,
   ToastVariantsList,
-} from "@thunderstore/cyberstorm-theme/src/components";
-import * as ToastProvider from "@thunderstore/cyberstorm/src/newComponents/Toast";
+} from "@thunderstore/cyberstorm-theme";
 
 // Note: The default export from Toast has .Provider and .Viewport attached
 const meta = {
@@ -20,9 +19,9 @@ const meta = {
   },
   args: { children: "Hello toast!", id: "toast-1" },
   render: (args) => (
-    <ToastProvider.default.Provider toastDuration={30000}>
+    <ToastProvider toastDuration={30000}>
       <Toast {...args} />
-    </ToastProvider.default.Provider>
+    </ToastProvider>
   ),
 } satisfies Meta<typeof Toast>;
 
@@ -40,11 +39,11 @@ export const Variants: Story = {
       </Toast>
     ));
     return (
-      <ToastProvider.default.Provider toastDuration={30000}>
+      <ToastProvider toastDuration={30000}>
         <div style={{ display: "flex", flexDirection: "column", gap: "1rem" }}>
           {toastVariants}
         </div>
-      </ToastProvider.default.Provider>
+      </ToastProvider>
     );
   },
 };
@@ -58,11 +57,11 @@ export const Sizes: Story = {
       </Toast>
     ));
     return (
-      <ToastProvider.default.Provider toastDuration={30000}>
+      <ToastProvider toastDuration={30000}>
         <div style={{ display: "flex", flexDirection: "column", gap: "1rem" }}>
           {toastSizes}
         </div>
-      </ToastProvider.default.Provider>
+      </ToastProvider>
     );
   },
 };
diff --git a/apps/storybook/tsconfig.app.json b/apps/storybook/tsconfig.app.json
index 787fcc8f8..2ea2b7d9e 100644
--- a/apps/storybook/tsconfig.app.json
+++ b/apps/storybook/tsconfig.app.json
@@ -11,7 +11,7 @@
     /* Bundler mode */
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
-    "verbatimModuleSyntax": true,
+    "verbatimModuleSyntax": false,
     "moduleDetection": "force",
     "noEmit": true,
     "jsx": "react-jsx",
diff --git a/apps/storybook/tsconfig.node.json b/apps/storybook/tsconfig.node.json
index 0c1e7b866..40a138756 100644
--- a/apps/storybook/tsconfig.node.json
+++ b/apps/storybook/tsconfig.node.json
@@ -10,7 +10,7 @@
     /* Bundler mode */
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
-    "verbatimModuleSyntax": true,
+    "verbatimModuleSyntax": false,
     "moduleDetection": "force",
     "noEmit": true,
 
diff --git a/packages/cyberstorm-forms/package.json b/packages/cyberstorm-forms/package.json
index eb4663900..78c7b5bb3 100644
--- a/packages/cyberstorm-forms/package.json
+++ b/packages/cyberstorm-forms/package.json
@@ -6,7 +6,7 @@
   "type": "module",
   "main": "dist/thunderstore-cyberstorm-forms.cjs.js",
   "module": "dist/thunderstore-cyberstorm-forms.esm.js",
-  "types": "src/index.ts",
+  "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
diff --git a/packages/cyberstorm-forms/src/actions/PackageLikeAction.tsx b/packages/cyberstorm-forms/src/actions/PackageLikeAction.tsx
index 494ed7138..8398992b7 100644
--- a/packages/cyberstorm-forms/src/actions/PackageLikeAction.tsx
+++ b/packages/cyberstorm-forms/src/actions/PackageLikeAction.tsx
@@ -1,11 +1,9 @@
-import { useFormToaster } from "@thunderstore/cyberstorm-forms";
-import {
-  ApiError,
-  RequestConfig,
-  packageRate,
-} from "@thunderstore/thunderstore-api";
+import { ApiError, packageRate } from "@thunderstore/thunderstore-api";
+import type { RequestConfig } from "@thunderstore/thunderstore-api";
 import { ApiAction } from "@thunderstore/ts-api-react-actions";
 
+import { useFormToaster } from "../useFormToaster";
+
 export function PackageLikeAction(props: {
   isLoggedIn: boolean;
   dataUpdateTrigger: () => Promise<void>;
@@ -15,11 +13,14 @@ export function PackageLikeAction(props: {
     { state: "rated" | "unrated" },
     { isLoggedIn: boolean; e: Error | ApiError | unknown }
   >({
-    successMessage: (successProps) =>
+    successMessage: (successProps: { state: "rated" | "unrated" }) =>
       `${
         successProps.state === "rated" ? "Liked" : "Removed like from"
       } package`,
-    errorMessage: (errorProps) =>
+    errorMessage: (errorProps: {
+      isLoggedIn: boolean;
+      e: Error | ApiError | unknown;
+    }) =>
       errorProps.isLoggedIn
         ? `Error: ${errorProps.e}`
         : "You must be logged in to like a package!",
diff --git a/packages/cyberstorm-theme/src/components.tsx b/packages/cyberstorm-theme/src/components.tsx
index 71ba4da8e..5fc39f190 100644
--- a/packages/cyberstorm-theme/src/components.tsx
+++ b/packages/cyberstorm-theme/src/components.tsx
@@ -132,6 +132,10 @@ export {
 export {
   type CardPackageVariants,
   CardPackageVariantsList,
+  type CardPackageSizes,
+  CardPackageSizesList,
+  type CardPackageModifiers,
+  CardPackageModifiersList,
 } from "./components/CardPackage/CardPackage";
 export {
   type SelectSearchVariants,
diff --git a/packages/cyberstorm-theme/src/index.tsx b/packages/cyberstorm-theme/src/index.tsx
index 2d27c204c..25629e988 100644
--- a/packages/cyberstorm-theme/src/index.tsx
+++ b/packages/cyberstorm-theme/src/index.tsx
@@ -29,3 +29,5 @@ import "./styles/colors.css";
 import "./styles/globals.css";
 import "./styles/layout.css";
 import "./styles/typography.css";
+
+export * from "./components";
diff --git a/packages/cyberstorm-theme/tsconfig.json b/packages/cyberstorm-theme/tsconfig.json
index 3801ae7db..3df7a806f 100644
--- a/packages/cyberstorm-theme/tsconfig.json
+++ b/packages/cyberstorm-theme/tsconfig.json
@@ -20,6 +20,9 @@
     "resolveJsonModule": true,
     "forceConsistentCasingInFileNames": true,
     "composite": true,
+    "declaration": true,
+    "declarationMap": true,
+    "emitDeclarationOnly": true,
     "outDir": "./dist",
     "rootDir": "./src",
     "jsx": "react-jsx"
diff --git a/packages/cyberstorm/src/index.ts b/packages/cyberstorm/src/index.ts
index 414d38cfe..3cae7b6d4 100644
--- a/packages/cyberstorm/src/index.ts
+++ b/packages/cyberstorm/src/index.ts
@@ -26,6 +26,7 @@ export {
   type InputTextAreaProps,
 } from "./primitiveComponents/Input/Input";
 export { type PrimitiveComponentDefaultProps } from "./primitiveComponents/utils/utils";
+export { TooltipWrapper } from "./primitiveComponents/utils/utils";
 
 // components
 export { CodeBox, type CodeBoxProps } from "./components/CodeBox/CodeBox";
@@ -82,6 +83,7 @@ export { Menu } from "./newComponents/Menu/Menu";
 export { MetaItem as NewMetaItem } from "./newComponents/MetaItem/MetaItem";
 export { Modal, type ModalProps } from "./newComponents/Modal/Modal";
 export { Pagination as NewPagination } from "./newComponents/Pagination/Pagination";
+export type { PaginationProps } from "./newComponents/Pagination/Pagination";
 export {
   Select as NewSelect,
   type SelectProps as NewSelectProps,
@@ -98,7 +100,10 @@ export {
   type TextInputProps as NewTextInputProps,
 } from "./newComponents/TextInput/TextInput";
 export { useToast } from "./newComponents/Toast/Provider";
+export { Provider as ToastProvider } from "./newComponents/Toast/Provider";
+export { Viewport as ToastViewport } from "./newComponents/Toast/Viewport";
 export { Toast } from "./newComponents/Toast/Toast";
+export type { ToastProps } from "./newComponents/Toast/Toast";
 export {
   Table as NewTable,
   TableSort as NewTableSort,
@@ -115,6 +120,9 @@ export { isNode, isRecord, isStringArray } from "./utils/type_guards";
 export type { SelectOption } from "./utils/types";
 export {
   range,
+  classnames,
+  componentClasses,
+  numberWithSpaces,
   formatFileSize,
   formatInteger,
   formatToDisplayName,
diff --git a/packages/cyberstorm/src/newComponents/Alert/Alert.tsx b/packages/cyberstorm/src/newComponents/Alert/Alert.tsx
index 5fd934b51..c86df8d08 100644
--- a/packages/cyberstorm/src/newComponents/Alert/Alert.tsx
+++ b/packages/cyberstorm/src/newComponents/Alert/Alert.tsx
@@ -10,7 +10,7 @@ import React from "react";
 import {
   type AlertSizes,
   type AlertVariants,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import { NewIcon, type PrimitiveComponentDefaultProps } from "../..";
 import { classnames, componentClasses } from "../../utils/utils";
diff --git a/packages/cyberstorm/src/newComponents/Avatar/Avatar.tsx b/packages/cyberstorm/src/newComponents/Avatar/Avatar.tsx
index 5e9d57c21..d9c0f85f5 100644
--- a/packages/cyberstorm/src/newComponents/Avatar/Avatar.tsx
+++ b/packages/cyberstorm/src/newComponents/Avatar/Avatar.tsx
@@ -4,7 +4,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import {
   type AvatarSizes,
   type AvatarVariants,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import { NewIcon, type PrimitiveComponentDefaultProps } from "../..";
 import { classnames, componentClasses } from "../../utils/utils";
diff --git a/packages/cyberstorm/src/newComponents/BreadCrumbs/BreadCrumbs.tsx b/packages/cyberstorm/src/newComponents/BreadCrumbs/BreadCrumbs.tsx
index f4777b6a4..df04e2add 100644
--- a/packages/cyberstorm/src/newComponents/BreadCrumbs/BreadCrumbs.tsx
+++ b/packages/cyberstorm/src/newComponents/BreadCrumbs/BreadCrumbs.tsx
@@ -6,7 +6,7 @@ import {
   type BreadCrumbsModifiers,
   type BreadCrumbsSizes,
   type BreadCrumbsVariants,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import {
   type NewCyberstormLinkProps,
diff --git a/packages/cyberstorm/src/newComponents/Button/Button.tsx b/packages/cyberstorm/src/newComponents/Button/Button.tsx
index 920dc8e5a..9d651e6ee 100644
--- a/packages/cyberstorm/src/newComponents/Button/Button.tsx
+++ b/packages/cyberstorm/src/newComponents/Button/Button.tsx
@@ -4,7 +4,7 @@ import {
   type ButtonModifiers,
   type ButtonSizes,
   type ButtonVariants,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import {
   Actionable,
diff --git a/packages/cyberstorm/src/newComponents/Card/CardPackage/CardPackage.tsx b/packages/cyberstorm/src/newComponents/Card/CardPackage/CardPackage.tsx
index 556be1a4d..fc5c19065 100644
--- a/packages/cyberstorm/src/newComponents/Card/CardPackage/CardPackage.tsx
+++ b/packages/cyberstorm/src/newComponents/Card/CardPackage/CardPackage.tsx
@@ -10,11 +10,11 @@ import { faLips } from "@fortawesome/pro-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import ago from "s-ago";
 
-import { type CardPackageVariants } from "@thunderstore/cyberstorm-theme/src/components";
+import { type CardPackageVariants } from "@thunderstore/cyberstorm-theme";
 import {
   type CardPackageModifiers,
   type CardPackageSizes,
-} from "@thunderstore/cyberstorm-theme/src/components/CardPackage/CardPackage";
+} from "@thunderstore/cyberstorm-theme";
 import { type PackageListing } from "@thunderstore/dapper/types";
 
 import { Image, NewIcon, NewLink, NewMetaItem, NewTag } from "../../..";
diff --git a/packages/cyberstorm/src/newComponents/CodeInput/CodeInput.tsx b/packages/cyberstorm/src/newComponents/CodeInput/CodeInput.tsx
index ad7d30eb6..0fce114d4 100644
--- a/packages/cyberstorm/src/newComponents/CodeInput/CodeInput.tsx
+++ b/packages/cyberstorm/src/newComponents/CodeInput/CodeInput.tsx
@@ -11,7 +11,7 @@ import {
   type CodeInputModifiers,
   type CodeInputSizes,
   type CodeInputVariants,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import { NewIcon } from "../..";
 import {
diff --git a/packages/cyberstorm/src/newComponents/Drawer/Drawer.tsx b/packages/cyberstorm/src/newComponents/Drawer/Drawer.tsx
index 3f8be984d..4a545e0ce 100644
--- a/packages/cyberstorm/src/newComponents/Drawer/Drawer.tsx
+++ b/packages/cyberstorm/src/newComponents/Drawer/Drawer.tsx
@@ -5,7 +5,7 @@ import { type ReactNode } from "react";
 import {
   type DrawerSizes,
   type DrawerVariants,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import { NewButton, NewIcon } from "../..";
 import {
diff --git a/packages/cyberstorm/src/newComponents/DropDown/DropDown.tsx b/packages/cyberstorm/src/newComponents/DropDown/DropDown.tsx
index 4c8fdfecf..e54cc242a 100644
--- a/packages/cyberstorm/src/newComponents/DropDown/DropDown.tsx
+++ b/packages/cyberstorm/src/newComponents/DropDown/DropDown.tsx
@@ -18,7 +18,7 @@ import {
   type DropDownModifiers,
   type DropDownSizes,
   type DropDownVariants,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import { type PrimitiveComponentDefaultProps } from "../../primitiveComponents/utils/utils";
 import { classnames, componentClasses } from "../../utils/utils";
diff --git a/packages/cyberstorm/src/newComponents/Heading/Heading.tsx b/packages/cyberstorm/src/newComponents/Heading/Heading.tsx
index 11c202d49..07ca61b20 100644
--- a/packages/cyberstorm/src/newComponents/Heading/Heading.tsx
+++ b/packages/cyberstorm/src/newComponents/Heading/Heading.tsx
@@ -4,7 +4,7 @@ import {
   type HeadingModifiers,
   type HeadingSizes,
   type HeadingVariants,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import {
   Frame,
diff --git a/packages/cyberstorm/src/newComponents/Icon/Icon.tsx b/packages/cyberstorm/src/newComponents/Icon/Icon.tsx
index 883947c5c..3fea2f7d5 100644
--- a/packages/cyberstorm/src/newComponents/Icon/Icon.tsx
+++ b/packages/cyberstorm/src/newComponents/Icon/Icon.tsx
@@ -1,6 +1,6 @@
 import { memo } from "react";
 
-import { type IconVariants } from "@thunderstore/cyberstorm-theme/src/components";
+import { type IconVariants } from "@thunderstore/cyberstorm-theme";
 
 import {
   Frame,
diff --git a/packages/cyberstorm/src/newComponents/Image/Image.tsx b/packages/cyberstorm/src/newComponents/Image/Image.tsx
index c097f21f9..c9fe543f6 100644
--- a/packages/cyberstorm/src/newComponents/Image/Image.tsx
+++ b/packages/cyberstorm/src/newComponents/Image/Image.tsx
@@ -2,7 +2,7 @@ import { faBan, faGamepad } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { memo } from "react";
 
-import { type ImageVariants } from "@thunderstore/cyberstorm-theme/src/components";
+import { type ImageVariants } from "@thunderstore/cyberstorm-theme";
 
 import { NewIcon } from "../..";
 import {
diff --git a/packages/cyberstorm/src/newComponents/Link/Link.tsx b/packages/cyberstorm/src/newComponents/Link/Link.tsx
index 0eb0e6884..ef96159b8 100644
--- a/packages/cyberstorm/src/newComponents/Link/Link.tsx
+++ b/packages/cyberstorm/src/newComponents/Link/Link.tsx
@@ -1,6 +1,6 @@
 import { memo } from "react";
 
-import { type LinkVariants } from "@thunderstore/cyberstorm-theme/src/components";
+import { type LinkVariants } from "@thunderstore/cyberstorm-theme";
 
 import {
   Actionable,
diff --git a/packages/cyberstorm/src/newComponents/Menu/Menu.tsx b/packages/cyberstorm/src/newComponents/Menu/Menu.tsx
index 953946de7..78987157f 100644
--- a/packages/cyberstorm/src/newComponents/Menu/Menu.tsx
+++ b/packages/cyberstorm/src/newComponents/Menu/Menu.tsx
@@ -2,7 +2,7 @@ import { faXmarkLarge } from "@fortawesome/pro-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { type ReactNode } from "react";
 
-import { type MenuVariants } from "@thunderstore/cyberstorm-theme/src/components";
+import { type MenuVariants } from "@thunderstore/cyberstorm-theme";
 
 import { NewButton, NewIcon } from "../..";
 import {
diff --git a/packages/cyberstorm/src/newComponents/MetaItem/MetaItem.tsx b/packages/cyberstorm/src/newComponents/MetaItem/MetaItem.tsx
index 311c6809d..2c675fe04 100644
--- a/packages/cyberstorm/src/newComponents/MetaItem/MetaItem.tsx
+++ b/packages/cyberstorm/src/newComponents/MetaItem/MetaItem.tsx
@@ -3,7 +3,7 @@ import React from "react";
 import {
   type MetaItemSizes,
   type MetaItemVariants,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import {
   Actionable,
diff --git a/packages/cyberstorm/src/newComponents/Modal/Modal.tsx b/packages/cyberstorm/src/newComponents/Modal/Modal.tsx
index d8db44583..5767afc0a 100644
--- a/packages/cyberstorm/src/newComponents/Modal/Modal.tsx
+++ b/packages/cyberstorm/src/newComponents/Modal/Modal.tsx
@@ -12,8 +12,10 @@ import {
   useState,
 } from "react";
 
-import { type ModalVariants } from "@thunderstore/cyberstorm-theme/src/components";
-import { type ModalSizes } from "@thunderstore/cyberstorm-theme/src/components/Modal/Modal";
+import {
+  type ModalSizes,
+  type ModalVariants,
+} from "@thunderstore/cyberstorm-theme";
 
 import { NewButton, NewIcon } from "../..";
 import { classnames, componentClasses } from "../../utils/utils";
diff --git a/packages/cyberstorm/src/newComponents/Select/Select.tsx b/packages/cyberstorm/src/newComponents/Select/Select.tsx
index e2bc7c1a5..054f98cc2 100644
--- a/packages/cyberstorm/src/newComponents/Select/Select.tsx
+++ b/packages/cyberstorm/src/newComponents/Select/Select.tsx
@@ -14,7 +14,7 @@ import {
   type SelectModifiers,
   type SelectSizes,
   type SelectVariants,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import { NewButton, NewIcon } from "../..";
 import type { SelectOption } from "../../utils/types";
diff --git a/packages/cyberstorm/src/newComponents/SelectSearch/SelectSearch.tsx b/packages/cyberstorm/src/newComponents/SelectSearch/SelectSearch.tsx
index ae3d1f15d..768cc0482 100644
--- a/packages/cyberstorm/src/newComponents/SelectSearch/SelectSearch.tsx
+++ b/packages/cyberstorm/src/newComponents/SelectSearch/SelectSearch.tsx
@@ -10,7 +10,7 @@ import {
   type SelectSearchModifiers,
   type SelectSearchSizes,
   type SelectSearchVariants,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import { NewIcon, NewTag } from "../../index";
 import type { SelectOption } from "../../utils/types";
diff --git a/packages/cyberstorm/src/newComponents/Switch/Switch.tsx b/packages/cyberstorm/src/newComponents/Switch/Switch.tsx
index d35eae8ec..b485e4a42 100644
--- a/packages/cyberstorm/src/newComponents/Switch/Switch.tsx
+++ b/packages/cyberstorm/src/newComponents/Switch/Switch.tsx
@@ -5,7 +5,7 @@ import {
   type SwitchModifiers,
   type SwitchSizes,
   type SwitchVariants,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import { classnames, componentClasses } from "../../utils/utils";
 import "./Switch.css";
diff --git a/packages/cyberstorm/src/newComponents/Table/Table.tsx b/packages/cyberstorm/src/newComponents/Table/Table.tsx
index 9e9662c9b..3e235d2d3 100644
--- a/packages/cyberstorm/src/newComponents/Table/Table.tsx
+++ b/packages/cyberstorm/src/newComponents/Table/Table.tsx
@@ -11,7 +11,7 @@ import {
   type TableModifiers,
   type TableSizes,
   type TableVariants,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import { NewIcon } from "../..";
 import { classnames, componentClasses } from "../../utils/utils";
diff --git a/packages/cyberstorm/src/newComponents/Tabs/Tabs.tsx b/packages/cyberstorm/src/newComponents/Tabs/Tabs.tsx
index 753cdba7e..673473832 100644
--- a/packages/cyberstorm/src/newComponents/Tabs/Tabs.tsx
+++ b/packages/cyberstorm/src/newComponents/Tabs/Tabs.tsx
@@ -3,7 +3,7 @@ import { memo } from "react";
 import {
   type TabsSizes,
   type TabsVariants,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import {
   Frame,
diff --git a/packages/cyberstorm/src/newComponents/Tag/Tag.tsx b/packages/cyberstorm/src/newComponents/Tag/Tag.tsx
index 6d287c1fe..af7cf7f90 100644
--- a/packages/cyberstorm/src/newComponents/Tag/Tag.tsx
+++ b/packages/cyberstorm/src/newComponents/Tag/Tag.tsx
@@ -4,7 +4,7 @@ import {
   type TagModifiers,
   type TagSizes,
   type TagVariants,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import {
   Actionable,
diff --git a/packages/cyberstorm/src/newComponents/TextInput/TextInput.tsx b/packages/cyberstorm/src/newComponents/TextInput/TextInput.tsx
index 553b618d1..a4b05c28c 100644
--- a/packages/cyberstorm/src/newComponents/TextInput/TextInput.tsx
+++ b/packages/cyberstorm/src/newComponents/TextInput/TextInput.tsx
@@ -6,7 +6,7 @@ import {
   type TextInputModifiers,
   type TextInputSizes,
   type TextInputVariants,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import { NewIcon } from "../..";
 import { Actionable } from "../../primitiveComponents/Actionable/Actionable";
diff --git a/packages/cyberstorm/src/newComponents/Toast/Toast.tsx b/packages/cyberstorm/src/newComponents/Toast/Toast.tsx
index fe0ae9837..e56bb89ff 100644
--- a/packages/cyberstorm/src/newComponents/Toast/Toast.tsx
+++ b/packages/cyberstorm/src/newComponents/Toast/Toast.tsx
@@ -14,7 +14,7 @@ import React from "react";
 import {
   type ToastSizes,
   type ToastVariants,
-} from "@thunderstore/cyberstorm-theme/src/components";
+} from "@thunderstore/cyberstorm-theme";
 
 import { NewIcon, type PrimitiveComponentDefaultProps } from "../..";
 import { classnames, componentClasses } from "../../utils/utils";
diff --git a/packages/cyberstorm/tsconfig.json b/packages/cyberstorm/tsconfig.json
index 6caacc2c8..bbb142e0b 100644
--- a/packages/cyberstorm/tsconfig.json
+++ b/packages/cyberstorm/tsconfig.json
@@ -20,6 +20,9 @@
     "resolveJsonModule": true,
     "forceConsistentCasingInFileNames": true,
     "composite": true,
+    "declaration": true,
+    "declarationMap": true,
+    "emitDeclarationOnly": true,
     "outDir": "./dist",
     "rootDir": "./src",
     "jsx": "react-jsx",
diff --git a/packages/dapper-ts/package.json b/packages/dapper-ts/package.json
index 0e47020bd..9ede0bbea 100644
--- a/packages/dapper-ts/package.json
+++ b/packages/dapper-ts/package.json
@@ -6,7 +6,7 @@
   "type": "module",
   "main": "dist/thunderstore-dapper-ts.cjs.js",
   "module": "dist/thunderstore-dapper-ts.esm.js",
-  "types": "src/index.ts",
+  "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
diff --git a/packages/dapper-ts/src/index.ts b/packages/dapper-ts/src/index.ts
index de752010a..3f6fc613f 100644
--- a/packages/dapper-ts/src/index.ts
+++ b/packages/dapper-ts/src/index.ts
@@ -1,5 +1,5 @@
-import { DapperInterface } from "@thunderstore/dapper";
-import { RequestConfig } from "@thunderstore/thunderstore-api";
+import type { DapperInterface } from "@thunderstore/dapper";
+import type { RequestConfig } from "@thunderstore/thunderstore-api";
 
 import { getCommunities, getCommunity } from "./methods/communities";
 import { getCommunityFilters } from "./methods/communityFilters";
@@ -68,7 +68,7 @@ export class DapperTs implements DapperTsInterface {
     this.getTeamDetails = this.getTeamDetails.bind(this);
     this.getTeamMembers = this.getTeamMembers.bind(this);
     this.getTeamServiceAccounts = this.getTeamServiceAccounts.bind(this);
-    this.postTeamCreate = () => this.postTeamCreate.bind(this);
+    this.postTeamCreate = this.postTeamCreate.bind(this);
     this.postPackageSubmissionMetadata =
       this.postPackageSubmissionMetadata.bind(this);
     this.getPackageSubmissionStatus =
@@ -100,3 +100,30 @@ export class DapperTs implements DapperTsInterface {
   public postPackageSubmissionMetadata = postPackageSubmissionMetadata;
   public getPackageSubmissionStatus = getPackageSubmissionStatus;
 }
+
+export {
+  getCommunities,
+  getCommunity,
+  getCommunityFilters,
+  getCurrentUser,
+  getCurrentUserTeamPermissions,
+  getDynamicHTML,
+  getPackageChangelog,
+  getPackageListingDetails,
+  getPackageListings,
+  getPackagePermissions,
+  getPackageReadme,
+  getPackageSource,
+  getPackageSubmissionStatus,
+  getPackageVersionDependencies,
+  getPackageVersionDetails,
+  getPackageVersions,
+  getPackageWiki,
+  getPackageWikiPage,
+  getRatedPackages,
+  getTeamDetails,
+  getTeamMembers,
+  getTeamServiceAccounts,
+  postPackageSubmissionMetadata,
+  postTeamCreate,
+};
diff --git a/packages/dapper/src/context.tsx b/packages/dapper/src/context.tsx
index 0c4b81dbc..987450c2b 100644
--- a/packages/dapper/src/context.tsx
+++ b/packages/dapper/src/context.tsx
@@ -1,6 +1,6 @@
-import { PropsWithChildren } from "react";
+import type { PropsWithChildren } from "react";
 
-import { DapperInterface } from "./dapper";
+import type { DapperInterface } from "./dapper";
 import { getDapperContext } from "./singleton";
 
 type DapperProviderProps = PropsWithChildren<{
diff --git a/packages/dapper/src/singleton.ts b/packages/dapper/src/singleton.ts
index b46ecedef..66f9b8580 100644
--- a/packages/dapper/src/singleton.ts
+++ b/packages/dapper/src/singleton.ts
@@ -1,4 +1,4 @@
-import { DapperInterface } from "./dapper";
+import type { DapperInterface } from "./dapper";
 
 interface GlobalContext {
   Dapper?: DapperContext;
diff --git a/packages/react-dnd/src/DnDFileInput.tsx b/packages/react-dnd/src/DnDFileInput.tsx
index 3c1423daf..053336a35 100644
--- a/packages/react-dnd/src/DnDFileInput.tsx
+++ b/packages/react-dnd/src/DnDFileInput.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, RefObject, useRef } from "react";
+import { type ReactNode, type RefObject, useRef } from "react";
 
 import { useDnDFileInput } from "./useDnDFileInput";
 
@@ -12,7 +12,7 @@ interface DnDFileInputProps {
   fileInputRef?: RefObject<HTMLInputElement | null>;
 }
 
-export const DnDFileInput: React.FC<DnDFileInputProps> = (props) => {
+export const DnDFileInput = (props: DnDFileInputProps) => {
   const fileInputRef = props.fileInputRef ?? useRef<HTMLInputElement>(null);
   const { onChange, onDrop, isDragging } = useDnDFileInput({
     inputRef: fileInputRef,
diff --git a/packages/react-dnd/src/useDnDFileInput.ts b/packages/react-dnd/src/useDnDFileInput.ts
index 8f4c59497..f0e83745a 100644
--- a/packages/react-dnd/src/useDnDFileInput.ts
+++ b/packages/react-dnd/src/useDnDFileInput.ts
@@ -1,4 +1,4 @@
-import React, { RefObject } from "react";
+import type { DragEvent, RefObject } from "react";
 
 import { useDnD } from "./useDnD";
 
@@ -21,7 +21,7 @@ export const useDnDFileInput = (props: useDragAndDropInputProps) => {
     resetDrag();
   };
 
-  const onDrop = (e: React.DragEvent) => {
+  const onDrop = (e: DragEvent) => {
     if (!props.readonly) {
       const inp = props.inputRef?.current;
       if (inp) {
diff --git a/packages/thunderstore-api/package.json b/packages/thunderstore-api/package.json
index 2847846d2..963bdbedb 100644
--- a/packages/thunderstore-api/package.json
+++ b/packages/thunderstore-api/package.json
@@ -4,10 +4,11 @@
   "description": "Thunderstore API client",
   "repository": "https://github.com/thunderstore-io/thunderstore-ui/tree/master/packages/thunderstore-api",
   "main": "dist/thunderstore-thunderstore-api.cjs.js",
-  "types": "src/index.ts",
+  "types": "dist/index.d.ts",
   "module": "dist/thunderstore-thunderstore-api.esm.js",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "module": "./dist/thunderstore-thunderstore-api.esm.js",
       "default": "./dist/thunderstore-thunderstore-api.cjs.js"
     },
diff --git a/packages/thunderstore-api/src/apiFetch.ts b/packages/thunderstore-api/src/apiFetch.ts
index 643c3789e..8933b8e2e 100644
--- a/packages/thunderstore-api/src/apiFetch.ts
+++ b/packages/thunderstore-api/src/apiFetch.ts
@@ -1,10 +1,10 @@
 import { z } from "zod";
 
+import type { RequestConfig } from "./index";
 import {
   ApiError,
   ParseError,
   RequestBodyParseError,
-  RequestConfig,
   RequestQueryParamsParseError,
 } from "./index";
 import { serializeQueryString } from "./queryString";
diff --git a/packages/thunderstore-api/src/delete/packageWiki.ts b/packages/thunderstore-api/src/delete/packageWiki.ts
index 380546a81..672579dc0 100644
--- a/packages/thunderstore-api/src/delete/packageWiki.ts
+++ b/packages/thunderstore-api/src/delete/packageWiki.ts
@@ -1,8 +1,8 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 import {
-  PackageWikiPageDeleteRequestData,
-  PackageWikiPageDeleteRequestParams,
+  type PackageWikiPageDeleteRequestData,
+  type PackageWikiPageDeleteRequestParams,
   packageWikiPageDeleteRequestDataSchema,
 } from "../schemas/requestSchemas";
 
diff --git a/packages/thunderstore-api/src/delete/teamDisband.ts b/packages/thunderstore-api/src/delete/teamDisband.ts
index 50a5bd0ed..e97c583dc 100644
--- a/packages/thunderstore-api/src/delete/teamDisband.ts
+++ b/packages/thunderstore-api/src/delete/teamDisband.ts
@@ -1,6 +1,6 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
-import { TeamDisbandRequestParams } from "../schemas/requestSchemas";
+import type { ApiEndpointProps } from "../index";
+import type { TeamDisbandRequestParams } from "../schemas/requestSchemas";
 
 export function teamDisband(
   props: ApiEndpointProps<TeamDisbandRequestParams, object, object>
diff --git a/packages/thunderstore-api/src/delete/teamRemoveMember.ts b/packages/thunderstore-api/src/delete/teamRemoveMember.ts
index a84b90545..e41a50ad9 100644
--- a/packages/thunderstore-api/src/delete/teamRemoveMember.ts
+++ b/packages/thunderstore-api/src/delete/teamRemoveMember.ts
@@ -1,5 +1,5 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps, TeamMemberRemoveRequestParams } from "../index";
+import type { ApiEndpointProps, TeamMemberRemoveRequestParams } from "../index";
 
 export function teamRemoveMember(
   props: ApiEndpointProps<TeamMemberRemoveRequestParams, object, object>
diff --git a/packages/thunderstore-api/src/delete/teamServiceAccountRemove.ts b/packages/thunderstore-api/src/delete/teamServiceAccountRemove.ts
index 796d0a674..966838a34 100644
--- a/packages/thunderstore-api/src/delete/teamServiceAccountRemove.ts
+++ b/packages/thunderstore-api/src/delete/teamServiceAccountRemove.ts
@@ -1,5 +1,5 @@
 import { apiFetch } from "../apiFetch";
-import {
+import type {
   ApiEndpointProps,
   TeamServiceAccountRemoveRequestParams,
 } from "../index";
diff --git a/packages/thunderstore-api/src/delete/userDelete.ts b/packages/thunderstore-api/src/delete/userDelete.ts
index 581d080b2..11cea895e 100644
--- a/packages/thunderstore-api/src/delete/userDelete.ts
+++ b/packages/thunderstore-api/src/delete/userDelete.ts
@@ -1,5 +1,5 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 
 export function userDelete(
   props: ApiEndpointProps<object, object, object>
diff --git a/packages/thunderstore-api/src/delete/userLinkedAccountDisconnect.ts b/packages/thunderstore-api/src/delete/userLinkedAccountDisconnect.ts
index 2e40a74c9..525f154f1 100644
--- a/packages/thunderstore-api/src/delete/userLinkedAccountDisconnect.ts
+++ b/packages/thunderstore-api/src/delete/userLinkedAccountDisconnect.ts
@@ -1,9 +1,9 @@
 import { apiFetch } from "../apiFetch";
-import {
+import type {
   ApiEndpointProps,
   UserLinkedAccountDisconnectRequestParams,
-  userLinkedAccountDisconnectRequestDataSchema,
 } from "../index";
+import { userLinkedAccountDisconnectRequestDataSchema } from "../index";
 
 export function userLinkedAccountDisconnect(
   props: ApiEndpointProps<
diff --git a/packages/thunderstore-api/src/get/community.ts b/packages/thunderstore-api/src/get/community.ts
index f39df0a57..402e879a7 100644
--- a/packages/thunderstore-api/src/get/community.ts
+++ b/packages/thunderstore-api/src/get/community.ts
@@ -1,8 +1,8 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
-import { CommunityRequestParams } from "../schemas/requestSchemas";
+import type { ApiEndpointProps } from "../index";
+import type { CommunityRequestParams } from "../schemas/requestSchemas";
 import {
-  CommunityResponseData,
+  type CommunityResponseData,
   communityResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/get/communityFilters.ts b/packages/thunderstore-api/src/get/communityFilters.ts
index d342a6e1c..6ec21b71b 100644
--- a/packages/thunderstore-api/src/get/communityFilters.ts
+++ b/packages/thunderstore-api/src/get/communityFilters.ts
@@ -1,11 +1,11 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 import {
-  CommunityFiltersRequestParams,
+  type CommunityFiltersRequestParams,
   communityFiltersRequestParamsSchema,
 } from "../schemas/requestSchemas";
 import {
-  CommunityFiltersResponseData,
+  type CommunityFiltersResponseData,
   communityFiltersResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/get/communityList.ts b/packages/thunderstore-api/src/get/communityList.ts
index 19c52d850..f29ffe74e 100644
--- a/packages/thunderstore-api/src/get/communityList.ts
+++ b/packages/thunderstore-api/src/get/communityList.ts
@@ -1,12 +1,12 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 import { CommunityListOrderingEnum } from "../schemas/queryParamSchemas";
 import {
-  CommunityListRequestQueryParams,
+  type CommunityListRequestQueryParams,
   communityListRequestQueryParamsSchema,
 } from "../schemas/requestSchemas";
 import {
-  CommunityListResponseData,
+  type CommunityListResponseData,
   communityListResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/get/communityPackageListings.ts b/packages/thunderstore-api/src/get/communityPackageListings.ts
index e0d7e41ed..a1b1c59c6 100644
--- a/packages/thunderstore-api/src/get/communityPackageListings.ts
+++ b/packages/thunderstore-api/src/get/communityPackageListings.ts
@@ -1,14 +1,14 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 import { PackageListingsOrderingEnum } from "../schemas/queryParamSchemas";
 import {
-  CommunityPackageListingsRequestParams,
-  PackageListingsRequestQueryParams,
+  type CommunityPackageListingsRequestParams,
+  type PackageListingsRequestQueryParams,
   communityPackageListingsRequestParamsSchema,
   packageListingsRequestQueryParamsSchema,
 } from "../schemas/requestSchemas";
 import {
-  PackageListingsResponseData,
+  type PackageListingsResponseData,
   packageListingsResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/get/currentUser.ts b/packages/thunderstore-api/src/get/currentUser.ts
index e202a56b8..62bf5947a 100644
--- a/packages/thunderstore-api/src/get/currentUser.ts
+++ b/packages/thunderstore-api/src/get/currentUser.ts
@@ -1,12 +1,12 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 import {
   type CurrentUserTeamPermissionsRequestParams,
   currentUserTeamPermissionsRequestParamsSchema,
 } from "../schemas/requestSchemas";
 import {
-  CurrentUserResponseData,
-  CurrentUserTeamPermissionsResponseData,
+  type CurrentUserResponseData,
+  type CurrentUserTeamPermissionsResponseData,
   currentUserResponseDataSchema,
   currentUserTeamPermissionsResponseDataSchema,
 } from "../schemas/responseSchemas";
diff --git a/packages/thunderstore-api/src/get/dynamicHTML.ts b/packages/thunderstore-api/src/get/dynamicHTML.ts
index 78488c84e..403d64261 100644
--- a/packages/thunderstore-api/src/get/dynamicHTML.ts
+++ b/packages/thunderstore-api/src/get/dynamicHTML.ts
@@ -1,8 +1,8 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
-import { DynamicHTMLRequestParams } from "../schemas/requestSchemas";
+import type { ApiEndpointProps } from "../index";
+import type { DynamicHTMLRequestParams } from "../schemas/requestSchemas";
 import {
-  DynamicHTMLResponseData,
+  type DynamicHTMLResponseData,
   dynamicHTMLResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/get/namespacePackageListings.ts b/packages/thunderstore-api/src/get/namespacePackageListings.ts
index fe5809f72..006f0ec18 100644
--- a/packages/thunderstore-api/src/get/namespacePackageListings.ts
+++ b/packages/thunderstore-api/src/get/namespacePackageListings.ts
@@ -1,13 +1,13 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 import { PackageListingsOrderingEnum } from "../schemas/queryParamSchemas";
 import {
-  NamespacePackageListingsRequestParams,
-  PackageListingsRequestQueryParams,
+  type NamespacePackageListingsRequestParams,
+  type PackageListingsRequestQueryParams,
   packageListingsRequestQueryParamsSchema,
 } from "../schemas/requestSchemas";
 import {
-  PackageListingsResponseData,
+  type PackageListingsResponseData,
   packageListingsResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/get/package.ts b/packages/thunderstore-api/src/get/package.ts
index 5c5c4a80c..396decdc2 100644
--- a/packages/thunderstore-api/src/get/package.ts
+++ b/packages/thunderstore-api/src/get/package.ts
@@ -1,8 +1,8 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
-import { PackagePermissionsRequestParams } from "../schemas/requestSchemas";
+import type { ApiEndpointProps } from "../index";
+import type { PackagePermissionsRequestParams } from "../schemas/requestSchemas";
 import {
-  PackagePermissionsResponseData,
+  type PackagePermissionsResponseData,
   packagePermissionsResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/get/packageChangelog.ts b/packages/thunderstore-api/src/get/packageChangelog.ts
index df86a0092..f3dbc621d 100644
--- a/packages/thunderstore-api/src/get/packageChangelog.ts
+++ b/packages/thunderstore-api/src/get/packageChangelog.ts
@@ -1,8 +1,8 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
-import { PackageChangelogRequestParams } from "../schemas/requestSchemas";
+import type { ApiEndpointProps } from "../index";
+import type { PackageChangelogRequestParams } from "../schemas/requestSchemas";
 import {
-  PackageChangelogResponseData,
+  type PackageChangelogResponseData,
   packageChangelogResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/get/packageDependantsListings.ts b/packages/thunderstore-api/src/get/packageDependantsListings.ts
index 493f3376f..3e47c369a 100644
--- a/packages/thunderstore-api/src/get/packageDependantsListings.ts
+++ b/packages/thunderstore-api/src/get/packageDependantsListings.ts
@@ -1,13 +1,13 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 import { PackageListingsOrderingEnum } from "../schemas/queryParamSchemas";
 import {
-  PackageDependantsListingsRequestParams,
-  PackageListingsRequestQueryParams,
+  type PackageDependantsListingsRequestParams,
+  type PackageListingsRequestQueryParams,
   packageListingsRequestQueryParamsSchema,
 } from "../schemas/requestSchemas";
 import {
-  PackageListingsResponseData,
+  type PackageListingsResponseData,
   packageListingsResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/get/packageListingDetails.ts b/packages/thunderstore-api/src/get/packageListingDetails.ts
index 644b1e682..0455d0d55 100644
--- a/packages/thunderstore-api/src/get/packageListingDetails.ts
+++ b/packages/thunderstore-api/src/get/packageListingDetails.ts
@@ -1,8 +1,8 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 import { packageListingDetailsSchema } from "../schemas/objectSchemas";
-import { PackageListingDetailsRequestParams } from "../schemas/requestSchemas";
-import { PackageListingDetailsResponseData } from "../schemas/responseSchemas";
+import type { PackageListingDetailsRequestParams } from "../schemas/requestSchemas";
+import type { PackageListingDetailsResponseData } from "../schemas/responseSchemas";
 
 export async function fetchPackageListingDetails(
   props: ApiEndpointProps<PackageListingDetailsRequestParams, object, object>
diff --git a/packages/thunderstore-api/src/get/packageReadme.ts b/packages/thunderstore-api/src/get/packageReadme.ts
index 8c2c0924c..5ba59674e 100644
--- a/packages/thunderstore-api/src/get/packageReadme.ts
+++ b/packages/thunderstore-api/src/get/packageReadme.ts
@@ -1,8 +1,8 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
-import { PackageReadmeRequestParams } from "../schemas/requestSchemas";
+import type { ApiEndpointProps } from "../index";
+import type { PackageReadmeRequestParams } from "../schemas/requestSchemas";
 import {
-  PackageReadmeResponseData,
+  type PackageReadmeResponseData,
   packageReadmeResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/get/packageSource.ts b/packages/thunderstore-api/src/get/packageSource.ts
index 44fbb19ea..adde13258 100644
--- a/packages/thunderstore-api/src/get/packageSource.ts
+++ b/packages/thunderstore-api/src/get/packageSource.ts
@@ -1,8 +1,8 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
-import { PackageSourceRequestParams } from "../schemas/requestSchemas";
+import type { ApiEndpointProps } from "../index";
+import type { PackageSourceRequestParams } from "../schemas/requestSchemas";
 import { packageSourceResponseDataSchema } from "../schemas/responseSchemas";
-import { PackageSourceResponseData } from "../schemas/responseSchemas";
+import type { PackageSourceResponseData } from "../schemas/responseSchemas";
 
 export async function fetchPackageSource(
   props: ApiEndpointProps<PackageSourceRequestParams, object, object>
diff --git a/packages/thunderstore-api/src/get/packageSubmission.ts b/packages/thunderstore-api/src/get/packageSubmission.ts
index 23775fdbe..33bbe4fc5 100644
--- a/packages/thunderstore-api/src/get/packageSubmission.ts
+++ b/packages/thunderstore-api/src/get/packageSubmission.ts
@@ -1,8 +1,8 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
-import { PackageSubmissionStatusRequestParams } from "../schemas/requestSchemas";
+import type { ApiEndpointProps } from "../index";
+import type { PackageSubmissionStatusRequestParams } from "../schemas/requestSchemas";
 import {
-  PackageSubmissionStatusResponseData,
+  type PackageSubmissionStatusResponseData,
   packageSubmissionStatusResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/get/packageVersionDependencies.ts b/packages/thunderstore-api/src/get/packageVersionDependencies.ts
index 81378d62b..7a33fa5a9 100644
--- a/packages/thunderstore-api/src/get/packageVersionDependencies.ts
+++ b/packages/thunderstore-api/src/get/packageVersionDependencies.ts
@@ -1,9 +1,11 @@
 import { apiFetch } from "../apiFetch";
-import {
+import type {
   ApiEndpointProps,
   PackageVersionDependenciesRequestParams,
   PackageVersionDependenciesRequestQueryParams,
   PackageVersionDependenciesResponseData,
+} from "../index";
+import {
   packageVersionDependenciesRequestQueryParamsSchema,
   packageVersionDependenciesResponseDataSchema,
 } from "../index";
diff --git a/packages/thunderstore-api/src/get/packageVersionDetails.ts b/packages/thunderstore-api/src/get/packageVersionDetails.ts
index eb20dd23d..8b7ece2e9 100644
--- a/packages/thunderstore-api/src/get/packageVersionDetails.ts
+++ b/packages/thunderstore-api/src/get/packageVersionDetails.ts
@@ -1,8 +1,8 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
-import { PackageVersionDetailsRequestParams } from "../schemas/requestSchemas";
+import type { ApiEndpointProps } from "../index";
+import type { PackageVersionDetailsRequestParams } from "../schemas/requestSchemas";
 import {
-  PackageVersionDetailsResponseData,
+  type PackageVersionDetailsResponseData,
   packageVersionDetailsResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/get/packageVersions.ts b/packages/thunderstore-api/src/get/packageVersions.ts
index 7664f60fe..4f01cad48 100644
--- a/packages/thunderstore-api/src/get/packageVersions.ts
+++ b/packages/thunderstore-api/src/get/packageVersions.ts
@@ -1,8 +1,8 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
-import { PackageVersionsRequestParams } from "../schemas/requestSchemas";
+import type { ApiEndpointProps } from "../index";
+import type { PackageVersionsRequestParams } from "../schemas/requestSchemas";
 import { packageVersionsResponseDataSchema } from "../schemas/responseSchemas";
-import { PackageVersionsResponseData } from "../schemas/responseSchemas";
+import type { PackageVersionsResponseData } from "../schemas/responseSchemas";
 
 export async function fetchPackageVersions(
   props: ApiEndpointProps<PackageVersionsRequestParams, object, object>
diff --git a/packages/thunderstore-api/src/get/packageWiki.ts b/packages/thunderstore-api/src/get/packageWiki.ts
index f3baeb50d..e8218d3c3 100644
--- a/packages/thunderstore-api/src/get/packageWiki.ts
+++ b/packages/thunderstore-api/src/get/packageWiki.ts
@@ -1,12 +1,12 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 import {
-  PackageWikiPageRequestParams,
-  PackageWikiRequestParams,
+  type PackageWikiPageRequestParams,
+  type PackageWikiRequestParams,
 } from "../schemas/requestSchemas";
 import {
-  PackageWikiPageResponseData,
-  PackageWikiResponseData,
+  type PackageWikiPageResponseData,
+  type PackageWikiResponseData,
   packageWikiPageResponseDataSchema,
   packageWikiResponseDataSchema,
 } from "../schemas/responseSchemas";
diff --git a/packages/thunderstore-api/src/get/ratedPackages.ts b/packages/thunderstore-api/src/get/ratedPackages.ts
index d5255cf5a..d88b85fb2 100644
--- a/packages/thunderstore-api/src/get/ratedPackages.ts
+++ b/packages/thunderstore-api/src/get/ratedPackages.ts
@@ -1,7 +1,7 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 import { ratedPackagesResponseDataSchema } from "../schemas/responseSchemas";
-import { RatedPackagesResponseData } from "../schemas/responseSchemas";
+import type { RatedPackagesResponseData } from "../schemas/responseSchemas";
 
 export async function fetchRatedPackages(
   props: ApiEndpointProps<object, object, object>
diff --git a/packages/thunderstore-api/src/get/teamDetails.ts b/packages/thunderstore-api/src/get/teamDetails.ts
index 2519f40bf..b1c381fd5 100644
--- a/packages/thunderstore-api/src/get/teamDetails.ts
+++ b/packages/thunderstore-api/src/get/teamDetails.ts
@@ -1,8 +1,8 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
-import { TeamDetailsRequestParams } from "../schemas/requestSchemas";
+import type { ApiEndpointProps } from "../index";
+import type { TeamDetailsRequestParams } from "../schemas/requestSchemas";
 import {
-  TeamDetailsResponseData,
+  type TeamDetailsResponseData,
   teamDetailsResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/get/teamMembers.ts b/packages/thunderstore-api/src/get/teamMembers.ts
index af4271d26..838ac2a11 100644
--- a/packages/thunderstore-api/src/get/teamMembers.ts
+++ b/packages/thunderstore-api/src/get/teamMembers.ts
@@ -1,8 +1,8 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
-import { TeamMembersRequestParams } from "../schemas/requestSchemas";
+import type { ApiEndpointProps } from "../index";
+import type { TeamMembersRequestParams } from "../schemas/requestSchemas";
 import {
-  TeamMembersResponseData,
+  type TeamMembersResponseData,
   teamMembersResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/get/teamServiceAccounts.ts b/packages/thunderstore-api/src/get/teamServiceAccounts.ts
index 093bf9d2f..b2f8735d4 100644
--- a/packages/thunderstore-api/src/get/teamServiceAccounts.ts
+++ b/packages/thunderstore-api/src/get/teamServiceAccounts.ts
@@ -1,8 +1,8 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
-import { TeamServiceAccountsRequestParams } from "../schemas/requestSchemas";
+import type { ApiEndpointProps } from "../index";
+import type { TeamServiceAccountsRequestParams } from "../schemas/requestSchemas";
 import {
-  TeamServiceAccountsResponseData,
+  type TeamServiceAccountsResponseData,
   teamServiceAccountsResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/patch/teamDetailsEdit.ts b/packages/thunderstore-api/src/patch/teamDetailsEdit.ts
index cae7e215c..d91932d77 100644
--- a/packages/thunderstore-api/src/patch/teamDetailsEdit.ts
+++ b/packages/thunderstore-api/src/patch/teamDetailsEdit.ts
@@ -1,9 +1,11 @@
 import { apiFetch } from "../apiFetch";
-import {
+import type {
   ApiEndpointProps,
   TeamDetailsEditRequestData,
   TeamDetailsEditRequestParams,
   TeamDetailsEditResponseData,
+} from "../index";
+import {
   teamDetailsEditRequestDataSchema,
   teamDetailsEditResponseSchema,
 } from "../index";
diff --git a/packages/thunderstore-api/src/patch/teamEditMember.ts b/packages/thunderstore-api/src/patch/teamEditMember.ts
index ad348fbac..c1ee5b427 100644
--- a/packages/thunderstore-api/src/patch/teamEditMember.ts
+++ b/packages/thunderstore-api/src/patch/teamEditMember.ts
@@ -1,8 +1,10 @@
 import { apiFetch } from "../apiFetch";
-import {
+import type {
   ApiEndpointProps,
   TeamMemberEditRequestData,
   TeamMemberEditRequestParams,
+} from "../index";
+import {
   teamEditMemberResponseSchema,
   teamMemberEditRequestParamsSchema,
 } from "../index";
diff --git a/packages/thunderstore-api/src/post/frontend.ts b/packages/thunderstore-api/src/post/frontend.ts
index 61536185c..9345c2929 100644
--- a/packages/thunderstore-api/src/post/frontend.ts
+++ b/packages/thunderstore-api/src/post/frontend.ts
@@ -1,11 +1,11 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 import {
-  MarkdownRenderRequestData,
+  type MarkdownRenderRequestData,
   markdownRenderRequestDataSchema,
 } from "../schemas/requestSchemas";
 import {
-  MarkdownRenderResponseData,
+  type MarkdownRenderResponseData,
   markdownRenderResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/post/package.ts b/packages/thunderstore-api/src/post/package.ts
index 80c6b0002..9d7d14ef2 100644
--- a/packages/thunderstore-api/src/post/package.ts
+++ b/packages/thunderstore-api/src/post/package.ts
@@ -1,20 +1,22 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 import {
-  PackageDeprecateRequestData,
-  PackageDeprecateRequestParams,
-  PackageUnlistRequestData,
-  PackageUnlistRequestParams,
+  type PackageDeprecateRequestData,
+  type PackageDeprecateRequestParams,
+  type PackageUnlistRequestData,
+  type PackageUnlistRequestParams,
   packageDeprecateRequestDataSchema,
   packageRateRequestDataSchema,
   packageUnlistRequestDataSchema,
 } from "../schemas/requestSchemas";
-import { PackageRateRequestData } from "../schemas/requestSchemas";
-import { PackageRateRequestParams } from "../schemas/requestSchemas";
+import type {
+  PackageRateRequestData,
+  PackageRateRequestParams,
+} from "../schemas/requestSchemas";
 import {
-  PackageDeprecateResponseData,
-  PackageRateResponseData,
-  PackageUnlistResponseData,
+  type PackageDeprecateResponseData,
+  type PackageRateResponseData,
+  type PackageUnlistResponseData,
   packageDeprecateResponseDataSchema,
   packageRateResponseDataSchema,
   packageUnlistResponseDataSchema,
diff --git a/packages/thunderstore-api/src/post/packageListing.ts b/packages/thunderstore-api/src/post/packageListing.ts
index 9ee312d72..7acecdb51 100644
--- a/packages/thunderstore-api/src/post/packageListing.ts
+++ b/packages/thunderstore-api/src/post/packageListing.ts
@@ -1,21 +1,21 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 import {
-  PackageListingApproveRequestData,
-  PackageListingApproveRequestParams,
-  PackageListingRejectRequestData,
-  PackageListingRejectRequestParams,
-  PackageListingReportRequestData,
-  PackageListingReportRequestParams,
-  PackageListingUpdateRequestData,
-  PackageListingUpdateRequestParams,
+  type PackageListingApproveRequestData,
+  type PackageListingApproveRequestParams,
+  type PackageListingRejectRequestData,
+  type PackageListingRejectRequestParams,
+  type PackageListingReportRequestData,
+  type PackageListingReportRequestParams,
+  type PackageListingUpdateRequestData,
+  type PackageListingUpdateRequestParams,
   packageListingApproveRequestDataSchema,
   packageListingRejectRequestDataSchema,
   packageListingReportRequestDataSchema,
   packageListingUpdateRequestDataSchema,
 } from "../schemas/requestSchemas";
 import {
-  PackageListingUpdateResponseData,
+  type PackageListingUpdateResponseData,
   packageListingUpdateResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/post/packageWiki.ts b/packages/thunderstore-api/src/post/packageWiki.ts
index 512ce03e2..6b76093c9 100644
--- a/packages/thunderstore-api/src/post/packageWiki.ts
+++ b/packages/thunderstore-api/src/post/packageWiki.ts
@@ -1,16 +1,16 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 import {
-  PackageWikiPageCreateRequestData,
-  PackageWikiPageCreateRequestParams,
-  PackageWikiPageEditRequestData,
-  PackageWikiPageEditRequestParams,
+  type PackageWikiPageCreateRequestData,
+  type PackageWikiPageCreateRequestParams,
+  type PackageWikiPageEditRequestData,
+  type PackageWikiPageEditRequestParams,
   packageWikiPageCreateRequestDataSchema,
   packageWikiPageEditRequestDataSchema,
 } from "../schemas/requestSchemas";
 import {
-  PackageWikiPageCreateResponseData,
-  PackageWikiPageEditResponseData,
+  type PackageWikiPageCreateResponseData,
+  type PackageWikiPageEditResponseData,
   packageWikiPageCreateResponseDataSchema,
   packageWikiPageEditResponseDataSchema,
 } from "../schemas/responseSchemas";
diff --git a/packages/thunderstore-api/src/post/submission.ts b/packages/thunderstore-api/src/post/submission.ts
index 3f92b3e44..4dfd407f4 100644
--- a/packages/thunderstore-api/src/post/submission.ts
+++ b/packages/thunderstore-api/src/post/submission.ts
@@ -1,14 +1,14 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 import {
-  PackageSubmissionRequestData,
-  SubmissionValidateManifestRequestData,
+  type PackageSubmissionRequestData,
+  type SubmissionValidateManifestRequestData,
   packageSubmissionRequestDataSchema,
   submissionValidateManifestRequestDataSchema,
 } from "../schemas/requestSchemas";
 import {
-  PackageSubmissionResponseData,
-  SubmissionValidateManifestResponseData,
+  type PackageSubmissionResponseData,
+  type SubmissionValidateManifestResponseData,
   packageSubmissionResponseDataSchema,
   submissionValidateManifestResponseDataSchema,
 } from "../schemas/responseSchemas";
diff --git a/packages/thunderstore-api/src/post/team.ts b/packages/thunderstore-api/src/post/team.ts
index 2f2814261..5b31d4e37 100644
--- a/packages/thunderstore-api/src/post/team.ts
+++ b/packages/thunderstore-api/src/post/team.ts
@@ -1,11 +1,11 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 import {
-  TeamCreateRequestData,
+  type TeamCreateRequestData,
   teamCreateRequestDataSchema,
 } from "../schemas/requestSchemas";
 import {
-  TeamCreateResponseData,
+  type TeamCreateResponseData,
   teamCreateResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/post/teamAddServiceAccount.ts b/packages/thunderstore-api/src/post/teamAddServiceAccount.ts
index aa0f14309..182243aa4 100644
--- a/packages/thunderstore-api/src/post/teamAddServiceAccount.ts
+++ b/packages/thunderstore-api/src/post/teamAddServiceAccount.ts
@@ -1,10 +1,12 @@
 // THIS API ENDPOINT IS NOT IMPLEMENTED YET IN THE THUNDERSTORE API
 import { apiFetch } from "../apiFetch";
-import {
+import type {
   ApiEndpointProps,
   TeamServiceAccountAddRequestData,
   TeamServiceAccountAddRequestParams,
   TeamServiceAccountAddResponseData,
+} from "../index";
+import {
   teamServiceAccountAddRequestDataSchema,
   teamServiceAccountAddResponseSchema,
 } from "../index";
diff --git a/packages/thunderstore-api/src/post/teamMember.ts b/packages/thunderstore-api/src/post/teamMember.ts
index 182fc8ba7..b06bb4717 100644
--- a/packages/thunderstore-api/src/post/teamMember.ts
+++ b/packages/thunderstore-api/src/post/teamMember.ts
@@ -1,12 +1,12 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 import {
-  TeamAddMemberRequestData,
+  type TeamAddMemberRequestData,
   teamAddMemberRequestDataSchema,
 } from "../schemas/requestSchemas";
-import { TeamAddMemberRequestParams } from "../schemas/requestSchemas";
+import type { TeamAddMemberRequestParams } from "../schemas/requestSchemas";
 import {
-  TeamAddMemberResponseData,
+  type TeamAddMemberResponseData,
   teamAddMemberResponseDataSchema,
 } from "../schemas/responseSchemas";
 
diff --git a/packages/thunderstore-api/src/post/usermedia.ts b/packages/thunderstore-api/src/post/usermedia.ts
index d711d2cbb..65b4c7a35 100644
--- a/packages/thunderstore-api/src/post/usermedia.ts
+++ b/packages/thunderstore-api/src/post/usermedia.ts
@@ -1,17 +1,17 @@
 import { apiFetch } from "../apiFetch";
-import { ApiEndpointProps } from "../index";
+import type { ApiEndpointProps } from "../index";
 import {
-  UsermediaAbortUploadRequestParams,
-  UsermediaFinishUploadRequestData,
-  UsermediaFinishUploadRequestParams,
-  UsermediaInitiateUploadRequestData,
+  type UsermediaAbortUploadRequestParams,
+  type UsermediaFinishUploadRequestData,
+  type UsermediaFinishUploadRequestParams,
+  type UsermediaInitiateUploadRequestData,
   usermediaFinishUploadRequestDataSchema,
   usermediaInitiateUploadRequestDataSchema,
 } from "../schemas/requestSchemas";
 import {
-  UsermediaAbortUploadResponseData,
-  UsermediaFinishUploadResponseData,
-  UsermediaInitiateUploadResponseData,
+  type UsermediaAbortUploadResponseData,
+  type UsermediaFinishUploadResponseData,
+  type UsermediaInitiateUploadResponseData,
   usermediaAbortUploadResponseDataSchema,
   usermediaFinishUploadResponseDataSchema,
   usermediaInitiateUploadResponseDataSchema,
diff --git a/packages/ts-api-react-actions/package.json b/packages/ts-api-react-actions/package.json
index 2885628ac..0d87a296f 100644
--- a/packages/ts-api-react-actions/package.json
+++ b/packages/ts-api-react-actions/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/thunderstore-io/thunderstore-ui/tree/master/packages/ts-api-react-actions",
   "main": "dist/thunderstore-ts-api-react-actions.cjs.js",
   "module": "dist/thunderstore-ts-api-react-actions.esm.js",
-  "types": "src/index.ts",
+  "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
diff --git a/packages/ts-api-react-actions/src/ApiAction.tsx b/packages/ts-api-react-actions/src/ApiAction.tsx
index 9daef6947..9c98d040a 100644
--- a/packages/ts-api-react-actions/src/ApiAction.tsx
+++ b/packages/ts-api-react-actions/src/ApiAction.tsx
@@ -1,7 +1,10 @@
 import { useCallback } from "react";
 
-import { ApiEndpointProps, ApiError } from "@thunderstore/thunderstore-api";
-import { ApiEndpoint } from "@thunderstore/ts-api-react";
+import type {
+  ApiEndpointProps,
+  ApiError,
+} from "@thunderstore/thunderstore-api";
+import type { ApiEndpoint } from "@thunderstore/ts-api-react";
 
 import { useApiAction } from "./useApiAction";
 
@@ -41,7 +44,7 @@ export function ApiAction<
         }
       } catch (e) {
         if (onSubmitError) {
-          onSubmitError(e);
+          onSubmitError(e instanceof Error ? e : new Error(String(e)));
         } else {
           throw e;
         }
diff --git a/packages/ts-api-react-forms/package.json b/packages/ts-api-react-forms/package.json
index 441214c37..3b2554920 100644
--- a/packages/ts-api-react-forms/package.json
+++ b/packages/ts-api-react-forms/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/thunderstore-io/thunderstore-ui/tree/master/packages/ts-api-react-forms",
   "main": "dist/thunderstore-ts-api-react-forms.cjs.js",
   "module": "dist/thunderstore-ts-api-react-forms.esm.js",
-  "types": "src/index.ts",
+  "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
diff --git a/packages/ts-api-react/package.json b/packages/ts-api-react/package.json
index 454f807db..43cb35c96 100644
--- a/packages/ts-api-react/package.json
+++ b/packages/ts-api-react/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/thunderstore-io/thunderstore-ui/tree/master/packages/ts-api-react",
   "main": "dist/thunderstore-ts-api-react.cjs.js",
   "module": "dist/thunderstore-ts-api-react.esm.js",
-  "types": "src/index.ts",
+  "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
diff --git a/packages/ts-api-react/src/SessionContext.tsx b/packages/ts-api-react/src/SessionContext.tsx
index 5472e21dd..3c8f38686 100644
--- a/packages/ts-api-react/src/SessionContext.tsx
+++ b/packages/ts-api-react/src/SessionContext.tsx
@@ -4,9 +4,9 @@
 // import { CurrentUser } from "@thunderstore/dapper/types";
 import { DapperTs } from "@thunderstore/dapper-ts";
 import {
-  EmptyUser,
-  RequestConfig,
-  User,
+  type EmptyUser,
+  type RequestConfig,
+  type User,
   userSchema,
 } from "@thunderstore/thunderstore-api";
 
diff --git a/packages/ts-api-react/src/index.ts b/packages/ts-api-react/src/index.ts
index 020f4c6e8..c25c996e1 100644
--- a/packages/ts-api-react/src/index.ts
+++ b/packages/ts-api-react/src/index.ts
@@ -1,16 +1,25 @@
 export {
   API_HOST_KEY,
+  COOKIE_DOMAIN_KEY,
   CURRENT_USER_KEY,
+  SESSION_STORAGE_KEY,
+  STALE_KEY,
+  getCookie,
   setSession,
+  setSessionStale,
   clearSession,
+  clearCookies,
   clearInvalidSession,
   getConfig,
+  getSessionContext,
+  getSessionStale,
   runSessionValidationCheck,
   storeCurrentUser,
   updateCurrentUser,
   getSessionCurrentUser,
 } from "./SessionContext";
 export type { ContextInterface } from "./SessionContext";
+export { StorageManager } from "./storage";
 export { StorageManager as NamespacedStorageManager } from "./storage";
 export { useApiCall } from "./useApiCall";
 export type { ApiEndpoint } from "./useApiCall";
diff --git a/packages/ts-uploader/src/index.ts b/packages/ts-uploader/src/index.ts
index 98c112e2c..0e5b386da 100644
--- a/packages/ts-uploader/src/index.ts
+++ b/packages/ts-uploader/src/index.ts
@@ -7,4 +7,5 @@ export type {
   UploadPartStatus,
   UploadError,
   UploadMetrics,
+  UserMedia,
 } from "./uploaders/types";
diff --git a/packages/ts-uploader/tsconfig.json b/packages/ts-uploader/tsconfig.json
index b9fe180f5..b11221f04 100644
--- a/packages/ts-uploader/tsconfig.json
+++ b/packages/ts-uploader/tsconfig.json
@@ -20,6 +20,9 @@
     "resolveJsonModule": true,
     "forceConsistentCasingInFileNames": true,
     "composite": true,
+    "declaration": true,
+    "declarationMap": true,
+    "emitDeclarationOnly": true,
     "outDir": "./dist",
     "rootDir": "./src",
     "jsx": "react-jsx",
diff --git a/packages/use-promise/package.json b/packages/use-promise/package.json
index 4066d43f9..8441b3ffc 100644
--- a/packages/use-promise/package.json
+++ b/packages/use-promise/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/thunderstore-io/thunderstore-ui/tree/master/packages/use-promise",
   "main": "dist/thunderstore-use-promise.cjs.js",
   "module": "dist/thunderstore-use-promise.esm.js",
-  "types": "src/index.ts",
+  "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
diff --git a/tsconfig.json b/tsconfig.json
index 833d49669..a63a8ee2e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,24 +1,24 @@
 {
   "files": [],
   "references": [
-    { "path": "apps/cyberstorm-remix" },
-    { "path": "apps/storybook" },
-    { "path": "packages/beta-switch" },
-    { "path": "packages/cyberstorm" },
-    { "path": "packages/cyberstorm-forms" },
-    { "path": "packages/cyberstorm-theme" },
+    { "path": "packages/thunderstore-api" },
     { "path": "packages/dapper" },
     { "path": "packages/dapper-fake" },
     { "path": "packages/dapper-ts" },
-    { "path": "packages/graph-system" },
-    { "path": "packages/react-dnd" },
-    { "path": "packages/thunderstore-api" },
     { "path": "packages/ts-api-react" },
     { "path": "packages/ts-api-react-actions" },
     { "path": "packages/ts-api-react-forms" },
+    { "path": "packages/typed-event-emitter" },
+    { "path": "packages/use-promise" },
+    { "path": "packages/react-dnd" },
     { "path": "packages/ts-uploader" },
     { "path": "packages/ts-uploader-react" },
-    { "path": "packages/typed-event-emitter" },
-    { "path": "packages/use-promise" }
+    { "path": "packages/cyberstorm-theme" },
+    { "path": "packages/cyberstorm" },
+    { "path": "packages/cyberstorm-forms" },
+    { "path": "packages/graph-system" },
+    { "path": "packages/beta-switch" },
+    { "path": "apps/cyberstorm-remix" },
+    { "path": "apps/storybook" }
   ]
 }