diff --git a/package-lock.json b/package-lock.json
index 14dccb8..fe09fe8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18698,7 +18698,7 @@
     },
     "package": {
       "name": "@userfront/toolkit",
-      "version": "1.0.1",
+      "version": "1.0.2-alpha.8",
       "license": "MIT",
       "dependencies": {
         "@r2wc/react-to-web-component": "^2.0.2",
@@ -19013,6 +19013,33 @@
         "node": ">=12"
       }
     },
+    "site/node_modules/@userfront/toolkit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@userfront/toolkit/-/toolkit-1.0.1.tgz",
+      "integrity": "sha512-lns7a/7Y7Pq6gjj5PEb5jgxphAuB14XCg08AxiR76qYtsnSzdAae9nkttBqSuJ3D+fpbSo3muXz1cRCI2Xz0DA==",
+      "dependencies": {
+        "@r2wc/react-to-web-component": "^2.0.2",
+        "@react-hook/resize-observer": "^1.2.6",
+        "@userfront/core": "^0.6.5-beta.1",
+        "@xstate/react": "3.0.1",
+        "lodash": "^4.17.21",
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0",
+        "react-icons": "^4.4.0",
+        "react-phone-input-2": "^2.15.1",
+        "urlon": "^3.1.0",
+        "xstate": "4.33.6"
+      }
+    },
+    "site/node_modules/@userfront/toolkit/node_modules/xstate": {
+      "version": "4.33.6",
+      "resolved": "https://registry.npmjs.org/xstate/-/xstate-4.33.6.tgz",
+      "integrity": "sha512-A5R4fsVKADWogK2a43ssu8Fz1AF077SfrKP1ZNyDBD8lNa/l4zfR//Luofp5GSWehOQr36Jp0k2z7b+sH2ivyg==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/xstate"
+      }
+    },
     "site/node_modules/@vitejs/plugin-react": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-2.2.0.tgz",
@@ -31262,6 +31289,31 @@
           "dev": true,
           "optional": true
         },
+        "@userfront/toolkit": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/@userfront/toolkit/-/toolkit-1.0.1.tgz",
+          "integrity": "sha512-lns7a/7Y7Pq6gjj5PEb5jgxphAuB14XCg08AxiR76qYtsnSzdAae9nkttBqSuJ3D+fpbSo3muXz1cRCI2Xz0DA==",
+          "requires": {
+            "@r2wc/react-to-web-component": "^2.0.2",
+            "@react-hook/resize-observer": "^1.2.6",
+            "@userfront/core": "^0.6.5-beta.1",
+            "@xstate/react": "3.0.1",
+            "lodash": "^4.17.21",
+            "react": "^18.2.0",
+            "react-dom": "^18.2.0",
+            "react-icons": "^4.4.0",
+            "react-phone-input-2": "^2.15.1",
+            "urlon": "^3.1.0",
+            "xstate": "4.33.6"
+          },
+          "dependencies": {
+            "xstate": {
+              "version": "4.33.6",
+              "resolved": "https://registry.npmjs.org/xstate/-/xstate-4.33.6.tgz",
+              "integrity": "sha512-A5R4fsVKADWogK2a43ssu8Fz1AF077SfrKP1ZNyDBD8lNa/l4zfR//Luofp5GSWehOQr36Jp0k2z7b+sH2ivyg=="
+            }
+          }
+        },
         "@vitejs/plugin-react": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-2.2.0.tgz",
diff --git a/package/build/build.cjs b/package/build/build.cjs
index 8d8985f..d0c1814 100644
--- a/package/build/build.cjs
+++ b/package/build/build.cjs
@@ -1,7 +1,6 @@
 const path = require("path");
 const vite = require("vite");
 const react = require("@vitejs/plugin-react");
-const dts = require("vite-plugin-dts");
 const cssInjectedByJsPlugin = require("vite-plugin-css-injected-by-js").default;
 
 const resolve = path.resolve;
@@ -50,9 +49,6 @@ const rollupOptions = {
 
 const esmPlugins = [
   react(),
-  dts({
-    insertTypesEntry: true,
-  }),
   cssInjectedByJsPlugin()
 ];
 
@@ -75,8 +71,6 @@ const esmOptions = {
 
 /* UMD (CommonJS and bundle) build config */
 
-// The dts (.d.ts file generation) plugin throws if it's
-// run with the UMD build
 const umdPlugins = [
   react(),
   cssInjectedByJsPlugin()
diff --git a/package/package-lock.json b/package/package-lock.json
index e43ba9e..cac16e0 100644
--- a/package/package-lock.json
+++ b/package/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@userfront/react",
-  "version": "1.0.1",
+  "version": "1.0.2-alpha.8",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@userfront/react",
-      "version": "1.0.1",
+      "version": "1.0.2-alpha.8",
       "license": "MIT",
       "dependencies": {
         "@r2wc/react-to-web-component": "^2.0.2",
diff --git a/package/package.json b/package/package.json
index 70faae4..70de8d5 100644
--- a/package/package.json
+++ b/package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@userfront/toolkit",
-  "version": "1.0.1",
+  "version": "1.0.2-alpha.8",
   "description": "Bindings and components for authentication with Userfront with React, Vue, other frameworks, and plain JS + HTML",
   "type": "module",
   "directories": {
@@ -10,7 +10,8 @@
     "dev-build": "node ./build/watch.cjs",
     "dev-tsc": "tsc --watch --noEmit",
     "dev": "npm-run-all --parallel dev-tsc dev-build",
-    "build": "tsc && node ./build/build.cjs",
+    "build": "tsc && node ./build/build.cjs && npm run build-types",
+    "build-types": "tsc src/**/*.{js,jsx} --declaration --allowJs --emitDeclarationOnly --outDir dist; cp types/index.d.ts dist/index.d.ts; cp types/index.d.ts dist/react.d.ts",
     "test": "vitest run",
     "watch": "vitest",
     "coverage": "vitest run --coverage",
diff --git a/package/src/components/BackButton.jsx b/package/src/components/BackButton.jsx
index 2afb377..bb00fd3 100644
--- a/package/src/components/BackButton.jsx
+++ b/package/src/components/BackButton.jsx
@@ -4,7 +4,7 @@
  * If no children are provided, contains the text "Back".
  * Additional props are passed through to the underlying <button>
  *
- * @param {props} props
+ * @param {object} props
  * @param {function} props.onEvent
  * @param {function} props.onClick
  * @param {Array} props.children
diff --git a/package/src/components/LogoutButton.jsx b/package/src/components/LogoutButton.jsx
index c0a9eac..2233f90 100644
--- a/package/src/components/LogoutButton.jsx
+++ b/package/src/components/LogoutButton.jsx
@@ -3,11 +3,11 @@ import { callUserfront } from "../services/userfront";
 /**
  * A functioning logout button.
  *
- * @param {props} props
- * @param {boolean} props.disabled - is the button disabled?
- * @param {string | boolean} props.redirect - URL to redirect to. If false, disables redirect.
+ * @param {object} props
+ * @param {boolean=} props.disabled - is the button disabled?
+ * @param {(string|boolean)=} props.redirect - URL to redirect to. If false, disables redirect.
  *  If absent, redirect based on the tenant's after-logout path.
- * @param {array} props.children - children to display in the button. Shows "Log out" if children are absent.
+ * @param {array=} props.children - children to display in the button. Shows "Log out" if children are absent.
  * @returns
  */
 const LogoutButton = ({ redirect, disabled = false, children }) => {
diff --git a/package/src/index.js b/package/src/index.js
index edd4e86..89f998b 100644
--- a/package/src/index.js
+++ b/package/src/index.js
@@ -17,11 +17,10 @@ export { default as LogoutButton } from "./components/LogoutButton";
  */
 import "./themes/default.css";
 
-// TODO #9: add link to upgrade guide
 Userfront.build = (toolId) => {
   console.error(`Userfront.build(${toolId}) has been removed. Instead, import the component directly:
-    import { SignupForm, LoginForm, PasswordResetForm, SetNewPasswordForm, LogoutButton } from "@userfront/react"
-  See TODO DOCS LINK for more information about upgrading to the new toolkit.`);
+    import { SignupForm, LoginForm, PasswordResetForm, SetNewPasswordForm, LogoutButton } from "@userfront/toolkit/react"
+  See https://userfront.com/dashboard/toolkit for more information about upgrading to the new toolkit.`);
 };
 
 /*
diff --git a/package/src/packaged-forms/LoginForm.jsx b/package/src/packaged-forms/LoginForm.jsx
index 30ded5e..d5bfd13 100644
--- a/package/src/packaged-forms/LoginForm.jsx
+++ b/package/src/packaged-forms/LoginForm.jsx
@@ -6,23 +6,23 @@ import PackagedUniversalForm from "./UniversalForm";
  * A fully functional Userfront login form
  *
  * @param {object} props
- * @param {string} props.tenantId - the tenant ID to use
- * @param {object} props.flow - auth flow to use. By default this is fetched from the server.
- * @param {boolean} props.compact - if true, for the password method, show a "Username and password" button.
+ * @param {string=} props.tenantId - the tenant ID to use
+ * @param {object=} props.flow - auth flow to use. By default this is fetched from the server.
+ * @param {boolean=} props.compact - if true, for the password method, show a "Username and password" button.
  *   If false, show the password entry form alongside the buttons to choose a different factor.
- * @param {string | boolean} props.redirect - URL to redirect to after successful login.
+ * @param {(string|boolean)=} props.redirect - URL to redirect to after successful login.
  *   If false, do not redirect.
  *   If absent, use the after-login path from the server.
- * @param {boolean} props.redirectOnLoadIfLoggedIn - if true, will redirect to the after-signup path on page load
+ * @param {boolean=} props.redirectOnLoadIfLoggedIn - if true, will redirect to the after-signup path on page load
  *     if the user is already logged in
  *   If false, will not redirect on page load.
  *   Defaults to false.
- *   Does not control whether user is redirected after signing up. @see props.redirect
- * @param {boolean} props.shouldFetchFlow - if true (default), fetch the first factors from the server.
+ *   Does not control whether user is redirected after signing up.
+ * @param {boolean=} props.shouldFetchFlow - if true (default), fetch the first factors from the server.
  *   If false, do not fetch the first factors from the server.
  *   Should be left at true in most production use cases.
  *   May be useful in some dev environments.
- * @param {boolean} props.xstateDevTools - if true, enable XState dev tools on the form's model.
+ * @param {boolean=} props.xstateDevTools - if true, enable XState dev tools on the form's model.
  *   Defaults to false; should remain false in production.
  *   Only useful when developing this library.
  */
diff --git a/package/src/packaged-forms/PasswordResetForm.jsx b/package/src/packaged-forms/PasswordResetForm.jsx
index d348b40..5508a77 100644
--- a/package/src/packaged-forms/PasswordResetForm.jsx
+++ b/package/src/packaged-forms/PasswordResetForm.jsx
@@ -6,11 +6,11 @@ import PackagedUniversalForm from "./UniversalForm";
  * reset link or for logged-in users.
  *
  * @param {object} props
- * @param {string} props.tenantId - the tenant ID to use
- * @param {string | boolean} props.redirect - URL to redirect to after successful login.
+ * @param {string=} props.tenantId - the tenant ID to use
+ * @param {(string|boolean)=} props.redirect - URL to redirect to after successful login.
  *   If false, do not redirect.
  *   If absent, use the after-login path from the server.
- * @param {boolean} props.xstateDevTools - if true, enable XState dev tools on the form's model.
+ * @param {boolean=} props.xstateDevTools - if true, enable XState dev tools on the form's model.
  *   Defaults to false; should remain false in production.
  *   Only useful when developing this library.
  */
diff --git a/package/src/packaged-forms/SignupForm.jsx b/package/src/packaged-forms/SignupForm.jsx
index 1ae986f..3af62e3 100644
--- a/package/src/packaged-forms/SignupForm.jsx
+++ b/package/src/packaged-forms/SignupForm.jsx
@@ -6,23 +6,23 @@ import PackagedUniversalForm from "./UniversalForm";
  * A fully functional Userfront signup form
  *
  * @param {object} props
- * @param {string} props.tenantId - the tenant ID to use
- * @param {object} props.flow - auth flow to use. By default this is fetched from the server.
- * @param {boolean} props.compact - if true, for the password method, show a "Username and password" button.
+ * @param {string=} props.tenantId - the tenant ID to use
+ * @param {object=} props.flow - auth flow to use. By default this is fetched from the server.
+ * @param {boolean=} props.compact - if true, for the password method, show a "Username and password" button.
  *   If false, show the password entry form alongside the buttons to choose a different factor.
- * @param {string | boolean} props.redirect - URL to redirect to after successful signup.
+ * @param {(string|boolean)=} props.redirect - URL to redirect to after successful signup.
  *   If false, do not redirect.
  *   If absent, use the after-signup path from the server.
- * @param {boolean} props.redirectOnLoadIfLoggedIn - if true, will redirect to the after-signup path on page load
+ * @param {boolean=} props.redirectOnLoadIfLoggedIn - if true, will redirect to the after-signup path on page load
  *     if the user is already logged in
  *   If false, will not redirect on page load.
  *   Defaults to false.
- *   Does not control whether user is redirected after signing up. @see props.redirect
- * @param {boolean} props.shouldFetchFlow - if true (default), fetch the first factors from the server.
+ *   Does not control whether user is redirected after signing up.
+ * @param {boolean=} props.shouldFetchFlow - if true (default), fetch the first factors from the server.
  *   If false, do not fetch the first factors from the server.
  *   Should be left at true in most production use cases.
  *   May be useful in some dev environments.
- * @param {boolean} props.xstateDevTools - if true, enable XState dev tools on the form's model.
+ * @param {boolean=} props.xstateDevTools - if true, enable XState dev tools on the form's model.
  *   Defaults to false; should remain false in production.
  *   Only useful when developing this library.
  */
diff --git a/package/src/packaged-forms/UniversalForm.jsx b/package/src/packaged-forms/UniversalForm.jsx
index 54f78e7..40e4558 100644
--- a/package/src/packaged-forms/UniversalForm.jsx
+++ b/package/src/packaged-forms/UniversalForm.jsx
@@ -11,24 +11,24 @@ import { useMachine } from "@xstate/react";
  * signup, login, requesting password reset, and setting a new password.
  *
  * @param {object} props
- * @param {string} props.type - the form type: "signup", "login", "reset"
- * @param {string} props.tenantId - the tenant ID to use
- * @param {object} props.flow - auth flow to use. By default this is fetched from the server.
- * @param {boolean} props.compact - if true, for the password method, show a "Username and password" button.
+ * @param {string=} props.type - the form type: "signup", "login", "reset"
+ * @param {string=} props.tenantId - the tenant ID to use
+ * @param {object=} props.flow - auth flow to use. By default this is fetched from the server.
+ * @param {boolean=} props.compact - if true, for the password method, show a "Username and password" button.
  *   If false, show the password entry form alongside the buttons to choose a different factor.
- * @param {string | boolean} props.redirect - URL to redirect to after successful login.
+ * @param {(string|boolean)=} props.redirect - URL to redirect to after successful login.
  *   If false, do not redirect.
  *   If absent, use the after-login path from the server.
- * @param {boolean} props.redirectOnLoadIfLoggedIn - if true, will redirect to the after-signup path on page load
+ * @param {boolean=} props.redirectOnLoadIfLoggedIn - if true, will redirect to the after-signup path on page load
  *     if the user is already logged in
  *   If false, will not redirect on page load.
  *   Defaults to false.
- *   Does not control whether user is redirected after signing up. @see props.redirect
- * @param {boolean} props.shouldFetchFlow - if true (default), fetch the first factors from the server.
+ *   Does not control whether user is redirected after signing up.
+ * @param {boolean=} props.shouldFetchFlow - if true (default), fetch the first factors from the server.
  *   If false, do not fetch the first factors from the server.
  *   Should be left at true in most production use cases.
  *   May be useful in some dev environments.
- * @param {boolean} props.xstateDevTools - if true, enable XState dev tools on the form's model.
+ * @param {boolean=} props.xstateDevTools - if true, enable XState dev tools on the form's model.
  *   Defaults to false; should remain false in production.
  *   Only useful when developing this library.
  */
diff --git a/package/types/index.d.ts b/package/types/index.d.ts
new file mode 100644
index 0000000..de52e5d
--- /dev/null
+++ b/package/types/index.d.ts
@@ -0,0 +1,26 @@
+/* 
+  Manually adjusted .d.ts for index.js
+  The auto-generated index.d.ts file does not pick up the CoreJS import,
+  so this adds that import. The import paths in this file reflect the
+  expected auto-generated paths and are not expected to be present
+  relative to this file.
+
+  During build, this is copied directly into the dist directory.
+*/
+
+export { default as SignupForm } from "./packaged-forms/SignupForm";
+export { default as LoginForm } from "./packaged-forms/LoginForm";
+export { default as PasswordResetForm } from "./packaged-forms/PasswordResetForm";
+export { default as LogoutButton } from "./components/LogoutButton";
+export namespace _devTools {
+  export { UnboundUniversalForm };
+  export { createUniversalFormModel };
+  export { defaultUniversalFormContext };
+  export { overrideUserfrontSingleton };
+}
+export default Userfront;
+import { default as UnboundUniversalForm } from "./forms/UniversalForm";
+import { default as createUniversalFormModel } from "./models/forms/universal";
+import { defaultAuthContext as defaultUniversalFormContext } from "./models/forms/universal";
+import { overrideUserfrontSingleton } from "./services/userfront";
+import * as Userfront from "@userfront/core";