diff --git a/examples/nextjs/app/page.tsx b/examples/nextjs/app/page.tsx
index c281b26..2a6fe7c 100644
--- a/examples/nextjs/app/page.tsx
+++ b/examples/nextjs/app/page.tsx
@@ -7,7 +7,7 @@ export default function Home() {
   const user = useUser();
 
   return (
-    <div className="p-8">
+    <div className="p-8 ">
       <h1 className="text-3xl font-bold mb-6">Firebase UI Demo</h1>
       <div className="mb-6">
         {user && <div>Welcome: {user.email || user.phoneNumber}</div>}
diff --git a/examples/nextjs/lib/examples/2/page.tsx b/examples/nextjs/lib/examples/2/page.tsx
index dbb5a62..fb01820 100644
--- a/examples/nextjs/lib/examples/2/page.tsx
+++ b/examples/nextjs/lib/examples/2/page.tsx
@@ -4,7 +4,6 @@ import { useState } from "react";
 import {
   EmailPasswordForm,
   RegisterForm,
-  CustomSignInScreen,
   Card,
   CardHeader,
   CardTitle,
@@ -52,7 +51,7 @@ export default function Example2() {
               style={{ animationDelay: "1s" }}
             ></div>
 
-            <CustomSignInScreen className="!min-h-0 !bg-transparent !p-0">
+            <div className="!min-h-0 !bg-transparent !p-0">
               <Card className="relative rounded-xl border border-white/10 bg-black/40 shadow-2xl backdrop-blur-xl">
                 <CardHeader>
                   <CardTitle>
@@ -84,7 +83,7 @@ export default function Example2() {
                   </>
                 )}
               </Card>
-            </CustomSignInScreen>
+            </div>
           </div>
         </main>
 
diff --git a/examples/nextjs/lib/examples/4/page.tsx b/examples/nextjs/lib/examples/4/page.tsx
index 88a1bc2..52fc226 100644
--- a/examples/nextjs/lib/examples/4/page.tsx
+++ b/examples/nextjs/lib/examples/4/page.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { SignInScreen } from "@firebase-ui/react";
+import { SignInAuthScreen } from "@firebase-ui/react";
 
 export default function Example4() {
   return (
-    <SignInScreen onForgotPasswordClick={() => {}} onRegisterClick={() => {}} />
+    <SignInAuthScreen onForgotPasswordClick={() => {}} onRegisterClick={() => {}} />
   );
 }
diff --git a/packages/firebaseui-react/src/auth/forms/email-password-form.tsx b/packages/firebaseui-react/src/auth/forms/email-password-form.tsx
index 299ff3b..4e791ca 100644
--- a/packages/firebaseui-react/src/auth/forms/email-password-form.tsx
+++ b/packages/firebaseui-react/src/auth/forms/email-password-form.tsx
@@ -14,7 +14,7 @@ import { Button } from "../../components/button";
 import { FieldInfo } from "../../components/field-info";
 import { Policies } from "../../components/policies";
 
-interface EmailPasswordFormProps {
+export interface EmailPasswordFormProps  {
   onForgotPasswordClick?: () => void;
   onRegisterClick?: () => void;
 }
diff --git a/packages/firebaseui-react/src/auth/forms/register-form.tsx b/packages/firebaseui-react/src/auth/forms/register-form.tsx
index 812df91..6396c21 100644
--- a/packages/firebaseui-react/src/auth/forms/register-form.tsx
+++ b/packages/firebaseui-react/src/auth/forms/register-form.tsx
@@ -14,7 +14,7 @@ import { Button } from "../../components/button";
 import { FieldInfo } from "../../components/field-info";
 import { Policies } from "../../components/policies";
 
-interface RegisterFormProps {
+export interface RegisterFormProps {
   onBackToSignInClick?: () => void;
 }
 
diff --git a/packages/firebaseui-react/src/auth/index.ts b/packages/firebaseui-react/src/auth/index.ts
index aa00d04..5051e5b 100644
--- a/packages/firebaseui-react/src/auth/index.ts
+++ b/packages/firebaseui-react/src/auth/index.ts
@@ -1,3 +1,4 @@
+/** Export screens */
 export {
   EmailLinkAuthScreen,
   type EmailLinkAuthScreenProps,
@@ -24,4 +25,13 @@ export {
   type PasswordResetScreenProps,
 } from "./screens/password-reset-screen";
 
+/** Export forms */
+export {
+  EmailPasswordForm,
+  type EmailPasswordFormProps,
+} from "./forms/email-password-form";
+
+export { RegisterForm, type RegisterFormProps } from "./forms/register-form";
+
+/** Export Buttons */
 export { GoogleSignInButton } from "./oauth/google-sign-in-button";
diff --git a/packages/firebaseui-react/src/components/index.tsx b/packages/firebaseui-react/src/components/index.tsx
new file mode 100644
index 0000000..1540784
--- /dev/null
+++ b/packages/firebaseui-react/src/components/index.tsx
@@ -0,0 +1,6 @@
+export * from '././button';
+export * from './card';
+export * from './country-selector';
+export * from './field-info';
+export * from './policies';
+export * from './divider';
\ No newline at end of file
diff --git a/packages/firebaseui-react/src/index.ts b/packages/firebaseui-react/src/index.ts
index 6ff917a..e49a699 100644
--- a/packages/firebaseui-react/src/index.ts
+++ b/packages/firebaseui-react/src/index.ts
@@ -1,3 +1,4 @@
 export * from "./auth";
 export * from "./hooks";
+export * from "./components";
 export { FirebaseUIProvider as ConfigProvider } from "./context";